added in Random triggers from 2016 and enhanced the searching

Author: T-Britton

MCwrapper/MakeMC.csh

@@ -366,13 +366,19 @@ set bkgloc_pre=`echo $BKGFOLDSTR | cut -c 1-4`
 if ( "$BKGFOLDSTR" == "DEFAULT" || "$bkgloc_pre" == "loc:" || "$BKGFOLDSTR" == "Random" ) then
    #find file and run:1
     echo "Finding the right file to fold in during MCsmear step"
-    set runperiod="RunPeriod-2017-01"
+    set runperiod="RunPeriod-2018-01"
 
-    if ( $RUN_NUMBER > 40000 ) then
+    if ( $RUN_NUMBER >= 40000 ) then
 		set runperiod="RunPeriod-2018-01"
+	else if ( $RUN_NUMBER >= 30000 ) then
+		set runperiod="RunPeriod-2017-01"
+	else if ( $RUN_NUMBER >= 20000 ) then
+		set runperiod="RunPeriod-2016-10"
+	else if ( $RUN_NUMBER >= 10000 ) then
+		set runperiod="RunPeriod-2016-02"
     endif
 
-    if ( $RUN_NUMBER < 30000 ) then
+    if ( $RUN_NUMBER < 10000 ) then
 		echo "Warning: random triggers do not exist for this run"
 		exit
     endif

MCwrapper/MakeMC.sh

@@ -365,14 +365,21 @@ bkgloc_pre=`echo $BKGFOLDSTR | cut -c 1-4`
 if [[ "$BKGFOLDSTR" == "DEFAULT" || "$bkgloc_pre" == "loc:" || "$BKGFOLDSTR" == "Random" ]]; then
 		    #find file and run:1
 		    echo "Finding the right file to fold in during MCsmear step"
-		    runperiod="RunPeriod-2017-01"
-
-		    if [[ $RUN_NUMBER > 40000 ]]; then
-			set runperiod="RunPeriod-2018-01"
+		    
+			runperiod="RunPeriod-2017-01"
+
+		    if [[ $RUN_NUMBER >= 40000 ]]; then
+				runperiod="RunPeriod-2018-01"
+			elif [[ $RUN_NUMBER >= 30000 ]]; then
+				runperiod="RunPeriod-2017-01"
+			elif [[ $RUN_NUMBER >= 20000 ]]; then
+				runperiod="RunPeriod-2016-10"
+			elif [[ $RUN_NUMBER >= 10000 ]]; then
+				runperiod="RunPeriod-2016-02"
 		    fi
 
 		    if [[ $RUN_NUMBER < 30000 ]]; then
-			echo "Warning: random triggers do not exist for this run"
+			echo "Warning: random triggers do not exist for this run number"
 			exit
 		    fi
 

MCwrapper/gluex_MC.py

@@ -196,7 +196,7 @@ def main(argv):
 
         print "*********************************"
         print "Welcome to v1.11 of the MCwrapper"
-        print "Thomas Britton 12/4/17"
+        print "Thomas Britton 12/5/17"
         print "*********************************"
 
 	#load all argument passed in and set default options