Main020326

.muse

@@ -1,5 +1,5 @@
 # prefer to build with this environment
-ENVSET p091
+ENVSET p092
 # add Offline/bin to path
 PATH bin
 # recent commits can take enforce these flags

Analyses/CMakeLists.txt

@@ -16,7 +16,6 @@ cet_build_plugin(CaloCalibAna art::module
 
       Offline::CaloCluster
       Offline::CalorimeterGeom
-      Offline::ConditionsService
       Offline::DataProducts
       Offline::GeometryService
       Offline::GlobalConstantsService
@@ -50,7 +49,6 @@ cet_build_plugin(CaloDigiAna art::module
       art_root_io::TFileService_service
 
       Offline::CalorimeterGeom
-      Offline::ConditionsService
       Offline::DataProducts
       Offline::GeometryService
       Offline::GlobalConstantsService
@@ -69,17 +67,6 @@ cet_build_plugin(CaloHitFinderInspect art::module
       Offline::RecoDataProducts
 )
 
-cet_build_plugin(CaloTrackMatchExample art::module
-    REG_SOURCE src/CaloTrackMatchExample_module.cc
-    LIBRARIES REG
-      art_root_io::TFileService_service
-      Offline::CalorimeterGeom
-      Offline::GeometryService
-      Offline::GlobalConstantsService
-      Offline::MCDataProducts
-      Offline::RecoDataProducts
-)
-
 cet_build_plugin(CollectionSizeAnalyzer art::module
     REG_SOURCE src/CollectionSizeAnalyzer_module.cc
     LIBRARIES REG
@@ -108,20 +95,6 @@ cet_build_plugin(CORSIKAGenPlots art::module
       Offline::Mu2eUtilities
 )
 
-cet_build_plugin(CosmicAnalysis art::module
-    REG_SOURCE src/CosmicAnalysis_module.cc
-    LIBRARIES REG
-
-
-      Offline::BTrkData
-      Offline::CosmicRayShieldGeom
-      Offline::DataProducts
-      Offline::GeometryService
-      Offline::MCDataProducts
-      Offline::Mu2eUtilities
-      Offline::RecoDataProducts
-)
-
 cet_build_plugin(CosmicFilter art::module
     REG_SOURCE src/CosmicFilter_module.cc
     LIBRARIES REG
@@ -272,20 +245,6 @@ cet_build_plugin(InteractiveRoot art::module
       Offline::MCDataProducts
 )
 
-cet_build_plugin(KineticFracAnalysis art::module
-    REG_SOURCE src/KineticFracAnalysis_module.cc
-    LIBRARIES REG
-      art_root_io::TFileService_service
-      Offline::CalorimeterGeom
-      Offline::DataProducts
-      Offline::GeneralUtilities
-      Offline::GeometryService
-      Offline::GlobalConstantsService
-      Offline::MCDataProducts
-      Offline::RecoDataProducts
-      Offline::TrackerGeom
-)
-
 cet_build_plugin(MTVerification art::module
     REG_SOURCE src/MTVerification_module.cc
     LIBRARIES REG
@@ -298,7 +257,6 @@ cet_build_plugin(Mu2eG4StudyCalo01ReadBack art::module
     REG_SOURCE src/Mu2eG4StudyCalo01ReadBack_module.cc
     LIBRARIES REG
       art_root_io::TFileService_service
-      Offline::ConditionsService
       Offline::GeometryService
       Offline::GlobalConstantsService
       Offline::MCDataProducts
@@ -308,7 +266,6 @@ cet_build_plugin(Mu2eG4StudyReadBack art::module
     REG_SOURCE src/Mu2eG4StudyReadBack_module.cc
     LIBRARIES REG
       art_root_io::TFileService_service
-      Offline::ConditionsService
       Offline::GeometryService
       Offline::GlobalConstantsService
       Offline::MCDataProducts
@@ -321,21 +278,6 @@ cet_build_plugin(ParticleIDScan art::module
       Offline::ParticleID
 )
 
-cet_build_plugin(PbarAnalysis2 art::module
-    REG_SOURCE src/PbarAnalysis2_module.cc
-    LIBRARIES REG
-      art_root_io::TFileService_service
-      Offline::CaloCluster
-      Offline::CalorimeterGeom
-      Offline::ConditionsService
-      Offline::DataProducts
-      Offline::GeometryService
-      Offline::GlobalConstantsService
-      Offline::MCDataProducts
-      Offline::RecoDataProducts
-      Offline::TrackerGeom
-)
-
 cet_build_plugin(pbars1hist art::module
     REG_SOURCE src/pbars1hist_module.cc
     LIBRARIES REG
@@ -432,19 +374,10 @@ cet_build_plugin(PtrTest0 art::module
       Offline::MCDataProducts
 )
 
-cet_build_plugin(PtrTest art::module
-    REG_SOURCE src/PtrTest_module.cc
-    LIBRARIES REG
-
-
-      Offline::RecoDataProducts
-)
-
 cet_build_plugin(ReadAntiProtonSteps art::module
     REG_SOURCE src/ReadAntiProtonSteps_module.cc
     LIBRARIES REG
       art_root_io::TFileService_service
-      Offline::ConditionsService
       Offline::GeometryService
       Offline::GlobalConstantsService
       Offline::MCDataProducts
@@ -474,20 +407,6 @@ cet_build_plugin(ReadBack art::module
       Offline::TrackerGeom
 )
 
-cet_build_plugin(ReadCaloDigi art::module
-    REG_SOURCE src/ReadCaloDigi_module.cc
-    LIBRARIES REG
-      art_root_io::TFileService_service
-      Offline::CalorimeterGeom
-      Offline::ConditionsService
-      Offline::DataProducts
-      Offline::GeometryService
-      Offline::GlobalConstantsService
-      Offline::MCDataProducts
-      Offline::RecoDataProducts
-      Offline::SeedService
-)
-
 cet_build_plugin(ReadMCTrajectories art::module
     REG_SOURCE src/ReadMCTrajectories_module.cc
     LIBRARIES REG
@@ -499,7 +418,6 @@ cet_build_plugin(ReadPSVacuum art::module
     REG_SOURCE src/ReadPSVacuum_module.cc
     LIBRARIES REG
       art_root_io::TFileService_service
-      Offline::ConditionsService
       Offline::GeometryService
       Offline::MCDataProducts
 )
@@ -508,18 +426,10 @@ cet_build_plugin(ReadPTM art::module
     REG_SOURCE src/ReadPTM_module.cc
     LIBRARIES REG
       art_root_io::TFileService_service
-      Offline::ConditionsService
       Offline::GeometryService
       Offline::MCDataProducts
 )
 
-cet_build_plugin(ReadPtr art::module
-    REG_SOURCE src/ReadPtr_module.cc
-    LIBRARIES REG
-      art_root_io::TFileService_service
-      Offline::RecoDataProducts
-)
-
 cet_build_plugin(ReadStrawDigiReco art::module
     REG_SOURCE src/ReadStrawDigiReco_module.cc
     LIBRARIES REG
@@ -538,63 +448,18 @@ cet_build_plugin(ReadStrawHitReco art::module
       Offline::TrackerGeom
 )
 
-cet_build_plugin(ReadTrackCaloMatching art::module
-    REG_SOURCE src/ReadTrackCaloMatching_module.cc
-    LIBRARIES REG
-      art_root_io::TFileService_service
-      Offline::ConditionsService
-      Offline::GeometryService
-      Offline::RecoDataProducts
-      Offline::TrackerGeom
-)
-
-cet_build_plugin(ReadTrackCaloMatchingMVA art::module
-    REG_SOURCE src/ReadTrackCaloMatchingMVA_module.cc
-    LIBRARIES REG
-      art_root_io::TFileService_service
-      Offline::CalorimeterGeom
-      Offline::DataProducts
-      Offline::GeometryService
-      Offline::MCDataProducts
-      Offline::RecoDataProducts
-)
-
 cet_build_plugin(ReadTrackerSteps art::module
     REG_SOURCE src/ReadTrackerSteps_module.cc
     LIBRARIES REG
       art_root_io::TFileService_service
-      Offline::ConditionsService
       Offline::GeometryService
       Offline::MCDataProducts
       Offline::TrackerGeom
 )
 
-cet_build_plugin(ReadTrkExtrapol art::module
-    REG_SOURCE src/ReadTrkExtrapol_module.cc
-    LIBRARIES REG
-      art_root_io::TFileService_service
-      Offline::ConditionsService
-      Offline::GeometryService
-      Offline::RecoDataProducts
-      Offline::TrackerGeom
-)
-
-cet_build_plugin(ReadTrkExtrapolMVA art::module
-    REG_SOURCE src/ReadTrkExtrapolMVA_module.cc
-    LIBRARIES REG
-      art_root_io::TFileService_service
-      Offline::ConditionsService
-      Offline::GeometryService
-      Offline::RecoDataProducts
-      Offline::TrackerGeom
-)
-
 cet_build_plugin(ReadVirtualDetector art::module
     REG_SOURCE src/ReadVirtualDetector_module.cc
     LIBRARIES REG
-
-
-      Offline::ConditionsService
       Offline::GeometryService
       Offline::GlobalConstantsService
       Offline::MCDataProducts
@@ -743,17 +608,6 @@ cet_build_plugin(TrackSummaryDataAnalyzer art::module
       Offline::RecoDataProducts
 )
 
-cet_build_plugin(TrackSummaryMaker art::module
-    REG_SOURCE src/TrackSummaryMaker_module.cc
-    LIBRARIES REG
-
-
-      Offline::DataProducts
-      Offline::GeometryService
-      Offline::Mu2eUtilities
-      Offline::RecoDataProducts
-)
-
 cet_build_plugin(TrackSummaryMCAnalyzer art::module
     REG_SOURCE src/TrackSummaryMCAnalyzer_module.cc
     LIBRARIES REG
@@ -764,17 +618,6 @@ cet_build_plugin(TrackSummaryMCAnalyzer art::module
       Offline::RecoDataProducts
 )
 
-cet_build_plugin(TrackSummaryTruthMaker art::module
-    REG_SOURCE src/TrackSummaryTruthMaker_module.cc
-    LIBRARIES REG
-
-
-      Offline::BTrkData
-      Offline::MCDataProducts
-      Offline::Mu2eUtilities
-      Offline::RecoDataProducts
-)
-
 cet_build_plugin(TrackSummaryTruthRFSelector art::module
     REG_SOURCE src/TrackSummaryTruthRFSelector_module.cc
     LIBRARIES REG

Analyses/fcl/simParticleAnalyzer.fcl

@@ -9,7 +9,6 @@ process_name : SimParticleAnalyzer
 services : {
    message : @local::default_message
    GeometryService : { inputFile : "Offline/Mu2eG4/geom/geom_common.txt" }
-   ConditionsService :{ conditionsfile : "Offline/ConditionsService/data/conditions_01.txt" }
    GlobalConstantsService : { inputFile : "Offline/GlobalConstantsService/data/globalConstants_01.txt" }
 }
 

Analyses/src/CaloCalibAna_module.cc

@@ -15,7 +15,6 @@
 #include "canvas/Utilities/InputTag.h"
 
 #include "Offline/GlobalConstantsService/inc/GlobalConstantsHandle.hh"
-#include "Offline/ConditionsService/inc/ConditionsHandle.hh"
 
 #include "Offline/CalorimeterGeom/inc/Calorimeter.hh"
 #include "Offline/CalorimeterGeom/inc/DiskCalorimeter.hh"

Analyses/src/CaloCalib_module.cc

@@ -18,7 +18,6 @@
 
 #include "Offline/MCDataProducts/inc/GenParticle.hh"
 #include "Offline/MCDataProducts/inc/SimParticle.hh"
-//#include "MCDataProducts/inc/StatusG4.hh"
 #include "Offline/MCDataProducts/inc/StepPointMC.hh"
 #include "Offline/MCDataProducts/inc/PtrStepPointMCVector.hh"
 #include "Offline/MCDataProducts/inc/GenId.hh"
@@ -46,15 +45,8 @@
 #include "TH2.h"
 
 // Mu2e includes.
-#include "Offline/RecoDataProducts/inc/KalRepCollection.hh"
-#include "Offline/RecoDataProducts/inc/KalRepPtrCollection.hh"
 #include "Offline/RecoDataProducts/inc/TrkFitDirection.hh"
 
-// BaBar Kalman filter includes
-#include "BTrk/KalmanTrack/KalRep.hh"
-#include "BTrk/TrkBase/HelixTraj.hh"
-
-
 #include <cmath>
 #include <iostream>
 #include <string>
@@ -121,7 +113,6 @@ namespace mu2e {
        std::string _trkPatRecModuleLabel;
        std::string _instanceName;
 
-       TrkParticle _tpart;
        TrkFitDirection _fdir;
 
 
@@ -162,13 +153,12 @@ namespace mu2e {
     _caloClusterModuleLabel(pset.get<std::string>("caloClusterModuleLabel","CaloClusterMakerNew")),
     _virtualDetectorLabel(pset.get<string>("virtualDetectorName","virtualdetector")),
     _trkPatRecModuleLabel(pset.get<string>("trkPatRecModuleLabel","TPRDownstreameMinus")),
-    _tpart((TrkParticle::type)(pset.get<int>("fitparticle",TrkParticle::e_minus))),
     _fdir((TrkFitDirection::FitDirection)(pset.get<int>("fitdirection",TrkFitDirection::downstream))),
     _hviewxy(0),_hviewxz(0),
     _Ntup(0)
 
   {
-    _instanceName = _fdir.name() + _tpart.name();
+    _instanceName = _fdir.name();
   }
 
   void CaloCalib::beginJob(){

Analyses/src/CaloDigiAna_module.cc

@@ -25,7 +25,6 @@
 
 // Mu2e includes.
 #include "Offline/CalorimeterGeom/inc/Calorimeter.hh"
-#include "Offline/ConditionsService/inc/ConditionsHandle.hh"
 #include "Offline/DataProducts/inc/CaloSiPMId.hh"
 #include "Offline/GlobalConstantsService/inc/GlobalConstantsHandle.hh"
 #include "Offline/GeometryService/inc/GeometryService.hh"

Analyses/src/CaloHitFinderInspect_module.cc

@@ -16,8 +16,6 @@
 #include "messagefacility/MessageLogger/MessageLogger.h"
 
 #include "Offline/CalorimeterGeom/inc/Calorimeter.hh"
-#include "Offline/ConditionsService/inc/ConditionsHandle.hh"
-#include "Offline/ConditionsService/inc/CalorimeterCalibrations.hh"
 #include "Offline/GeometryService/inc/GeomHandle.hh"
 #include "Offline/GeometryService/inc/GeometryService.hh"
 #include "Offline/GlobalConstantsService/inc/GlobalConstantsHandle.hh"