Skip to content

move rg-l engine geometry initialization to detectorChanged #1306

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

Open
baltzell wants to merge 2 commits into
base: development
Choose a base branch
from
Open

move rg-l engine geometry initialization to detectorChanged #1306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3fb2bd
move rg-l engine geometry initialization to detectorChanged
baltzell Jun 5, 2026
46d74af
Merge branch 'development' into rrns-alert
baltzell Jun 6, 2026
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
4 changes: 1 addition & 3 deletions reconstruction/alert/src/main/java/org/jlab/service/ahdc/AHDCEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,12 @@ public class AHDCEngine extends ReconstructionEngine {

@Override
public void detectorChanged(int run) {
// FIXME: move geometry initialization here
factory = (new AlertDCFactory()).createDetectorCLAS(new DatabaseConstantProvider(run,"default"));
}

@Override
public boolean init() {

factory = (new AlertDCFactory()).createDetectorCLAS(new DatabaseConstantProvider());

Map<String, Integer> tableMap = new HashMap<>();
tableMap.put("/calibration/alert/ahdc/time_offsets", 3);
tableMap.put("/calibration/alert/ahdc/time_to_distance_wire", 3);
Expand Down
13 changes: 5 additions & 8 deletions reconstruction/alert/src/main/java/org/jlab/service/alert/ALERTEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,11 @@ public ALERTEngine() {
}

@Override
public void detectorChanged(int run) {}
public void detectorChanged(int run) {
DatabaseConstantProvider cp = new DatabaseConstantProvider(run, "default");
ATOF = (new AlertTOFFactory()).createDetectorCLAS(cp);
AHDC = (new AlertDCFactory()).createDetectorCLAS(cp);
}

/**
* ALERTEngine initialization.
Expand All @@ -150,13 +154,6 @@ public boolean init() {
modelTrackMatching = new ModelTrackMatching();
modelPrePID = new ModelPrePID();

AlertTOFFactory factory = new AlertTOFFactory();

// One CCDB session for both ATOF and AHDC geometry.
DatabaseConstantProvider cp = new DatabaseConstantProvider(11, "default");
ATOF = factory.createDetectorCLAS(cp);
AHDC = (new AlertDCFactory()).createDetectorCLAS(cp);

Map<String, Integer> tableMap = new HashMap<>();
tableMap.put("/calibration/alert/ahdc/gains", 3);
requireConstants(tableMap);
Expand Down
8 changes: 3 additions & 5 deletions reconstruction/alert/src/main/java/org/jlab/service/atof/ATOFEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,17 +134,15 @@ public boolean processDataEventUser(DataEvent event) {

@Override
public void detectorChanged(int run) {
// FIXME: move geometry initialization here
AlertTOFFactory factory = new AlertTOFFactory();
DatabaseConstantProvider cp = new DatabaseConstantProvider(run, "default");
this.ATOF = factory.createDetectorCLAS(cp);
}

@Override
public boolean init() {
rbc = new RecoBankWriter();

AlertTOFFactory factory = new AlertTOFFactory();
DatabaseConstantProvider cp = new DatabaseConstantProvider(11, "default");
this.ATOF = factory.createDetectorCLAS(cp);

Map<String, Integer> tableMap = new HashMap<>();
tableMap.put("/calibration/alert/atof/effective_velocity", 3);
tableMap.put("/calibration/alert/atof/time_walk", 4);
Expand Down