Merge pull request #827 from eflumerf/eflumerf/RenameMu2eArtdaqCore

Rename mu2e artdaq core
Mu2e · Aug 11, 2022 · d395469 · d395469
2 parents 36755dc + 60e4a58
commit d395469
Show file tree

Hide file tree

Showing 17 changed files with 44 additions and 44 deletions.
diff --git a/.muse b/.muse
@@ -1,5 +1,5 @@
 # prefer to build with this environment
-ENVSET p026
+ENVSET p029
 # add these to python path
 PYTHONPATH Trigger/python
 # add Offline/bin to path

diff --git a/Analyses/src/SConscript b/Analyses/src/SConscript
@@ -72,7 +72,7 @@ helper.make_plugins( [ mainlib,
   'pthread',
   #'hep_concurrency',
   'DTCInterface',
-  'mu2e-artdaq-core_Overlays'
+  'Overlays'
 ] )
 # this tells emacs to view this file in python mode.
 # Local Variables:

diff --git a/CaloDiag/src/SConscript b/CaloDiag/src/SConscript
@@ -70,7 +70,7 @@ helper.make_plugins( [ mainlib,
                        'pthread',
                        'hep_concurrency',
                        'DTCInterface',
-                       'mu2e-artdaq-core_Overlays'
+                       'Overlays'
                        ] )
 
 # this tells emacs to view this file in python mode.

diff --git a/DAQ/inc/CaloDAQUtilities.hh b/DAQ/inc/CaloDAQUtilities.hh
@@ -5,8 +5,8 @@
 //
 //
 
-#include "mu2e-artdaq-core/Overlays/CalorimeterFragment.hh"
-#include "mu2e-artdaq-core/Overlays/FragmentType.hh"
+#include "artdaq-core-mu2e/Overlays/CalorimeterFragment.hh"
+#include "artdaq-core-mu2e/Overlays/FragmentType.hh"
 #include <artdaq-core/Data/Fragment.hh>
 
 #include <string>

diff --git a/DAQ/src/ArtBinaryPacketsFromDigis_module.cc b/DAQ/src/ArtBinaryPacketsFromDigis_module.cc
@@ -28,10 +28,10 @@
 #include "Offline/GeometryService/inc/DetectorSystem.hh"
 #include "Offline/GeometryService/inc/GeomHandle.hh"
 
-// mu2e-artdaq-core includes
-#include "mu2e-artdaq-core/Overlays/CRVFragment.hh"
-#include "mu2e-artdaq-core/Overlays/CalorimeterFragment.hh"
-#include "mu2e-artdaq-core/Overlays/TrackerFragment.hh"
+// artdaq-core-mu2e includes
+#include "artdaq-core-mu2e/Overlays/CRVFragment.hh"
+#include "artdaq-core-mu2e/Overlays/CalorimeterFragment.hh"
+#include "artdaq-core-mu2e/Overlays/TrackerFragment.hh"
 
 // pci_linux_kernel_module includes
 #include "dtcInterfaceLib/DTC_Packets.h"

diff --git a/DAQ/src/CaloDAQUtilities.cc b/DAQ/src/CaloDAQUtilities.cc
@@ -1,6 +1,6 @@
 
-#include "mu2e-artdaq-core/Overlays/CalorimeterFragment.hh"
-#include "mu2e-artdaq-core/Overlays/FragmentType.hh"
+#include "artdaq-core-mu2e/Overlays/CalorimeterFragment.hh"
+#include "artdaq-core-mu2e/Overlays/FragmentType.hh"
 #include <artdaq-core/Data/Fragment.hh>
 
 #include "Offline/DAQ/inc/CaloDAQUtilities.hh"

diff --git a/DAQ/src/CaloHitsFromFragments_module.cc b/DAQ/src/CaloHitsFromFragments_module.cc
@@ -10,9 +10,9 @@
 #include "fhiclcpp/ParameterSet.h"
 
 #include "art/Framework/Principal/Handle.h"
-#include "mu2e-artdaq-core/Overlays/CalorimeterFragment.hh"
-#include "mu2e-artdaq-core/Overlays/FragmentType.hh"
-#include "mu2e-artdaq-core/Overlays/Mu2eEventFragment.hh"
+#include "artdaq-core-mu2e/Overlays/CalorimeterFragment.hh"
+#include "artdaq-core-mu2e/Overlays/FragmentType.hh"
+#include "artdaq-core-mu2e/Overlays/Mu2eEventFragment.hh"
 
 #include "Offline/RecoDataProducts/inc/CaloHit.hh"
 #include "Offline/RecoDataProducts/inc/IntensityInfoCalo.hh"

diff --git a/DAQ/src/CaloRecoFromFragments_module.cc b/DAQ/src/CaloRecoFromFragments_module.cc
@@ -10,9 +10,9 @@
 #include "fhiclcpp/ParameterSet.h"
 
 #include "art/Framework/Principal/Handle.h"
-#include "mu2e-artdaq-core/Overlays/CalorimeterFragment.hh"
-#include "mu2e-artdaq-core/Overlays/Mu2eEventFragment.hh"
-#include "mu2e-artdaq-core/Overlays/FragmentType.hh"
+#include "artdaq-core-mu2e/Overlays/CalorimeterFragment.hh"
+#include "artdaq-core-mu2e/Overlays/Mu2eEventFragment.hh"
+#include "artdaq-core-mu2e/Overlays/FragmentType.hh"
 
 //-- insert calls to proditions ..for calodmap-----
 #include "Offline/CaloConditions/inc/CaloDAQMap.hh"

diff --git a/DAQ/src/CrvDigisFromFragments_module.cc b/DAQ/src/CrvDigisFromFragments_module.cc
@@ -10,7 +10,7 @@
 #include "fhiclcpp/ParameterSet.h"
 
 #include "art/Framework/Principal/Handle.h"
-#include "mu2e-artdaq-core/Overlays/CRVFragment.hh"
+#include "artdaq-core-mu2e/Overlays/CRVFragment.hh"
 #include "Offline/RecoDataProducts/inc/CaloDigi.hh"
 #include "Offline/RecoDataProducts/inc/CrvDigi.hh"
 #include "Offline/RecoDataProducts/inc/StrawDigi.hh"

diff --git a/DAQ/src/FragmentAna_module.cc b/DAQ/src/FragmentAna_module.cc
@@ -15,10 +15,10 @@
 #include "art_root_io/TFileDirectory.h"
 #include "art_root_io/TFileService.h"
 #include "fhiclcpp/ParameterSet.h"
-#include "mu2e-artdaq-core/Overlays/CalorimeterFragment.hh"
-#include "mu2e-artdaq-core/Overlays/FragmentType.hh"
-#include "mu2e-artdaq-core/Overlays/Mu2eEventFragment.hh"
-#include "mu2e-artdaq-core/Overlays/TrackerFragment.hh"
+#include "artdaq-core-mu2e/Overlays/CalorimeterFragment.hh"
+#include "artdaq-core-mu2e/Overlays/FragmentType.hh"
+#include "artdaq-core-mu2e/Overlays/Mu2eEventFragment.hh"
+#include "artdaq-core-mu2e/Overlays/TrackerFragment.hh"
 
 #include <artdaq-core/Data/Fragment.hh>
 

diff --git a/DAQ/src/PrefetchDAQData_module.cc b/DAQ/src/PrefetchDAQData_module.cc
@@ -10,8 +10,8 @@
 #include "Offline/RecoDataProducts/inc/StrawDigi.hh"
 
 // DAQ data
-//#include "mu2e-artdaq-core/Overlays/FragmentType.hh"
-//#include "mu2e-artdaq-core/Overlays/TrackerFragment.hh"
+//#include "artdaq-core-mu2e/Overlays/FragmentType.hh"
+//#include "artdaq-core-mu2e/Overlays/TrackerFragment.hh"
 #include <artdaq-core/Data/Fragment.hh>
 
 

diff --git a/DAQ/src/SConscript b/DAQ/src/SConscript
@@ -88,7 +88,7 @@ helper.make_plugins( [ mainlib,
                        'Minuit',  # Needed for BetaTauPitch_module.cc and ReadStrawCluster_module.cc
                                   # See the Fixme at the top of the file.
                        'DTCInterface',
-                       'mu2e-artdaq-core_Overlays',
+                       'Overlays',
                        'artdaq-core_Data'
                      ]
                      )

diff --git a/DAQ/src/StrawAndCaloDigisFromFragments_module.cc b/DAQ/src/StrawAndCaloDigisFromFragments_module.cc
@@ -10,10 +10,10 @@
 #include "fhiclcpp/ParameterSet.h"
 
 #include "art/Framework/Principal/Handle.h"
-#include "mu2e-artdaq-core/Overlays/CalorimeterFragment.hh"
-#include "mu2e-artdaq-core/Overlays/FragmentType.hh"
-#include "mu2e-artdaq-core/Overlays/Mu2eEventFragment.hh"
-#include "mu2e-artdaq-core/Overlays/TrackerFragment.hh"
+#include "artdaq-core-mu2e/Overlays/CalorimeterFragment.hh"
+#include "artdaq-core-mu2e/Overlays/FragmentType.hh"
+#include "artdaq-core-mu2e/Overlays/Mu2eEventFragment.hh"
+#include "artdaq-core-mu2e/Overlays/TrackerFragment.hh"
 
 #include "Offline/DataProducts/inc/TrkTypes.hh"
 #include "Offline/RecoDataProducts/inc/CaloDigi.hh"

diff --git a/DAQ/src/StrawHitRecoFromFragments_module.cc b/DAQ/src/StrawHitRecoFromFragments_module.cc
@@ -38,10 +38,10 @@
 #include "Offline/RecoDataProducts/inc/StrawHit.hh"
 
 #include "art/Framework/Principal/Handle.h"
-#include "mu2e-artdaq-core/Overlays/CalorimeterFragment.hh"
-#include "mu2e-artdaq-core/Overlays/FragmentType.hh"
-#include "mu2e-artdaq-core/Overlays/TrackerFragment.hh"
-#include "mu2e-artdaq-core/Overlays/Mu2eEventFragment.hh"
+#include "artdaq-core-mu2e/Overlays/CalorimeterFragment.hh"
+#include "artdaq-core-mu2e/Overlays/FragmentType.hh"
+#include "artdaq-core-mu2e/Overlays/TrackerFragment.hh"
+#include "artdaq-core-mu2e/Overlays/Mu2eEventFragment.hh"
 #include <artdaq-core/Data/Fragment.hh>
 
 #include "TH1F.h"

diff --git a/DAQ/src/StrawRecoFromFragments_module.cc b/DAQ/src/StrawRecoFromFragments_module.cc
@@ -10,9 +10,9 @@
 #include "fhiclcpp/ParameterSet.h"
 
 #include "art/Framework/Principal/Handle.h"
-#include "mu2e-artdaq-core/Overlays/FragmentType.hh"
-#include "mu2e-artdaq-core/Overlays/TrackerFragment.hh"
-#include "mu2e-artdaq-core/Overlays/Mu2eEventFragment.hh"
+#include "artdaq-core-mu2e/Overlays/FragmentType.hh"
+#include "artdaq-core-mu2e/Overlays/TrackerFragment.hh"
+#include "artdaq-core-mu2e/Overlays/Mu2eEventFragment.hh"
 
 #include "Offline/DataProducts/inc/TrkTypes.hh"
 #include "Offline/RecoDataProducts/inc/StrawDigi.hh"

diff --git a/ups_install/install.sh b/ups_install/install.sh
@@ -11,7 +11,7 @@ export ${MU2E_SETUP_BUILDOPTS}
 export DEBUG_LEVEL=${MUSE_BUILD}
 export PACKAGE_NAME=offline
 export PACKAGE_SOURCE=${MUSE_WORK_DIR}/Offline
-export PACKAGE_VERSION=d10_10_01
+export PACKAGE_VERSION=d10_17_00
 
 # Check that the installation directoy has been defined.
 if [ "${PRODUCTS_INSTALL}" = '' ];then
@@ -22,7 +22,7 @@ fi
 
 # Learn if the extra products needed for the trigger are active.
 # Use mu2e_artdaq_core as a proxy for the ensemble.
-if [ "`ups active | grep mu2e_artdaq_core`" != "" ]; then
+if [ "`ups active | grep artdaq_core_mu2e`" != "" ]; then
    haveTrigger=".trig"
 else
    haveTrigger=""

diff --git a/ups_install/installTableFile.sh b/ups_install/installTableFile.sh
@@ -16,7 +16,7 @@ art_ver=`ups active | awk '$1 == "art" {print $2}'`
 btrk_ver=`ups active | awk '$1 == "BTrk" {print $2}'`
 kinkal_ver=`ups active | awk '$1 == "KinKal" {print $2}'`
 xerces_ver=`ups active | awk '$1 == "xerces_c" {print $2}'`
-mu2e_artdaq_core_ver=`ups active | awk '$1 == "mu2e_artdaq_core" {print $2}'`
+artdaq_core_mu2e_ver=`ups active | awk '$1 == "artdaq_core_mu2e" {print $2}'`
 
 # A table file needs the qualifiers string in three formats:
 #   - colon delimited
@@ -53,10 +53,10 @@ Common:
   Action = setup
     prodDir()
     setupEnv()
-    envSet (OFFLINE_INC, \${OFFLINE_DIR}/include/Offline )
+    envSet (OFFLINE_INC, \${OFFLINE_DIR}/include )
     envSet (MU2E_BASE_RELEASE, \${OFFLINE_DIR} )
-    envSet (MU2E_SEARCH_PATH, \${OFFLINE_DIR}/config/Offline:\${MU2E_DATA_PATH} )
-    envSet (FHICL_FILE_PATH, \${OFFLINE_DIR}/config/Offline:\${OFFLINE_DIR}/config/Offline/fcl )
+    envSet (MU2E_SEARCH_PATH, \${OFFLINE_DIR}/config:\${MU2E_DATA_PATH}:/cvmfs/mu2e.opensciencegrid.org/DataFiles )
+    envSet (FHICL_FILE_PATH, \${OFFLINE_DIR}/config:\${OFFLINE_DIR}/config/Offline/fcl )
     envSet (OFFLINE_VERSION, \${UPS_PROD_VERSION} )
     pathAppend( ROOT_INCLUDE_PATH, \${OFFLINE_INC})
 
@@ -106,7 +106,7 @@ Qualifiers = "${qualifiers_value}:trig:${MUSE_BUILD}"
       setupRequired( BTrk  ${btrk_ver} -q +${mu2e_ups_qualifiers}:+${MUSE_BUILD}:+$MUSE_PYTHON )
       setupRequired( KinKal  ${kinkal_ver} -q +${mu2e_ups_qualifiers}:+${MUSE_BUILD}:+$MUSE_PYTHON )
       setupRequired( xerces_c  ${xerces_ver} -q +${mu2e_ups_qualifiers}:+${MUSE_BUILD} )
-      setupRequired( mu2e_artdaq_core ${mu2e_artdaq_core_ver} -q ${mu2e_ups_qualifiers}:+${MUSE_ART}:+${MUSE_BUILD} )
+      setupRequired( artdaq_core_mu2e ${artdaq_core_mu2e_ver} -q ${mu2e_ups_qualifiers}:+${MUSE_ART}:+${MUSE_BUILD} )
 
 EOG
 )
@@ -125,7 +125,7 @@ unset art_ver
 unset btrk_ver
 unset kinkal_ver
 unset xerces_ver
-unset mu2e_artdaq_core_ver
+unset artdaq_core_mu2e_ver
 unset qualifiers_value
 unset offline_fq_value
 unset mu2e_ups_qualifiers