rename processDataEvent/processEvent

JeffersonLab · Aug 28, 2023 · f0d3fe1 · f0d3fe1
1 parent d010e71
commit f0d3fe1
Show file tree

Hide file tree

Showing 45 changed files with 82 additions and 83 deletions.
diff --git a/common-tools/clas-reco/src/main/java/org/jlab/clas/reco/EngineProcessor.java b/common-tools/clas-reco/src/main/java/org/jlab/clas/reco/EngineProcessor.java
@@ -236,7 +236,7 @@ public void init(){
     public void processEvent(DataEvent event){
         for(Map.Entry<String,ReconstructionEngine> engine : this.processorEngines.entrySet()){
             try {
-                engine.getValue().processEvent(event);
+                engine.getValue().processDataEvent(event);
             } catch (Exception e){
                 LOGGER.log(Level.SEVERE, "[Exception] >>>>> engine : {0}\n\n", engine.getKey());
                 e.printStackTrace();

diff --git a/common-tools/clas-reco/src/main/java/org/jlab/clas/reco/ReconstructionEngine.java b/common-tools/clas-reco/src/main/java/org/jlab/clas/reco/ReconstructionEngine.java
@@ -67,10 +67,14 @@ public abstract class ReconstructionEngine implements Engine {
 
     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;
@@ -107,9 +111,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
@@ -333,8 +334,6 @@ public void dropBanks(DataEvent event) {
         }
     }
 
-    public abstract void detectorChanged(int runNumber);
-
     public synchronized boolean checkRunNumber(DataEvent event) {
         int r = 0;
         if (event.hasBank("RUN::config")) {
@@ -347,7 +346,7 @@ public synchronized boolean checkRunNumber(DataEvent event) {
         return !this.ignoreInvalidRunNumbers || r>0;
     }
 
-    public void processEvent(DataEvent dataEvent) {
+    public void processDataEvent(DataEvent dataEvent) {
         if (!this.wroteConfig) {
             this.wroteConfig = true;
             JsonUtils.extend(dataEvent, CONFIG_BANK_NAME, "json", this.generateConfig());
@@ -357,7 +356,7 @@ public void processEvent(DataEvent dataEvent) {
         }
         if(this.applyTriggerMask(dataEvent)) {
             if (this.checkRunNumber(dataEvent)) {
-                this.processDataEvent(dataEvent);
+                this.processDataEventUser(dataEvent);
             }
         }        
     }
@@ -396,7 +395,7 @@ public EngineData execute(EngineData input) {
             }
 
             try {
-                this.processEvent(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));
@@ -512,7 +511,7 @@ public Reco(){
             super("a","b","c");
         }
         @Override
-        public boolean processDataEvent(DataEvent event) {
+        public boolean processDataEventUser(DataEvent event) {
             throw new UnsupportedOperationException("Not supported yet.");
         }
 

diff --git a/common-tools/swim-tools/src/main/java/org/jlab/clas/swimtools/MagFieldsEngine.java b/common-tools/swim-tools/src/main/java/org/jlab/clas/swimtools/MagFieldsEngine.java
@@ -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
         // -------------------

diff --git a/reconstruction/alert/src/main/java/org/jlab/rec/service/AHDCEngine.java b/reconstruction/alert/src/main/java/org/jlab/rec/service/AHDCEngine.java
@@ -51,7 +51,7 @@ public boolean init() {
     public void detectorChanged(int runNumber) {}
 
 	@Override
-	public boolean processDataEvent(DataEvent event) {
+	public boolean processDataEventUser(DataEvent event) {
 
 		int    runNo          = 10;
 		int    eventNo        = 777;
@@ -182,7 +182,7 @@ public static void main(String[] args) {
 			// System.out.println("***********  NEXT EVENT ************");
 			// event.show();
 
-			en.processDataEvent(event);
+			en.processDataEventUser(event);
 			writer.writeEvent(event);
 
 		}

diff --git a/reconstruction/band/src/main/java/org/jlab/service/band/BANDEngine.java b/reconstruction/band/src/main/java/org/jlab/service/band/BANDEngine.java
@@ -29,7 +29,7 @@ public BANDEngine() {
 	int Run = -1;
 
 	@Override
-		public boolean processDataEvent(DataEvent event) {
+		public boolean processDataEventUser(DataEvent event) {
 			//System.out.println("**** NEW EVENT ****");
 			// update calibration constants based on run number if changed
 			setRunConditionsParameters(event);
@@ -127,7 +127,7 @@ public static void main (String arg[]) {
 			//	event.getBank("band::adc").show();
 			//	event.getBank("band::tdc").show();
 			//}
-			en.processDataEvent(event);
+			en.processDataEventUser(event);
 			writer.writeEvent(event);
 			//event.getBank("band::hits").show();
 			nevent++;

diff --git a/reconstruction/cnd/src/main/java/org/jlab/service/cnd/CNDCalibrationEngine.java b/reconstruction/cnd/src/main/java/org/jlab/service/cnd/CNDCalibrationEngine.java
@@ -45,7 +45,7 @@ public CNDCalibrationEngine() {
     private int newRun = 0;
 
 	@Override
-	public boolean processDataEvent(DataEvent event) {
+	public boolean processDataEventUser(DataEvent event) {
 
         if (!event.hasBank("RUN::config")) {
             return true;
@@ -142,7 +142,7 @@ public static void main (String arg[]) {
 
 			//event.getBank("MC::Particle").show();
 			//if(event.hasBank("CVT::Tracks")){event.getBank("CVT::Tracks").show();};
-			en.processDataEvent(event);
+			en.processDataEventUser(event);
 
 			//			System.out.println("event après process ");
 			//			event.show();

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
@@ -281,7 +281,7 @@ public void setBmtzmaxclussize(int bmtzmaxclussize) {
     }
 
     @Override
-    public boolean processDataEvent(DataEvent event) {
+    public boolean processDataEventUser(DataEvent event) {
 
         Swim swimmer = new Swim();
 

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
@@ -31,7 +31,7 @@ public CVTSecondPassEngine() {
 
 
     @Override
-    public boolean processDataEvent(DataEvent event) {
+    public boolean processDataEventUser(DataEvent event) {
 
         int run = this.getRun(event);
         if(Constants.getInstance().seedingDebugMode)

diff --git a/reconstruction/dc/src/main/java/org/jlab/service/dc/DCEngine.java b/reconstruction/dc/src/main/java/org/jlab/service/dc/DCEngine.java
@@ -140,7 +140,7 @@ public void LoadTables() {
 
 
     @Override
-    public boolean processDataEvent(DataEvent event) {
+    public boolean processDataEventUser(DataEvent event) {
         return true;
     }
 

diff --git a/reconstruction/dc/src/main/java/org/jlab/service/dc/DCHBClustering.java b/reconstruction/dc/src/main/java/org/jlab/service/dc/DCHBClustering.java
@@ -36,7 +36,7 @@ public void setDropBanks() {
 
 
     @Override
-    public boolean processDataEvent(DataEvent event) {
+    public boolean processDataEventUser(DataEvent event) {
 
         int run = this.getRun(event);
         if(run==0) return true;

diff --git a/reconstruction/dc/src/main/java/org/jlab/service/dc/DCHBEngine.java b/reconstruction/dc/src/main/java/org/jlab/service/dc/DCHBEngine.java
@@ -55,7 +55,7 @@ public void setDropBanks() {
     }
 
     @Override
-    public boolean processDataEvent(DataEvent event) {
+    public boolean processDataEventUser(DataEvent event) {
 
         int run = this.getRun(event);
         if(run==0) return true;

diff --git a/reconstruction/dc/src/main/java/org/jlab/service/dc/DCHBPostClusterAI.java b/reconstruction/dc/src/main/java/org/jlab/service/dc/DCHBPostClusterAI.java
@@ -44,7 +44,7 @@ public void setDropBanks() {
     }
 
     @Override
-    public boolean processDataEvent(DataEvent event) {
+    public boolean processDataEventUser(DataEvent event) {
 
         int run = this.getRun(event);
         if(run==0) {

diff --git a/reconstruction/dc/src/main/java/org/jlab/service/dc/DCHBPostClusterConv.java b/reconstruction/dc/src/main/java/org/jlab/service/dc/DCHBPostClusterConv.java
@@ -46,7 +46,7 @@ public void setDropBanks() {
     }
 
     @Override
-    public boolean processDataEvent(DataEvent event) {
+    public boolean processDataEventUser(DataEvent event) {
 
         int run = this.getRun(event);
         if(run==0) return true;

diff --git a/reconstruction/dc/src/main/java/org/jlab/service/dc/DCTBEngine.java b/reconstruction/dc/src/main/java/org/jlab/service/dc/DCTBEngine.java
@@ -59,7 +59,7 @@ public void setDropBanks() {
     }
 
     @Override
-    public boolean processDataEvent(DataEvent event) {
+    public boolean processDataEventUser(DataEvent event) {
 
         int run = this.getRun(event);
         if(run==0) return true;

diff --git a/reconstruction/dc/src/main/java/org/jlab/service/dc/LayerEfficiencyAnalyzer.java b/reconstruction/dc/src/main/java/org/jlab/service/dc/LayerEfficiencyAnalyzer.java
@@ -214,7 +214,7 @@ public boolean equals(Object obj) {
     private final ArrayList<HashMap<Coordinate, H1F>> LayerEffsTrkD = new ArrayList<HashMap<Coordinate, H1F>>();
 
     @Override
-    public boolean processDataEvent(DataEvent event) {
+    public boolean processDataEventUser(DataEvent event) {
 
         int run = this.getRun(event);
         if(run==0) return true;
@@ -449,7 +449,7 @@ public static void main(String[] args) {
             while (reader.hasEvent()) {
                 counter++;
                 DataEvent event = reader.getNextEvent();
-                tm.processDataEvent(event);
+                tm.processDataEventUser(event);
                 tm.ProcessLayerEffs(event);
                 //event.show();
                 if(counter%1000==0) {

diff --git a/reconstruction/dc/src/test/java/org/jlab/service/dc/DCReconstructionTest.java b/reconstruction/dc/src/test/java/org/jlab/service/dc/DCReconstructionTest.java
@@ -50,8 +50,8 @@ public void testDCReconstruction() {
     DCHBPostClusterConv engineHB = new DCHBPostClusterConv();
     engineCL.init();
     engineHB.init();
-    engineCL.processEvent(testEvent); 
-    engineHB.processEvent(testEvent); 
+    engineCL.processDataEvent(testEvent); 
+    engineHB.processDataEvent(testEvent); 
     if(testEvent.hasBank("HitBasedTrkg::HBTracks")) {
         testEvent.getBank("HitBasedTrkg::HBTracks").show();
     }

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
@@ -65,7 +65,7 @@ public void setUsePOCA(boolean val) {
     }
 
     @Override
-    public boolean processDataEvent(DataEvent de) {
+    public boolean processDataEventUser(DataEvent de) {
         throw new RuntimeException("EBEngine cannot be used directly.  Use EBTBEngine/EBHBEngine instead.");
     }
 
@@ -90,7 +90,7 @@ public void setOutputBankPrefix(String prefix) {
         }
     }
 
-    public boolean processDataEvent(DataEvent de,EBScalers ebs) {
+    public boolean processDataEventUser(DataEvent de,EBScalers ebs) {
 
         // check run number, get constants from CCDB:
         int run=-1;

diff --git a/reconstruction/eb/src/main/java/org/jlab/service/eb/EBHBAIEngine.java b/reconstruction/eb/src/main/java/org/jlab/service/eb/EBHBAIEngine.java
@@ -18,8 +18,8 @@ public EBHBAIEngine(){
     }
 
     @Override
-    public boolean processDataEvent(DataEvent de) {
-        return super.processDataEvent(de,ebScalers);
+    public boolean processDataEventUser(DataEvent de) {
+        return super.processDataEventUser(de,ebScalers);
     }
 
     @Override

diff --git a/reconstruction/eb/src/main/java/org/jlab/service/eb/EBHBEngine.java b/reconstruction/eb/src/main/java/org/jlab/service/eb/EBHBEngine.java
@@ -18,8 +18,8 @@ public EBHBEngine(){
     }
 
     @Override
-    public boolean processDataEvent(DataEvent de) {
-        return super.processDataEvent(de,ebScalers);
+    public boolean processDataEventUser(DataEvent de) {
+        return super.processDataEventUser(de,ebScalers);
     }
 
     @Override

diff --git a/reconstruction/eb/src/main/java/org/jlab/service/eb/EBTBAIEngine.java b/reconstruction/eb/src/main/java/org/jlab/service/eb/EBTBAIEngine.java
@@ -18,8 +18,8 @@ public EBTBAIEngine(){
     }
 
     @Override
-    public boolean processDataEvent(DataEvent de) {
-        return super.processDataEvent(de,ebScalers);
+    public boolean processDataEventUser(DataEvent de) {
+        return super.processDataEventUser(de,ebScalers);
     }
 
     @Override

diff --git a/reconstruction/eb/src/main/java/org/jlab/service/eb/EBTBEngine.java b/reconstruction/eb/src/main/java/org/jlab/service/eb/EBTBEngine.java
@@ -24,8 +24,8 @@ public EBTBEngine(){
     }
 
     @Override
-    public boolean processDataEvent(DataEvent de) {
-        final boolean ret = super.processDataEvent(de,ebScalers);
+    public boolean processDataEventUser(DataEvent de) {
+        final boolean ret = super.processDataEventUser(de,ebScalers);
         this.linkTracks(de);
         return ret;
     }

diff --git a/reconstruction/eb/src/main/java/org/jlab/service/eb/VersionEngine.java b/reconstruction/eb/src/main/java/org/jlab/service/eb/VersionEngine.java
@@ -25,7 +25,7 @@ public static void show(DataBank bank) {
     }
 
     @Override
-    public boolean processDataEvent(DataEvent event) {
+    public boolean processDataEventUser(DataEvent event) {
         if (!done) {
             JsonObject versions = Versions.getVersionsJson();
             JsonObject config = new JsonObject();

diff --git a/reconstruction/ec/src/main/java/org/jlab/service/ec/ECEngine.java b/reconstruction/ec/src/main/java/org/jlab/service/ec/ECEngine.java
@@ -30,7 +30,7 @@ public ECEngine(){
     }
 
     @Override
-    public boolean processDataEvent(DataEvent de) {
+    public boolean processDataEventUser(DataEvent de) {
 
         List<ECStrip>     ecStrips = ECCommon.initEC(de, this.getConstantsManager()); // thresholds, ADC/TDC match        
         List<ECPeak>       ecPeaks = ECCommon.processPeaks(ECCommon.createPeaks(ecStrips)); // thresholds, split peaks -> update peak-lines          

diff --git a/reconstruction/ec/src/main/java/org/jlab/service/swim/SwimEngine.java.old b/reconstruction/ec/src/main/java/org/jlab/service/swim/SwimEngine.java.old
@@ -48,7 +48,7 @@ public class SwimEngine extends ReconstructionEngine {
     }
 
     @Override
-    public boolean processDataEvent(DataEvent event) {
+    public boolean processDataEventUser(DataEvent event) {
         //this.test_caching_index();
         //this.test_caching();
         this.swimParticles(event);

diff --git a/reconstruction/ec/src/test/java/org/jlab/service/ec/ECReconstructionTest.java b/reconstruction/ec/src/test/java/org/jlab/service/ec/ECReconstructionTest.java
@@ -30,7 +30,7 @@ public void testECReconstruction() {
 
     ECEngine engineEC = new ECEngine();
     engineEC.init();
-    engineEC.processEvent(testEvent);
+    engineEC.processDataEvent(testEvent);
 
     testEvent.show();
     testEvent.getBank("ECAL::hits").show();

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
@@ -72,7 +72,7 @@ public void detectorChanged(int runNumber) {
     }
 
     @Override
-    public boolean processDataEvent(DataEvent event) {
+    public boolean processDataEventUser(DataEvent event) {
         // Initial setup.
         if(debug) System.out.println("\nNew event");
 

diff --git a/reconstruction/ft/src/main/java/org/jlab/rec/ft/FTEBEngine.java b/reconstruction/ft/src/main/java/org/jlab/rec/ft/FTEBEngine.java
@@ -61,7 +61,7 @@ public boolean init() {
     public void detectorChanged(int runNumber) {}
 
     @Override
-    public boolean processDataEvent(DataEvent event) {
+    public boolean processDataEventUser(DataEvent event) {
 
         int run = this.setRunConditionsParameters(event);
         if (run>=0) {
@@ -376,10 +376,10 @@ public static void main(String arg[]){
             // always print to keep track of running
             if(debugMode>-1) System.out.println("////////////// event read " + bankEvt + " - sequential number " + nev);
             //if(nev > 10239) System.exit(0); if(nev != 10239) continue; // stop at a given evt number
-            cal.processDataEvent(event);
-            hodo.processDataEvent(event);
-	    trk.processDataEventAndGetClusters(event);
-            en.processDataEvent(event);
+            cal.processDataEventUser(event);
+            hodo.processDataEventUser(event);
+	        trk.processDataEventAndGetClusters(event);
+            en.processDataEventUser(event);
             if(!event.hasBank("FTCAL::hits")) continue; 
             if (event instanceof EvioDataEvent) {
                 GenericKinematicFitter fitter = new GenericKinematicFitter(11);

diff --git a/reconstruction/ft/src/main/java/org/jlab/rec/ft/cal/FTCALEngine.java b/reconstruction/ft/src/main/java/org/jlab/rec/ft/cal/FTCALEngine.java
@@ -51,7 +51,7 @@ public boolean init() {
     public void detectorChanged(int runNumber) {}
 
 	@Override
-	public boolean processDataEvent(DataEvent event) {
+	public boolean processDataEventUser(DataEvent event) {
             List<FTCALHit>     allHits           = new ArrayList();
             List<FTCALHit>     selectedHits      = new ArrayList();
             List<FTCALCluster> clusters          = new ArrayList();
@@ -123,7 +123,7 @@ public static void main (String arg[])  {
         while(reader.hasEvent()){
 //        for(int nev=0; nev<2; nev++){
             DataEvent event = (DataEvent) reader.getNextEvent();
-            cal.processDataEvent(event);
+            cal.processDataEventUser(event);
 
             if(event instanceof EvioDataEvent) {
                 GenericKinematicFitter      fitter = new GenericKinematicFitter(11);