Iss782: Test run file cleanup

analysis/src/main/java/org/hps/analysis/ecal/EcalHitPlots.java

@@ -10,7 +10,7 @@
 import org.hps.recon.ecal.EcalUtils;
 import org.hps.record.triggerbank.AbstractIntData;
 import org.hps.record.triggerbank.SSPData;
-import org.hps.record.triggerbank.TestRunTriggerData;
+import org.hps.record.triggerbank.BaseTriggerData;
 import org.lcsim.event.CalorimeterHit;
 import org.lcsim.event.EventHeader;
 import org.lcsim.event.GenericObject;
@@ -155,8 +155,8 @@ public void process(EventHeader event) {
         if (event.hasCollection(GenericObject.class, "TriggerBank")) {
             List<GenericObject> triggerList = event.get(GenericObject.class, "TriggerBank");
             for (GenericObject data : triggerList) {
-                if (AbstractIntData.getTag(data) == TestRunTriggerData.BANK_TAG) {
-                    TestRunTriggerData triggerData = new TestRunTriggerData(data);
+                if (AbstractIntData.getTag(data) == BaseTriggerData.BANK_TAG) {
+                    BaseTriggerData triggerData = new BaseTriggerData(data);
 
                     int orTrig = triggerData.getOrTrig();
                     if (orTrig != 0) {

conditions/src/main/java/org/hps/conditions/database/DatabaseConditionsManager.java

@@ -25,12 +25,10 @@
 import org.hps.conditions.api.TableRegistry;
 import org.hps.conditions.ecal.EcalConditions;
 import org.hps.conditions.ecal.EcalConditionsConverter;
-import org.hps.conditions.ecal.TestRunEcalConditionsConverter;
 import org.hps.conditions.hodoscope.HodoscopeConditions;
 import org.hps.conditions.hodoscope.HodoscopeConditionsConverter;
 import org.hps.conditions.svt.SvtConditions;
 import org.hps.conditions.svt.SvtConditionsConverter;
-import org.hps.conditions.svt.TestRunSvtConditionsConverter;
 import org.lcsim.conditions.ConditionsConverter;
 import org.lcsim.conditions.ConditionsManager;
 import org.lcsim.conditions.ConditionsManagerImplementation;
@@ -203,16 +201,6 @@ public static DatabaseConditionsManager getInstance() {
         return INSTANCE;
     }
 
-    /**
-     * Utility method to determine if a run number is from the 2012 Test Run.
-     *
-     * @param runNumber the run number
-     * @return <code>true</code> if run number is from the Test Run
-     */
-    public static boolean isTestRun(final int runNumber) {
-        return runNumber > 0 && runNumber <= TEST_RUN_MAX_RUN;
-    }
-
     /**
      * Utility method to determine if a run number is from the 2019 Physics Run.
      *
@@ -261,11 +249,6 @@ public static boolean isPhys2019Run(final int runNumber) {
      */
     private boolean isInitialized = false;
 
-    /**
-     * True if current run number is from Test Run.
-     */
-    private boolean isTestRun = false;
-
     /**
      * The converter for creating the combined SVT conditions object.
      */
@@ -667,15 +650,6 @@ public static void reset() {
         INSTANCE = new DatabaseConditionsManager();
     }
 
-    /**
-     * Return <code>true</code> if Test Run configuration is active
-     *
-     * @return <code>true</code> if Test Run configuration is active
-     */
-    public boolean isTestRun() {
-        return this.isTestRun;
-    }
-
     /**
      * Create a new collection with the given type.
      *
@@ -757,17 +731,11 @@ private void registerConverters() {
             this.removeConditionsConverter(this.hodoscopeConverter);
         }
 
-        // Is configured for TestRun?
-        if (this.isTestRun()) {
-            // Load Test Run specific converters.
-            this.svtConverter = new TestRunSvtConditionsConverter();
-            this.ecalConverter = new TestRunEcalConditionsConverter();
-        } else {
-            // Load the default converters.
-            this.svtConverter = new SvtConditionsConverter();
-            this.ecalConverter = new EcalConditionsConverter();
-            this.hodoscopeConverter = new HodoscopeConditionsConverter();
-        }
+        // Load the default converters.
+        this.svtConverter = new SvtConditionsConverter();
+        this.ecalConverter = new EcalConditionsConverter();
+        this.hodoscopeConverter = new HodoscopeConditionsConverter();
+
         this.registerConditionsConverter(this.svtConverter);
         this.registerConditionsConverter(this.ecalConverter);
         if (this.hodoscopeConverter != null) {
@@ -809,11 +777,6 @@ public synchronized void setDetector(final String detectorName, final int runNum
 
                 LOG.config("Initializing conditions system with detector '" + detectorName + "' and run " + runNumber);
 
-                // Set flag if run number is from Test Run 2012 data.
-                if (isTestRun(runNumber)) {
-                    this.isTestRun = true;
-                }
-
                 // Register the converters for this initialization.
                 this.registerConverters();