Remerge main into Run1B

CMakeLists.txt

@@ -136,7 +136,6 @@ add_subdirectory(CalPatRec)
 add_subdirectory(CommonMC)
 add_subdirectory(CommonReco)
 add_subdirectory(Compression)
-add_subdirectory(ConditionsService)
 add_subdirectory(ConfigTools)
 add_subdirectory(CosmicRayShieldGeom)
 add_subdirectory(CosmicReco)

CRVReco/fcl/epilog_extracted_v03.fcl

@@ -5,41 +5,38 @@ physics.producers.CrvCoincidenceClusterFinder.sectorConfig :
           PEthreshold : 10  //PEs
           maxTimeDifferenceAdjacentPulses : 10  //ns
           maxTimeDifference : 20  //ns
-          minOverlapTimeAdjacentPulses : 30  //ns
-          minOverlapTime : 30  //ns
           minSlope :-6
           maxSlope : 6  //width direction over thickness direction
           maxSlopeDifference : 3
           coincidenceLayers : 2
           minClusterPEs : 0
           initialClusterMaxDistance : 250
+          finalClusterMaxDistance : 0
         },
         {
           CRVSector : "T1"
           PEthreshold : 10
           maxTimeDifferenceAdjacentPulses : 10
           maxTimeDifference : 20
-          minOverlapTimeAdjacentPulses : 30
-          minOverlapTime : 30
           minSlope :-6
           maxSlope : 6
           maxSlopeDifference : 3
           coincidenceLayers : 2
           minClusterPEs : 0
           initialClusterMaxDistance : 250
+          finalClusterMaxDistance : 0
         },
         {
           CRVSector : "T2"
           PEthreshold : 10
           maxTimeDifferenceAdjacentPulses : 10
           maxTimeDifference : 20
-          minOverlapTimeAdjacentPulses : 30
-          minOverlapTime : 30
           minSlope :-6
           maxSlope : 6
           maxSlopeDifference : 3
           coincidenceLayers : 2
           minClusterPEs : 0
           initialClusterMaxDistance : 250
+          finalClusterMaxDistance : 0
         }
       ]

CRVReco/fcl/epilog_run1a_v01.fcl

@@ -5,27 +5,25 @@ physics.producers.CrvCoincidenceClusterFinder.sectorConfig :
           PEthreshold : 8
           maxTimeDifferenceAdjacentPulses : 20
           maxTimeDifference : 20
-          minOverlapTimeAdjacentPulses : 30
-          minOverlapTime : 30
           minSlope :-6
           maxSlope : 6
           maxSlopeDifference : 3
           coincidenceLayers : 3
           minClusterPEs : 0
           initialClusterMaxDistance : 250
+          finalClusterMaxDistance : 0
         },
         {
           CRVSector : "T2"
           PEthreshold : 8
           maxTimeDifferenceAdjacentPulses : 20
           maxTimeDifference : 20
-          minOverlapTimeAdjacentPulses : 30
-          minOverlapTime : 30
           minSlope :-6
           maxSlope : 6
           maxSlopeDifference : 3
           coincidenceLayers : 3
           minClusterPEs : 0
           initialClusterMaxDistance : 250
+          finalClusterMaxDistance : 0
         }
       ]