replacing wrong setup.sh file and making changes as requested by Andr…

…ei for PR
Mu2e · Dec 17, 2020 · a73ca89 · a73ca89
1 parent 8556d31
commit a73ca89
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/Mu2eG4/inc/Mu2eG4WorkerRunManager.hh b/Mu2eG4/inc/Mu2eG4WorkerRunManager.hh
@@ -50,8 +50,8 @@ namespace mu2e {
                           const G4ThreeVector& origin_in_world);
     void initializeUserActions(const G4ThreeVector& origin_in_world);
     void initializeRun(art::Event* const art_event);
-    void processEvent(art::EventID);
-    G4Event* generateEvt(art::EventID);
+    void processEvent(const art::EventID&);
+    G4Event* generateEvt(const art::EventID&);
 
     inline bool workerRMInitialized() const { return m_managerInitialized; }
 

diff --git a/Mu2eG4/src/Mu2eG4WorkerRunManager.cc b/Mu2eG4/src/Mu2eG4WorkerRunManager.cc
@@ -276,7 +276,7 @@ namespace mu2e {
   }
 
 
-  void Mu2eG4WorkerRunManager::processEvent(art::EventID evtID){
+  void Mu2eG4WorkerRunManager::processEvent(const art::EventID& evtID){
 
     numberOfEventToBeProcessed = 1;
     runIsSeeded = false;
@@ -293,7 +293,7 @@ namespace mu2e {
   }
 
 
-  G4Event* Mu2eG4WorkerRunManager::generateEvt(art::EventID evtID){
+  G4Event* Mu2eG4WorkerRunManager::generateEvt(const art::EventID& evtID){
 
     G4Event* anEvent = new G4Event(evtID.event());
     G4bool eventHasToBeSeeded = true;

diff --git a/setup.sh b/setup.sh
@@ -13,9 +13,7 @@ fi
 if [[ ${#@} -ne 0 ]]; then
     cat >&2 <<EOF
 ERROR: the setup.sh script does not accept arguments. Use
-
     $(dirname ${BASH_SOURCE})/buildopts
-
 to query and define build configuraton.
 EOF
     return 1
@@ -103,7 +101,7 @@ build=$($MU2E_BASE_RELEASE/buildopts --build)
 # and is therefore different from the value shown in
 # SETUP_<productname> environment vars, or by the "ups active" command.
 export MU2E_UPS_QUALIFIERS=+e20:+${build}
-export MU2E_ART_SQUALIFIER=s101
+export MU2E_ART_SQUALIFIER=s104
 
 MU2E_G4_GRAPHICS_QUALIFIER=''
 if [[ $($MU2E_BASE_RELEASE/buildopts --g4vis) == qt ]]; then
@@ -124,7 +122,7 @@ export MU2E_G4_EXTRA_QUALIFIER=''
 
 # Setup the framework and its dependent products
 setup -B art v3_06_03 -q${MU2E_UPS_QUALIFIERS}
-setup -B art_root_io v1_04_03 -q${MU2E_UPS_QUALIFIERS}
+setup -B art_root_io v1_05_00 -q${MU2E_UPS_QUALIFIERS}
 
 # Geant4 and its cross-section files.
 if [[ $($MU2E_BASE_RELEASE/buildopts --trigger) == "off" ]]; then
@@ -134,10 +132,10 @@ else
 fi
 
 # Get access to raw data formats.
-setup -B mu2e_artdaq_core v1_05_00 -q${MU2E_UPS_QUALIFIERS}:+${MU2E_ART_SQUALIFIER}:offline
+setup -B mu2e_artdaq_core v1_05_03 -q${MU2E_UPS_QUALIFIERS}:+${MU2E_ART_SQUALIFIER}:offline
 
 setup -B heppdt   v03_04_02 -q${MU2E_UPS_QUALIFIERS}
-setup -B BTrk   v1_02_28  -q${MU2E_UPS_QUALIFIERS}:p383b
+setup -B BTrk   v1_02_29  -q${MU2E_UPS_QUALIFIERS}:p383b
 setup -B cry   v1_7n  -q${MU2E_UPS_QUALIFIERS}
 setup -B gsl v2_6a
 setup curl v7_64_1