Added Status table reading from ccdb

JeffersonLab · Jun 8, 2018 · b253ef8 · b253ef8
1 parent d0feba2
commit b253ef8
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 12 deletions.
diff --git a/reconstruction/dc/src/main/java/org/jlab/rec/dc/banks/HitReader.java b/reconstruction/dc/src/main/java/org/jlab/rec/dc/banks/HitReader.java
@@ -92,7 +92,8 @@ public void set_TBHits(List<FittedHit> _TBHits) {
      * @param event DataEvent
      */
     public void fetch_DCHits(DataEvent event, Clas12NoiseAnalysis noiseAnalysis, NoiseReductionParameters parameters,
-            Clas12NoiseResult results, double[][][][] T0, double[][][][] T0ERR, IndexedTable tab, IndexedTable tab2, DCGeant4Factory DcDetector,
+            Clas12NoiseResult results, double[][][][] T0, double[][][][] T0ERR, IndexedTable tab, IndexedTable tab2, 
+            IndexedTable tab3, DCGeant4Factory DcDetector,
             double triggerPhase) {
 
         if (event.hasBank("DC::tdc") == false) {
@@ -154,7 +155,7 @@ public void fetch_DCHits(DataEvent event, Clas12NoiseAnalysis noiseAnalysis, Noi
         noiseAnalysis.findNoise(sector, superlayerNum, layerNum, wire, results);
 
         for (int i = 0; i < size; i++) {
-            if (wire[i] != -1 && results.noise[i] == false && useMChit[i] != -1 && !(superlayerNum[i] == 0)) {
+            if (tab3.getIntValue("status", sector[i], layer[i] ,wire[i])==0 && wire[i] != -1 && results.noise[i] == false && useMChit[i] != -1 && !(superlayerNum[i] == 0)) {
 
                 double tStart = 0;
                 double timeCutMin = 0;

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
@@ -109,6 +109,7 @@ public boolean init() {
          //   "/calibration/dc/time_corrections/T0_correction",
             "/calibration/dc/time_corrections/timingcuts",
             "/calibration/dc/time_jitter",
+            "/calibration/dc/status_tables/MK_V1",
         };
 
         requireConstants(Arrays.asList(dcTables));
@@ -222,7 +223,9 @@ public boolean processDataEvent(DataEvent event) {
        HitReader hitRead = new HitReader();
        hitRead.fetch_DCHits(event, noiseAnalysis, parameters, results, Constants.getT0(), Constants.getT0Err(), 
                this.getConstantsManager().getConstants(newRun, "/calibration/dc/time_to_distance/time2dist"), 
-               this.getConstantsManager().getConstants(newRun,"/calibration/dc/time_corrections/timingcuts"), dcDetector, triggerPhase);
+               this.getConstantsManager().getConstants(newRun,"/calibration/dc/time_corrections/timingcuts"), 
+               this.getConstantsManager().getConstants(newRun,"/calibration/dc/status_tables/MK_V1"), 
+               dcDetector, triggerPhase);
 
        List<Hit> hits = new ArrayList<Hit>();
        //I) get the hits

diff --git a/reconstruction/dc/src/main/java/org/jlab/service/dc/DCHBEngineCalib.java b/reconstruction/dc/src/main/java/org/jlab/service/dc/DCHBEngineCalib.java
@@ -110,6 +110,7 @@ public boolean init() {
          //   "/calibration/dc/time_corrections/T0_correction",
             "/calibration/dc/time_corrections/timingcuts",
             "/calibration/dc/time_jitter",
+            "/calibration/dc/status_tables/MK_V1",
         };
 
         requireConstants(Arrays.asList(dcTables));
@@ -218,8 +219,10 @@ public boolean processDataEvent(DataEvent event) {
        HitReader hitRead = new HitReader();
        hitRead.fetch_DCHits(event, noiseAnalysis, parameters, results, Constants.getT0(), Constants.getT0Err(), 
                this.getConstantsManager().getConstants(newRun, "/calibration/dc/time_to_distance/time2dist"), 
-               this.getConstantsManager().getConstants(newRun,"/calibration/dc/time_corrections/timingcuts"), dcDetector, triggerPhase);
-
+               this.getConstantsManager().getConstants(newRun,"/calibration/dc/time_corrections/timingcuts"), 
+               this.getConstantsManager().getConstants(newRun,"/calibration/dc/status_tables/MK_V1"), 
+               dcDetector, triggerPhase);
+
        List<Hit> hits = new ArrayList<Hit>();
        //I) get the hits
        hits = hitRead.get_DCHits();

diff --git a/reconstruction/dc/src/main/java/org/jlab/service/dc/DCHBLayerEffsEngine.java b/reconstruction/dc/src/main/java/org/jlab/service/dc/DCHBLayerEffsEngine.java
@@ -110,6 +110,7 @@ public boolean init() {
          //   "/calibration/dc/time_corrections/T0_correction",
             "/calibration/dc/time_corrections/timingcuts",
             "/calibration/dc/time_jitter",
+            "/calibration/dc/status_tables/MK_V1",
         };
 
         requireConstants(Arrays.asList(dcTables));
@@ -219,8 +220,10 @@ public boolean processDataEvent(DataEvent event) {
        HitReader hitRead = new HitReader();
        hitRead.fetch_DCHits(event, noiseAnalysis, parameters, results, Constants.getT0(), Constants.getT0Err(), 
                this.getConstantsManager().getConstants(newRun, "/calibration/dc/time_to_distance/time2dist"), 
-               this.getConstantsManager().getConstants(newRun,"/calibration/dc/time_corrections/timingcuts"), dcDetector, triggerPhase);
-
+               this.getConstantsManager().getConstants(newRun,"/calibration/dc/time_corrections/timingcuts"), 
+               this.getConstantsManager().getConstants(newRun,"/calibration/dc/status_tables/MK_V1"), 
+               dcDetector, triggerPhase);
+
        List<Hit> hits = new ArrayList<Hit>();
        //I) get the hits
        hits = hitRead.get_DCHits();

diff --git a/reconstruction/dc/src/main/java/org/jlab/service/dc/TrackingEff.java b/reconstruction/dc/src/main/java/org/jlab/service/dc/TrackingEff.java
@@ -81,7 +81,8 @@ public boolean init() {
          //   "/calibration/dc/time_corrections/T0_correction",
             "/calibration/dc/time_corrections/timingcuts",
             "/calibration/dc/time_jitter",
-            };
+            "/calibration/dc/status_tables/MK_V1",
+        };
 
             requireConstants(Arrays.asList(dcTables));
             // Get the constants for the correct variation
@@ -226,10 +227,12 @@ public boolean processDataEvent(DataEvent event) {
 
             HitReader hitRead = new HitReader();
             //hitRead.fetch_DCHits(event, noiseAnalysis, parameters, results, T0, T0ERR, this.getConstantsManager().getConstants(newRun, "/calibration/dc/time_to_distance/t2d"), dcDetector);
-            hitRead.fetch_DCHits(event, noiseAnalysis, parameters, results, T0, T0ERR, 
-                    this.getConstantsManager().getConstants(newRun, "/calibration/dc/time_to_distance/time2dist"), 
-                    this.getConstantsManager().getConstants(newRun,"/calibration/dc/time_corrections/timingcuts"), dcDetector, 0.0);
-
+                   hitRead.fetch_DCHits(event, noiseAnalysis, parameters, results, Constants.getT0(), Constants.getT0Err(), 
+               this.getConstantsManager().getConstants(newRun, "/calibration/dc/time_to_distance/time2dist"), 
+               this.getConstantsManager().getConstants(newRun,"/calibration/dc/time_corrections/timingcuts"), 
+               this.getConstantsManager().getConstants(newRun,"/calibration/dc/status_tables/MK_V1"), 
+               dcDetector, 0);
+
             List<Hit> hits = new ArrayList<Hit>();
             List<Hit> sighits = new ArrayList<Hit>();
             //I) get the hits