Skip to content

update to DC tracking to read and use the new TDC cuts ccdb table. #747

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
raffaelladevita merged 3 commits into from
Jul 24, 2025
Merged

update to DC tracking to read and use the new TDC cuts ccdb table. #747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f7ac933
update to DC tracking to read and use the new TDC cuts ccdb table.
Jul 16, 2025
69d02de
use live database
baltzell Jul 18, 2025
8d791b4
Merge branch 'development' into iss741-DCTDCCuts
raffaelladevita Jul 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion reconstruction/dc/src/main/java/org/jlab/rec/dc/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
46 changes: 5 additions & 41 deletions reconstruction/dc/src/main/java/org/jlab/rec/dc/banks/HitReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -261,7 +226,6 @@ public void fetch_DCHits(DataEvent event) {
}
}
}

}

public Map<Integer, ArrayList<FittedHit>> read_Hits(DataEvent event) {
Expand Down
Loading