diff --git a/run_analysis.sh b/run_analysis.sh index 84fcc29..9ae7725 100755 --- a/run_analysis.sh +++ b/run_analysis.sh @@ -22,7 +22,7 @@ do echo "Results already exists. Create tables from stored results." cp analyses/${ref_band}_≺_${echo_band}/*.out . else - python scripts/analyze_lightcurve.py $ref_curve $echo_curve >> /dev/null + time python scripts/analyze_lightcurve.py $ref_curve $echo_curve >> log_${echo_curve} mkdir -p "analyses/${ref_band}_≺_${echo_band}" cp *.out analyses/${ref_band}_≺_${echo_band}/ fi diff --git a/scripts/analyze_lightcurve.py b/scripts/analyze_lightcurve.py index 4ab44a7..45bbf82 100644 --- a/scripts/analyze_lightcurve.py +++ b/scripts/analyze_lightcurve.py @@ -59,7 +59,7 @@ fqd = 10**(np.log10( (fqL[:-1]*fqL[1:]) )/2.) ## load the first light curve -lc1_time, lc1_strength, lc1_strength_err = np.loadtxt(args[0],skiprows=1) +lc1_time, lc1_strength, lc1_strength_err = np.loadtxt(args[0],skiprows=1).T # for pylab: errorbar(t1,l1,yerr=l1e,fmt='o') @@ -77,7 +77,7 @@ ref_psd, ref_psd_err = clag.errors(P1, ref_psd, ref_psd_err) #errorbar(fqd, ref_psd, yerr=ref_psd_err, fmt='o', ms=10) # Load second light curve -lc2_time, lc2_strength, lc2_strength_err = np.loadtxt(args[1],skiprows=1) +lc2_time, lc2_strength, lc2_strength_err = np.loadtxt(args[1],skiprows=1).T P2 = clag.clag('psd10r', [lc2_time], [lc2_strength], [lc2_strength_err], dt, fqL) echo_psd, echo_psd_err = clag.optimize(P2, initial_args) echo_psd, echo_psd_err = clag.errors(P2, echo_psd, echo_psd_err) @@ -88,7 +88,7 @@ echo_psd, echo_psd_err = clag.errors(P2, echo_psd, echo_psd_err) ### We also give it the calculated psd values as input ### Cx = clag.clag('cxd10r', [[lc1_time,lc1_time]], - [[lc1_strength,lc2_strengt]], + [[lc1_strength,lc2_strength]], [[lc1_strength_err,lc2_strength_err]], dt, fqL, ref_psd, echo_psd) @@ -97,7 +97,7 @@ Cx_vals = np.concatenate( ((ref_psd+echo_psd)*0.5-0.3,ref_psd*0+0.1) ) Cx_vals, Cx_err = clag.optimize(Cx, Cx_vals) #?????? %autoreload -Cx_vals, Cx_err = clas.errors(Cx,Cx_vals,Cx_err) +Cx_vals, Cx_err = clag.errors(Cx,Cx_vals,Cx_err) phi, phie = Cx_vals[nfq:], Cx_err[nfq:] lag, lage = phi/(2*np.pi*fqd), phie/(2*np.pi*fqd)