updating calib script and calibration log filenames to conform to gris naming scheme

run_grisred.sh

@@ -123,18 +123,25 @@ for f in $@; do
 	cd $f
 	time=`date`
 	
+        # get the folder name and extract date parts
+	theday=$(get_date $f)
+	
 	# set up output files, append runnumber if in single run mode
+	clean_date=`date --date="$theday" +%Y%m%d` 
+	echo $clean_date
 	if [ -n "$runnumber" ] ;then 
 	    echo "Running in single run mode for run $runnumber"
-	    calfile="calib_run$runnumber.pro" # stores idl routines
-	    logfile="calibration_log_run$runnumber.log" # stores calibration log	    
+	    file_base=`printf "gris_%s_%03d" $clean_date $runnumber`
 	else
-	    calfile=calib.pro # stores idl routines
-	    logfile=calibration_log.log # stores calibration log	    
+	    echo "Running in day mode"
+ 	    file_base=`printf "gris_%s" $clean_date`	
 	fi
 
-        # get the folder name and extract date parts
-	theday=$(get_date $f)
+        calfile=`printf "%s_calib-script.pro" $file_base` # stores idl routines
+        logfile=`printf "%s_calib-log.log" $file_base` # stores calibration log	    
+
+	echo "Storing script to $calfile"
+	echo "Storing calibration log to $calfile"
 
 	# generate commands from settings and write to calfile
 	echo python $grisred_folder/gen_command.py $THOROUGH_CAL $theday $runnumber