Merge pull request #314 from oksuzian/cosmic_s2

Cosmic s2

CampaignConfig/mdc2020_corsika.cfg

@@ -1,18 +1,19 @@
 [global]
-includes = /exp/mu2e/app/users/oksuzian/muse_101323/Production/CampaignConfig/mdc2020_prolog.cfg
-#includes = /cvmfs/mu2e.opensciencegrid.org/Musings/SimJob/MDC2020ae/Production/CampaignConfig/mdc2020_prolog.cfg
+includes = /cvmfs/mu2e.opensciencegrid.org/Musings/SimJob/MDC2020ae/Production/CampaignConfig/mdc2020_prolog.cfg
 
 db_folder = mdc2020ab
 run_number = 1200
 release = MDC2020
 release_v_i = ab
-release_v_o = ad
+release_v_o = ae
 njobs_s1 = 17500
-njobs = 10
-events_per_job = 5000
+njobs = 82330
+events_per_job = 500000
 s1_start_job=0
-s1type = Low # Only accepts 'Low' or 'All'
+#s1type only accepts 'Low' or 'All'
+s1type = Low 
 s1gen = CORSIKA
+#testid is a string appended to the conf
 testid = _test5
 desc = %(release)s%(release_v_o)s%(testid)s
 
@@ -35,20 +36,19 @@ submit.expected-lifetime = 28h
 submit.timeout = 27h
 
 [stage_generation]
-
 global.stage_name = CosmicDSStops%(s1gen)s
 
-job_output_2.addoutput = sim.%(submitter)s.%(stage_name)s.%(desc)s.*.art
-job_output_2.add_to_dataset = sim.%(submitter)s.%(stage_name)s.%(desc)s.art
-job_output_2.dest = %(outdir_sim_tape)s/%(stage_name)s/%(desc)s/art/
+job_output_1.dest = %(logdir_bck)s/%(stage_name)s/%(desc)s/tbz/
 
-job_output_3.addoutput = sim.%(submitter)s.%(stage_name)s%(s1type)s.%(desc)s.*.art
-job_output_3.add_to_dataset = sim.%(submitter)s.%(stage_name)s%(s1type)s.%(desc)s.art
-job_output_3.dest = %(outdir_sim_tape)s/%(stage_name)s%(s1type)s/%(desc)s/art/
+job_output_2.addoutput = sim.%(submitter)s.%(stage_name)sAll.%(desc)s.*.art
+job_output_2.add_to_dataset = sim.%(submitter)s.%(stage_name)sAll.%(desc)s.art
+job_output_2.dest = %(outdir_sim_tape)s/%(stage_name)sAll/%(desc)s/art/
 
-job_output_1.dest = %(logdir_bck)s/%(stage_name)s/%(desc)s/tbz/
+job_output_3.addoutput = sim.%(submitter)s.%(stage_name)sLow.%(desc)s.*.art
+job_output_3.add_to_dataset = sim.%(submitter)s.%(stage_name)sLow.%(desc)s.art
+job_output_3.dest = %(outdir_sim_tape)s/%(stage_name)sLow/%(desc)s/art/
 
-global.artRoot_dataset = sim.%(submitter)s.%(stage_name)s.%(desc)s.art,sim.%(submitter)s.%(stage_name)s%(s1type)s.%(desc)s.art
+global.artRoot_dataset = sim.%(submitter)s.%(stage_name)s.%(desc)sAll.art,sim.%(submitter)s.%(stage_name)sLow.%(desc)s.art
 
 job_setup.getconfig = True
 job_setup.setup_8 = corsika
@@ -69,8 +69,6 @@ job_setup.postscript_9 = loggedMu2e.sh -c `cat torun.txt`
 job_setup.multifile = False
 job_setup.setup_local = True
 
-job_setup.multifile = False
-job_setup.setup_local = True
 submit.expected-lifetime = 24h
 submit.disk =40GB
 submit.memory =4000MB
@@ -175,3 +173,8 @@ job_setup.getconfig = False
 job_setup.multifile = True
 job_setup.setup_local = True
 job_setup.ifdh_art = False
+
+#NERSC specifics
+#submit.OS=SL7
+#submit.resource-provides=usage_model="OFFSITE"
+#submit.site="NERSC-Perlmutter-CPU"

CampaignConfig/mdc2020_corsika.ini

@@ -6,21 +6,17 @@ campaign_stage_list = generation_par, generation, resampler_par, resampler, spil
 
 [campaign_defaults]
 vo_role=Production
-campaign_keywords={"s1type": "All"}
+campaign_keywords={"s1type": "All", "testid": ""}
 software_version=mdc2020
 dataset_or_split_data=None
 cs_split_type=None
-completion_type=completed
+completion_type=located
 completion_pct=100
-param_overrides = [["-Oglobal.low=","%(low)s"],["-Oglobal.simjob_release=","/cvmfs/mu2e-development.opensciencegrid.org/museCIBuild/main/ba2305b1/setup.sh"]]
-test_param_overrides = [["-Oglobal.low=","%(low)s"],["-Oglobal.simjob_release=", "/cvmfs/mu2e-development.opensciencegrid.org/museCIBuild/main/ba2305b1/setup.sh"]]
-
-#param_overrides = [["-Oglobal.low=","%(low)s"],["-Oglobal.simjob_release=","/cvmfs/mu2e.opensciencegrid.org/Musings/SimJob/MDC2020ad/setup.sh"]]
-#test_param_overrides = [["-Oglobal.low=","%(low)s"],["-Oglobal.simjob_release=", "/cvmfs/mu2e.opensciencegrid.org/Musings/SimJob/MDC2020ad/setup.sh"]]
+param_overrides = [["-Oglobal.s1type=","%(s1type)s"],["-Oglobal.testid=","%(testid)s"],["-Oglobal.simjob_release=","/cvmfs/mu2e.opensciencegrid.org/Musings/SimJob/MDC2020ae/setup.sh"]]
+test_param_overrides = [["-Oglobal.s1type=","%(s1type)s"],["-Oglobal.testid=","%(testid)s"],["-Oglobal.simjob_release=", "/cvmfs/mu2e.opensciencegrid.org/Musings/SimJob/MDC2020ae/setup.sh"]]
 merge_overrides=True
-
 login_setup=mu2epro_login_v3
-job_type=mu2e_corsika_oksuzian_v3_production_jobtype
+job_type=mu2e_corsika_jobtype_MDC2020ae
 stage_type=regular
 output_ancestor_depth=1
 
@@ -37,18 +33,18 @@ test_param_overrides = [["--stage ", "generation"]]
 [campaign_stage resampler_par]
 param_overrides = [["--stage ", "resampler_par"]]
 test_param_overrides = [["--stage ", "resampler_par"]]
-job_type = generate_par_oksuzian_v3_corsika_jobtype
+job_type = generate_par_corsika_jobtype_MDC2020ae
 
 [campaign_stage resampler]
-dataset_or_split_data=mu2epro_index_CosmicCORSIKALow_MDC2020ad
+dataset_or_split_data=mu2epro_index_CosmicCORSIKAAll_MDC2020ae
 cs_split_type=nfiles(50)
 param_overrides = [["--stage ", "resampler"], ["-Osubmit.dataset=","%(dataset)s"]]
 test_param_overrides = [["--stage ", "resampler"], ["-Osubmit.dataset=","%(dataset)s"], ["-Oglobal.outdir_dts_tape=","/pnfs/mu2e/scratch/datasets/phy-sim/dts/mu2e/"]]
 
 [campaign_stage spillsplitter_par]
 param_overrides = [["--stage ", "spillsplitter_par"]]
 test_param_overrides = [["--stage ", "spillsplitter_par"]]
-job_type = generate_par_oksuzian_v3_corsika_jobtype
+job_type = generate_par_corsika_jobtype_MDC2020ae
 
 [campaign_stage spillsplitter]
 param_overrides = [["--stage ", "spillsplitter"]]
@@ -75,13 +71,13 @@ campaign_stage_1 = spillsplitter_par
 file_pattern_1 =
 
 # Job types and login_setup #
-[job_type mu2e_cvmfs_corsika_jobtype_MDC2020ae]
+[job_type mu2e_corsika_jobtype_MDC2020ae]
 launch_script = fife_launch
 parameters = [["-c ", "/cvmfs/mu2e.opensciencegrid.org/Musings/SimJob/MDC2020ae/Production/CampaignConfig/mdc2020_corsika.cfg"]]
 output_file_patterns = %.art
 recoveries = [["proj_status",[["-Oglobal.override_dataset=','%(dataset)s"],["--stage ","recovery"]]]]
 
-[job_type generate_par_cvmfs_corsika_jobtype_MDC2020ae]
+[job_type generate_par_corsika_jobtype_MDC2020ae]
 launch_script = fife_launch
 parameters = [["-c ", "/cvmfs/mu2e.opensciencegrid.org/Musings/SimJob/MDC2020ae/Production/CampaignConfig/mdc2020_corsika.cfg"]]
 output_file_patterns = %.tar

JobConfig/cosmic/S1DSStopsCORSIKA.fcl

@@ -1,5 +1,5 @@
 #include "Production/JobConfig/cosmic/S1DSStops.fcl"
 source: @local::Cosmic.CORSIKA.source
-physics.producers.generate : @local::Cosmic.CORSIKA.generate
-outputs.S1Output.fileName         : "sim.owner.CosmicDSStopsCORSIKA.version.sequencer.art"
-outputs.S1LowOutput.fileName         : "sim.owner.CosmicDSStopsCORSIKALow.version.sequencer.art"
+physics.producers.generate   : @local::Cosmic.CORSIKA.generate
+outputs.S1Output.fileName    : "sim.owner.CosmicDSStopsCORSIKAAll.version.sequencer.art"
+outputs.S1LowOutput.fileName : "sim.owner.CosmicDSStopsCORSIKALow.version.sequencer.art"

JobConfig/cosmic/S1DSStopsCRY.fcl

@@ -1,5 +1,5 @@
 #include "Production/JobConfig/cosmic/S1DSStops.fcl"
 source.module_type: EmptyEvent
-physics.producers.generate : @local::Cosmic.generateCRY
-outputs.S1Output.fileName : "sim.owner.CosmicDSStopsCRY.version.sequencer.art"
+physics.producers.generate   : @local::Cosmic.generateCRY
+outputs.S1Output.fileName    : "sim.owner.CosmicDSStopsCRYAll.version.sequencer.art"
 outputs.S1LowOutput.fileName : "sim.owner.CosmicDSStopsCRYLow.version.sequencer.art"