Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
5a94b29
remove unused stuff
Aug 22, 2023
4e55990
add detectorChanged method (and remove unused imports)
Aug 22, 2023
fc461b5
fix formatting
Aug 22, 2023
3749000
implement all detectorChanged hooks (and cleanup/formatting)
Aug 22, 2023
4b9fc9b
synchronize and count changes
Aug 22, 2023
584f1cc
allow nulls
Aug 22, 2023
9a75c42
add empty list check
Aug 22, 2023
374664c
cleanup/formatting
Aug 22, 2023
3d600ff
use the same wrapper used in clara/recon-util
Aug 22, 2023
a1311c1
hardcode it to 11 for now
Aug 22, 2023
e259837
implement detectorChanged for cvt
Aug 22, 2023
83079c0
implement detector changed for dc
Aug 22, 2023
0f80d3f
use the same wrapper used in clara/recon-util
Aug 22, 2023
f344bb8
fix logic oops
Aug 22, 2023
480acd0
rename processDataEvent/processEvent
Aug 28, 2023
4d6eadf
make MLTDEngine respect run number like everyone else, unless overrid…
Sep 19, 2023
5e7ffd1
add newly-required methods
Sep 19, 2023
82d2a05
restore initialization
Sep 19, 2023
5c5f4e8
allow run number override from YAML
Oct 17, 2023
c9bc171
add missing overrides
baltzell Oct 18, 2024
4de2908
remove mc/data check
baltzell Oct 18, 2024
357c521
processDataEvent should be final
baltzell Jan 3, 2025
7f1c420
cleanup script
baltzell Jan 3, 2025
78243d1
remove unused/unnecessary script
baltzell Jan 3, 2025
2cc7db1
add neutron test
baltzell Jan 3, 2025
7398121
remove leftovers
baltzell Jan 8, 2025
0ca25bb
abort on error
baltzell Jan 9, 2025
ea06cdf
fix rebase mistake
baltzell May 22, 2025
0e3663f
add missing overrides
baltzell May 22, 2025
1ea0576
add missing overrides
baltzell May 22, 2025
65da548
add missing overrides
baltzell May 22, 2025
df5cf62
accounting for tstart, tflight and tprop in MC tracks reconstruction
raffaelladevita Jan 3, 2025
bee941d
removed check on run number when setting the DC hit uncertainty
raffaelladevita Jan 15, 2025
073edf3
removed hardcoded change to default variation in BAND engine
raffaelladevita Jan 24, 2025
d0fa922
apply TDC jitter correction only if TI timestamp is >0, excluding MC …
raffaelladevita Jan 28, 2025
d1c0eca
moved RF offsets to time written to RUN::rf bank
raffaelladevita Jan 29, 2025
dd00538
fixed bug in REC::Event.RFTime introduced with last commit
raffaelladevita Jan 29, 2025
b4933b8
restored TDC jitter correction for timestamp=0
raffaelladevita Jan 31, 2025
485c4a1
switch to load geometry for real run number
raffaelladevita Feb 20, 2025
2c0398e
fix env
baltzell Jul 15, 2025
a0bd26d
add missing override
baltzell Aug 4, 2025
6b35314
remove unused imports
baltzell Aug 4, 2025
327a35c
add missing overrides
baltzell Oct 2, 2025
e6d8d73
add missing overrides
baltzell Oct 23, 2025
4da5023
propagate detectorChanged and method renaming to new UberEngine
raffaelladevita Nov 7, 2025
089abe2
changed EC to load the geometry with the real run number
raffaelladevita Jan 5, 2026
f7a412c
fix merge mistake
baltzell Jan 12, 2026
ffac379
undoing RF offset changes
raffaelladevita Jan 15, 2026
aae070a
add missing overrides
baltzell Jan 16, 2026
4932e7a
updated use of geometry factory in URWT engine
raffaelladevita Mar 18, 2026
dcf079d
cleanup
baltzell Mar 26, 2026
087f967
add detector changed hooks
baltzell Apr 7, 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: 3 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -271,14 +271,16 @@ jobs:
id:
- kpp
- eb-ep
- eb-en
- eb-eg
- eb-epc
- eb-enc
- eb-eftpi
include:
# run all tests on ubuntu
# run selected tests on ubuntu
- { id: kpp, cmd: ./run-advanced-tests.sh }
- { id: eb-ep, cmd: ./run-eb-tests.sh -100 electronproton }
- { id: eb-en, cmd: ./run-eb-tests.sh -100 electronneutron }
- { id: eb-eg, cmd: ./run-eb-tests.sh -100 electrongamma }
- { id: eb-epc, cmd: ./run-eb-tests.sh -100 electronprotonC }
- { id: eb-enc, cmd: ./run-eb-tests.sh -100 electronneutronC }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public void setFieldsConfig(String fieldsConfig) {


@Override
public boolean processDataEvent(DataEvent event) {
public boolean processDataEventUser(DataEvent event) {
Reader reader ;
this.FieldsConfig = this.getFieldsConfig();
if (event.hasBank("RUN::config") == false) {
Expand Down Expand Up @@ -250,5 +250,7 @@ public double[] getBeamSpot(DataEvent event, IndexedTable beamPos) {
}
return xybeam;
}

public void detectorChanged(int run) {}

}
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,7 @@ public static JsonObject Map2Json(Map<String,Object> map) {
ret.add(topKey,Map2Json((Map)entry.getValue()));
}
else {
if(entry.getValue() != null) {
ret.add(topKey, entry.getValue().toString());
}
ret.add(topKey, entry.getValue() == null ? null : entry.getValue().toString());
}
}
return ret;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ public void init(){
public void processEvent(DataEvent event){
for(Map.Entry<String,ReconstructionEngine> engine : this.processorEngines.entrySet()){
try {
engine.getValue().filterEvent(event);
engine.getValue().processDataEvent(event);
} catch (Exception e){
LOGGER.log(Level.SEVERE, "[Exception] >>>>> engine : {0}\n\n", engine.getKey());
e.printStackTrace();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
Expand Down Expand Up @@ -60,14 +61,22 @@ public abstract class ReconstructionEngine implements Engine {
volatile boolean dropOutputBanks = false;
private final Set<String> outputBanks = new HashSet<>();

private volatile List<Integer> runNumbers = new ArrayList<>();

private boolean ignoreInvalidRunNumbers = true;

private int runNumberOverride = -1;

volatile long triggerMask = 0xFFFFFFFFFFFFFFFFL;

String engineName = "UnknownEngine";
String engineAuthor = "N.T.";
String engineVersion = "0.0";
String engineDescription = "CLARA Engine";
String engineName = "UnknownEngine";
String engineAuthor = "N.T.";
String engineVersion = "0.0";
String engineDescription = "CLARA Engine";

abstract public boolean processDataEventUser(DataEvent event);
abstract public boolean init();
abstract public void detectorChanged(int runNumber);

public ReconstructionEngine(String name, String author, String version){
engineName = name;
Expand Down Expand Up @@ -108,9 +117,6 @@ protected RawBank getRawBankReader(String bankName, OrderType... order) {
return new RawDataBank(bankName, order);
}

abstract public boolean processDataEvent(DataEvent event);
abstract public boolean init();

/**
* Use a map just to avoid name clash in ConstantsManager.
* @param tables map of table names to #indices
Expand Down Expand Up @@ -187,6 +193,9 @@ public EngineData configure(EngineData ed) {
engineDictionary = new SchemaFactory();
LOGGER.log(Level.FINEST,"--- engine configuration is called " + this.getDescription());
try {
if (this.getEngineConfigString("runNumberOverride")!=null) {
this.runNumberOverride = Integer.valueOf(this.getEngineConfigString("runNumberOverride"));
}
if (this.getEngineConfigString("rawBankGroup")!=null) {
this.rawBankOrders = RawBank.getFilterGroup(this.getEngineConfigString("rawBankGroup"));
}
Expand Down Expand Up @@ -227,8 +236,7 @@ public EngineData configure(EngineData ed) {
}

protected String getStringConfigParameter(String jsonString,
String key) throws Exception {
Object js;
String key) throws Exception {
String variation = "";
try {
JSONObject base = new JSONObject(jsonString);
Expand All @@ -238,13 +246,6 @@ protected String getStringConfigParameter(String jsonString,
} else {
LOGGER.log(Level.FINE,"[JSON]" + this.getName() + " **** warning **** does not contain key = " + key);
}
/*
js = base.get(key);
if (js instanceof String) {
return (String) js;
} else {
throw new Exception("JSONObject[" + "] not a string.");
}*/
} catch (JSONException e) {
throw new Exception(e.getMessage());
}
Expand Down Expand Up @@ -345,17 +346,22 @@ public void dropBanks(DataEvent event) {
}
}
}

public boolean checkRunNumber(DataEvent event) {
if (!this.ignoreInvalidRunNumbers) return true;
int run = 0;
if (event.hasBank("RUN::config")) {
run = event.getBank("RUN::config").getInt("run",0);

public synchronized boolean checkRunNumber(DataEvent event) {
int r = runNumberOverride;
if (r <= 0 && event.hasBank("RUN::config")) {
r = event.getBank("RUN::config").getInt("run",0);
}
return run>0;
if (r > 0) {
if (this.runNumbers.isEmpty() || r != this.runNumbers.get(this.runNumbers.size()-1)) {
this.runNumbers.add(r);
this.detectorChanged(r);
}
}
return !this.ignoreInvalidRunNumbers || r>0;
}

public void filterEvent(DataEvent dataEvent) {
public void processDataEvent(DataEvent dataEvent) {
if (!this.wroteConfig) {
this.wroteConfig = true;
JsonUtils.extend(dataEvent, CONFIG_BANK_NAME, "json", this.generateConfig());
Expand All @@ -365,7 +371,7 @@ public void filterEvent(DataEvent dataEvent) {
}
if(this.applyTriggerMask(dataEvent)) {
if (this.checkRunNumber(dataEvent)) {
this.processDataEvent(dataEvent);
this.processDataEventUser(dataEvent);
}
}
}
Expand Down Expand Up @@ -404,7 +410,7 @@ public EngineData execute(EngineData input) {
}

try {
this.filterEvent(dataEventHipo);
this.processDataEvent(dataEventHipo);
output.setData(mt, dataEventHipo.getHipoEvent());
} catch (Exception e) {
String msg = String.format("Error processing input event%n%n%s", ClaraUtil.reportException(e));
Expand Down Expand Up @@ -519,16 +525,21 @@ public Reco(){
super("a","b","c");
}
@Override
public boolean processDataEvent(DataEvent event) {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
public boolean processDataEventUser(DataEvent event) {
throw new UnsupportedOperationException("Not supported yet.");
}

@Override
public boolean init() {
throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
throw new UnsupportedOperationException("Not supported yet.");
}

}

@Override
public void detectorChanged(int runNumber) {
throw new UnsupportedOperationException("Not supported yet.");
}
}

public static void main(String[] args){
System.setProperty("CLAS12DIR", "/Users/gavalian/Work/Software/project-3a.0.0/Distribution/clas12-offline-software/coatjava");
try {
Expand All @@ -549,7 +560,6 @@ public static void main(String[] args){
"\"timestamp\":333\n" +
"}";
System.out.println(json);
//json = "{ \"ccdb\":{\"run\":10,\"variation\":\"default\"}, \"variation\":\"cosmic\"}";
Reco reco = new Reco();
String variation = reco.getStringConfigParameter(json, "variation");
System.out.println(" Variation : " + variation);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ protected void add(ReconstructionEngine... e) {
}

@Override
public boolean processDataEvent(DataEvent event) {
public boolean processDataEventUser(DataEvent event) {
throw new RuntimeException("UberEngine does not implement processDataEvent.");
}

Expand All @@ -39,9 +39,9 @@ public boolean processDataEvent(DataEvent event) {
* @param event
*/
@Override
public final void filterEvent(DataEvent event) {
public final void processDataEvent(DataEvent event) {
for (ReconstructionEngine e : engines)
e.filterEvent(event);
e.processDataEvent(event);
}

/**
Expand All @@ -55,6 +55,16 @@ public final boolean init() {
if (!e.init()) ret = false;
return ret;
}

/**
* Run all engines' dettectorChanged methods.
* @param runNumber
*/
@Override
public final void detectorChanged(int runNumber) {
for (ReconstructionEngine e : engines)
e.detectorChanged(runNumber);
}

/**
* Run all engines' configure methods.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ private void loadTables() {
}

@Override
public boolean processDataEvent(DataEvent event) {
public boolean processDataEventUser(DataEvent event) {
DataBank bank = event.getBank("RUN::config");
// Load the constants
// -------------------
Expand Down Expand Up @@ -195,4 +195,6 @@ public boolean init() {
return true;
}

@Override
public void detectorChanged(int runNumber) {}
}
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ public DCClsComboEngine() {
super("DCClsComboEngine","tongtong","1.0");
}

@Override
public void detectorChanged(int run){}

@Override
public boolean init() {
System.setProperty("ai.djl.pytorch.num_interop_threads", "1");
Expand Down Expand Up @@ -116,7 +119,7 @@ public boolean init() {
}

@Override
public boolean processDataEvent(DataEvent event) {
public boolean processDataEventUser(DataEvent event) {

//// 6-cluster combo prediction
// load clusters from bank HitBasedTrkg::Clusters
Expand Down Expand Up @@ -537,4 +540,4 @@ public float[] processOutput(TranslatorContext ctx, NDList out) {
public Batchifier getBatchifier() { return Batchifier.STACK; }
};
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,11 @@ public boolean init() {
}

@Override
public boolean processDataEvent(DataEvent event) {
public void detectorChanged(int run) {}

@Override
public boolean processDataEventUser(DataEvent event) {

for (String bankName : BANK_NAMES) {
if (!event.hasBank(bankName)) continue;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,11 @@ public boolean init(ModeTrackFinding m) {
return init();
}

@Override
public void detectorChanged(int run) {
// FIXME: move geometry initialization here
}

@Override
public boolean init() {

Expand All @@ -91,7 +96,7 @@ public boolean init() {
}

@Override
public boolean processDataEvent(DataEvent event) {
public boolean processDataEventUser(DataEvent event) {

if(event.hasBank("MC::Particle")) simulation = true;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,9 @@ public ALERTEngine() {
super("ALERT", "whit,ouillon,pilleux", "0.1");
}

@Override
public void detectorChanged(int run) {}

/**
* ALERTEngine initialization.
* Creates the RecoBankWriter and checks for various yaml flags.
Expand Down Expand Up @@ -132,7 +135,7 @@ public boolean init() {
* </ul>
*/
@Override
public boolean processDataEvent(DataEvent event) {
public boolean processDataEventUser(DataEvent event) {

if (!event.hasBank("AHDC::adc"))
return false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ public Detector getATOF() {
private IndexedTable atofTimeOffsetsTable;

@Override
public boolean processDataEvent(DataEvent event) {
public boolean processDataEventUser(DataEvent event) {

if (!event.hasBank("RUN::config")) {
return true;
}
Expand Down Expand Up @@ -131,6 +132,11 @@ public boolean processDataEvent(DataEvent event) {
return true;
}

@Override
public void detectorChanged(int run) {
// FIXME: move geometry initialization here
}

@Override
public boolean init() {
rbc = new RecoBankWriter();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ private static double getTriggerPhase( DataEvent ev) {
if(ev.hasBank("RUN::config")) {
DataBank bank = ev.getBank("RUN::config");
long timeStamp = bank.getLong("timestamp", 0);
if( CalibrationConstantsLoader.JITTER_CYCLES > 0 && timeStamp != -1 ) {
if( CalibrationConstantsLoader.JITTER_CYCLES > 0 && timeStamp >= 0 ) {
tPh = CalibrationConstantsLoader.JITTER_PERIOD *
( ( timeStamp + CalibrationConstantsLoader.JITTER_PHASE ) %
CalibrationConstantsLoader.JITTER_CYCLES);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,9 @@ public CalibrationConstantsLoader() {
public static int LASER_COMPONENT = 6;
public static double[] LASER_CONV = {0,1,0};

public static synchronized void Load(int runno, String var, ConstantsManager manager) {
public static synchronized void Load(int runno, ConstantsManager manager) {

//System.out.println("*Loading calibration constants*");
manager.setVariation(var);

IndexedTable lroffsets = manager.getConstants(runno, "/calibration/band/lr_offsets");
IndexedTable timewalkL = manager.getConstants(runno, "/calibration/band/time_walk_amp_left");
Expand Down
Loading
Loading