Skip to content

Commit af98b96

Browse files
zieglerraffaelladevita
authored andcommitted
update to DC tracking to read and use the new TDC cuts ccdb table.
1 parent b6e64aa commit af98b96

File tree

2 files changed

+6
-42
lines changed

2 files changed

+6
-42
lines changed

reconstruction/dc/src/main/java/org/jlab/rec/dc/Constants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public static Constants getInstance() {
109109
public static final String PRESSURE = "/hall/weather/pressure";
110110
public static final String T2DPRESSUREREF = "/calibration/dc/v2/ref_pressure";
111111
public static final String T0CORRECTION = "/calibration/dc/v2/t0";
112-
public static final String TDCTCUTS = "/calibration/dc/time_corrections/tdctimingcuts";
112+
public static final String TDCTCUTS = "/calibration/dc/v2/tdc_cuts";
113113
public static final String WIRESTAT = "/calibration/dc/tracking/wire_status";
114114
public static final String TIMEJITTER = "/calibration/dc/time_jitter";
115115
public static final String BEAMPOS = "/geometry/beam/position";

reconstruction/dc/src/main/java/org/jlab/rec/dc/banks/HitReader.java

Lines changed: 5 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -206,51 +206,16 @@ public void fetch_DCHits(DataEvent event) {
206206

207207
double timeCutMin = 0;
208208
double timeCutMax = 0;
209-
double timeCutLC = 0;
210209

211210
int region = ((superlayer + 1) / 2);
212-
213-
switch (region) {
214-
case 1:
215-
timeCutMin = tdccuts.getIntValue("MinEdge", 0, region, 0);
216-
timeCutMax = tdccuts.getIntValue("MaxEdge", 0, region, 0);
217-
break;
218-
case 2:
219-
if (wire <= 56) {
220-
timeCutLC = tdccuts.getIntValue("LinearCoeff", 0, region, 1);
221-
timeCutMin = tdccuts.getIntValue("MinEdge", 0, region, 1);
222-
timeCutMax = tdccuts.getIntValue("MaxEdge", 0, region, 1);
223-
}
224-
if (wire > 56) {
225-
timeCutLC = tdccuts.getIntValue("LinearCoeff", 0, region, 56);
226-
timeCutMin = tdccuts.getIntValue("MinEdge", 0, region, 56);
227-
timeCutMax = tdccuts.getIntValue("MaxEdge", 0, region, 56);
228-
}
229-
break;
230-
case 3:
231-
timeCutMin = tdccuts.getIntValue("MinEdge", 0, region, 0);
232-
timeCutMax = tdccuts.getIntValue("MaxEdge", 0, region, 0)+timeBuf;
233-
break;
234-
}
211+
timeCutMin = tdccuts.getIntValue("min", 0, region, wire);
212+
timeCutMax = tdccuts.getIntValue("max", 0, region, wire);
213+
235214
boolean passTimingCut = false;
236215

237-
if (region == 1 && tdc > timeCutMin && tdc < timeCutMax)
238-
passTimingCut = true;
239-
if (region == 2) {
240-
double Bscale = Swimmer.getTorScale() * Swimmer.getTorScale();
241-
if (wire >= 56) {
242-
if (tdc > timeCutMin &&
243-
tdc < timeCutMax + timeCutLC * (double) (112 - wire / 56) * Bscale)
244-
passTimingCut = true;
245-
} else {
246-
if (tdc > timeCutMin &&
247-
tdc < timeCutMax + timeCutLC * (double) (56 - wire / 56) * Bscale)
248-
passTimingCut = true;
249-
}
250-
}
251-
if (region == 3 && tdc > timeCutMin && tdc < timeCutMax)
216+
if (tdc > timeCutMin && tdc < timeCutMax)
252217
passTimingCut = true;
253-
218+
254219
if (passTimingCut) { // cut on spurious hits
255220
Hit hit = new Hit(sector, superlayer, layer, wire, tdc, jitter, (index + 1));
256221
hit.calc_CellSize(detector);
@@ -261,7 +226,6 @@ public void fetch_DCHits(DataEvent event) {
261226
}
262227
}
263228
}
264-
265229
}
266230

267231
public Map<Integer, ArrayList<FittedHit>> read_Hits(DataEvent event) {

0 commit comments

Comments
 (0)