cleanups and renaming

raffaelladevita · baltzell · commit 752de7ec66b2 · 2025-08-06T16:36:52.000-04:00
diff --git a/etc/services/data-ai.yaml b/etc/services/data-ai.yaml
@@ -61,7 +61,7 @@ services:
     name: RTPC
   - class: org.jlab.rec.service.vtx.VTXEngine
     name: VTX
-  - class: org.jlab.calibration.service.CalibBankEngine
+  - class: org.jlab.calibration.service.CalibBanksEngine
     name: CALIB
 configuration:
   global:
diff --git a/etc/services/data-aicv.yaml b/etc/services/data-aicv.yaml
@@ -72,7 +72,7 @@ services:
     name: RTPC
   - class: org.jlab.rec.service.vtx.VTXEngine
     name: VTX
-  - class: org.jlab.calibration.service.CalibBankEngine
+  - class: org.jlab.calibration.service.CalibBanksEngine
     name: CALIB
 configuration:
   global:
diff --git a/etc/services/data-cv.yaml b/etc/services/data-cv.yaml
@@ -59,7 +59,7 @@ services:
     name: RTPC
   - class: org.jlab.rec.service.vtx.VTXEngine
     name: VTX
-  - class: org.jlab.calibration.service.CalibBankEngine
+  - class: org.jlab.calibration.service.CalibBanksEngine
     name: CALIB    
 configuration:
   global:
diff --git a/etc/services/dcalign.yaml b/etc/services/dcalign.yaml
@@ -51,7 +51,7 @@ services:
     name: RICH
   - class: org.jlab.service.rtpc.RTPCEngine
     name: RTPC
-  - class: org.jlab.calibration.service.CalibBankEngine
+  - class: org.jlab.calibration.service.CalibBanksEngine
     name: CALIB
 configuration:
   global:
diff --git a/etc/services/denoise.yaml b/etc/services/denoise.yaml
@@ -74,7 +74,7 @@ services:
     name: RICH
   - class: org.jlab.service.rtpc.RTPCEngine
     name: RTPC
-  - class: org.jlab.calibration.service.CalibBankEngine
+  - class: org.jlab.calibration.service.CalibBanksEngine
     name: CALIB    
 configuration:
   global:
diff --git a/etc/services/kpp.yaml b/etc/services/kpp.yaml
@@ -70,7 +70,7 @@ services:
     name: RICH
   - class: org.jlab.service.rtpc.RTPCEngine
     name: RTPC
-  - class: org.jlab.calibration.service.CalibBankEngine
+  - class: org.jlab.calibration.service.CalibBanksEngine
     name: CALIB
 configuration:
   services:
diff --git a/etc/services/mc-ai.yaml b/etc/services/mc-ai.yaml
@@ -61,7 +61,7 @@ services:
     name: RTPC
   - class: org.jlab.rec.service.vtx.VTXEngine
     name: VTX
-  - class: org.jlab.calibration.service.CalibBankEngine
+  - class: org.jlab.calibration.service.CalibBanksEngine
     name: CALIB
 configuration:
 #  global:
diff --git a/etc/services/mc-aicv.yaml b/etc/services/mc-aicv.yaml
@@ -72,7 +72,7 @@ services:
     name: RTPC
   - class: org.jlab.rec.service.vtx.VTXEngine
     name: VTX
-  - class: org.jlab.calibration.service.CalibBankEngine
+  - class: org.jlab.calibration.service.CalibBanksEngine
     name: CALIB
 configuration:
 #  global:
diff --git a/etc/services/mc-cv.yaml b/etc/services/mc-cv.yaml
@@ -59,7 +59,7 @@ services:
     name: RTPC
   - class: org.jlab.rec.service.vtx.VTXEngine
     name: VTX
-  - class: org.jlab.calibration.service.CalibBankEngine
+  - class: org.jlab.calibration.service.CalibBanksEngine
     name: CALIB
 configuration:
 #  global:
diff --git a/reconstruction/calib/src/main/java/org/jlab/calibration/detectors/CTOFBankBuilder.java b/reconstruction/calib/src/main/java/org/jlab/calibration/detectors/CTOFBankBuilder.java
@@ -10,9 +10,9 @@
  *
  * @author devita
  */
-public class CTOFCalibrator extends DetectorCalibrator {
+public class CTOFBankBuilder extends CalibBankBuilder {
 
-    public CTOFCalibrator() {
+    public CTOFBankBuilder() {
         super(DetectorType.CTOF);
         super.init("CTOF::adc", "CTOF::tdc", "CTOF::hits", "CVTRec::Tracks", 
                    "REC::Track", "REC::Scintillator", "REC::Particle");
diff --git a/reconstruction/calib/src/main/java/org/jlab/calibration/detectors/CalibBankBuilder.java b/reconstruction/calib/src/main/java/org/jlab/calibration/detectors/CalibBankBuilder.java
@@ -10,13 +10,13 @@
  *
  * @author devita
  */
-public abstract class DetectorCalibrator {
+public abstract class CalibBankBuilder {
     
     private DetectorType  type;
     private List<String> bankNames;
     private String outputBankName;
     
-    public DetectorCalibrator(DetectorType type) {
+    public CalibBankBuilder(DetectorType type) {
         this.type = type;
         this.outputBankName = type.getName()+"::calib";
     }
diff --git a/reconstruction/calib/src/main/java/org/jlab/calibration/detectors/DCBankBuilder.java b/reconstruction/calib/src/main/java/org/jlab/calibration/detectors/DCBankBuilder.java
@@ -12,13 +12,13 @@
  *
  * @author devita
  */
-public class DCCalibrator extends DetectorCalibrator {
+public class DCBankBuilder extends CalibBankBuilder {
 
     private static final int MINCLUSTERSIZE = 5;
     private static final double MAXRESIDUAL = 0.1; // cm
     private static final double CHI2PIDCUT  = 5; // cm
     
-    public DCCalibrator() {
+    public DCBankBuilder() {
         super(DetectorType.DC);
         super.init("TimeBasedTrkg::TBHits","TimeBasedTrkg::TBHits","TimeBasedTrkg::TBTracks", 
                    "REC::Track", "REC::Particle");
diff --git a/reconstruction/calib/src/main/java/org/jlab/calibration/detectors/FTOFBankBuilder.java b/reconstruction/calib/src/main/java/org/jlab/calibration/detectors/FTOFBankBuilder.java
@@ -10,9 +10,9 @@
  *
  * @author devita
  */
-public class FTOFCalibrator extends DetectorCalibrator {
+public class FTOFBankBuilder extends CalibBankBuilder {
 
-    public FTOFCalibrator() {
+    public FTOFBankBuilder() {
         super(DetectorType.FTOF);
         super.init("FTOF::adc", "FTOF::tdc", "FTOF::hits", "TimeBasedTrkg::TBTracks", 
                    "REC::Track", "REC::Scintillator", "REC::Particle");
diff --git a/reconstruction/calib/src/main/java/org/jlab/calibration/detectors/RICHBankBuilder.java b/reconstruction/calib/src/main/java/org/jlab/calibration/detectors/RICHBankBuilder.java
@@ -12,9 +12,9 @@
  *
  * @author devita
  */
-public class RICHCalibrator extends DetectorCalibrator {
+public class RICHBankBuilder extends CalibBankBuilder {
         
-    public RICHCalibrator() {
+    public RICHBankBuilder() {
         super(DetectorType.RICH);
         super.init("RICH::Hit", "RICH::Photon", "REC::Particle");
     }
diff --git a/reconstruction/calib/src/main/java/org/jlab/calibration/service/CalibBanksEngine.java b/reconstruction/calib/src/main/java/org/jlab/calibration/service/CalibBanksEngine.java
@@ -5,11 +5,11 @@
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
-import org.jlab.calibration.detectors.CTOFCalibrator;
-import org.jlab.calibration.detectors.DCCalibrator;
-import org.jlab.calibration.detectors.DetectorCalibrator;
-import org.jlab.calibration.detectors.FTOFCalibrator;
-import org.jlab.calibration.detectors.RICHCalibrator;
+import org.jlab.calibration.detectors.CTOFBankBuilder;
+import org.jlab.calibration.detectors.DCBankBuilder;
+import org.jlab.calibration.detectors.CalibBankBuilder;
+import org.jlab.calibration.detectors.FTOFBankBuilder;
+import org.jlab.calibration.detectors.RICHBankBuilder;
 import org.jlab.clas.reco.ReconstructionEngine;
 import org.jlab.detector.base.DetectorType;
 import org.jlab.io.base.DataBank;
@@ -19,21 +19,21 @@
  *
  * @author devita
  */
-public class CalibBankEngine extends ReconstructionEngine {
+public class CalibBanksEngine extends ReconstructionEngine {
 
-    private final Map<DetectorType,DetectorCalibrator> calibrators = new HashMap<>();
+    private final Map<DetectorType,CalibBankBuilder> calibrators = new HashMap<>();
 
     public static final String CONF_DETECTORS = "detectors";
     private final List<DetectorType> detectors = new ArrayList<>();
     
-    static final Logger logger = Logger.getLogger(CalibBankEngine.class.getName());
+    static final Logger logger = Logger.getLogger(CalibBanksEngine.class.getName());
 
-    public CalibBankEngine() {
+    public CalibBanksEngine() {
         super("CALIB", "devita", "1.0");
-        calibrators.put(DetectorType.DC  , new DCCalibrator());
-        calibrators.put(DetectorType.FTOF, new FTOFCalibrator());
-        calibrators.put(DetectorType.CTOF, new CTOFCalibrator());
-        calibrators.put(DetectorType.RICH, new RICHCalibrator());
+        calibrators.put(DetectorType.DC  , new DCBankBuilder());
+        calibrators.put(DetectorType.FTOF, new FTOFBankBuilder());
+        calibrators.put(DetectorType.CTOF, new CTOFBankBuilder());
+        calibrators.put(DetectorType.RICH, new RICHBankBuilder());
     }
 
     @Override
@@ -62,7 +62,7 @@ public boolean processDataEvent(DataEvent event) {
         
         for(DetectorType d : detectors) {
         
-            DetectorCalibrator calibrator = calibrators.get(d);
+            CalibBankBuilder calibrator = calibrators.get(d);
             
             if(calibrator.isGoodEvent(event)) {
                 DataBank calib = calibrator.getCalibBank(event);
diff --git a/reconstruction/tof/src/main/java/org/jlab/rec/tof/banks/ftof/RecoBankWriter.java b/reconstruction/tof/src/main/java/org/jlab/rec/tof/banks/ftof/RecoBankWriter.java
@@ -209,65 +209,6 @@ private DataBank fillMatchedClustersBank(DataEvent event,
         }
     }
 
-    public DataBank fillCalibBank(DataEvent event, List<Hit> hitlist, String hitsType) {
-        if (hitlist == null) {
-            return null;
-        }
-        if (hitlist.isEmpty()) {
-            return null;
-        }
-        
-        if(hitsType.equalsIgnoreCase("FTOFHB"))
-            return null;
-        
-        int nrows=0;
-        for(Hit h : hitlist) {
-            if(h.get_TrkId()>0 && 
-               h.get_TrkPosition()!=null &&
-               h.get_TrkPosition().z()!=0)
-                nrows++;
-        }
-        if(nrows==0) return null;
-        
-        String bankName = "FTOF::calib";               
-        DataBank bank = event.createBank(bankName, nrows);
-        if (bank == null) {
-            System.err.println("COULD NOT CREATE A BANK!!!!!!"+bankName);
-            return null;
-        }
-        int irow=0;
-        for(Hit h : hitlist) {
-            if(h.get_TrkId()>0 && 
-               h.get_TrkPosition()!=null &&
-               h.get_TrkPosition().z()!=0) {
-                bank.setShort("id", irow, (short) h.get_Id());
-                bank.setByte("sector", irow, (byte) h.get_Sector());
-                bank.setByte("layer", irow, (byte) h.get_Panel());
-                bank.setShort("component", irow, (short) h.get_Paddle());
-                bank.setShort("status", irow, (short) h.getStatus());
-                bank.setFloat("energy", irow, (float) h.get_Energy());
-                bank.setFloat("time", irow, (float) h.get_t());
-                bank.setFloat("x", irow, (float) h.get_Position().x());
-                bank.setFloat("y", irow, (float) h.get_Position().y());
-                bank.setFloat("z", irow, (float) h.get_Position().z());
-                bank.setFloat("tx", irow, (float) h.get_TrkPosition().x());
-                bank.setFloat("ty", irow, (float) h.get_TrkPosition().y());
-                bank.setFloat("tz", irow, (float) h.get_TrkPosition().z());
-                bank.setShort("trackid", irow, (short) h.get_TrkId());
-                bank.setInt("adc1", irow, h.get_ADC1());
-                bank.setInt("adc2", irow, h.get_ADC2());
-                bank.setInt("tdc1", irow, h.get_TDC1());
-                bank.setInt("tdc2", irow, h.get_TDC2());
-                bank.setFloat("pathLength", irow, (float) h.get_TrkPathLen());
-                bank.setFloat("pathLengthThruBar", irow, (float) h.get_TrkPathLenThruBar());
-                irow++;
-            }
-        }
-        // bank.show();
-        return bank;
-
-    }
-
     public void appendFTOFBanks(DataEvent event, List<Hit> hits, List<Cluster> clusters,
                                 ArrayList<ClusterMatcher> matchedClusters, String hitsType) {
         List<DataBank> fTOFBanks = new ArrayList<DataBank>();
@@ -292,17 +233,19 @@ public void appendFTOFBanks(DataEvent event, List<Hit> hits, List<Cluster> clust
             fTOFBanks.add(bank4);
         }
 
-//        DataBank bank5 = this.fillCalibBank((DataEvent) event, hits, hitsType);
-//        if (bank5 != null) {
-//            fTOFBanks.add(bank5);
-//        }
-
-        if(!fTOFBanks.isEmpty()) {
-            DataBank[] banks = new DataBank[fTOFBanks.size()];
-            event.appendBanks(fTOFBanks.toArray(banks));
+        if (fTOFBanks.size() == 4) {
+            event.appendBanks(fTOFBanks.get(0), fTOFBanks.get(1), fTOFBanks.get(2), fTOFBanks.get(3));
+        }
+        if (fTOFBanks.size() == 3) {
+            event.appendBanks(fTOFBanks.get(0), fTOFBanks.get(1), fTOFBanks.get(2));
+        }
+        if (fTOFBanks.size() == 2) {
+            event.appendBanks(fTOFBanks.get(0), fTOFBanks.get(1));
+        }
+        if (fTOFBanks.size() == 1) {
+            event.appendBanks(fTOFBanks.get(0));
         }
         
-
     }
 
 }
