Merge pull request #397 from oksuzian/oksuzian111224a

Various tweaks for S1 production

Author: brownd1978

CampaignConfig/mdc2020_prolog.cfg

@@ -78,12 +78,8 @@ source_4 = %(simjob_setup)s
 setup = OfflineOps
 setup_1 = mu2etools
 
-#postscript = [ -f template.fcl ] && rm template.fcl
-#postscript_2 = [[ $(ls *.{art,root} 2>/dev/null) ]] && samweb file-lineage parents `basename ${fname}` > parents.txt
-#postscript_3 = [[ $(ls *.{art,root} 2>/dev/null) ]] && echo `basename ${fname}` >> parents.txt
-#postscript_4 = IND=$(echo $fname | awk -F. '{print $5}'); IND=$((10#$IND));
-#postscript_5 = TARF=$(ls $CONDOR_DIR_INPUT/cnf*.0.tar 2>/dev/null);
-#postscript_6 = [[ -n ${TARF} ]] && mu2ejobiodetail --jobdef ${TARF} --index ${IND} --inputs >> parents.txt
+prescript_1 = export MU2E_SEARCH_PATH=$MU2E_SEARCH_PATH:${CONDOR_DIR_INPUT}
+prescript_2 = export FHICL_FILE_PATH=$FHICL_FILE_PATH:${CONDOR_DIR_INPUT}
 
 [sam_consumer]
 limit = 1

CampaignConfig/mdc2020_stage1.cfg

@@ -1,10 +1,11 @@
 [stage_stage1_generation_par]
+
 executable.name = true
 executable_2.name = gen_S1.sh
 executable_2.arg_1 = --dsconf %(dsconf)s
 executable_2.arg_2 = --desc %(desc)s
-executable_2.arg_4 = --fcl %(fcl)s
-executable_2.arg_5 = --njobs %(njobs)s
-executable_2.arg_6 = --events %(events)s
-executable_2.arg_7 = --run %(run)s
-executable_2.arg_8 = --simjob_setup %(simjob_setup)s
+executable_2.arg_3 = --fcl %(fcl)s
+executable_2.arg_4 = --njobs %(njobs)s
+executable_2.arg_5 = --events %(events)s
+executable_2.arg_6 = --run %(run)s
+executable_2.arg_7 = --simjob_setup %(simjob_setup)s

ProjPy/gen_Campaigns.py

@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 
 #Script to create and/or submit multiple campaign using Project-py
-#Create ini files: ./ProjPy/gen_Campaigns.py --ini_file ProjPy/mdc2020_mixing.in --comb_json data/mix.json --simjob MDC2020ae
-#Create ini files: ./ProjPy/gen_Campaigns.py --ini_file ProjPy/mdc2020_primary.ini --comb_json data/primary.json --simjob MDC2020ae --comb_type list --cutoff_key primary_name
-#Create, upload and submit all campaign: ./ProjPy/gen_Campaigns.py --ini_file ProjPy/mdc2020_mixing.ini --cfg_file CampaignConfig/mdc2020_digireco.cfg --comb_json data/mix.json --simjob MDC2020ae --upload --submit
+#Create ini files: ./ProjPy/gen_Campaigns.py --ini_file ProjPy/mdc2020_mixing.in --comb_json data/mix.json
+#Create ini files: ./ProjPy/gen_Campaigns.py --ini_file ProjPy/mdc2020_primary.ini --comb_json data/primary.json --comb_type list --cutoff_key primary_name
+#Create, upload and submit all campaign: ./ProjPy/gen_Campaigns.py --ini_file ProjPy/mdc2020_mixing.ini --cfg_file CampaignConfig/mdc2020_digireco.cfg --comb_json data/mix.json --upload --submit
 
 #To upload setup poms-client first, delete voms-proxy (NOT as mu2epro!!!), get kx509:
 #source /cvmfs/fermilab.opensciencegrid.org/packages/common/setup-env.sh
@@ -23,15 +23,13 @@
 requiredNamed.add_argument("--comb_type", type=str, help="JSON file type: list or product", required=True)
 
 parser.add_argument("--cutoff_key", type=str, help="Ignore keys in the campaign name after the cutoff_key", default=None)
-parser.add_argument("--simjob", type=str, help="SimJob version, i.e. MDC2020", default="MDC2020")
 parser.add_argument("--upload", action="store_true", help="Create campaigns")
 parser.add_argument("--submit", action="store_true", help="Submit campaigns")
 parser.add_argument("--test_run", action="store_true", help="Run in test run mode")
 parser.add_argument("--ini_version", default="", type=str, help="Append version to the end of campaign name, i.e. _v1")
 
 args = parser.parse_args()
 ini_file = args.ini_file
-simjob = args.simjob
 comb_json = args.comb_json
 comb_type = args.comb_type
 cutoff_key = args.cutoff_key
@@ -69,9 +67,9 @@
     # We use only keys that appear prior to cutoff_key (i.e "primary_name"), and ignore the rest in the campaign/file name
     if cutoff_key is not None:
         cutoff_key_index = list_keys.index(cutoff_key) + 1 
-        campaign_name = f"{simjob}_{'_'.join(map(str, campain_name_list[:cutoff_key_index]))}{ini_version}"
+        campaign_name = f"{'_'.join(map(str, campain_name_list[:cutoff_key_index]))}{ini_version}"
     else:
-        campaign_name = f"{simjob}_{'_'.join(map(str, campain_name_list))}{ini_version}"
+        campaign_name = f"{'_'.join(map(str, campain_name_list))}{ini_version}"
 
     out_ini_file = f"{campaign_name}.ini"
     os.system(f"cp {ini_file} {out_ini_file}")

ProjPy/mdc2020_stage1.ini

@@ -25,7 +25,10 @@ param_overrides = [["-Oglobal.dsconf=","%(dsconf)s"],
 		   ["-Oglobal.events=","%(events)s"],
 		   ["-Oglobal.run=","%(run)s"],
 		   ["-Oglobal.simjob_setup=","%(simjob_setup)s"]]
-		   
+#Add the following if you'd like to use a custom fcl file
+#["-Osubmit.f_2=", "dropbox:///exp/mu2e/app/users/oksuzian/muse_080224/Production/JobConfig/cosmic/ExtractedCRY.fcl"]
+#change "fcl" in campaign_keywords to ExtractedCRY.fcl
+
 test_param_overrides = []
 
 merge_overrides=True