enable rebuilding scalers in postproc engine

baltzell · baltzell · commit b51871fa0416 · 2024-09-24T18:13:06.000+02:00
diff --git a/common-tools/clas-analysis/src/main/java/org/jlab/analysis/postprocess/Processor.java b/common-tools/clas-analysis/src/main/java/org/jlab/analysis/postprocess/Processor.java
@@ -31,8 +31,6 @@
  */
 public class Processor {
 
-    static final Logger logger = Logger.getLogger(Util.class.getName());
-
     public static final String CCDB_TABLES[] = {"/runcontrol/fcup","/runcontrol/slm",
         "/runcontrol/helicity","/daq/config/scalers/dsc1","/runcontrol/hwp"};
     public static final String DEF_PRELOAD_GLOB = "*.{hipo,h5}";
@@ -45,32 +43,29 @@ public class Processor {
     private DaqScalersSequence chargeSequence = null;
     private HelicitySequenceDelayed helicitySequence = null;
 
-    public Processor(File file, boolean restream) {
-        configure(restream, Arrays.asList(file.getAbsolutePath()));
+    public Processor(File file, boolean restream, boolean rebuild) {
+        configure(Arrays.asList(file.getAbsolutePath()), restream, rebuild);
     }
     
-    public Processor(String dir, boolean restream) {
-        configure(restream, findPreloadFiles(dir,DEF_PRELOAD_GLOB));
+    public Processor(String dir, boolean restream, boolean rebuild) {
+        configure(findPreloadFiles(dir,DEF_PRELOAD_GLOB), restream, rebuild);
     }
 
-    public Processor(String dir, String glob, boolean restream) {
-        configure(restream, findPreloadFiles(dir,glob));
+    public Processor(String dir, String glob, boolean restream, boolean rebuild) {
+        configure(findPreloadFiles(dir,glob), restream, rebuild);
     }
 
-    private void configure(boolean restream, List<String> preloadFiles) {
-        if (preloadFiles.isEmpty()) {
-            logger.warning("<<<< No preload files found, postprocessing disabled.");
-            initialized = false;
-        } else {
+    private void configure(List<String> preloadFiles, boolean restream, boolean rebuild) {
+        if (!preloadFiles.isEmpty()) {
             HipoReader r = new HipoReader();
             r.open(preloadFiles.get(0));
             conman = new ConstantsManager();
             conman.init(CCDB_TABLES);
             schemaFactory = r.getSchemaFactory();
             helicitySequence = Util.getHelicity(preloadFiles, schemaFactory, restream, conman);
-            chargeSequence = DaqScalersSequence.readSequence(preloadFiles);
+            if (rebuild) chargeSequence = DaqScalersSequence.rebuildSequence(1, conman, preloadFiles);
+            else chargeSequence = DaqScalersSequence.readSequence(preloadFiles);
             r.close();
-            initialized = true;
         }
     }
 
@@ -223,17 +218,9 @@ private static void replace(Map<String,String> files) {
         }
     }
 
-    /**
-     * Replace preload files with rebuilt ones. 
-     */
-    private void rebuildAndReplace(List<String> preloadFiles) {
-        replace(rebuild(".",preloadFiles));
-    }
-
     public static void main(String args[]) {
         DefaultLogger.debug();
-        Processor p = new Processor(System.getenv("HOME")+"/tmp","r*.hipo",false);
-        //p.rebuildAndReplace();
+        Processor p = new Processor(System.getenv("HOME")+"/tmp","r*.hipo",false,false);
     }
 
 }
diff --git a/reconstruction/postproc/src/main/java/org/jlab/service/postproc/PostprocEngine.java b/reconstruction/postproc/src/main/java/org/jlab/service/postproc/PostprocEngine.java
@@ -31,27 +31,24 @@ public boolean init() {
         requireConstants(Processor.CCDB_TABLES);
         if (getEngineConfigString(CONF_PRELOAD_FILE) != null) {
             if (getEngineConfigString(CONF_PRELOAD_DIR) != null)
-                logger.warning("PostprocEngine::  Using preloadFile, ignoring preloadDir.");
+                logger.warning("PostprocEngine::  Ignoring preloadDir, using preloadFile.");
             processor = new Processor(new File(getEngineConfigString(CONF_PRELOAD_FILE)),
-                Boolean.parseBoolean(getEngineConfigString(CONF_RESTREAM_HELICITY,"false")));
+                Boolean.parseBoolean(getEngineConfigString(CONF_RESTREAM_HELICITY,"false")),
+                Boolean.parseBoolean(getEngineConfigString(CONF_REBUILD_SCALERS,"true")));
         }
-        if (getEngineConfigString(CONF_PRELOAD_DIR) != null) {
+        else if (getEngineConfigString(CONF_PRELOAD_DIR) != null) {
             processor = new Processor(
                 getEngineConfigString(CONF_PRELOAD_DIR),
                 getEngineConfigString(CONF_PRELOAD_GLOB, Processor.DEF_PRELOAD_GLOB),
-                Boolean.parseBoolean(getEngineConfigString(CONF_RESTREAM_HELICITY,"false")));
-        }
-        if (null != getEngineConfigString(CONF_REBUILD_SCALERS)) {
-            if (Boolean.getBoolean(getEngineConfigString(CONF_REBUILD_SCALERS))) {
-                //processor.rebuildAndReplace();
-            }
+                Boolean.parseBoolean(getEngineConfigString(CONF_RESTREAM_HELICITY,"false")),
+                Boolean.parseBoolean(getEngineConfigString(CONF_REBUILD_SCALERS,"true")));
         }
         return true;
     }
 
     @Override
     public boolean processDataEvent(DataEvent event) {
-        if (processor != null) processor.processEvent(event);
+        processor.processEvent(event);
         return true;
     }
 
