Minor changes in auto comb find script to handle case of no combs

autoCombFind.sh

 #!/bin/bash
-source /home/aneunzert/gwpybokeh/bin/activate
+source /home/aneunzert/test/bin/activate
 
 TEMP_DIR=~/public_html/latest/
 CONSEC=4
@@ -9,13 +9,15 @@ echo "Removing old file from temp directory..."
 rm $TEMP_DIR/*
 
 echo "Finding latest spectrum file and copying to temp directory..."
-RECENTSPECT=$(ls ~/public_html/comb_plots/combCheck*_fscan_cumulsince_2016-09-18/* | grep dat_ | tail -n1)
+RECENTSPECT=$(ls -tr ~/public_html/comb_plots/combCheck*_cumulsince_2016-09-18/* | grep dat_ | tail -n1)
 echo $RECENTSPECT > $TEMP_DIR/foundcombs.txt
 cp $RECENTSPECT $TEMP_DIR
 RECENTSPECT=$(ls -t $TEMP_DIR/* | head -n1)
 
 echo "Running comb finding algorithm..."
-COMBSTATS=$(python findComb.py --inputfile=$RECENTSPECT --knowncombfile="preER10combs.txt" --fmin 0 --fmax 100 --spacingmin 0.3 --spacingmax 20 --scalerange 10 --nmostcommoncombs 1000 --ntoppeaks 1000 --consecutive $CONSEC --checkrange 1 --printmaxstat True --printmax 10 | tail -n2)
+COMBSTATS=$(python findComb.py --inputfile=$RECENTSPECT --knowncombfile="preER10combnotes.txt" --fmin 0 --fmax 100 --spacingmin 0.3 --spacingmax 20 --scalerange 30 --nmostcommoncombs 1000 --ntoppeaks 1000 --consecutive $CONSEC --checkrange 1 --printmaxstat True --printmax 10 | tail -n2)
+
+echo $COMBSTATS
 
 TAGCOMBS=$(echo "$COMBSTATS" | tail -n1)
 MAXSTAT=$(echo "$COMBSTATS" | head -n1)
@@ -36,13 +38,13 @@ fi
 
 SUMMARY="<h2> Unidentified comb alerts </h2>
 <p>Probability of unidentified comb(s) in the latest cumulative spectrum: ${ALERTMSG}
-<br>Plot showing the top comb candidates (max 10): <span><a href='https://ldas-jobs.ligo-wa.caltech.edu/~aneunzert/latest/H1:LSC-DARM_OUT_DQ.html' target='_blank'>here</a></span>" 
+<br>Plot showing the top comb candidates (max 10): <span><a href='https://ldas-jobs.ligo-la.caltech.edu/~aneunzert/latest/L1:LSC-DARM_OUT_DQ.html' target='_blank'>here</a></span>" 
 
 echo "$SUMMARY" > $TEMP_DIR/summary.txt
 
 echo "Plotting..."
 
-python chplot.py --truefcutoff=True --fmin 0 --fmax 100 --consecutive $CONSEC --checkrange 1 --overwrite=True --scalerange=0 --knowncombfile="preER10combs.txt" --tagcombs $TAGCOMBS --inputfolder $TEMP_DIR
+python chplot.py --truefcutoff=True --fmin 0 --fmax 100 --consecutive $CONSEC --checkrange 1 --overwrite=True --scalerange=0 $TAGCOMBS --inputfolder $TEMP_DIR
 
 HTMLFILE=$(ls $TEMP_DIR/*.html)
 

findComb.py

@@ -72,7 +72,7 @@ def main():
 		nConsecReq=args.consecutive,nCheckAdj=args.checkrange,verbose=args.verbose,showBeforeZeroing=args.showbeforezero,
 		zeroInds=knownLineInds,threshold=args.threshold)
 
-	if args.printmaxstat:
+	if args.printmaxstat and len(combs)>0:
 		print(combs[0]['str'])
 
 	if args.printwithstat:
@@ -84,7 +84,10 @@ def main():
 		n=min(args.printmax,len(combs))
 		for i in combs[:n]:
 			l+="\"{:.6f},{:.6f}\" ".format(i['sp'],i['off'])
-		print(l)
+		if len(l)>0:
+			print("--tagcombs "+l)
+		else:
+			print(" ")
 
 
 if __name__=='__main__':