Commit 38e41326 authored by David Keitel's avatar David Keitel
Browse files

update CFSv2 test scripts to drop --IFO option

 -superfluous or easy to replace with file name filter in each case
 -in testComputeFstatistic_v2_grids.sh also needed to drop archaic
  MFD option --outSFTv1
parent 06d1ccd9
......@@ -103,7 +103,7 @@ echo "STEP 2: run CFS_v2 with perfect match"
echo "----------------------------------------------------------------------"
echo
cfs_CL="--IFO=$IFO --Alpha=$Alpha --Delta=$Delta --Freq=$cfs_Freq --dFreq=$cfs_dFreq --f1dot=$cfs_f1dot --f1dotBand=$cfs_f1dotBand --df1dot=$cfs_df1dot --DataFiles='./*.sft' --NumCandidatesToKeep=${cfs_nCands} --Dterms=${Dterms} --outputLoudest=${outfile_Loudest} ${FstatMethod} --refTime=$startTime"
cfs_CL="--Alpha=$Alpha --Delta=$Delta --Freq=$cfs_Freq --dFreq=$cfs_dFreq --f1dot=$cfs_f1dot --f1dotBand=$cfs_f1dotBand --df1dot=$cfs_df1dot --DataFiles='./*.sft' --NumCandidatesToKeep=${cfs_nCands} --Dterms=${Dterms} --outputLoudest=${outfile_Loudest} ${FstatMethod} --refTime=$startTime"
if [ "$haveNoise" != "true" ]; then
cfs_CL="$cfs_CL --SignalOnly"
fi
......
......@@ -72,7 +72,7 @@ mkdir $SFTdir_40h
# build MFD_v4 command line
mfd_CL=" --Alpha=$Alpha --Delta=$Delta --IFO=$IFO --Tsft=$Tsft --startTime=$startTime --duration=$duration --h0=$h0 --cosi=$cosi --psi=$psi --phi0=$phi0"
mfd_CL="${mfd_CL} --fmin=$mfd_fmin --Band=$mfd_FreqBand --Freq=$Freq --outSFTbname=$SFTdir_40h/testSFT --f1dot=$f1dot --outSFTv1"
mfd_CL="${mfd_CL} --fmin=$mfd_fmin --Band=$mfd_FreqBand --Freq=$Freq --outSFTbname=$SFTdir_40h --f1dot=$f1dot"
if [ "$haveNoise" = true ]; then
mfd_CL="$mfd_CL --noiseSqrtSh=$sqrtSh";
fi
......@@ -118,7 +118,7 @@ echo
## common arguments for grid types 0,1,2,3,6
sky_CL="--Alpha=$Alpha --AlphaBand=$AlphaBand --dAlpha=$dAlpha --Delta=$Delta --DeltaBand=$DeltaBand --dDelta=$dDelta"
spin_CL="--Freq=$Freq --FreqBand=$FreqBand --dFreq=$dFreq --f1dot=$f1dot --f1dotBand=$f1dotBand --df1dot=$df1dot"
cfs_CL="--IFO=$IFO --DataFiles='${SFTdir_40h}/testSFT*' --TwoFthreshold=0 --Dterms=16 --FstatMethod=DemodOptC --RngMedWindow=$RngMedWindow $extra_args"
cfs_CL="--DataFiles='${SFTdir_40h}/*.sft' --TwoFthreshold=0 --Dterms=16 --FstatMethod=DemodOptC --RngMedWindow=$RngMedWindow $extra_args"
if [ "$haveNoise" = false ]; then
cfs_CL="$cfs_CL --SignalOnly"
fi
......
......@@ -65,10 +65,10 @@ outfile_cfs_all="fstat_all.dat"
timingsfile="cfs_timing.dat"
## construct ComputeFstatistic command lines
cfs_CL=" --DataFiles='*.sft' --TwoFthreshold=0.0 --Alpha=$Alpha --Delta=$Delta --Freq=$cfs_fmin --FreqBand=$cfs_FreqBand --clusterOnScanline=2"
cfs_CL=" --TwoFthreshold=0.0 --Alpha=$Alpha --Delta=$Delta --Freq=$cfs_fmin --FreqBand=$cfs_FreqBand --clusterOnScanline=2"
## multi-IFO
cmdline="$cfs_code $cfs_CL --outputFstat='$outfile_cfs_all' --outputLoudest='$outfile_cfs_loudest' --outputTiming='$timingsfile'"
cmdline="$cfs_code $cfs_CL --DataFiles='*.sft' --outputFstat='$outfile_cfs_all' --outputLoudest='$outfile_cfs_loudest' --outputTiming='$timingsfile'"
echo $cmdline
if ! eval $cmdline; then
echo "Error.. something failed when running '$cfs_code' ..."
......@@ -78,7 +78,7 @@ twoFcfs_multi=$(sed 's/\;//' $outfile_cfs_loudest | LC_ALL=C awk '{if($1=="twoF"
twoFcfs_multi_all=$(sed -e '/%/d;' $outfile_cfs_all | sort -nr -k7,7 | head -1 | LC_ALL=C awk '{printf "%6f",$7}')
## detector H1
cmdline="$cfs_code $cfs_CL --outputFstat='$outfile_cfs_all' --outputLoudest='$outfile_cfs_loudest' --IFO='H1'"
cmdline="$cfs_code $cfs_CL --DataFiles='*H1*.sft' --outputFstat='$outfile_cfs_all' --outputLoudest='$outfile_cfs_loudest'"
echo $cmdline
if ! eval $cmdline; then
echo "Error.. something failed when running '$cfs_code' ..."
......@@ -88,7 +88,7 @@ twoFcfs_H1=$(sed 's/\;//' $outfile_cfs_loudest | LC_ALL=C awk '{if($1=="twoF"){p
twoFcfs_H1_all=$(sed -e '/%/d;' $outfile_cfs_all | sort -nr -k7,7 | head -1 | LC_ALL=C awk '{printf "%6f",$7}')
## detector L1
cmdline="$cfs_code $cfs_CL --outputFstat='$outfile_cfs_all' --outputLoudest='$outfile_cfs_loudest' --IFO='L1'"
cmdline="$cfs_code $cfs_CL --DataFiles='*L1*.sft' --outputFstat='$outfile_cfs_all' --outputLoudest='$outfile_cfs_loudest'"
echo $cmdline
if ! eval $cmdline; then
echo "Error.. something failed when running '$cfs_code' ..."
......@@ -108,7 +108,7 @@ outfile_cfs_toplist_loudest="fstat_toplist_loudest.dat"
outfile_cfs_toplist_all="fstat_toplist_all.dat"
timingsfile_toplist="cfs_timing_toplist.dat"
cmdline="$cfs_code $cfs_CL --outputFstat='$outfile_cfs_toplist_all' --outputLoudest='$outfile_cfs_toplist_loudest' --outputTiming='$timingsfile_toplist' --NumCandidatesToKeep=$cfs_toplist_cands"
cmdline="$cfs_code $cfs_CL --DataFiles='*.sft' --outputFstat='$outfile_cfs_toplist_all' --outputLoudest='$outfile_cfs_toplist_loudest' --outputTiming='$timingsfile_toplist' --NumCandidatesToKeep=$cfs_toplist_cands"
echo $cmdline
if ! eval $cmdline; then
echo "Error.. something failed when running '$cfs_code' ..."
......@@ -128,7 +128,7 @@ outfile_cfs_singleF_loudest="fstat_singleF_loudest.dat"
outfile_cfs_singleF_all="fstat_singleF_all.dat"
timingsfile_singleF="cfs_timing_singleF.dat"
cmdline="$cfs_code $cfs_CL --outputSingleF --outputFstat='$outfile_cfs_singleF_all' --outputLoudest='$outfile_cfs_singleF_loudest' --outputTiming='$timingsfile_singleF'"
cmdline="$cfs_code $cfs_CL --DataFiles='*.sft' --outputSingleF --outputFstat='$outfile_cfs_singleF_all' --outputLoudest='$outfile_cfs_singleF_loudest' --outputTiming='$timingsfile_singleF'"
echo $cmdline
if ! eval $cmdline; then
echo "Error.. something failed when running '$cfs_code' ..."
......@@ -152,7 +152,7 @@ outfile_cfs_singleF_toplist_loudest="fstat_singleF_toplist_loudest.dat"
outfile_cfs_singleF_toplist_all="fstat_singleF_toplist_all.dat"
timingsfile_singleF_toplist="cfs_timing_singleF_toplist.dat"
cmdline="$cfs_code $cfs_CL --outputSingleF --outputFstat='$outfile_cfs_singleF_toplist_all' --outputLoudest='$outfile_cfs_singleF_toplist_loudest' --outputTiming='$timingsfile_singleF_toplist' --NumCandidatesToKeep=$cfs_toplist_cands"
cmdline="$cfs_code $cfs_CL --DataFiles='*.sft' --outputSingleF --outputFstat='$outfile_cfs_singleF_toplist_all' --outputLoudest='$outfile_cfs_singleF_toplist_loudest' --outputTiming='$timingsfile_singleF_toplist' --NumCandidatesToKeep=$cfs_toplist_cands"
echo $cmdline
if ! eval $cmdline; then
echo "Error.. something failed when running '$cfs_code' ..."
......
......@@ -115,7 +115,7 @@ echo "STEP 2: Comparing CW and tCW results over a freq grid at (t0,tau)=(T0,Tdat
echo "----------------------------------------------------------------------"
echo
cfs_CL_base="--IFO=$IFO --Alpha=$Alpha --Delta=$Delta --DataFiles='./*.sft' --Dterms=${Dterms} ${FstatMethod} --refTime=$startTime --TwoFthreshold=0" # --NumCandidatesToKeep=${cfs_nCands}
cfs_CL_base="--Alpha=$Alpha --Delta=$Delta --DataFiles='./*.sft' --Dterms=${Dterms} ${FstatMethod} --refTime=$startTime --TwoFthreshold=0" # --NumCandidatesToKeep=${cfs_nCands}
if [ "$haveNoise" != "true" ]; then
cfs_CL_base="$cfs_CL_base --SignalOnly"
fi
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment