From b7005a9e5984dca2140571cb89cea2262e7c2e3c Mon Sep 17 00:00:00 2001 From: Raffaella De Vita Date: Mon, 5 Dec 2022 19:34:54 +0100 Subject: [PATCH] Removed redundant check on run>0 in detector reconstruction engines --- .../java/org/jlab/rec/cvt/services/CVTEngine.java | 1 - .../jlab/rec/cvt/services/CVTSecondPassEngine.java | 1 - .../src/main/java/org/jlab/service/eb/EBEngine.java | 4 ---- .../src/main/java/org/jlab/service/fmt/FMTEngine.java | 6 ------ .../java/org/jlab/service/raster/RasterEngine.java | 4 ---- .../main/java/org/jlab/service/rtpc/RTPCEngine.java | 4 ---- .../main/java/org/jlab/service/ctof/CTOFEngine.java | 5 +---- .../main/java/org/jlab/service/ftof/FTOFEngine.java | 5 +---- .../java/org/jlab/service/urwell/URWellEngine.java | 11 ----------- 9 files changed, 2 insertions(+), 39 deletions(-) diff --git a/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/services/CVTEngine.java b/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/services/CVTEngine.java index 1e7dff2c7d..deef8c61d3 100644 --- a/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/services/CVTEngine.java +++ b/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/services/CVTEngine.java @@ -173,7 +173,6 @@ public boolean processDataEvent(DataEvent event) { Swim swimmer = new Swim(); int run = this.getRun(event); - if(run<=0) return true; IndexedTable svtStatus = this.getConstantsManager().getConstants(run, "/calibration/svt/status"); IndexedTable svtLorentz = this.getConstantsManager().getConstants(run, "/calibration/svt/lorentz_angle"); diff --git a/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/services/CVTSecondPassEngine.java b/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/services/CVTSecondPassEngine.java index c6e112a923..bf8f85aae8 100644 --- a/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/services/CVTSecondPassEngine.java +++ b/reconstruction/cvt/src/main/java/org/jlab/rec/cvt/services/CVTSecondPassEngine.java @@ -31,7 +31,6 @@ public CVTSecondPassEngine() { public boolean processDataEvent(DataEvent event) { int run = this.getRun(event); - if(run<=0) return true; Swim swimmer = new Swim(); diff --git a/reconstruction/eb/src/main/java/org/jlab/service/eb/EBEngine.java b/reconstruction/eb/src/main/java/org/jlab/service/eb/EBEngine.java index 96339d16c0..b849715eae 100644 --- a/reconstruction/eb/src/main/java/org/jlab/service/eb/EBEngine.java +++ b/reconstruction/eb/src/main/java/org/jlab/service/eb/EBEngine.java @@ -99,10 +99,6 @@ public boolean processDataEvent(DataEvent de,EBScalers ebs) { if (de.hasBank("RUN::config")) { run=de.getBank("RUN::config").getInt("run",0); } - if (run<=0) { - LOGGER.log(Level.WARNING,"EBEngine: found no run number, CCDB constants not loaded, skipping event."); - return false; - } EBCCDBConstants ccdb = new EBCCDBConstants(run,this.getConstantsManager()); diff --git a/reconstruction/fmt/src/main/java/org/jlab/service/fmt/FMTEngine.java b/reconstruction/fmt/src/main/java/org/jlab/service/fmt/FMTEngine.java index 162b04f416..de6e67e4d5 100644 --- a/reconstruction/fmt/src/main/java/org/jlab/service/fmt/FMTEngine.java +++ b/reconstruction/fmt/src/main/java/org/jlab/service/fmt/FMTEngine.java @@ -78,12 +78,6 @@ public boolean processDataEvent(DataEvent event) { DataBank runConfig = event.getBank("RUN::config"); if (runConfig == null || runConfig.rows() == 0) return true; int run = runConfig.getInt("run", 0); - int eventNumber = runConfig.getInt("event", 0); - - if (run<=0) { - System.out.println("FMTEngine: found no run number, CCDB constants not loaded, skipping event."); - return false; - } // Set swimmer. Swim swimmer = new Swim(); diff --git a/reconstruction/raster/src/main/java/org/jlab/service/raster/RasterEngine.java b/reconstruction/raster/src/main/java/org/jlab/service/raster/RasterEngine.java index 03287d5316..20d7619e1f 100644 --- a/reconstruction/raster/src/main/java/org/jlab/service/raster/RasterEngine.java +++ b/reconstruction/raster/src/main/java/org/jlab/service/raster/RasterEngine.java @@ -56,10 +56,6 @@ public boolean processDataEvent(DataEvent event) { if (event.hasBank("RUN::config")) { run = event.getBank("RUN::config").getInt("run",0); } - if (run<=0) { - LOGGER.log(Level.WARNING,"RasterEngine: found no run number, CCDB constants not loaded, skipping event."); - return false; - } IndexedTable adc2position = this.getConstantsManager().getConstants(run, "/calibration/raster/adc_to_position"); diff --git a/reconstruction/rtpc/src/main/java/org/jlab/service/rtpc/RTPCEngine.java b/reconstruction/rtpc/src/main/java/org/jlab/service/rtpc/RTPCEngine.java index 8a225f4b34..b6231f34be 100644 --- a/reconstruction/rtpc/src/main/java/org/jlab/service/rtpc/RTPCEngine.java +++ b/reconstruction/rtpc/src/main/java/org/jlab/service/rtpc/RTPCEngine.java @@ -127,10 +127,6 @@ public boolean processDataEvent(DataEvent event) { runNo = bank.getInt("run", 0); eventNo = bank.getInt("event",0); magfieldfactor = bank.getFloat("solenoid",0); - if (runNo<=0) { - System.err.println("RTPCEngine: got run <= 0 in RUN::config, skipping event."); - return false; - } } magfield = 50 * magfieldfactor; diff --git a/reconstruction/tof/src/main/java/org/jlab/service/ctof/CTOFEngine.java b/reconstruction/tof/src/main/java/org/jlab/service/ctof/CTOFEngine.java index f54cad2d08..8fb79d5b51 100644 --- a/reconstruction/tof/src/main/java/org/jlab/service/ctof/CTOFEngine.java +++ b/reconstruction/tof/src/main/java/org/jlab/service/ctof/CTOFEngine.java @@ -96,10 +96,7 @@ public boolean processDataEvent(DataEvent event) { //------------------- final int newRun = bank.getInt("run", 0); long timeStamp = bank.getLong("timestamp", 0); - if (newRun<=0) { - System.err.println("CTOFEngine: got run <= 0 in RUN::config, skipping event."); - return false; - } + if (timeStamp==-1) { System.err.println("CTOFEngine: got 0 timestamp, skipping event"); return false; diff --git a/reconstruction/tof/src/main/java/org/jlab/service/ftof/FTOFEngine.java b/reconstruction/tof/src/main/java/org/jlab/service/ftof/FTOFEngine.java index 1445418672..4a0c24d2c3 100644 --- a/reconstruction/tof/src/main/java/org/jlab/service/ftof/FTOFEngine.java +++ b/reconstruction/tof/src/main/java/org/jlab/service/ftof/FTOFEngine.java @@ -99,10 +99,7 @@ public boolean processDataEvent(DataEvent event) { //------------------- int newRun = bank.getInt("run", 0); long timeStamp = bank.getLong("timestamp", 0); - if (newRun<=0) { - System.err.println("FTOFEngine: got run <= 0 in RUN::config, skipping event."); - return false; - } + if (timeStamp==-1) { System.err.println("FTOFEngine: got 0 timestamp, skipping event"); return false; diff --git a/reconstruction/urwell/src/main/java/org/jlab/service/urwell/URWellEngine.java b/reconstruction/urwell/src/main/java/org/jlab/service/urwell/URWellEngine.java index 6e903557c2..15a338c757 100644 --- a/reconstruction/urwell/src/main/java/org/jlab/service/urwell/URWellEngine.java +++ b/reconstruction/urwell/src/main/java/org/jlab/service/urwell/URWellEngine.java @@ -57,17 +57,6 @@ public boolean init() { @Override public boolean processDataEvent(DataEvent event) { - int run = -1; - - if(event.hasBank("RUN::config")){ - DataBank bank = event.getBank("RUN::config"); - run = bank.getInt("run", 0); - if (run<=0) { - LOGGER.log(Level.WARNING,"URwellEngine: got run <= 0 in RUN::config, skipping event."); - return false; - } - } - List strips = URWellStrip.getStrips(event, factory, this.getConstantsManager()); List clusters = URWellCluster.createClusters(strips); List crosses = URWellCross.createCrosses(clusters);