Merge pull request #648 from yangtj207/feature/tjyang_cvnfix

Add cvn back to fcl files

Author: bear-is-asleep

sbndcode/CMakeLists.txt

@@ -44,5 +44,4 @@ add_subdirectory(Decoders)
 add_subdirectory(ChannelMaps)
 
 # for CVN
-# Disable for now
 add_subdirectory(SBNDCVN)

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

@@ -16,7 +16,7 @@
 #include "crtskim_sbnd.fcl"
 #include "pmtskim_sbnd.fcl"
 
-##include "SBNDCVNMapper.fcl"
+#include "SBNDCVNMapper.fcl"
 
 BEGIN_PROLOG
 
@@ -71,7 +71,7 @@ sbnd_reco2_producers:{
     caloskimCalorimetry: @local::caloskim_calorimetry
 
     ### CVN
-#    cvn:                 @local::standard_sbndcvnevaluatorslc
+    cvn:                 @local::standard_sbndcvnevaluatorslc
 }
 
 sbnd_reco2_producer_sequence: [  
@@ -106,7 +106,7 @@ sbnd_reco2_producer_sequence: [
     , fmatcharaSCE
     , fmatchoparaSCE
     , opt0finderSCE
-#    , cvn
+    , cvn
 ]
 
 #FIXME override the producer labels.  This should really happen in the module's config fcl

sbndcode/JobConfigurations/standard/reco/reco2_data.fcl

@@ -19,10 +19,9 @@ physics.producers:
 }
 
 physics.reco2: [ pandora, pandoraTrack, pandoraShower, pandoraShowerSBN, pandoraCaloData, pandoraPidData, caloskimCalorimetry,
-  crtclustering, crtspacepoints, crttracks]
-#  crtclustering, crtspacepoints, crttracks, cvn ]
+  crtclustering, crtspacepoints, crttracks, cvn ]
 
 physics.analyzers.caloskim.G4producer: ""
 physics.analyzers.caloskim.SimChannelproducer: ""
 physics.caloskimana_tpconly: [ caloskim ]
-physics.end_paths: [stream1, caloskimana_tpconly]
+physics.end_paths: [stream1, caloskimana_tpconly]