added some logging

This commit is contained in:
caes 2017-01-29 22:52:54 -05:00
parent 7f8f2267bd
commit 19d3e470d0
2 changed files with 5 additions and 5 deletions

View File

@ -22,7 +22,7 @@ do
echo "Results already exists. Create tables from stored results." echo "Results already exists. Create tables from stored results."
cp analyses/${ref_band}_≺_${echo_band}/*.out . cp analyses/${ref_band}_≺_${echo_band}/*.out .
else 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}" mkdir -p "analyses/${ref_band}_≺_${echo_band}"
cp *.out analyses/${ref_band}_≺_${echo_band}/ cp *.out analyses/${ref_band}_≺_${echo_band}/
fi fi

View File

@ -59,7 +59,7 @@ fqd = 10**(np.log10( (fqL[:-1]*fqL[1:]) )/2.)
## load the first light curve ## 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') # 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) #errorbar(fqd, ref_psd, yerr=ref_psd_err, fmt='o', ms=10)
# Load second light curve # 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) 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.optimize(P2, initial_args)
echo_psd, echo_psd_err = clag.errors(P2, echo_psd, echo_psd_err) 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 ### ### We also give it the calculated psd values as input ###
Cx = clag.clag('cxd10r', Cx = clag.clag('cxd10r',
[[lc1_time,lc1_time]], [[lc1_time,lc1_time]],
[[lc1_strength,lc2_strengt]], [[lc1_strength,lc2_strength]],
[[lc1_strength_err,lc2_strength_err]], [[lc1_strength_err,lc2_strength_err]],
dt, fqL, ref_psd, echo_psd) 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) Cx_vals, Cx_err = clag.optimize(Cx, Cx_vals)
#?????? %autoreload #?????? %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:] phi, phie = Cx_vals[nfq:], Cx_err[nfq:]
lag, lage = phi/(2*np.pi*fqd), phie/(2*np.pi*fqd) lag, lage = phi/(2*np.pi*fqd), phie/(2*np.pi*fqd)