fixed reco2_workflow. Removed unnecessary include statements. Declared variables in the lowest scope when possible

Author: aantonakis

sbndcode/CRT/CRTVeto/CRTVetoProducer_module.cc

@@ -72,7 +72,6 @@ class sbnd::crt::CRTVetoProducer : public art::EDProducer {
 
 private:
 
-  CRTGeoAlg        fCRTGeoAlg;
   double           fWindowStart;
   double           fWindowEnd;
   std::string      fCRTClusterModuleLabel;
@@ -88,8 +87,6 @@ class sbnd::crt::CRTVetoProducer : public art::EDProducer {
   uint32_t         fRawTSCorrection;  
   uint32_t         fMaxAllowedRefTimeDiff;
 
-  std::vector<art::Ptr<CRTSpacePoint>> fVetoSpacePoints;
-
   unsigned int fEventID;
   unsigned int fRun;
   unsigned int fSubRun;
@@ -99,7 +96,6 @@ class sbnd::crt::CRTVetoProducer : public art::EDProducer {
 
 sbnd::crt::CRTVetoProducer::CRTVetoProducer(fhicl::ParameterSet const& p)
   : EDProducer{p}
-  , fCRTGeoAlg(p.get<fhicl::ParameterSet>("CRTGeoAlg"))
   , fWindowStart(p.get<double>("WindowStart"))
   , fWindowEnd(p.get<double>("WindowEnd"))
   , fCRTClusterModuleLabel(p.get<std::string>("CRTClusterModuleLabel"))
@@ -119,9 +115,9 @@ sbnd::crt::CRTVetoProducer::CRTVetoProducer(fhicl::ParameterSet const& p)
 
 void sbnd::crt::CRTVetoProducer::produce(art::Event& e)
 {
+  // Declare Space Point Vector. Will fill this with Space Points that we veto on
+  std::vector<art::Ptr<CRTSpacePoint>> fVetoSpacePoints;
 
-  fVetoSpacePoints.clear();
- 
   fEventID = e.id().event();
   fRun = e.run();
   fSubRun = e.subRun();

sbndcode/CRT/CRTVeto/crtvetoproducer_sbnd.fcl

@@ -1,12 +1,7 @@
-#include "crtgeoalg_sbnd.fcl"
-#include "crtsimmodules_sbnd.fcl"
-
 BEGIN_PROLOG
 
-
 crtvetoproducer_sbnd:
 {
-   CRTGeoAlg:                    @local::crtgeoalg_sbnd
    CRTClusterModuleLabel:        "crtclustering"
    CRTSpacePointModuleLabel:     "crtspacepoints"
    CRTTimingReferenceInfoLabel:  "crtstrips"
@@ -17,7 +12,6 @@ crtvetoproducer_sbnd:
 }
 
 crtvetoproducer_data_sbnd:                           @local::crtvetoproducer_sbnd
-crtvetoproducer_data_sbnd.CRTGeoAlg:                 @local::crtgeoalg_data_sbnd
 crtvetoproducer_data_sbnd.IsData:                    true
 
 # Values for testing
@@ -32,7 +26,6 @@ crtvetoproducer_data_sbnd.MaxAllowedRefTimeDiff:     3000000
 
 # Top Hat Configuration for Debugging
 crtvetoproducer_data_sbnd_tophat:                    @local::crtvetoproducer_sbnd
-crtvetoproducer_data_sbnd_tophat.CRTGeoAlg:          @local::crtgeoalg_data_sbnd
 crtvetoproducer_data_sbnd_tophat.IsData:             true
 
 # Values for testing

sbndcode/JobConfigurations/standard/reco/config/workflow_reco2.fcl

@@ -3,7 +3,6 @@
 #include "pandoramodules_sbnd.fcl"
 #include "calorimetry_sbnd.fcl"
 #include "sbnd_flashfinder_deco.fcl"
-#include "crtrecoproducers_sbnd.fcl"
 #include "crtvetoproducer_sbnd.fcl"
 #include "particleid_sbnd.fcl"
 #include "crttpcmatchingproducers_sbnd.fcl"
@@ -45,11 +44,6 @@ sbnd_reco2_producers:{
     pandoraSCEShower:    @local::sbnd_sce_incremental_pandoraModularShowerCreation
     pandoraSCEShowerSBN: @local::sbnd_sce_sbn_pandoraModularShowerCreation
 
-    ### CRT reconstruction
-    crtclustering:  @local::crtclusterproducer_sbnd
-    crtspacepoints: @local::crtspacepointproducer_sbnd
-    crttracks:      @local::crttrackproducer_sbnd
-
     ### CRT Veto
     crtveto:        @local::crtvetoproducer_sbnd
 
@@ -87,9 +81,6 @@ sbnd_reco2_producer_sequence: [
     , pandoraShowerSBN
     , pandoraCalo
     , pandoraPid
-    , crtclustering
-    , crtspacepoints
-    , crttracks
     , crtveto
     , crtspacepointmatching
     , crttrackmatching