Changed production to Dec concept, prop.6

ECCE-EIC · Dec 6, 2021 · d10b680 · d10b680
2 parents aa2d745 + 40d17f7
commit d10b680
Show file tree

Hide file tree

Showing 6 changed files with 295 additions and 27 deletions.
diff --git a/.github/workflows/sync-with-production.yml b/.github/workflows/sync-with-production.yml
@@ -0,0 +1,34 @@
+name: Sync production branches
+on:
+  push:
+    branches:
+      - 'production'
+jobs:
+  sync-branch:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+
+      - name: Merge production -> production_singleElectron_0-20GeV
+        uses: devmasx/[email protected]
+        with:
+          type: now
+          from_branch: production
+          target_branch: production_singleElectron_0-20GeV
+          github_token: ${{ github.token }}
+
+      - name: Merge production -> production_singlePion_0-20GeV
+        uses: devmasx/[email protected]
+        with:
+          type: now
+          from_branch: production
+          target_branch: production_singlePion_0-20GeV
+          github_token: ${{ github.token }}
+
+      - name: Merge production -> production_pythia8
+        uses: devmasx/[email protected]
+        with:
+          type: now
+          from_branch: production
+          target_branch: production_pythia8
+          github_token: ${{ github.token }}
diff --git a/common/G4_EventEvaluator.C b/common/G4_EventEvaluator.C
@@ -51,10 +51,8 @@ void Event_Eval(const std::string &filename)
     }
 
     eval->set_do_PROJECTIONS(true);
-    if (G4TRACKING::DISPLACED_VERTEX)
-      eval->set_do_VERTEX(true);
-    if (Enable::DIRC_RECO or Enable::mRICH_RECO or Enable::RICH_RECO)
-      eval->set_do_PID_LogLikelihood(true);
+    if (G4TRACKING::DISPLACED_VERTEX) eval->set_do_VERTEX(true);
+    if (Enable::DIRC_RECO or Enable::mRICH_RECO or Enable::RICH_RECO) eval->set_do_PID_LogLikelihood(true);
   }
   // set calorimeter Infos
   if (Enable::CEMC) eval->set_do_CEMC(true);
@@ -69,6 +67,7 @@ void Event_Eval(const std::string &filename)
   if (Enable::DRCALO) eval->set_do_DRCALO(true);
   if (Enable::LFHCAL) eval->set_do_LFHCAL(true);
   if (Enable::BECAL) eval->set_do_BECAL(true);
+  if (Enable::EHCAL) eval->set_do_EHCAL(true);
 
   // storing MC event info 
   eval->set_do_MCPARTICLES(true);

diff --git a/common/G4_FwdJets.C b/common/G4_FwdJets.C
@@ -128,46 +128,46 @@ void Jet_FwdReco()
   return;
 }
 
-void Jet_FwdEval(const std::string &outfilepath = ".", const std::string &prepend = "")
+void Jet_FwdEval(std::string &outputfile)
 {
   int verbosity = std::max(Enable::VERBOSITY, Enable::FWDJETS_VERBOSITY);
   Fun4AllServer *se = Fun4AllServer::instance();
 
   JetEvaluator *evaltrk05 = new JetEvaluator("JETEVALUATORTRACK05","AntiKt_Track_r05",
-                                        "AntiKt_Truth_r05", outfilepath + "/" + prepend + "g4fwdjets_track_05_eval.root");
+                                        "AntiKt_Truth_r05", outputfile + "_g4fwdjets_track_05_eval.root");
   evaltrk05->Verbosity(verbosity);
   se->registerSubsystem(evaltrk05);
 
   JetEvaluator *evalfull05 = new JetEvaluator("JETEVALUATORFULL05","AntiKt_Full_r05",
-                                        "AntiKt_Truth_r05", outfilepath + "/" + prepend + "g4fwdjets_full_05_eval.root");
+                                        "AntiKt_Truth_r05", outputfile + "_g4fwdjets_full_05_eval.root");
   evalfull05->Verbosity(verbosity);
   se->registerSubsystem(evalfull05);
 
   JetEvaluator *evalt05 = new JetEvaluator("JETEVALUATORTOWER05","AntiKt_Tower_r05",
-                                        "AntiKt_Truth_r05", outfilepath + "/" + prepend + "g4fwdjets_tower_05_eval.root");
+                                        "AntiKt_Truth_r05", outputfile + "_g4fwdjets_tower_05_eval.root");
   evalt05->Verbosity(verbosity);
   se->registerSubsystem(evalt05);
   JetEvaluator *evalt07 = new JetEvaluator("JETEVALUATORTOWER07","AntiKt_Tower_r07",
-                                        "AntiKt_Truth_r07", outfilepath + "/" + prepend + "g4fwdjets_tower_07_eval.root");
+                                        "AntiKt_Truth_r07", outputfile + "_g4fwdjets_tower_07_eval.root");
   evalt07->Verbosity(verbosity);
   se->registerSubsystem(evalt07);
   JetEvaluator *evalt10 = new JetEvaluator("JETEVALUATORTOWER10","AntiKt_Tower_r10",
-                                        "AntiKt_Truth_r10", outfilepath + "/" + prepend + "g4fwdjets_tower_10_eval.root");
+                                        "AntiKt_Truth_r10", outputfile + "_g4fwdjets_tower_10_eval.root");
   evalt10->Verbosity(verbosity);
   se->registerSubsystem(evalt10);
 
   JetEvaluator *evalc05 = new JetEvaluator("JETEVALUATORCLUSTER05", "AntiKt_Cluster_r05",
-                                        "AntiKt_Truth_r05", outfilepath + "/" + prepend + "g4fwdjets_cluster_05_eval.root");
+                                        "AntiKt_Truth_r05", outputfile + "_g4fwdjets_cluster_05_eval.root");
   evalc05->Verbosity(verbosity);
   se->registerSubsystem(evalc05);
 
   JetEvaluator *evalc07 = new JetEvaluator("JETEVALUATORCLUSTER07", "AntiKt_Cluster_r07",
-                                        "AntiKt_Truth_r07", outfilepath + "/" + prepend + "g4fwdjets_cluster_07_eval.root");
+                                        "AntiKt_Truth_r07", outputfile + "_g4fwdjets_cluster_07_eval.root");
   evalc07->Verbosity(verbosity);
   se->registerSubsystem(evalc07);
 
   JetEvaluator *evalc10 = new JetEvaluator("JETEVALUATORCLUSTER10", "AntiKt_Cluster_r10",
-                                        "AntiKt_Truth_r10", outfilepath + "/" + prepend + "g4fwdjets_cluster_10_eval.root");
+                                        "AntiKt_Truth_r10", outputfile + "_g4fwdjets_cluster_10_eval.root");
   evalc10->Verbosity(verbosity);
   se->registerSubsystem(evalc10);
 

diff --git a/detectors/EICDetector/Fun4All_G4_EICDetector.C b/detectors/EICDetector/Fun4All_G4_EICDetector.C
@@ -48,7 +48,7 @@ int Fun4All_G4_EICDetector(
   // which will produce identical results so you can debug your code
   // rc->set_IntFlag("RANDOMSEED", 12345);
 
-  bool generate_seed = false;
+  bool generate_seed = true;
 
   if (generate_seed)
   {
@@ -102,7 +102,7 @@ int Fun4All_G4_EICDetector(
   //   Input::SARTRE = true;
 
   // Simple multi particle generator in eta/phi/pt ranges
-  Input::SIMPLE = true;
+  //Input::SIMPLE = true;
   // Input::SIMPLE_NUMBER = 2; // if you need 2 of them
   // Input::SIMPLE_VERBOSITY = 1;
 
@@ -119,7 +119,7 @@ int Fun4All_G4_EICDetector(
   // And/Or read generated particles from file
 
   // eic-smear output
-  // Input::READEIC = true;
+  Input::READEIC = true;
   INPUTREADEIC::filename = inputFile;
 
   // HepMC2 files
@@ -242,7 +242,7 @@ int Fun4All_G4_EICDetector(
   // Write the DST
   //======================
 
-  // Enable::DSTOUT = true;
+  Enable::DSTOUT = true;
   DstOut::OutputDir = outdir;
   DstOut::OutputFile = outputFile;
   Enable::DSTOUT_COMPRESS = true;  // Compress DST files
@@ -297,7 +297,7 @@ int Fun4All_G4_EICDetector(
   Enable::HTOF_GAS = Enable::HTOF && true;
 
   Enable::TRACKING = true;
-  Enable::TRACKING_EVAL = Enable::TRACKING && true;
+  Enable::TRACKING_EVAL = Enable::TRACKING && false;
   G4TRACKING::DISPLACED_VERTEX = true;  // this option exclude vertex in the track fitting and use RAVE to reconstruct primary and 2ndary vertexes
                                         // projections to calorimeters
   G4TRACKING::PROJECTION_EEMC = true;
@@ -348,7 +348,7 @@ int Fun4All_G4_EICDetector(
   G4TTL::SETTING::optionEEMCH           = Enable::EEMCH && true;
   Enable::EHCAL   = false;
 
-  Enable::FFR_EVAL = Enable::HFARFWD_MAGNETS && Enable::HFARFWD_VIRTUAL_DETECTORS && true;
+  Enable::FFR_EVAL = Enable::HFARFWD_MAGNETS && Enable::HFARFWD_VIRTUAL_DETECTORS && false;
 
   Enable::PLUGDOOR = false;
 
@@ -364,6 +364,10 @@ int Fun4All_G4_EICDetector(
   Enable::BLACKHOLE = true;
   //Enable::BLACKHOLE_SAVEHITS = false; // turn off saving of bh hits
   //BlackHoleGeometry::visible = true;
+
+  // ZDC
+  // Enable::ZDC = true;
+  // Enable::ZDC_DISABLE_BLACKHOLE = true;
 
   // ZDC
   // Enable::ZDC = true;
@@ -394,24 +398,24 @@ int Fun4All_G4_EICDetector(
   Enable::BECAL_CELL    = Enable::BECAL && true;
   Enable::BECAL_TOWER   = Enable::BECAL_CELL && true;
   Enable::BECAL_CLUSTER = Enable::BECAL_TOWER && true;
-  Enable::BECAL_EVAL    = Enable::BECAL_CLUSTER && true;
+  Enable::BECAL_EVAL    = Enable::BECAL_CLUSTER && false;
 
   //  Enable::HCALIN_ABSORBER = true;
   Enable::HCALIN_CELL     = Enable::HCALIN && true;
   Enable::HCALIN_TOWER    = Enable::HCALIN_CELL && true;
   Enable::HCALIN_CLUSTER  = Enable::HCALIN_TOWER && true;
-  Enable::HCALIN_EVAL     = Enable::HCALIN_CLUSTER && true;
+  Enable::HCALIN_EVAL     = Enable::HCALIN_CLUSTER && false;
 
   //  Enable::HCALOUT_ABSORBER = true;
   Enable::HCALOUT_CELL    = Enable::HCALOUT && true;
   Enable::HCALOUT_TOWER   = Enable::HCALOUT_CELL && true;
   Enable::HCALOUT_CLUSTER = Enable::HCALOUT_TOWER && true;
-  Enable::HCALOUT_EVAL    = Enable::HCALOUT_CLUSTER && true;
+  Enable::HCALOUT_EVAL    = Enable::HCALOUT_CLUSTER && false;
 
   //  Enable::FEMC_ABSORBER = true;
   Enable::FEMC_TOWER      = Enable::FEMC && true;
   Enable::FEMC_CLUSTER    = Enable::FEMC_TOWER && true;
-  Enable::FEMC_EVAL       = Enable::FEMC_CLUSTER && true;
+  Enable::FEMC_EVAL       = Enable::FEMC_CLUSTER && false;
 
   Enable::DRCALO_CELL     = Enable::DRCALO && true;
   Enable::DRCALO_TOWER    = Enable::DRCALO_CELL && true;
@@ -422,19 +426,19 @@ int Fun4All_G4_EICDetector(
   Enable::LFHCAL_CELL     = Enable::LFHCAL && true;
   Enable::LFHCAL_TOWER    = Enable::LFHCAL_CELL && true;
   Enable::LFHCAL_CLUSTER  = Enable::LFHCAL_TOWER && true;
-  Enable::LFHCAL_EVAL     = Enable::LFHCAL_CLUSTER && true;
+  Enable::LFHCAL_EVAL     = Enable::LFHCAL_CLUSTER && false;
 
   Enable::EEMCH_TOWER     = Enable::EEMCH && true;
   Enable::EEMCH_CLUSTER   = Enable::EEMCH_TOWER && true;
-  Enable::EEMCH_EVAL      = Enable::EEMCH_CLUSTER && true;
+  Enable::EEMCH_EVAL      = Enable::EEMCH_CLUSTER && false;
 
   Enable::EHCAL_CELL      = Enable::EHCAL && true;
   Enable::EHCAL_TOWER     = Enable::EHCAL_CELL && true;
   Enable::EHCAL_CLUSTER   = Enable::EHCAL_TOWER && true;
-  Enable::EHCAL_EVAL      = Enable::EHCAL_CLUSTER && true;
+  Enable::EHCAL_EVAL      = Enable::EHCAL_CLUSTER && false;
 
   // Enabling the event evaluator?
-  Enable::EVENT_EVAL            = true;
+  Enable::EVENT_EVAL            = false;
   Enable::EVENT_EVAL_DO_HITS    = true;
   Enable::EVENT_EVAL_DO_HEPMC   = Input::PYTHIA6 or Input::PYTHIA8 or Input::SARTRE or Input::HEPMC or Input::READEIC;
   Enable::EVENT_EVAL_DO_EVT_LVL = Input::PYTHIA6 or Input::PYTHIA8 or Input::READEIC;
@@ -604,6 +608,7 @@ int Fun4All_G4_EICDetector(
 
   if (Enable::USER) UserAnalysisInit();
 
+
   //--------------
   // Set up Input Managers
   //--------------