diff --git a/CampaignConfig/mdc2020_corsika.cfg b/CampaignConfig/mdc2020_corsika.cfg index fe0cd4b8..6b4d0436 100644 --- a/CampaignConfig/mdc2020_corsika.cfg +++ b/CampaignConfig/mdc2020_corsika.cfg @@ -1,11 +1,17 @@ [global] includes = /mu2e/app/users/srsoleti/workDir/Production/CampaignConfig/mdc2020_prolog.cfg -desc = MDC2020m -release = MDC2020m +desc = MDC2020n +release = MDC2020 +release_v_o = n njobs = 50 +[submit] +tar_file_name = dropbox:///mu2e/data/users/srsoleti/museTarball/tmp.BIdJ4mQMgR/Code.tar.bz2 +use-cvmfs-dropbox = True + [job_setup] -source_2 = /cvmfs/mu2e.opensciencegrid.org/Musings/SimJob/%(release)s/setup.sh +source_1 = /cvmfs/mu2e.opensciencegrid.org/setupmu2e-art.sh +source_2 = ${CONDOR_DIR_INPUT}/Code/Code/setup.sh [stage_generation_fcl] global.stage_name = CosmicDSStopsCORSIKA @@ -62,17 +68,23 @@ executable_2.arg_4 = --aux=1:physics.filters.cosmicResample.fileNames:inputs.txt executable_2.arg_5 = --run-number=1205 executable_2.arg_6 = --events-per-job=200000 executable_2.arg_7 = --njobs=%(njobs)s -executable_2.arg_8 = --embed +executable_2.arg_8 = --include executable_2.arg_9 = Production/JobConfig/cosmic/S2ResamplerCORSIKA.fcl job_setup.ifdh_art = False [stage_resampler] global.stage_name = CosmicCORSIKA +job_output_2.addoutput = *CosmicCORSIKA*.art job_output_2.add_to_dataset = dts.%(submitter)s.CosmicCORSIKA.%(desc)s.art job_output_2.dest = %(outdir_dts_tape)s/CosmicCORSIKA/%(desc)s/art + +job_output_3.addoutput = *CosmicLooseCORSIKA*.art +job_output_3.add_to_dataset = dts.%(submitter)s.CosmicLooseCORSIKA.%(desc)s.art +job_output_3.dest = %(outdir_dts_tape)s/CosmicLooseCORSIKA/%(desc)s/art + job_output_1.dest = %(logdir_bck)s/%(stage_name)s/%(desc)s/tbz/ -global.artRoot_dataset = dts.%(submitter)s.CosmicCORSIKA.%(desc)s.art +global.artRoot_dataset = dts.%(submitter)s.CosmicCORSIKA.%(desc)s.art,dts.%(submitter)s.CosmicLooseCORSIKA.%(desc)s.art job_setup.postscript = samweb file-lineage parents `basename ${fname}` > parents.txt diff --git a/CampaignConfig/mdc2020_corsika.ini b/CampaignConfig/mdc2020_corsika.ini index f9b28288..63dbbfea 100644 --- a/CampaignConfig/mdc2020_corsika.ini +++ b/CampaignConfig/mdc2020_corsika.ini @@ -87,4 +87,4 @@ output_file_patterns = %.fcl [login_setup mu2epro_login] host=mu2egpvm01.fnal.gov account=mu2epro -setup=export X509_USER_PROXY=/opt/mu2epro/mu2epro.Production.proxy;setup fife_utils v3_4_0, poms_client, poms_jobsub_wrapper; +setup=export X509_USER_PROXY=/opt/mu2epro/mu2epro.Production.proxy;setup fife_utils v3_4_0, poms_client, poms_jobsub_wrapper; \ No newline at end of file diff --git a/CampaignConfig/mdc2020_cry.cfg b/CampaignConfig/mdc2020_cry.cfg index 7d111433..99130c65 100644 --- a/CampaignConfig/mdc2020_cry.cfg +++ b/CampaignConfig/mdc2020_cry.cfg @@ -54,15 +54,18 @@ job_setup.ifdh_art = False [stage_resampler] global.stage_name = CosmicCRY + +job_output_2.addoutput = *CosmicCRY*.art job_output_2.add_to_dataset = dts.%(submitter)s.CosmicCRY.%(desc)s.art job_output_2.dest = %(outdir_dts_tape)s/CosmicCRY/%(desc)s/art -job_output_3.add_to_dataset = dts.%(submitter)s.CosmicLoose.CRY.%(desc)s.art -job_output_3.dest = %(outdir_dts_tape)s/CosmicLoose.CRY/%(desc)s/art +job_output_3.addoutput = *CosmicLooseCRY*.art +job_output_3.add_to_dataset = dts.%(submitter)s.CosmicLooseCRY.%(desc)s.art +job_output_3.dest = %(outdir_dts_tape)s/CosmicLooseCRY/%(desc)s/art job_output_1.dest = %(logdir_bck)s/%(stage_name)s/%(desc)s/tbz/ -global.artRoot_dataset = dts.%(submitter)s.CosmicCRY.%(desc)s.art,dts.%(submitter)s.CosmicLoose.CRY.%(desc)s.art +global.artRoot_dataset = dts.%(submitter)s.CosmicCRY.%(desc)s.art,dts.%(submitter)s.CosmicLooseCRY.%(desc)s.art job_setup.postscript = samweb file-lineage parents `basename ${fname}` > parents.txt diff --git a/CampaignConfig/mdc2020_noprimary.cfg b/CampaignConfig/mdc2020_noprimary.cfg index 33e3b375..ed4f060c 100644 --- a/CampaignConfig/mdc2020_noprimary.cfg +++ b/CampaignConfig/mdc2020_noprimary.cfg @@ -56,6 +56,7 @@ global.artRoot_dataset = dig.%(submitter)s.%(stage_name)sTriggered.%(desc)s.art, submit.dataset = cnf.%(submitter)s.%(stage_name)s.%(desc)s.fcl submit.n_files_per_job = 1 +submit.disk = 40000MB sam_consumer.limit = 1 job_setup.postscript = samweb file-lineage parents `basename ${fname}` > parents.txt @@ -136,7 +137,7 @@ global.artRoot_dataset = dig.%(submitter)s.%(stage_name)sTriggered.%(desc)s.art, submit.dataset = cnf.%(submitter)s.%(stage_name)s.%(desc)s.fcl submit.n_files_per_job = 1 submit.memory = 6000MB - +submit.disk = 40000MB sam_consumer.limit = 1 job_setup.postscript = samweb file-lineage parents `basename ${fname}` > parents.txt diff --git a/JobConfig/cosmic/S2Resampler.fcl b/JobConfig/cosmic/S2Resampler.fcl index e57026eb..d0853970 100644 --- a/JobConfig/cosmic/S2Resampler.fcl +++ b/JobConfig/cosmic/S2Resampler.fcl @@ -8,6 +8,8 @@ physics.filters.cosmicResample: @local::Cosmic.cosmicResample physics.filters.cosmicResample.mu2e.MaxEventsToSkip: 18415 # this number depends on the production details physics.filters.cosmicResample.mu2e.products.cosmicLivetimeMixer.moduleLabel: "generate" +physics.filters.cosmicResample.mu2e.products.cosmicLivetimeMixer.genCounterLabel: "genCounter::Primary" + physics.filters.signalFilter: @local::Cosmic.signalFilter # Point Mu2eG4 to the pre-simulated data @@ -43,4 +45,4 @@ outputs.LooseOutput.outputCommands : [@sequence::Primary.KeptProducts, outputs.Output.fileName : "dts.owner.Cosmic.version.sequencer.art" outputs.Output.outputCommands : [@sequence::Primary.KeptProducts, - "keep mu2e::CosmicLivetime_*_mixed_*"] \ No newline at end of file + "keep mu2e::CosmicLivetime_*_mixed_*"]