From c1093b568e76fa3322032d1df8101e2f94d79044 Mon Sep 17 00:00:00 2001 From: othocaeS Date: Thu, 14 Jul 2016 16:12:56 -0400 Subject: [PATCH] finalizing frequency bins for formal analysis --- data/STORM_III/lightcurves/Δt≔0.1/HST1367.lc | 279 ++++++++++--------- data/STORM_III/lightcurves/Δt≔0.1/i_7647.lc | 137 --------- notes/Fourier Frequencies | 134 +++++++++ scripts/analyze_lightcurves.sh | 24 +- scripts/heasoft_to_psdlag.pl | 18 +- scripts/prep_lcfiles.sh | 2 +- 6 files changed, 302 insertions(+), 292 deletions(-) delete mode 100644 data/STORM_III/lightcurves/Δt≔0.1/i_7647.lc create mode 100644 notes/Fourier Frequencies diff --git a/data/STORM_III/lightcurves/Δt≔0.1/HST1367.lc b/data/STORM_III/lightcurves/Δt≔0.1/HST1367.lc index 7c12944..cd486dc 100644 --- a/data/STORM_III/lightcurves/Δt≔0.1/HST1367.lc +++ b/data/STORM_III/lightcurves/Δt≔0.1/HST1367.lc @@ -1,160 +1,171 @@ -# 1 1 -56692.0 3.658 0.066 -56693.0 3.814 0.068 -56695.0 4.094 0.071 -56696.0 4.425 0.075 -56697.0 4.53 0.075 -56698.0 4.827 0.079 -56699.0 4.58 0.076 -56700.0 4.6 0.076 -56701.0 4.746 0.078 -56702.0 4.774 0.078 -56703.0 4.756 0.078 -56705.0 4.577 0.076 -56706.0 4.47 0.075 -56707.0 4.665 0.077 -56708.0 4.324 0.074 -56709.0 4.143 0.071 -56710.0 3.769 0.068 -56711.0 3.522 0.065 -56712.0 3.476 0.064 -56713.0 3.518 0.065 -56714.0 3.445 0.064 +# 0.1 1 +56691.5 3.545 0.065 +56692.4 3.771 0.067 +56693.3 3.814 0.068 +56695.3 4.094 0.071 +56696.2 4.425 0.075 +56697.3 4.53 0.075 +56698.3 4.827 0.079 +56699.2 4.58 0.076 +56700.2 4.6 0.076 +56701.4 4.746 0.078 +56702.2 4.774 0.078 +56703.2 4.756 0.078 +56705.3 4.577 0.076 +56706.2 4.47 0.075 +56707.2 4.665 0.077 +56708.3 4.324 0.074 +56709.3 4.143 0.071 +56710.3 3.769 0.068 +56711.1 3.522 0.065 +56712.2 3.476 0.064 +56713.2 3.518 0.065 +56714.2 3.445 0.064 56715.0 3.146 0.061 -56716.0 3.058 0.06 -56717.0 2.964 0.059 -56719.0 2.675 0.056 -56720.0 2.601 0.055 +56715.9 3.058 0.06 +56716.8 2.964 0.059 +56718.8 2.675 0.056 +56720.1 2.601 0.055 56721.0 2.376 0.053 -56722.0 2.225 0.051 -56723.0 2.187 0.051 -56726.0 2.296 0.052 -56727.0 2.272 0.051 -56728.0 2.307 0.052 -56729.0 2.391 0.053 -56730.0 2.454 0.054 -56731.0 2.422 0.053 +56722.1 2.225 0.051 +56723.1 2.187 0.051 +56726.1 2.296 0.052 +56727.1 2.272 0.051 +56727.8 2.307 0.052 +56728.9 2.391 0.053 +56729.8 2.454 0.054 +56730.8 2.422 0.053 56732.0 2.469 0.054 -56733.0 2.439 0.053 -56734.0 2.494 0.054 -56735.0 2.763 0.057 -56736.0 3.4105 0.0635 -56738.0 3.8895 0.069 -56740.0 4.395 0.0745 -56741.0 4.523 0.076 -56744.0 5.435 0.085 -56745.0 5.479 0.086 -56746.0 5.254 0.084 -56747.0 5.659 0.088 -56748.0 5.497 0.086 -56749.0 5.283 0.084 -56750.0 5.155 0.082 -56751.0 4.937 0.08 +56732.9 2.439 0.053 +56733.8 2.494 0.054 +56734.8 2.763 0.057 +56735.8 3.243 0.062 +56736.4 3.578 0.065 +56737.7 3.788 0.068 +56738.5 3.991 0.07 +56739.7 4.246 0.073 +56740.4 4.544 0.076 +56741.3 4.523 0.076 +56744.4 5.435 0.085 +56745.3 5.479 0.086 +56746.2 5.254 0.084 +56747.2 5.659 0.088 +56748.2 5.497 0.086 +56749.2 5.283 0.084 +56750.3 5.155 0.082 +56751.2 4.937 0.08 56752.0 4.672 0.077 56753.0 4.089 0.071 56754.0 3.619 0.066 -56755.0 3.446 0.064 -56756.0 3.546 0.065 -56757.0 3.726 0.067 -56759.0 3.586 0.066 -56760.0 3.568 0.065 -56761.0 3.888 0.069 -56762.0 3.911 0.069 +56755.2 3.446 0.064 +56756.1 3.546 0.065 +56757.1 3.726 0.067 +56759.3 3.586 0.066 +56760.1 3.568 0.065 +56761.1 3.888 0.069 +56762.1 3.911 0.069 56763.0 3.932 0.069 -56764.0 4.043 0.071 -56765.0 3.83 0.068 +56764.2 4.043 0.071 +56765.2 3.83 0.068 56766.0 3.949 0.069 56767.0 4.083 0.071 -56768.0 4.142 0.072 -56769.0 4.528 0.076 -56770.0 4.851 0.079 -56771.0 4.979 0.081 +56768.1 4.142 0.072 +56769.2 4.528 0.076 +56770.1 4.851 0.079 +56771.1 4.979 0.081 56772.0 4.965 0.08 -56773.0 5.055 0.082 +56773.1 5.055 0.082 56774.0 5.102 0.082 -56775.0 5.004 0.081 -56776.0 5.033 0.081 -56777.0 4.614 0.077 -56778.0 4.545 0.076 -56779.0 4.431 0.075 -56780.0 4.556 0.076 -56781.0 4.353 0.074 -56782.0 4.135 0.072 -56783.0 4.528 0.076 -56785.0 5.118 0.082 -56786.0 5.355 0.085 -56787.0 4.987 0.0805 -56788.0 4.882 0.08 -56789.0 4.609 0.076 -56790.0 4.335 0.074 -56791.0 4.289 0.073 -56792.0 4.553 0.076 -56793.0 4.741 0.078 -56794.0 4.643 0.077 -56795.0 4.364 0.074 -56796.0 4.423 0.075 -56797.0 4.936 0.08 -56798.0 4.948 0.08 -56799.0 4.692 0.078 +56774.6 5.004 0.081 +56775.6 5.033 0.081 +56776.7 4.596 0.077 +56777.4 4.632 0.077 +56778.5 4.545 0.076 +56779.4 4.431 0.075 +56780.5 4.556 0.076 +56781.4 4.353 0.074 +56782.4 4.135 0.072 +56783.4 4.528 0.076 +56784.8 5.118 0.082 +56785.8 5.355 0.085 +56786.7 5.037 0.081 +56787.3 4.937 0.08 +56788.3 4.882 0.08 +56789.3 4.609 0.076 +56790.3 4.335 0.074 +56791.3 4.289 0.073 +56792.3 4.553 0.076 +56793.2 4.741 0.078 +56794.2 4.643 0.077 +56795.3 4.364 0.074 +56796.1 4.423 0.075 +56797.1 4.936 0.08 +56798.1 4.948 0.08 +56799.2 4.692 0.078 56800.0 4.622 0.077 56801.0 4.809 0.079 56802.0 4.633 0.077 56803.0 4.794 0.079 56805.0 4.473 0.075 56806.0 4.346 0.074 -56807.0 4.345 0.074 -56808.0 4.478 0.075 -56809.0 4.707 0.078 -56810.0 4.573 0.076 -56811.0 4.465 0.075 +56807.1 4.345 0.074 +56808.1 4.478 0.075 +56809.1 4.707 0.078 +56809.9 4.573 0.076 +56810.8 4.465 0.075 56812.0 4.719 0.078 56813.0 4.809 0.079 -56814.0 5.004 0.081 -56815.0 5.324 0.084 -56816.0 5.486 0.086 -56817.0 5.576 0.087 -56818.0 6.186 0.094 -56819.0 6.474 0.097 -56820.0 6.463 0.097 +56814.1 5.004 0.081 +56814.9 5.324 0.084 +56816.1 5.486 0.086 +56816.9 5.576 0.087 +56817.9 6.186 0.094 +56818.9 6.474 0.097 +56819.7 6.463 0.097 56821.0 6.206 0.094 -56822.0 5.888 0.091 -56823.0 5.736 0.089 -56824.0 5.553 0.087 -56825.0 5.425 0.085 -56826.0 5.133 0.083 -56827.0 4.588 0.077 -56828.0 4.3825 0.0745 -56830.0 4.157 0.072 -56832.0 4.2755 0.073 -56834.0 4.765 0.079 -56835.0 4.738 0.078 -56836.0 4.4445 0.075 -56838.0 4.44 0.075 -56839.0 4.45 0.075 -56840.0 4.52 0.076 -56841.0 4.442 0.075 -56842.0 4.469 0.075 -56843.0 4.231 0.073 -56844.0 4.082 0.071 +56821.9 5.888 0.091 +56822.8 5.736 0.089 +56823.8 5.553 0.087 +56824.6 5.425 0.085 +56825.6 5.133 0.083 +56826.9 4.588 0.077 +56827.8 4.371 0.074 +56828.5 4.394 0.075 +56829.6 4.204 0.073 +56830.5 4.11 0.071 +56831.7 4.171 0.072 +56832.3 4.38 0.074 +56833.8 4.765 0.079 +56834.8 4.738 0.078 +56835.8 4.455 0.075 +56836.2 4.434 0.075 +56837.6 4.431 0.075 +56838.2 4.449 0.075 +56839.2 4.45 0.075 +56840.1 4.52 0.076 +56841.2 4.442 0.075 +56842.2 4.469 0.075 +56843.1 4.231 0.073 +56844.2 4.082 0.071 56845.0 4.105 0.071 -56846.0 4.033 0.071 +56846.1 4.033 0.071 56847.0 3.887 0.069 56848.0 3.796 0.068 -56849.0 3.71 0.067 +56849.1 3.71 0.067 56850.0 3.554 0.066 -56851.0 3.426 0.064 -56852.0 3.377 0.064 -56853.0 3.419 0.064 +56850.9 3.426 0.064 +56851.9 3.377 0.064 +56852.9 3.419 0.064 56854.0 3.324 0.063 56855.0 3.457 0.065 -56856.0 3.8 0.068 -56857.0 4.33 0.074 -56858.0 4.513 0.076 -56859.0 4.389 0.075 -56860.0 4.079 0.071 -56861.0 4.043 0.071 -56862.0 3.986 0.07 -56863.0 3.741 0.068 -56864.0 4.104 0.072 -56865.0 4.331 0.074 -56866.0 4.708 0.078 +56856.2 3.8 0.068 +56857.2 4.33 0.074 +56858.1 4.513 0.076 +56858.9 4.389 0.075 +56860.1 4.079 0.071 +56860.9 4.043 0.071 +56861.8 3.986 0.07 +56862.9 3.741 0.068 +56863.9 4.104 0.072 +56864.9 4.331 0.074 +56865.9 4.708 0.078 diff --git a/data/STORM_III/lightcurves/Δt≔0.1/i_7647.lc b/data/STORM_III/lightcurves/Δt≔0.1/i_7647.lc deleted file mode 100644 index 278d448..0000000 --- a/data/STORM_III/lightcurves/Δt≔0.1/i_7647.lc +++ /dev/null @@ -1,137 +0,0 @@ -# 1 1 -56694.0 0.99818 0.0010832 -56695.0 1.0013 0.0011449 -56696.0 1.0108 0.0010735 -56697.0 1.01595 0.0025351 -56698.0 1.0152 0.0015205 -56699.0 1.0214 0.003556 -56700.0 1.0193 0.0039285 -56701.0 1.0248 0.00057142 -56702.0 1.02295 0.00356505 -56703.0 1.0311 0.0036114 -56704.0 1.0341 0.0028286 -56705.0 1.0351 0.0033558 -56706.0 1.03885 0.0029278 -56707.0 1.0394 0.0041289 -56708.0 1.0421 0.004911 -56710.0 1.0268 0.0044325 -56711.0 1.02535 0.00395625 -56712.0 1.02215 0.00219665 -56714.0 1.0144 0.0037523 -56715.0 1.011 0.00047881 -56716.0 1.0075 0.0042615 -56717.0 1.0073 0.0011921 -56718.0 1.000505 0.0050132 -56719.0 0.99439 0.00487405 -56720.0 0.97784 0.010423 -56721.0 0.97176 0.001192 -56722.0 0.96021 0.00086336 -56723.0 0.94266 0.00073112 -56724.0 0.9498 0.0011062 -56725.0 0.92922 0.0082206 -56728.0 0.94276 0.0092891 -56729.0 0.942585 0.00088675 -56731.0 0.9436725 0.0018895975 -56732.0 0.94518 0.00059886 -56733.0 0.9465 0.00060471 -56734.0 0.949485 0.002453405 -56735.0 0.95214 0.00063674 -56736.0 0.96425 0.00252907 -56737.0 0.9794 0.002665995 -56741.0 1.0188 0.0098614 -56742.0 1.016 0.004847785 -56744.0 1.0336 0.006135 -56745.0 1.043 0.00448035 -56747.0 1.0507 0.0046892 -56748.0 1.0586 0.011607 -56749.0 1.0573 0.0073935 -56750.0 1.0654 0.0053101 -56752.0 1.0668 0.0065078 -56753.0 1.071 0.0013997 -56754.0 1.0614 0.0013847 -56755.0 1.0533 0.0014189 -56756.0 1.0354 0.0098934 -56757.0 1.0356 0.00514494 -56758.0 1.0455 0.0074823 -56759.0 1.0349 0.0055304 -56760.0 1.0264 0.0054586 -56763.0 1.0162 0.0031825 -56764.0 1.0142 0.0031806 -56765.0 1.0157 0.0039904 -56766.0 1.0113 0.00319955 -56771.0 1.0251 0.0030363 -56772.0 1.02565 0.00103871 -56773.0 1.03505 0.00619505 -56774.0 1.0367 0.0065486 -56775.0 1.0423 0.00842345 -56776.0 1.047875 0.003213195 -56778.0 1.04595 0.00127615 -56779.0 1.0438 0.0028443 -56780.0 1.03895 0.00392025 -56781.0 1.04065 0.00370985 -56782.0 1.0339 0.0013211 -56783.0 1.03395 0.0044336 -56784.0 1.0343 0.0013026 -56785.0 1.0354 0.0011273 -56786.0 1.0373 0.0010105 -56787.0 1.0346 0.0008086 -56790.0 1.0298 0.00089144 -56792.0 1.0234 0.00064158 -56793.0 1.0263 0.0011514 -56794.0 1.0327 0.0013893 -56795.0 1.0266 0.0013657 -56796.0 1.0299 0.0016216 -56797.0 1.0342 0.0015733 -56798.0 1.0344 0.0016566 -56799.0 1.0388 0.0015688 -56800.0 1.0346 0.0012622 -56801.0 1.0319 0.00112 -56802.0 1.0336 0.00097995 -56803.0 1.0358 0.0014131 -56805.0 1.0323 0.0016691 -56806.0 1.0272 0.0010286 -56807.0 1.0338 0.0012573 -56808.0 1.0356 0.0014605 -56809.0 1.0365 0.0013149 -56810.0 1.0381 0.0014683 -56811.0 1.0372 0.001497 -56812.0 1.0398 0.001338 -56813.0 1.0392 0.0017247 -56815.0 1.0443 0.0016613 -56816.0 1.04995 0.0020961 -56817.0 1.04905 0.00349665 -56818.0 1.0568 0.0029221 -56819.0 1.0639 0.0019499 -56820.0 1.0676 0.0010707 -56821.0 1.073 0.0031384 -56822.0 1.0768 0.0011759 -56823.0 1.0863 0.0016316 -56824.0 1.0826 0.0017377 -56825.0 1.08875 0.0035919 -56826.0 1.0736 0.0018112 -56827.0 1.0696 0.0016159 -56828.0 1.0676 0.0016659 -56829.0 1.0648 0.0015916 -56830.0 1.0616 0.0018272 -56831.0 1.0419 0.0016339 -56832.0 1.0473 0.0015363 -56833.0 1.0512 0.0016127 -56834.0 1.0565 0.0014259 -56835.0 1.0492 0.0015334 -56839.0 1.0496 0.0039668 -56841.0 1.0514 0.0014987 -56842.0 1.0486 0.004392 -56843.0 1.0465 0.00282365 -56845.0 1.0415 0.0016418 -56847.0 1.0284 0.0012048 -56848.0 1.0219 0.00083962 -56849.0 1.0252 0.0065753 -56850.0 1.0311 0.0029486 -56858.0 1.0166 0.0016626 -56860.0 1.0135 0.0019027 -56861.0 1.0197 0.0013262 -56862.0 1.0128 0.0017233 -56863.0 1.0119 0.0015518 -56864.0 1.0245 0.0018702 -56865.0 1.0165 0.0051545 -56866.0 1.0161 0.0088544 diff --git a/notes/Fourier Frequencies b/notes/Fourier Frequencies new file mode 100644 index 0000000..f0bc1e6 --- /dev/null +++ b/notes/Fourier Frequencies @@ -0,0 +1,134 @@ + + +HST1367 time boundaries (days) +────────────────────────────── +56691.5 +56865.9 + + + + +Fourier Quantification +────────────────────── +(56865.9 - 56691.5) days = 174.4 days + +1 / (174.4 days) = ~0.00573394495412844037 days⁻¹ + + First 27 Frequencies + ──────────────────── + Linear Log₁₀ + 0.00573394495412844037 -2.24154648059654841582 + 0.01146788990825688074 -1.94051648493256722061 + 0.01720183486238532111 -1.76442522587688597853 + 0.02293577981651376148 -1.63948648926858602540 + 0.02866972477064220185 -1.54257647626052961104 + 0.03440366972477064222 -1.46339523021290478332 + 0.04013761467889908259 -1.39644844058229158511 + 0.04587155963302752296 -1.33845649360460483018 + 0.05160550458715596333 -1.28730397115722354124 + 0.0573394495412844037 -1.24154648059654841582 + 0.06307339449541284407 -1.20015379543832337508 + 0.06880733944954128444 -1.16236523454892358810 + 0.07454128440366972481 -1.12760312828971164662 + 0.08027522935779816518 -1.09541844491831038990 + 0.08600917431192660555 -1.06545522154086717374 + 0.09174311926605504592 -1.03742649794062363497 + 0.09747706422018348629 -1.01109755921827448728 + 0.10321100917431192666 -0.98627397549324234602 + 0.10894495412844036703 -0.96279287964371945429 + 0.1146788990825688074 -0.94051648493256722061 + 0.12041284403669724777 -0.91932718586262914782 + 0.12614678899082568814 -0.89912379977434217986 + 0.13188073394495412851 -0.87981864457895553696 + 0.13761467889908256888 -0.86133523888494239289 + 0.14334862385321100925 -0.84360647192451080625 + 0.14908256880733944962 -0.82657313262573045141 + 0.15481651376146788999 -0.81018271643756110394 + +Calibration Bins +──────────────── +min max binned # +0.005 0.019 3 + 0.00573394495412844037 -2.24154648059654841582 + 0.01146788990825688074 -1.94051648493256722061 + 0.01720183486238532111 -1.76442522587688597853 +0.019 0.0425 4 + 0.02293577981651376148 -1.63948648926858602540 + 0.02866972477064220185 -1.54257647626052961104 + 0.03440366972477064222 -1.46339523021290478332 + 0.04013761467889908259 -1.39644844058229158511 +0.0425 0.07 5 + 0.04587155963302752296 -1.33845649360460483018 + 0.05160550458715596333 -1.28730397115722354124 + 0.0573394495412844037 -1.24154648059654841582 + 0.06307339449541284407 -1.20015379543832337508 + 0.06880733944954128444 -1.16236523454892358810 +0.07 0.11 7 + 0.07454128440366972481 -1.12760312828971164662 + 0.08027522935779816518 -1.09541844491831038990 + 0.08600917431192660555 -1.06545522154086717374 + 0.09174311926605504592 -1.03742649794062363497 + 0.09747706422018348629 -1.01109755921827448728 + 0.10321100917431192666 -0.98627397549324234602 + 0.10894495412844036703 -0.96279287964371945429 +0.11 0.17 8 + 0.1146788990825688074 -0.94051648493256722061 + 0.12041284403669724777 -0.91932718586262914782 + 0.12614678899082568814 -0.89912379977434217986 + 0.13188073394495412851 -0.87981864457895553696 + 0.13761467889908256888 -0.86133523888494239289 + 0.14334862385321100925 -0.84360647192451080625 + 0.14908256880733944962 -0.82657313262573045141 + 0.15481651376146788999 -0.81018271643756110394 +0.17 0.24 12 (30-41) +0.24 0.4 28 (42-69) +0.4 0.603 36 (70-105) + + +Binning Regimes to Try on i band Lightcurve +─────────────────────────────────────────── +With lowest frequency + 0.0049999999 0.018619375 + 0.018619375 0.044733049 + 0.044733049 0.069336227 + 0.069336227 0.10747115 + 0.10747115 0.16658029 + 0.16658029 0.25819945 + 0.25819945 0.40020915 + 0.40020915 0.62032418 + +Next, let’s remove that lowest frequency + + 0.0099999998 0.024025000 + 0.024025000 0.037238750 + 0.037238750 0.057720063 + 0.057720063 0.089466098 + 0.089466098 0.13867245 + 0.13867245 0.21494230 + 0.21494230 0.33316057 + 0.33316057 0.51639889 + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/scripts/analyze_lightcurves.sh b/scripts/analyze_lightcurves.sh index 81d962e..06f6e49 100755 --- a/scripts/analyze_lightcurves.sh +++ b/scripts/analyze_lightcurves.sh @@ -1,18 +1,18 @@ #!/usr/local/bin/bash -for curvefile in data/STORM_III/lightcurves/Δt≔0.01/* +for curvefile in data/STORM_III/lightcurves/Δt≔0.1/* do echo Running psdlag for $curvefile. newfilename="analyses/$(basename $curvefile|sed 's@\(.*\)\.lc@\1@')≻HST1367_$(basename $(dirname $curvefile))" - echo "2" > inputfile.tmp - echo "data/STORM_III/lightcurves/Δt≔0.01/HST1367.lc 0" >> inputfile.tmp - echo "$curvefile 0" >> inputfile.tmp - echo "8 0.005 0.019 0.0425 0.07 0.11 0.17 0.24 0.4 0.603" >> inputfile.tmp - echo "0" >> inputfile.tmp - echo ".9999 .9999 .9999 0.49 0.42 0.30 0.36 1.2 -0.60 -0.89 -0.72 2.39 -0.74 -1.5 -1 -3.1 -1.3 -2.3 -2 -1.9 -1.6 -2.6 -2 -1.3 -1.8 -2.6 -1.2 0 -2 -2.7 -1.3 0.63" >> inputfile.tmp - echo "0:0 0" >> inputfile.tmp - echo "0" >> inputfile.tmp - echo "0" >> inputfile.tmp - echo "100 50 50 mcmc.dat" >> inputfile.tmp - time bin/psdlag inputfile.tmp >> $newfilename + echo "2" > tmp.psdlagargs + echo "data/STORM_III/lightcurves/Δt≔0.01/HST1367.lc 0" >> tmp.psdlagargs + echo "$curvefile 0" >> tmp.psdlagargs + echo "8 0.005 0.019 0.0425 0.07 0.11 0.17 0.24 0.4 0.603" >> tmp.psdlagargs + echo "0" >> tmp.psdlagargs + echo ".9999 .9999 .9999 0.49 0.42 0.30 0.36 1.2 -0.60 -0.89 -0.72 2.39 -0.74 -1.5 -1 -3.1 -1.3 -2.3 -2 -1.9 -1.6 -2.6 -2 -1.3 -1.8 -2.6 -1.2 0 -2 -2.7 -1.3 0.63" >> tmp.psdlagargs + echo "0:0 0" >> tmp.psdlagargs + echo "0" >> tmp.psdlagargs + echo "0" >> tmp.psdlagargs + echo "100 50 50 mcmc.dat" >> tmp.psdlagargs + time bin/psdlag tmp.psdlagargs >> $newfilename done \ No newline at end of file diff --git a/scripts/heasoft_to_psdlag.pl b/scripts/heasoft_to_psdlag.pl index 746e3d5..e2b159b 100755 --- a/scripts/heasoft_to_psdlag.pl +++ b/scripts/heasoft_to_psdlag.pl @@ -47,13 +47,13 @@ while (<>) { # This mess to average measurements occuring at the same time coordinate $this_t = "$t𝓃.$t𝜀"; if ($this_t == $last_t) { - if ($heap_count == 0) { + if ($heap_count == 1) { if ( $linetoprint =~ /([0-9\.]+)\s+([0-9e\-\.]+)\s+([0-9e\-\.]+)/ ) { - $new_flux_μ = $flux_μ + $2; + our $new_flux_μ = $flux_μ + $2; # Could just take the max error # $new_flux_σ = max($flux_σ,$3); # Average error seems fair - $new_flux_σ = $flux_σ + $3; + our $new_flux_σ = $flux_σ + $3; $num_avg++; } else { die "Malformed data"; } @@ -65,12 +65,14 @@ while (<>) { $heap_count++; } else { - $new_flux_μ /= $heap_count; - $new_flux_σ /= $heap_count; - $linetoprint="$this_t $new_flux_μ $new_flux_σ"; - our $heap_count = 0; + if ($heap_count > 1) { + $new_flux_μ /= $heap_count; + $new_flux_σ /= $heap_count; + $linetoprint="$last_t $new_flux_μ $new_flux_σ"; + our $heap_count = 1; + } say $linetoprint; - $linetoprint = "$t𝓃.$t𝜀 $flux_μ $flux_σ"; + $linetoprint = "$this_t $flux_μ $flux_σ"; } $last_t = $this_t; } diff --git a/scripts/prep_lcfiles.sh b/scripts/prep_lcfiles.sh index 6354591..d142bb5 100755 --- a/scripts/prep_lcfiles.sh +++ b/scripts/prep_lcfiles.sh @@ -1,3 +1,3 @@ #!/usr/local/bin/bash -for file in data/STORM_III/raw/separated/*; do scripts/heasoft_to_psdlag.pl < $file > data/STORM_III/lightcurves/Δt≔0.01/$(basename $file|sed 's@\(.*\)\.tab@\1.lc@'); done \ No newline at end of file +for file in data/STORM_III/raw/separated/*; do scripts/heasoft_to_psdlag.pl < $file > data/STORM_III/lightcurves/Δt≔0.1/$(basename $file|sed 's@\(.*\)\.tab@\1.lc@'); done \ No newline at end of file