Merge pull request #366 from oksuzian/oksuzian111224a

Changes to pionfilter campaign

Author: oksuzian

CampaignConfig/mdc2020_pibeam.cfg

@@ -1,13 +1,4 @@
-[global]
-includes = /exp/mu2e/app/users/sophie/ProductionPush/Production/CampaignConfig/mdc2020_prolog.cfg
-desc = MDC2020z
-db_folder = mdc2020z
-run_number = 1210
-release = MDC2020
-release_v_o = z
-njobs = 1000
-
-[stage_pot_infinitepion_fcl]
+[stage_pibeam_pot_infinitepion_fcl]
 global.stage_name = POT_infinitepion
 job_output.dest = %(outdir_fcl)s/%(stage_name)s/%(desc)s/fcl/
 
@@ -23,7 +14,7 @@ executable_2.arg_8 = Production/JobConfig/beam/POT_infinitepion.fcl
 
 job_setup.ifdh_art = False
 
-[stage_pot_infinitepion]
+[stage_pibeam_pot_infinitepion]
 global.stage_name = POT
 global.artRoot_dataset = sim.%(submitter)s.PiBeam.%(desc)s.art
 
@@ -46,7 +37,7 @@ job_setup.getconfig = True
 job_setup.multifile = False
 job_setup.setup_local = True
 
-[stage_pibeam_resampler_fcl]
+[stage_pibeam_pibeam_resampler_fcl]
 global.stage_name = PiBeamResampler
 job_output.dest = %(outdir_fcl)s/%(stage_name)s/%(desc)s/fcl/
 
@@ -72,7 +63,7 @@ executable_2.arg_9 = template.fcl
 
 job_setup.ifdh_art = False
 
-[stage_pibeam_resampler]
+[stage_pibeam_pibeam_resampler]
 global.stage_name = PiBeamResampler
 
 job_output_1.dest = %(logdir_bck)s/%(stage_name)s/%(desc)s/tbz/
@@ -94,9 +85,9 @@ job_setup.getconfig = True
 job_setup.multifile = False
 job_setup.setup_local = True
 
-[stage_pion_selector_fcl]
+[stage_pibeam_pion_selector_fcl]
 global.stage_name = PionStopSelector
-job_output.dest = https://dbdata0vm.fnal.gov:9443/mu2e_ucondb_prod/app/data/%(db_folder)s/
+#job_output.dest = https://dbdata0vm.fnal.gov:9443/mu2e_ucondb_prod/app/data/%(db_folder)s/
 job_setup.source_3 = $CONDOR_DIR_INPUT/ucondb_auth.sh
 
 job_setup.prescript = samweb list-file-locations --defname=sim.%(submitter)s.PiTargetStops.%(desc)s.art --schema=root | cut -f1 > inputs.txt
@@ -111,7 +102,7 @@ executable_2.arg_7 = Production/JobConfig/pileup/PionStopSelector.fcl
 job_setup.ifdh_art = False
 
 
-[stage_pion_selector]
+[stage_pibeam_pion_selector]
 global.stage_name = PionStopSelector
 
 job_output_1.dest = %(logdir_bck)s/%(stage_name)s/%(desc)s/tbz/
@@ -136,18 +127,18 @@ job_setup.getconfig = True
 job_setup.multifile = False
 job_setup.setup_local = True
 
-[stage_pionfilter_par]
+[stage_pibeam_pionfilter_par]
 
 global.stage_name = %(primary_name)s
 
 executable.name = true
 executable_2.name =  gen_PiFilter.sh
 executable_2.arg_1 = --campaign %(release)s
-executable_2.arg_2 = --pver %(release_v_dts)s
+executable_2.arg_2 = --pver %(release_v_o)s
 executable_2.arg_3 = --sver %(release_v_stops)s
 job_setup.ifdh_art = False
 
-[stage_pionfilter]
+[stage_pibeam_pionfilter]
 global.stage_name = PiminusStopsFilt
 global.upload_parfile = True
 submit.f_1 = dropbox:////tmp/%(parfile)s

CampaignConfig/mdc2020_pibeam_pionfilter.ini

@@ -0,0 +1,41 @@
+[campaign]
+experiment = mu2e
+poms_role = production
+name = mdc2020ak_pibeam_pionfilter
+campaign_stage_list = pibeam_pionfilter_par, pibeam_pionfilter_par
+
+[campaign_defaults]
+vo_role=Production
+campaign_keywords={"release_v_o": "ak", 
+		   "release_v_stops": "t",
+		   "simjob_release": "/cvmfs/mu2e.opensciencegrid.org/Musings/SimJob/MDC2020ak/setup.sh"}
+		   
+software_version=mdc2020
+dataset_or_split_data=None
+cs_split_type=None
+completion_type=located
+completion_pct=100
+param_overrides = [["-Oglobal.release_v_o=","%(release_v_o)s"],
+		   ["-Oglobal.release_v_stops=","%(release_v_stops)s"],
+		   ["-Oglobal.simjob_release=","%(simjob_release)s"]]
+test_param_overrides = []
+
+merge_overrides=True
+login_setup=mu2epro
+job_type = mu2epro_jobtype_ak
+stage_type=regular
+output_ancestor_depth=1
+
+[campaign_stage pionfilter_par]
+param_overrides = [["--stage ", "pibeam_pionfilter_par"]]
+test_param_overrides = [["--stage ", "pibeam_pionfilter_par"]]
+#job_type = par_mu2epro_primary_jobtype_ai
+
+[campaign_stage pionfilter]
+param_overrides = [["--stage ", "pibeam_pionfilter"]]
+test_param_overrides = [["--stage ", "pibeam_pionfilter"]]
+
+# Dependencies
+[dependencies pionfilter]
+campaign_stage_1 = pionfilter_par
+file_pattern_1 = %.tar

ProjPy/mdc2020_primary.ini

@@ -13,7 +13,8 @@ campaign_keywords={"release_v_o": "override_me",
 		   "start_mom": "override_me",
 		   "end_mom": "110",
 		   "num_events": "override_me",
-		   "num_jobs": "override_me",		   
+		   "num_jobs": "override_me",
+		   "cat": "override_me",
 		   "simjob_release": "override_me"}
 
 software_version=mdc2020
@@ -29,6 +30,7 @@ param_overrides = [["-Oglobal.release_v_o=","%(release_v_o)s"],
 		   ["-Oglobal.end_mom=","%(end_mom)s"],
 		   ["-Oglobal.num_events=","%(num_events)s"],
 		   ["-Oglobal.num_jobs=","%(num_jobs)s"],
+		   ["-Oglobal.cat=","%(cat)s"],
 		   ["-Oglobal.simjob_release=","%(simjob_release)s"]]
 test_param_overrides = []
 

Scripts/gen_PiFilter.sh

@@ -86,7 +86,7 @@ let nskip=nevts/nfiles
 rm -f pifilter.fcl
 
 echo "#include \"Production/JobConfig/primary/TargetPiStopPreFilter.fcl\"" >> pifilter.fcl
-echo outputs.StopFilterOutput.fileName: \"sim.${OWNER}.PiMinusFilter.version.sequencer.art\"  >> pifilter.fcl
+echo outputs.StopFilterOutput.fileName: \"sim.${OWNER}.PiminusStopsFilt.version.sequencer.art\"  >> pifilter.fcl
 
 
 if [[ -n $SETUP ]]; then
@@ -99,7 +99,7 @@ if [[ "$PROD" = true ]]; then
     rm cnf.*.tar
 fi
 
-cmd="mu2ejobdef --embed pifilter.fcl --setup ${SETUP} --desc PiMinusFilter --dsconf ${PRIMARY_CAMPAIGN} --inputs=Stops.txt --merge-factor=1"
+cmd="mu2ejobdef --embed pifilter.fcl --setup ${SETUP} --desc PiminusStopsFilt --dsconf ${PRIMARY_CAMPAIGN} --inputs=Stops.txt --merge-factor=1"
 
 echo "Running: $cmd"
 $cmd

data/primary.json

@@ -7,6 +7,7 @@
 	"start_mom": 75,
 	"num_events": 96000,
 	"num_jobs": 5000,
+	"cat": "Cat",	
 	"simjob_release": "/cvmfs/mu2e.opensciencegrid.org/Musings/SimJob/MDC2020ai/setup.sh"
     },
     {
@@ -17,6 +18,7 @@
 	"start_mom": 95,
 	"num_events": 850,
 	"num_jobs": 900,
+	"cat": "Cat",	
 	"simjob_release": "/cvmfs/mu2e.opensciencegrid.org/Musings/SimJob/MDC2020ai/setup.sh"
     },
     {
@@ -27,16 +29,32 @@
 	"start_mom": 0,
 	"num_events": 10,
 	"num_jobs": 900,
+	"cat": "Cat",
 	"simjob_release": "/cvmfs/mu2e.opensciencegrid.org/Musings/SimJob/MDC2020ai/setup.sh"
     },
     {
-	"release_v_o": "ai",
+	"release_v_o": "ak",
 	"stopped_type": "Piminus",
-	"release_v_stops": "t",
+	"release_v_stops": "ak",
 	"primary_name": "RPCInternal",
 	"start_mom": 0,
-	"num_events": 1200,
+	"num_events": 42000,
 	"num_jobs": 850,
-	"simjob_release": "/cvmfs/mu2e.opensciencegrid.org/Musings/SimJob/MDC2020ai/setup.sh"
+	"cat": "Filt",
+	"simjob_release": "/cvmfs/mu2e.opensciencegrid.org/Musings/SimJob/MDC2020ak/setup.sh"
+    },
+    {
+	"release_v_o": "ak",
+	"stopped_type": "Piminus",
+	"release_v_stops": "ak",
+	"primary_name": "RPCExternal",
+	"start_mom": 0,
+	"num_events": 6110000,
+	"num_jobs": 850,
+	"cat": "Filt",
+	"simjob_release": "/cvmfs/mu2e.opensciencegrid.org/Musings/SimJob/MDC2020ak/setup.sh"
     }
+
+
+    
 ]