diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9b62e169a1..ba7ff717a3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ env: java_distribution: zulu javadoc_version: 24 # newer than `java_version` for better javadoc groovy_version: 4.x - CCDB_CONNECTION: 'sqlite:////cvmfs/oasis.opensciencegrid.org/jlab/hallb/clas12/sw/noarch/data/ccdb/ccdb_latest.sqlite' + #CCDB_CONNECTION: 'sqlite:////cvmfs/oasis.opensciencegrid.org/jlab/hallb/clas12/sw/noarch/data/ccdb/ccdb_latest.sqlite' nthreads: 1 jobs: diff --git a/reconstruction/dc/src/main/java/org/jlab/rec/dc/Constants.java b/reconstruction/dc/src/main/java/org/jlab/rec/dc/Constants.java index 25473ca915..b74617f86c 100644 --- a/reconstruction/dc/src/main/java/org/jlab/rec/dc/Constants.java +++ b/reconstruction/dc/src/main/java/org/jlab/rec/dc/Constants.java @@ -109,7 +109,7 @@ public static Constants getInstance() { public static final String PRESSURE = "/hall/weather/pressure"; public static final String T2DPRESSUREREF = "/calibration/dc/v2/ref_pressure"; public static final String T0CORRECTION = "/calibration/dc/v2/t0"; - public static final String TDCTCUTS = "/calibration/dc/time_corrections/tdctimingcuts"; + public static final String TDCTCUTS = "/calibration/dc/v2/tdc_cuts"; public static final String WIRESTAT = "/calibration/dc/tracking/wire_status"; public static final String TIMEJITTER = "/calibration/dc/time_jitter"; public static final String BEAMPOS = "/geometry/beam/position"; diff --git a/reconstruction/dc/src/main/java/org/jlab/rec/dc/banks/HitReader.java b/reconstruction/dc/src/main/java/org/jlab/rec/dc/banks/HitReader.java index 2dbac67675..716a5980f0 100644 --- a/reconstruction/dc/src/main/java/org/jlab/rec/dc/banks/HitReader.java +++ b/reconstruction/dc/src/main/java/org/jlab/rec/dc/banks/HitReader.java @@ -206,51 +206,16 @@ public void fetch_DCHits(DataEvent event) { double timeCutMin = 0; double timeCutMax = 0; - double timeCutLC = 0; int region = ((superlayer + 1) / 2); - - switch (region) { - case 1: - timeCutMin = tdccuts.getIntValue("MinEdge", 0, region, 0); - timeCutMax = tdccuts.getIntValue("MaxEdge", 0, region, 0); - break; - case 2: - if (wire <= 56) { - timeCutLC = tdccuts.getIntValue("LinearCoeff", 0, region, 1); - timeCutMin = tdccuts.getIntValue("MinEdge", 0, region, 1); - timeCutMax = tdccuts.getIntValue("MaxEdge", 0, region, 1); - } - if (wire > 56) { - timeCutLC = tdccuts.getIntValue("LinearCoeff", 0, region, 56); - timeCutMin = tdccuts.getIntValue("MinEdge", 0, region, 56); - timeCutMax = tdccuts.getIntValue("MaxEdge", 0, region, 56); - } - break; - case 3: - timeCutMin = tdccuts.getIntValue("MinEdge", 0, region, 0); - timeCutMax = tdccuts.getIntValue("MaxEdge", 0, region, 0)+timeBuf; - break; - } + timeCutMin = tdccuts.getIntValue("min", 0, region, wire); + timeCutMax = tdccuts.getIntValue("max", 0, region, wire); + boolean passTimingCut = false; - if (region == 1 && tdc > timeCutMin && tdc < timeCutMax) - passTimingCut = true; - if (region == 2) { - double Bscale = Swimmer.getTorScale() * Swimmer.getTorScale(); - if (wire >= 56) { - if (tdc > timeCutMin && - tdc < timeCutMax + timeCutLC * (double) (112 - wire / 56) * Bscale) - passTimingCut = true; - } else { - if (tdc > timeCutMin && - tdc < timeCutMax + timeCutLC * (double) (56 - wire / 56) * Bscale) - passTimingCut = true; - } - } - if (region == 3 && tdc > timeCutMin && tdc < timeCutMax) + if (tdc > timeCutMin && tdc < timeCutMax) passTimingCut = true; - + if (passTimingCut) { // cut on spurious hits Hit hit = new Hit(sector, superlayer, layer, wire, tdc, jitter, (index + 1)); hit.calc_CellSize(detector); @@ -261,7 +226,6 @@ public void fetch_DCHits(DataEvent event) { } } } - } public Map> read_Hits(DataEvent event) {