FPFSoftware · mvicenzi · Aug 19, 2025 · Jul 2, 2025 · Jul 2, 2025 · Jul 2, 2025
diff --git a/FPFSim.cc b/FPFSim.cc
@@ -17,10 +17,11 @@ using namespace std;
  * - run macros
  * - start interactive UI mode (no arguments)
  */
-int main(int argc, char** argv) {
-  std::cout<<"Application starting..."<<std::endl;
-//  G4long myseed = 345354;
-//  CLHEP::HepRandom::setTheSeed(myseed);
+int main(int argc, char** argv)
+{
+  G4cout<< " FPFSim starting..." << G4endl;
+  //G4long myseed = 345354;
+  //CLHEP::HepRandom::setTheSeed(myseed);
 
   // invoke analysis manager before ui manager to invoke analysis manager messenger
   AnalysisManager* analysis = AnalysisManager::GetInstance();
@@ -44,7 +45,7 @@ int main(int argc, char** argv) {
   G4UImanager* UImanager = G4UImanager::GetUIpointer();
 
   // Parse command line arguments
-  if (argc==1) {
+  if ( argc==1 ){
     G4UIExecutive* ui = new G4UIExecutive(argc, argv);
     UImanager->ApplyCommand("/control/execute macros/vis.mac");
     ui->SessionStart();
@@ -61,7 +62,7 @@ int main(int argc, char** argv) {
         ui->SessionStart();
         delete ui;
       } else {
-        std::cout<<"Please specify the second argument as vis to visualize the event"<<std::endl;
+        G4cout << "Please specify the second argument as vis to visualize the event" << G4endl;
         return 0;
       }
     }
@@ -70,7 +71,7 @@ int main(int argc, char** argv) {
   delete visManager;
   delete runManager;
 
-  std::cout<<"Application sucessfully ended.\nBye :-)"<<std::endl;
+  G4cout << "Application sucessfully ended.\nBye :-)" << G4endl;
 
   return 0;
 }
diff --git a/GridUtils/dune-gpvms/nue/nue_job.sh b/GridUtils/dune-gpvms/nue/nue_job.sh
@@ -33,12 +33,12 @@ cat << EOF >> temp.mac
 /gen/genie/genieInput nue_kling_ar40_e5000.ghep.root
 /gen/genie/genieIStart ${istart}
 
-/histo/addDiffusion false
-/histo/saveHit false
-/histo/save3DEvd true
-/histo/save2DEvd false
-/histo/circleFit true
-/histo/fileName ${outputfile}
+/out/flare/addDiffusion false
+
+/out/flare/save3DEvd true
+/out/flare/save2DEvd false
+
+/out/fileName ${outputfile}
 
 /run/beamOn ${num_evt_per_file}
 EOF

diff --git a/GridUtils/dune-gpvms/numu/README.md b/GridUtils/dune-gpvms/numu/README.md
@@ -1,27 +1,32 @@
 # Description
 
 This directory contains scripts for submitting batch jobs to simulate numu interactions in FLArE.
-* `batch_script.sh` is the script that is actually being submitted and executed on the worker nodes. 
-   Worker nodes have a limited scope, so the script takes care of:
-   1. copying over from `pnfs` all inputs (including the executable);
-   2. running the executable;
-   3. copying back to `pnfs` output and log files.  
 
-* `submit.sh` is the script that handles the job submission by calling `jobsub_submit`.
-   It sets the required computing resources and passes the input filepaths to `batch_script.sh`.
+- `batch_script.sh` is the script that is actually being submitted and executed on the worker nodes.
+  Worker nodes have a limited scope, so the script takes care of:
 
-* `numu_job.sh` is the main script: 
-   1. it sets production parameters (number of files, number of events) and paths;
-   2. it generates several `.mac` files starting from a template, keeping track of them in a list;
-   3. it passes the lists of configuration files and other paths to `submit.sh`.
+  1.  copying over from `pnfs` all inputs (including the executable);
+  2.  running the executable;
+  3.  copying back to `pnfs` output and log files.
 
-* `glob_output.sh` is the script that retrieves all the job output files in `/pnfs/dune/scratch`.
-   The files are copied over to `dune\data` for storage.
+- `submit.sh` is the script that handles the job submission by calling `jobsub_submit`.
+  It sets the required computing resources and passes the input filepaths to `batch_script.sh`.
 
-* `merge_outputs.sh` is the script that merges all the output files into a single one.
+- `numu_job.sh` is the main script:
+
+  1.  it sets production parameters (number of files, number of events) and paths;
+  2.  it generates several `.mac` files starting from a template, keeping track of them in a list;
+  3.  it passes the lists of configuration files and other paths to `submit.sh`.
+
+- `glob_output.sh` is the script that retrieves all the job output files in `/pnfs/dune/scratch`.
+  The files are copied over to `dune\data` for storage.
+
+- `merge_outputs.sh` is the script that merges all the output files into a single one.
 
 ## Instructions:
-* The `.mac` template is 
+
+- The `.mac` template is
+
 ```
 /control/execute ${geomacro}
 
@@ -32,19 +37,21 @@ This directory contains scripts for submitting batch jobs to simulate numu inter
 /genie/genieInput numu_kling_ar40_e5000.ghep.root
 /genie/genieIStart ${istart}
 
-/histo/saveEvd false
-/histo/saveHit false
-/histo/circleFit true
-/histo/fileName ${outputfile}
+/out/saveEvd false
+
+
+/out/fileName ${outputfile}
 
 /run/beamOn ${num_evt_per_file}
-```   
+```
+
 The script relies on GENIE-simulated numu neutrino vertices stored in `numu_kling_ar40_e5000.ghep.root`.
 In order for this file to be visibile on the worker nodes, `batch_script.sh` copies it over from an hardcoded `pnfs` location:
+
 ```
 ifdh cp /pnfs/dune/persistent/users/mvicenzi/numu/numu_kling_ar40_e5000.ghep.root numu_kling_ar40_e5000.ghep.root
 ```
-* The current implementation requires the user to provide the name of the geometry macro from `macro\geometry_options` by writing it in `numu_job.sh`. The name of this file is used to create the output directory as well as for the filenames themselves. It is the only argument that is needed by `glob_output.sh` and `merge_outputs.sh`.
-* `${istart}` is set according to the number of files requested and the number of events per file chosen, in order to avoid using the same events.
-* Most of the paths are currently hardcoded to point to `/pnfs/dune/scratch/users/mvicenzi` to store (temporary) submission files as well as the output files. They can be changed as necessary, but they need to be on `pnfs` to be accessible by the worker nodes with `ifdh cp`.
-  
+
+- The current implementation requires the user to provide the name of the geometry macro from `macro\geometry_options` by writing it in `numu_job.sh`. The name of this file is used to create the output directory as well as for the filenames themselves. It is the only argument that is needed by `glob_output.sh` and `merge_outputs.sh`.
+- `${istart}` is set according to the number of files requested and the number of events per file chosen, in order to avoid using the same events.
+- Most of the paths are currently hardcoded to point to `/pnfs/dune/scratch/users/mvicenzi` to store (temporary) submission files as well as the output files. They can be changed as necessary, but they need to be on `pnfs` to be accessible by the worker nodes with `ifdh cp`.
diff --git a/GridUtils/dune-gpvms/numu/numu_job.sh b/GridUtils/dune-gpvms/numu/numu_job.sh
@@ -33,9 +33,9 @@ cat << EOF >> temp.mac
 /gen/genie/genieInput numu_kling_ar40_e5000.ghep.root
 /gen/genie/genieIStart ${istart}
 
-/histo/saveHit false
-/histo/circleFit true
-/histo/fileName ${outputfile}
+
+
+/out/fileName ${outputfile}
 
 /run/beamOn ${num_evt_per_file}
 EOF

diff --git a/GridUtils/dune-gpvms/nutau/nutau_job.sh b/GridUtils/dune-gpvms/nutau/nutau_job.sh
@@ -33,12 +33,12 @@ cat << EOF >> temp.mac
 /gen/genie/genieInput nutau_bai_ar40_e2000.ghep.root
 /gen/genie/genieIStart ${istart}
 
-/histo/addDiffusion false
-/histo/saveHit false
-/histo/save3DEvd true
-/histo/save2DEvd false
-/histo/circleFit true
-/histo/fileName ${outputfile}
+/out/flare/addDiffusion false
+
+/out/flare/save3DEvd true
+/out/flare/save2DEvd false
+
+/out/fileName ${outputfile}
 
 /run/beamOn ${num_evt_per_file}
 EOF

diff --git a/GridUtils/dune-gpvms/single_particle/gen_jobfile.sh b/GridUtils/dune-gpvms/single_particle/gen_jobfile.sh
@@ -30,8 +30,8 @@ cat << EOF >> ${filename}
 /gps/particle ${particle}
 /gps/ene/mono ${particle_kin} GeV
 
-/histo/saveEvd false
-/histo/fileName ${outputfile}
+/out/flare/save2DEvd false
+/out/fileName ${outputfile}
 
 /run/beamOn ${num_evt_per_file}
 EOF

diff --git a/GridUtils/dune-gpvms/single_particle/gen_muons.sh b/GridUtils/dune-gpvms/single_particle/gen_muons.sh
@@ -35,10 +35,10 @@ cat << EOF >> ${filename}
 /gps/particle ${particle}
 /gps/ene/mono ${particle_kin} GeV
 
-/histo/saveEvd false
-/histo/saveHit false
-/histo/circleFit true
-/histo/fileName ${outputfile}
+/out/flare/save2DEvd false
+
+
+/out/fileName ${outputfile}
 
 /run/beamOn ${num_evt_per_file}
 EOF

diff --git a/GridUtils/lxplus/nujobs/nu_job.sh b/GridUtils/lxplus/nujobs/nu_job.sh
@@ -81,12 +81,12 @@ function generate_macros {
 /gen/genie/genieInput ${gst}
 /gen/genie/genieIStart ${istart}
 
-/histo/save3DEvd false
-/histo/save2DEvd false
-/histo/saveHit false
-/histo/addDiffusion false
-/histo/circleFit true
-/histo/fileName ${outputfile}
+/out/flare/save3DEvd false
+/out/flare/save2DEvd false
+
+/out/flare/addDiffusion false
+
+/out/fileName ${outputfile}
 
 /run/beamOn ${n_evt_per_job}
 EOF

diff --git a/GridUtils/sdcc/bkgjobs/batch_bkg_script.sh b/GridUtils/sdcc/bkgjobs/batch_bkg_script.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+cluster=$1
+process=$2
+fpfsim=$3
+macrolist=$4
+setup=$5
+
+echo "Executing JOBID ${cluster}.${process}"
+
+# source the environment
+source $setup
+
+# select the macro file
+let num=$((${process}+1))
+echo "Selecting macro from line ${num} in list:"
+
+macropath=$(tail -n+${num} ${macrolist} | head -n1)
+macro=`basename "$macropath"`
+echo "$macro"
+
+# running !!
+echo "Running ${fpfsim} ${macropath}"
+${fpfsim} ${macropath}
+
+echo "Completed JOBID ${cluster}.${process}"