Author: [log in to unmask]
Date: Thu Aug 20 16:40:54 2015
New Revision: 3388
Log:
Move packages from ecal-recon to record-util. HPSJAVA-581
Added:
java/trunk/record-util/src/main/java/org/hps/record/daqconfig/AbstractConfig.java
- copied, changed from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/AbstractConfig.java
java/trunk/record-util/src/main/java/org/hps/record/daqconfig/ConfigurationManager.java
- copied, changed from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/ConfigurationManager.java
java/trunk/record-util/src/main/java/org/hps/record/daqconfig/DAQConfig.java
- copied, changed from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/DAQConfig.java
java/trunk/record-util/src/main/java/org/hps/record/daqconfig/DAQConfigDriver.java
- copied, changed from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/DAQConfigDriver.java
java/trunk/record-util/src/main/java/org/hps/record/daqconfig/ESBCutConfig.java
- copied, changed from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/ESBCutConfig.java
java/trunk/record-util/src/main/java/org/hps/record/daqconfig/EvioDAQParser.java
- copied, changed from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/EvioDAQParser.java
java/trunk/record-util/src/main/java/org/hps/record/daqconfig/FADCConfig.java
- copied, changed from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/FADCConfig.java
java/trunk/record-util/src/main/java/org/hps/record/daqconfig/GTPConfig.java
- copied, changed from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/GTPConfig.java
java/trunk/record-util/src/main/java/org/hps/record/daqconfig/IDAQConfig.java
- copied, changed from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/IDAQConfig.java
java/trunk/record-util/src/main/java/org/hps/record/daqconfig/LBOCutConfig.java
- copied, changed from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/LBOCutConfig.java
java/trunk/record-util/src/main/java/org/hps/record/daqconfig/PairTriggerConfig.java
- copied, changed from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/PairTriggerConfig.java
java/trunk/record-util/src/main/java/org/hps/record/daqconfig/SSPConfig.java
- copied, changed from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/SSPConfig.java
java/trunk/record-util/src/main/java/org/hps/record/daqconfig/SinglesTriggerConfig.java
- copied, changed from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/SinglesTriggerConfig.java
java/trunk/record-util/src/main/java/org/hps/record/daqconfig/UBOCutConfig.java
- copied, changed from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/UBOCutConfig.java
java/trunk/record-util/src/main/java/org/hps/record/daqconfig/ULBCutConfig.java
- copied, changed from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/ULBCutConfig.java
java/trunk/record-util/src/main/java/org/hps/record/triggerbank/AbstractIntData.java
- copied, changed from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/AbstractIntData.java
java/trunk/record-util/src/main/java/org/hps/record/triggerbank/HeadBankData.java
- copied, changed from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/HeadBankData.java
java/trunk/record-util/src/main/java/org/hps/record/triggerbank/SSPCluster.java
- copied, changed from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/SSPCluster.java
java/trunk/record-util/src/main/java/org/hps/record/triggerbank/SSPCosmicTrigger.java
- copied, changed from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/SSPCosmicTrigger.java
java/trunk/record-util/src/main/java/org/hps/record/triggerbank/SSPData.java
- copied, changed from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/SSPData.java
java/trunk/record-util/src/main/java/org/hps/record/triggerbank/SSPNumberedTrigger.java
- copied, changed from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/SSPNumberedTrigger.java
java/trunk/record-util/src/main/java/org/hps/record/triggerbank/SSPPairTrigger.java
- copied, changed from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/SSPPairTrigger.java
java/trunk/record-util/src/main/java/org/hps/record/triggerbank/SSPSinglesTrigger.java
- copied, changed from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/SSPSinglesTrigger.java
java/trunk/record-util/src/main/java/org/hps/record/triggerbank/SSPTrigger.java
- copied, changed from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/SSPTrigger.java
java/trunk/record-util/src/main/java/org/hps/record/triggerbank/SSPTriggerFactory.java
- copied, changed from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/SSPTriggerFactory.java
java/trunk/record-util/src/main/java/org/hps/record/triggerbank/TDCData.java
- copied, changed from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/TDCData.java
java/trunk/record-util/src/main/java/org/hps/record/triggerbank/TIData.java
- copied, changed from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/TIData.java
java/trunk/record-util/src/main/java/org/hps/record/triggerbank/TestRunTriggerData.java
- copied, changed from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/TestRunTriggerData.java
java/trunk/record-util/src/main/java/org/hps/record/triggerbank/TriggerModule.java
- copied, changed from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/TriggerModule.java
Removed:
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/AbstractConfig.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/ConfigurationManager.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/DAQConfig.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/DAQConfigDriver.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/ESBCutConfig.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/EvioDAQParser.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/FADCConfig.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/GTPConfig.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/IDAQConfig.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/LBOCutConfig.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/PairTriggerConfig.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/SSPConfig.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/SinglesTriggerConfig.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/UBOCutConfig.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/ULBCutConfig.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/AbstractIntData.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/HeadBankData.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/SSPCluster.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/SSPCosmicTrigger.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/SSPData.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/SSPNumberedTrigger.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/SSPPairTrigger.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/SSPSinglesTrigger.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/SSPTrigger.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/SSPTriggerFactory.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/TDCData.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/TIData.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/TestRunTriggerData.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/TriggerModule.java
Modified:
java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/DataQualityMonitor.java
java/trunk/analysis/src/main/java/org/hps/analysis/ecal/EcalHitPlots.java
java/trunk/analysis/src/main/java/org/hps/analysis/trigger/TriggerDiagnosticDriver.java
java/trunk/analysis/src/main/java/org/hps/analysis/trigger/data/ClusterMatchedPair.java
java/trunk/analysis/src/main/java/org/hps/analysis/trigger/data/DetailedClusterEvent.java
java/trunk/analysis/src/main/java/org/hps/analysis/trigger/event/TriggerPlotsModule.java
java/trunk/analysis/src/main/java/org/hps/analysis/trigger/util/PairTrigger.java
java/trunk/analysis/src/main/java/org/hps/analysis/trigger/util/SinglesTrigger.java
java/trunk/analysis/src/main/java/org/hps/analysis/trigger/util/TriggerDiagnosticUtil.java
java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/FADCPrimaryTriggerDriver.java
java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/ReadoutTrigger.java
java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/SinglesTriggerDriver.java
java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/TestRunTriggerDriver.java
java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/TriggerDriver.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalOnlineRawConverter.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalOnlineRawConverterDriver.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverter.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverterDriver.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/GTPOnlineClusterDriver.java
java/trunk/monitoring-app/src/main/java/org/hps/monitoring/application/util/SyncEventProcessor.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SampleZeroHVBiasChecker.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SensorOccupancyPlotsDriver.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SvtTimingInPlots.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/trackrecon/TrackTimePlots.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalClusterPlots.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalHitPlots.java
java/trunk/recon/src/main/java/org/hps/recon/filtering/TriggerTypeFilter.java
java/trunk/record-util/src/main/java/org/hps/job/JobManager.java
java/trunk/record-util/src/main/java/org/hps/record/evio/EvioFileMetaDataReader.java
java/trunk/users/src/main/java/org/hps/users/baltzell/EcalRawConverter.java
java/trunk/users/src/main/java/org/hps/users/baltzell/EcalRawConverterDriver.java
java/trunk/users/src/main/java/org/hps/users/celentan/DummyDriverRaw.java
java/trunk/users/src/main/java/org/hps/users/holly/EcalRawConverter.java
java/trunk/users/src/main/java/org/hps/users/kmccarty/InvariantMassPairDriver.java
java/trunk/users/src/main/java/org/hps/users/kmccarty/MTEAnalysis.java
java/trunk/users/src/main/java/org/hps/users/kmccarty/TriggerPlotsModule.java
java/trunk/users/src/main/java/org/hps/users/luca/FeeCalibHistCreator.java
java/trunk/users/src/main/java/org/hps/users/luca/rate.java
java/trunk/users/src/main/java/org/hps/users/luca/ratetest.java
java/trunk/users/src/main/java/org/hps/users/meeg/TDCPrintDriver.java
java/trunk/users/src/main/java/org/hps/users/mgraham/PositronDebug.java
java/trunk/users/src/main/java/org/hps/users/phansson/ROOTFlatTupleDriver.java
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/DataQualityMonitor.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/DataQualityMonitor.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/DataQualityMonitor.java Thu Aug 20 16:40:54 2015
@@ -7,8 +7,9 @@
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.hps.recon.ecal.triggerbank.AbstractIntData;
-import org.hps.recon.ecal.triggerbank.TIData;
+
+import org.hps.record.triggerbank.AbstractIntData;
+import org.hps.record.triggerbank.TIData;
import org.lcsim.event.EventHeader;
import org.lcsim.event.GenericObject;
import org.lcsim.util.Driver;
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/ecal/EcalHitPlots.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/ecal/EcalHitPlots.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/ecal/EcalHitPlots.java Thu Aug 20 16:40:54 2015
@@ -8,9 +8,9 @@
import java.util.List;
import org.hps.recon.ecal.EcalUtils;
-import org.hps.recon.ecal.triggerbank.AbstractIntData;
-import org.hps.recon.ecal.triggerbank.SSPData;
-import org.hps.recon.ecal.triggerbank.TestRunTriggerData;
+import org.hps.record.triggerbank.AbstractIntData;
+import org.hps.record.triggerbank.SSPData;
+import org.hps.record.triggerbank.TestRunTriggerData;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
import org.lcsim.event.GenericObject;
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/trigger/TriggerDiagnosticDriver.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/trigger/TriggerDiagnosticDriver.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/trigger/TriggerDiagnosticDriver.java Thu Aug 20 16:40:54 2015
@@ -29,19 +29,19 @@
import org.hps.analysis.trigger.util.SinglesTrigger;
import org.hps.analysis.trigger.util.Trigger;
import org.hps.analysis.trigger.util.TriggerDiagnosticUtil;
-import org.hps.recon.ecal.daqconfig.ConfigurationManager;
-import org.hps.recon.ecal.daqconfig.DAQConfig;
-import org.hps.recon.ecal.daqconfig.PairTriggerConfig;
-import org.hps.recon.ecal.daqconfig.SinglesTriggerConfig;
-import org.hps.recon.ecal.triggerbank.AbstractIntData;
-import org.hps.recon.ecal.triggerbank.SSPCluster;
-import org.hps.recon.ecal.triggerbank.SSPData;
-import org.hps.recon.ecal.triggerbank.SSPNumberedTrigger;
-import org.hps.recon.ecal.triggerbank.SSPPairTrigger;
-import org.hps.recon.ecal.triggerbank.SSPSinglesTrigger;
-import org.hps.recon.ecal.triggerbank.SSPTrigger;
-import org.hps.recon.ecal.triggerbank.TIData;
-import org.hps.recon.ecal.triggerbank.TriggerModule;
+import org.hps.record.daqconfig.ConfigurationManager;
+import org.hps.record.daqconfig.DAQConfig;
+import org.hps.record.daqconfig.PairTriggerConfig;
+import org.hps.record.daqconfig.SinglesTriggerConfig;
+import org.hps.record.triggerbank.AbstractIntData;
+import org.hps.record.triggerbank.SSPCluster;
+import org.hps.record.triggerbank.SSPData;
+import org.hps.record.triggerbank.SSPNumberedTrigger;
+import org.hps.record.triggerbank.SSPPairTrigger;
+import org.hps.record.triggerbank.SSPSinglesTrigger;
+import org.hps.record.triggerbank.SSPTrigger;
+import org.hps.record.triggerbank.TIData;
+import org.hps.record.triggerbank.TriggerModule;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.Cluster;
import org.lcsim.event.EventHeader;
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/trigger/data/ClusterMatchedPair.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/trigger/data/ClusterMatchedPair.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/trigger/data/ClusterMatchedPair.java Thu Aug 20 16:40:54 2015
@@ -2,7 +2,7 @@
import org.hps.analysis.trigger.util.Pair;
import org.hps.analysis.trigger.util.TriggerDiagnosticUtil;
-import org.hps.recon.ecal.triggerbank.SSPCluster;
+import org.hps.record.triggerbank.SSPCluster;
import org.lcsim.event.Cluster;
/**
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/trigger/data/DetailedClusterEvent.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/trigger/data/DetailedClusterEvent.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/trigger/data/DetailedClusterEvent.java Thu Aug 20 16:40:54 2015
@@ -4,7 +4,7 @@
import java.util.List;
import org.hps.analysis.trigger.util.TriggerDiagnosticUtil;
-import org.hps.recon.ecal.triggerbank.SSPCluster;
+import org.hps.record.triggerbank.SSPCluster;
import org.lcsim.event.Cluster;
public class DetailedClusterEvent extends ClusterEvent {
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/trigger/event/TriggerPlotsModule.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/trigger/event/TriggerPlotsModule.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/trigger/event/TriggerPlotsModule.java Thu Aug 20 16:40:54 2015
@@ -1,8 +1,8 @@
package org.hps.analysis.trigger.event;
import org.hps.analysis.trigger.util.Trigger;
-import org.hps.recon.ecal.triggerbank.SSPCluster;
-import org.hps.recon.ecal.triggerbank.TriggerModule;
+import org.hps.record.triggerbank.SSPCluster;
+import org.hps.record.triggerbank.TriggerModule;
import org.lcsim.event.Cluster;
import org.lcsim.util.aida.AIDA;
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/trigger/util/PairTrigger.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/trigger/util/PairTrigger.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/trigger/util/PairTrigger.java Thu Aug 20 16:40:54 2015
@@ -1,6 +1,6 @@
package org.hps.analysis.trigger.util;
-import org.hps.recon.ecal.triggerbank.TriggerModule;
+import org.hps.record.triggerbank.TriggerModule;
public class PairTrigger<E> extends SinglesTrigger<E> {
// Define the supported trigger cuts.
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/trigger/util/SinglesTrigger.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/trigger/util/SinglesTrigger.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/trigger/util/SinglesTrigger.java Thu Aug 20 16:40:54 2015
@@ -1,6 +1,6 @@
package org.hps.analysis.trigger.util;
-import org.hps.recon.ecal.triggerbank.TriggerModule;
+import org.hps.record.triggerbank.TriggerModule;
public class SinglesTrigger<E> extends Trigger<E> {
// Define the supported trigger cuts.
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/trigger/util/TriggerDiagnosticUtil.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/trigger/util/TriggerDiagnosticUtil.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/trigger/util/TriggerDiagnosticUtil.java Thu Aug 20 16:40:54 2015
@@ -3,7 +3,7 @@
import java.awt.Point;
import org.hps.analysis.trigger.data.TriggerStatModule;
-import org.hps.recon.ecal.triggerbank.SSPCluster;
+import org.hps.record.triggerbank.SSPCluster;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.Cluster;
Modified: java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/FADCPrimaryTriggerDriver.java
=============================================================================
--- java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/FADCPrimaryTriggerDriver.java (original)
+++ java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/FADCPrimaryTriggerDriver.java Thu Aug 20 16:40:54 2015
@@ -9,7 +9,7 @@
import java.util.Queue;
import org.hps.recon.ecal.EcalUtils;
-import org.hps.recon.ecal.triggerbank.TriggerModule;
+import org.hps.record.triggerbank.TriggerModule;
import org.lcsim.event.Cluster;
import org.lcsim.event.EventHeader;
import org.lcsim.util.aida.AIDA;
Modified: java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/ReadoutTrigger.java
=============================================================================
--- java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/ReadoutTrigger.java (original)
+++ java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/ReadoutTrigger.java Thu Aug 20 16:40:54 2015
@@ -8,7 +8,7 @@
import java.util.List;
import java.util.Set;
-import org.hps.recon.ecal.triggerbank.TriggerModule;
+import org.hps.record.triggerbank.TriggerModule;
import org.lcsim.event.Cluster;
import org.lcsim.event.EventHeader;
import org.lcsim.util.Driver;
Modified: java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/SinglesTriggerDriver.java
=============================================================================
--- java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/SinglesTriggerDriver.java (original)
+++ java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/SinglesTriggerDriver.java Thu Aug 20 16:40:54 2015
@@ -2,11 +2,13 @@
import hep.aida.IHistogram1D;
import hep.aida.IHistogram2D;
+
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import java.util.Queue;
-import org.hps.recon.ecal.triggerbank.TriggerModule;
+
+import org.hps.record.triggerbank.TriggerModule;
import org.lcsim.event.Cluster;
import org.lcsim.event.EventHeader;
import org.lcsim.util.aida.AIDA;
Modified: java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/TestRunTriggerDriver.java
=============================================================================
--- java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/TestRunTriggerDriver.java (original)
+++ java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/TestRunTriggerDriver.java Thu Aug 20 16:40:54 2015
@@ -3,7 +3,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.hps.recon.ecal.triggerbank.TestRunTriggerData;
+import org.hps.record.triggerbank.TestRunTriggerData;
import org.lcsim.event.Cluster;
import org.lcsim.event.EventHeader;
Modified: java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/TriggerDriver.java
=============================================================================
--- java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/TriggerDriver.java (original)
+++ java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/TriggerDriver.java Thu Aug 20 16:40:54 2015
@@ -10,7 +10,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.hps.recon.ecal.triggerbank.TestRunTriggerData;
+import org.hps.record.triggerbank.TestRunTriggerData;
import org.lcsim.event.EventHeader;
import org.lcsim.lcio.LCIOWriter;
Modified: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalOnlineRawConverter.java
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalOnlineRawConverter.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalOnlineRawConverter.java Thu Aug 20 16:40:54 2015
@@ -5,8 +5,8 @@
import java.awt.event.ActionListener;
import java.util.ArrayList;
-import org.hps.recon.ecal.daqconfig.ConfigurationManager;
-import org.hps.recon.ecal.daqconfig.FADCConfig;
+import org.hps.record.daqconfig.ConfigurationManager;
+import org.hps.record.daqconfig.FADCConfig;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
import org.lcsim.event.GenericObject;
Modified: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalOnlineRawConverterDriver.java
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalOnlineRawConverterDriver.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalOnlineRawConverterDriver.java Thu Aug 20 16:40:54 2015
@@ -3,7 +3,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.hps.recon.ecal.daqconfig.ConfigurationManager;
+import org.hps.record.daqconfig.ConfigurationManager;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
import org.lcsim.event.GenericObject;
Modified: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverter.java
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverter.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverter.java Thu Aug 20 16:40:54 2015
@@ -11,8 +11,8 @@
import org.hps.conditions.ecal.EcalChannel;
import org.hps.conditions.ecal.EcalChannelConstants;
import org.hps.conditions.ecal.EcalConditions;
-import org.hps.recon.ecal.daqconfig.ConfigurationManager;
-import org.hps.recon.ecal.daqconfig.FADCConfig;
+import org.hps.record.daqconfig.ConfigurationManager;
+import org.hps.record.daqconfig.FADCConfig;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
import org.lcsim.event.GenericObject;
Modified: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverterDriver.java
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverterDriver.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverterDriver.java Thu Aug 20 16:40:54 2015
@@ -6,7 +6,7 @@
import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.conditions.ecal.EcalChannelConstants;
import org.hps.conditions.ecal.EcalConditions;
-import org.hps.recon.ecal.daqconfig.ConfigurationManager;
+import org.hps.record.daqconfig.ConfigurationManager;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
import org.lcsim.event.GenericObject;
Modified: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/GTPOnlineClusterDriver.java
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/GTPOnlineClusterDriver.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/GTPOnlineClusterDriver.java Thu Aug 20 16:40:54 2015
@@ -3,8 +3,8 @@
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import org.hps.recon.ecal.daqconfig.ConfigurationManager;
-import org.hps.recon.ecal.daqconfig.GTPConfig;
+import org.hps.record.daqconfig.ConfigurationManager;
+import org.hps.record.daqconfig.GTPConfig;
import org.lcsim.event.EventHeader;
/**
@@ -36,7 +36,7 @@
* @author Kyle McCarty <[log in to unmask]>
* @see GTPOnlineClusterer
* @see ConfigurationManager
- * @see org.hps.recon.ecal.daqconfig.DAQConfigDriver
+ * @see org.hps.record.daqconfig.DAQConfigDriver
*/
public class GTPOnlineClusterDriver extends ClusterDriver {
/** An instance of the clustering algorithm object for producing
@@ -86,7 +86,7 @@
* static class has received a DAQ configuration from the event
* stream and is initialized. Driver <code>DAQConfigDriver</code>
* must be in the driver chain for this to occur.
- * @see org.hps.recon.ecal.daqconfig.DAQConfigDriver
+ * @see org.hps.record.daqconfig.DAQConfigDriver
*/
@Override
public void process(EventHeader event) {
@@ -165,7 +165,7 @@
* of the driver chain, then no clusters will ever be created.
* @param state - <code>true</code> means that DAQ configuration
* will be used and <code>false</code> that it will not.
- * @see org.hps.recon.ecal.daqconfig.DAQConfigDriver
+ * @see org.hps.record.daqconfig.DAQConfigDriver
*/
public void setUseDAQConfig(boolean state) {
useDAQConfig = state;
Modified: java/trunk/monitoring-app/src/main/java/org/hps/monitoring/application/util/SyncEventProcessor.java
=============================================================================
--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/application/util/SyncEventProcessor.java (original)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/application/util/SyncEventProcessor.java Thu Aug 20 16:40:54 2015
@@ -4,8 +4,8 @@
import java.util.List;
import org.hps.evio.TriggerConfigEvioReader;
-import org.hps.recon.ecal.daqconfig.ConfigurationManager;
-import org.hps.recon.ecal.daqconfig.EvioDAQParser;
+import org.hps.record.daqconfig.ConfigurationManager;
+import org.hps.record.daqconfig.EvioDAQParser;
import org.hps.record.et.EtEventProcessor;
import org.hps.record.evio.EvioEventUtilities;
import org.jlab.coda.et.EtEvent;
@@ -19,8 +19,8 @@
* which have an event type in which bits 6 and 7 are set to 1.
*
* @author <a href="mailto:[log in to unmask]">Jeremy McCormick</a>
- * @see org.hps.recon.ecal.daqconfig.ConfigurationManager
- * @see org.hps.recon.ecal.daqconfig.EvioDAQParser
+ * @see org.hps.record.daqconfig.ConfigurationManager
+ * @see org.hps.record.daqconfig.EvioDAQParser
*/
// FIXME: This class is currently unused.
public final class SyncEventProcessor extends EtEventProcessor {
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SampleZeroHVBiasChecker.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SampleZeroHVBiasChecker.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SampleZeroHVBiasChecker.java Thu Aug 20 16:40:54 2015
@@ -7,6 +7,7 @@
import hep.aida.IPlotter;
import hep.aida.IPlotterFactory;
import hep.aida.ITree;
+
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
@@ -17,6 +18,7 @@
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
+
import org.hps.conditions.api.ConditionsRecord.ConditionsRecordCollection;
import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.conditions.run.RunSpreadsheet;
@@ -26,9 +28,9 @@
import org.hps.conditions.svt.SvtBiasMyaDataReader;
import org.hps.conditions.svt.SvtBiasMyaDataReader.SvtBiasMyaRange;
import org.hps.conditions.svt.SvtBiasMyaDataReader.SvtBiasRunRange;
-import org.hps.recon.ecal.triggerbank.AbstractIntData;
-import org.hps.recon.ecal.triggerbank.HeadBankData;
import org.hps.record.epics.EpicsData;
+import org.hps.record.triggerbank.AbstractIntData;
+import org.hps.record.triggerbank.HeadBankData;
import org.hps.util.BasicLogFormatter;
import org.lcsim.detector.tracker.silicon.HpsSiSensor;
import org.lcsim.event.EventHeader;
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SensorOccupancyPlotsDriver.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SensorOccupancyPlotsDriver.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SensorOccupancyPlotsDriver.java Thu Aug 20 16:40:54 2015
@@ -17,13 +17,14 @@
import hep.aida.jfree.plotter.PlotterRegion;
import hep.aida.ref.rootwriter.RootFileStore;
import hep.physics.vec.Hep3Vector;
+
import java.util.HashSet;
import java.util.Set;
+
import org.hps.monitoring.subsys.StatusCode;
import org.hps.monitoring.subsys.Subsystem;
import org.hps.monitoring.subsys.SystemStatus;
import org.hps.monitoring.subsys.SystemStatusImpl;
-
import org.lcsim.detector.tracker.silicon.HpsSiSensor;
import org.lcsim.detector.tracker.silicon.ChargeCarrier;
import org.lcsim.detector.tracker.silicon.SiStrips;
@@ -33,9 +34,8 @@
import org.lcsim.event.RawTrackerHit;
import org.lcsim.geometry.Detector;
import org.lcsim.util.Driver;
-
-import org.hps.recon.ecal.triggerbank.AbstractIntData;
-import org.hps.recon.ecal.triggerbank.TIData;
+import org.hps.record.triggerbank.AbstractIntData;
+import org.hps.record.triggerbank.TIData;
import org.lcsim.util.aida.AIDA;
/**
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SvtTimingInPlots.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SvtTimingInPlots.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SvtTimingInPlots.java Thu Aug 20 16:40:54 2015
@@ -23,13 +23,13 @@
import org.lcsim.event.LCRelation;
import org.lcsim.event.RawTrackerHit;
import org.lcsim.geometry.Detector;
-import org.hps.recon.ecal.triggerbank.SSPCluster;
-import org.hps.recon.ecal.triggerbank.SSPData;
-import org.hps.recon.ecal.triggerbank.AbstractIntData;
-import org.hps.recon.ecal.triggerbank.SSPSinglesTrigger;
-import org.hps.recon.ecal.triggerbank.TIData;
import org.hps.recon.tracking.FittedRawTrackerHit;
import org.hps.recon.tracking.ShapeFitParameters;
+import org.hps.record.triggerbank.AbstractIntData;
+import org.hps.record.triggerbank.SSPCluster;
+import org.hps.record.triggerbank.SSPData;
+import org.hps.record.triggerbank.SSPSinglesTrigger;
+import org.hps.record.triggerbank.TIData;
/**
* Monitoring driver that will be used when 'timing in' the SVT.
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/trackrecon/TrackTimePlots.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/trackrecon/TrackTimePlots.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/trackrecon/TrackTimePlots.java Thu Aug 20 16:40:54 2015
@@ -9,10 +9,11 @@
import hep.aida.ref.plotter.style.registry.StyleRegistry;
import java.util.List;
+
import static org.hps.monitoring.drivers.trackrecon.PlotAndFitUtilities.plot;
-import org.hps.recon.ecal.triggerbank.AbstractIntData;
-import org.hps.recon.ecal.triggerbank.TestRunTriggerData;
+import org.hps.record.triggerbank.AbstractIntData;
+import org.hps.record.triggerbank.TestRunTriggerData;
import org.lcsim.detector.tracker.silicon.DopedSilicon;
import org.lcsim.detector.tracker.silicon.HpsSiSensor;
import org.lcsim.event.EventHeader;
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalClusterPlots.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalClusterPlots.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalClusterPlots.java Thu Aug 20 16:40:54 2015
@@ -10,7 +10,7 @@
import org.apache.commons.math.stat.StatUtils;
import org.hps.recon.ecal.EcalUtils;
-import org.hps.recon.ecal.triggerbank.TriggerModule;
+import org.hps.record.triggerbank.TriggerModule;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.Cluster;
import org.lcsim.event.EventHeader;
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalHitPlots.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalHitPlots.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalHitPlots.java Thu Aug 20 16:40:54 2015
@@ -9,7 +9,7 @@
import java.util.List;
import org.hps.recon.ecal.EcalUtils;
-import org.hps.recon.ecal.triggerbank.SSPData;
+import org.hps.record.triggerbank.SSPData;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
import org.lcsim.event.GenericObject;
Modified: java/trunk/recon/src/main/java/org/hps/recon/filtering/TriggerTypeFilter.java
=============================================================================
--- java/trunk/recon/src/main/java/org/hps/recon/filtering/TriggerTypeFilter.java (original)
+++ java/trunk/recon/src/main/java/org/hps/recon/filtering/TriggerTypeFilter.java Thu Aug 20 16:40:54 2015
@@ -1,7 +1,7 @@
package org.hps.recon.filtering;
-import org.hps.recon.ecal.triggerbank.AbstractIntData;
-import org.hps.recon.ecal.triggerbank.TIData;
+import org.hps.record.triggerbank.AbstractIntData;
+import org.hps.record.triggerbank.TIData;
import org.lcsim.event.EventHeader;
import org.lcsim.event.GenericObject;
Modified: java/trunk/record-util/src/main/java/org/hps/job/JobManager.java
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/job/JobManager.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/job/JobManager.java Thu Aug 20 16:40:54 2015
@@ -2,6 +2,7 @@
import org.hps.conditions.ConditionsDriver;
import org.hps.conditions.database.DatabaseConditionsManager;
+import org.hps.record.run.RunManager;
import org.lcsim.job.JobControlManager;
import org.lcsim.util.Driver;
@@ -24,6 +25,11 @@
}
/**
+ * Flag to enable the run database in a job (enabled by default).
+ */
+ private boolean enableRunDatabase = false;
+
+ /**
* Class constructor.
*/
public JobManager() {
@@ -36,7 +42,8 @@
// Just don't print info if not accessible (running in test case?).
}
- // Always want to reset conditions system before starting the job.
+ // Always want to reset the conditions system before starting the job.
+ // FIXME: Should this happen in the run method instead?
DatabaseConditionsManager.resetInstance();
}
@@ -49,7 +56,13 @@
public final boolean run() {
// Setup the conditions if there is a ConditionsDriver present.
- setupConditions();
+ this.setupConditions();
+
+ // Is usage of run database enabled?
+ if (this.enableRunDatabase) {
+ // Enable the run database.
+ this.setupRunManager();
+ }
// Run the job.
final boolean result = super.run();
@@ -58,6 +71,15 @@
DatabaseConditionsManager.getInstance().closeConnection();
return result;
+ }
+
+ /**
+ * Enable the run database.
+ *
+ * @param enableRunDatabase <code>true</code> to enable run database
+ */
+ public void setEnableRunDatabase(final boolean enableRunDatabase) {
+ this.enableRunDatabase = enableRunDatabase;
}
/**
@@ -77,4 +99,12 @@
conditionsDriver.initialize();
}
}
+
+ /**
+ * Set the {@link org.hps.record.run.RunManager} for accessing the run database.
+ */
+ private void setupRunManager() {
+ final RunManager runManager = RunManager.getRunManager();
+ DatabaseConditionsManager.getInstance().addConditionsListener(runManager);
+ }
}
Copied: java/trunk/record-util/src/main/java/org/hps/record/daqconfig/AbstractConfig.java (from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/AbstractConfig.java)
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/AbstractConfig.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/record/daqconfig/AbstractConfig.java Thu Aug 20 16:40:54 2015
@@ -1,4 +1,4 @@
-package org.hps.recon.ecal.daqconfig;
+package org.hps.record.daqconfig;
import java.util.ArrayList;
import java.util.List;
Copied: java/trunk/record-util/src/main/java/org/hps/record/daqconfig/ConfigurationManager.java (from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/ConfigurationManager.java)
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/ConfigurationManager.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/record/daqconfig/ConfigurationManager.java Thu Aug 20 16:40:54 2015
@@ -1,4 +1,4 @@
-package org.hps.recon.ecal.daqconfig;
+package org.hps.record.daqconfig;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
Copied: java/trunk/record-util/src/main/java/org/hps/record/daqconfig/DAQConfig.java (from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/DAQConfig.java)
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/DAQConfig.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/record/daqconfig/DAQConfig.java Thu Aug 20 16:40:54 2015
@@ -1,4 +1,4 @@
-package org.hps.recon.ecal.daqconfig;
+package org.hps.record.daqconfig;
/**
* Class <code>DAQConfig</code> holds all of the supported parameters
Copied: java/trunk/record-util/src/main/java/org/hps/record/daqconfig/DAQConfigDriver.java (from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/DAQConfigDriver.java)
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/DAQConfigDriver.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/record/daqconfig/DAQConfigDriver.java Thu Aug 20 16:40:54 2015
@@ -1,4 +1,4 @@
-package org.hps.recon.ecal.daqconfig;
+package org.hps.record.daqconfig;
import java.util.List;
Copied: java/trunk/record-util/src/main/java/org/hps/record/daqconfig/ESBCutConfig.java (from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/ESBCutConfig.java)
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/ESBCutConfig.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/record/daqconfig/ESBCutConfig.java Thu Aug 20 16:40:54 2015
@@ -1,4 +1,4 @@
-package org.hps.recon.ecal.daqconfig;
+package org.hps.record.daqconfig;
/**
* Class <code>ESBCutConfig</code> is an implementation of the abstract
Copied: java/trunk/record-util/src/main/java/org/hps/record/daqconfig/EvioDAQParser.java (from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/EvioDAQParser.java)
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/EvioDAQParser.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/record/daqconfig/EvioDAQParser.java Thu Aug 20 16:40:54 2015
@@ -1,4 +1,4 @@
-package org.hps.recon.ecal.daqconfig;
+package org.hps.record.daqconfig;
import java.util.ArrayList;
import java.util.Arrays;
Copied: java/trunk/record-util/src/main/java/org/hps/record/daqconfig/FADCConfig.java (from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/FADCConfig.java)
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/FADCConfig.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/record/daqconfig/FADCConfig.java Thu Aug 20 16:40:54 2015
@@ -1,4 +1,4 @@
-package org.hps.recon.ecal.daqconfig;
+package org.hps.record.daqconfig;
import java.awt.Point;
import java.util.HashMap;
Copied: java/trunk/record-util/src/main/java/org/hps/record/daqconfig/GTPConfig.java (from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/GTPConfig.java)
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/GTPConfig.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/record/daqconfig/GTPConfig.java Thu Aug 20 16:40:54 2015
@@ -1,4 +1,4 @@
-package org.hps.recon.ecal.daqconfig;
+package org.hps.record.daqconfig;
/**
* Class <code>GTPConfig</code> stores GTP configuration settings
Copied: java/trunk/record-util/src/main/java/org/hps/record/daqconfig/IDAQConfig.java (from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/IDAQConfig.java)
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/IDAQConfig.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/record/daqconfig/IDAQConfig.java Thu Aug 20 16:40:54 2015
@@ -1,4 +1,4 @@
-package org.hps.recon.ecal.daqconfig;
+package org.hps.record.daqconfig;
/**
Copied: java/trunk/record-util/src/main/java/org/hps/record/daqconfig/LBOCutConfig.java (from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/LBOCutConfig.java)
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/LBOCutConfig.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/record/daqconfig/LBOCutConfig.java Thu Aug 20 16:40:54 2015
@@ -1,4 +1,4 @@
-package org.hps.recon.ecal.daqconfig;
+package org.hps.record.daqconfig;
/**
* Class <code>LBOCutConfig</code> is an implementation of the abstract
Copied: java/trunk/record-util/src/main/java/org/hps/record/daqconfig/PairTriggerConfig.java (from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/PairTriggerConfig.java)
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/PairTriggerConfig.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/record/daqconfig/PairTriggerConfig.java Thu Aug 20 16:40:54 2015
@@ -1,4 +1,4 @@
-package org.hps.recon.ecal.daqconfig;
+package org.hps.record.daqconfig;
/**
* Class <code>PairTriggerConfig</code> holds the configuration data
Copied: java/trunk/record-util/src/main/java/org/hps/record/daqconfig/SSPConfig.java (from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/SSPConfig.java)
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/SSPConfig.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/record/daqconfig/SSPConfig.java Thu Aug 20 16:40:54 2015
@@ -1,4 +1,4 @@
-package org.hps.recon.ecal.daqconfig;
+package org.hps.record.daqconfig;
/**
Copied: java/trunk/record-util/src/main/java/org/hps/record/daqconfig/SinglesTriggerConfig.java (from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/SinglesTriggerConfig.java)
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/SinglesTriggerConfig.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/record/daqconfig/SinglesTriggerConfig.java Thu Aug 20 16:40:54 2015
@@ -1,4 +1,4 @@
-package org.hps.recon.ecal.daqconfig;
+package org.hps.record.daqconfig;
/**
* Class <code>SinglesTriggerConfig</code> holds the configuration data
Copied: java/trunk/record-util/src/main/java/org/hps/record/daqconfig/UBOCutConfig.java (from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/UBOCutConfig.java)
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/UBOCutConfig.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/record/daqconfig/UBOCutConfig.java Thu Aug 20 16:40:54 2015
@@ -1,4 +1,4 @@
-package org.hps.recon.ecal.daqconfig;
+package org.hps.record.daqconfig;
/**
* Class <code>UBOCutConfig</code> is an implementation of the abstract
Copied: java/trunk/record-util/src/main/java/org/hps/record/daqconfig/ULBCutConfig.java (from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/ULBCutConfig.java)
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/ULBCutConfig.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/record/daqconfig/ULBCutConfig.java Thu Aug 20 16:40:54 2015
@@ -1,4 +1,4 @@
-package org.hps.recon.ecal.daqconfig;
+package org.hps.record.daqconfig;
/**
* Class <code>ULBCutConfig</code> is an implementation of the abstract
Modified: java/trunk/record-util/src/main/java/org/hps/record/evio/EvioFileMetaDataReader.java
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/record/evio/EvioFileMetaDataReader.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/record/evio/EvioFileMetaDataReader.java Thu Aug 20 16:40:54 2015
@@ -125,6 +125,8 @@
if (eventIdData != null) {
endEvent = eventIdData[0];
LOGGER.info("set end event " + endEvent);
+ } else {
+ throw new IllegalStateException("Missing last event ID data in " + evioFile.getPath());
}
} catch (EvioException | IOException e) {
throw new RuntimeException(e);
Copied: java/trunk/record-util/src/main/java/org/hps/record/triggerbank/AbstractIntData.java (from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/AbstractIntData.java)
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/AbstractIntData.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/record/triggerbank/AbstractIntData.java Thu Aug 20 16:40:54 2015
@@ -1,4 +1,4 @@
-package org.hps.recon.ecal.triggerbank;
+package org.hps.record.triggerbank;
import java.util.Arrays;
import org.lcsim.event.GenericObject;
Copied: java/trunk/record-util/src/main/java/org/hps/record/triggerbank/HeadBankData.java (from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/HeadBankData.java)
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/HeadBankData.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/record/triggerbank/HeadBankData.java Thu Aug 20 16:40:54 2015
@@ -1,4 +1,4 @@
-package org.hps.recon.ecal.triggerbank;
+package org.hps.record.triggerbank;
import java.util.Date;
import org.lcsim.event.GenericObject;
Copied: java/trunk/record-util/src/main/java/org/hps/record/triggerbank/SSPCluster.java (from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/SSPCluster.java)
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/SSPCluster.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/record/triggerbank/SSPCluster.java Thu Aug 20 16:40:54 2015
@@ -1,4 +1,4 @@
-package org.hps.recon.ecal.triggerbank;
+package org.hps.record.triggerbank;
import java.util.logging.Level;
import java.util.logging.Logger;
Copied: java/trunk/record-util/src/main/java/org/hps/record/triggerbank/SSPCosmicTrigger.java (from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/SSPCosmicTrigger.java)
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/SSPCosmicTrigger.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/record/triggerbank/SSPCosmicTrigger.java Thu Aug 20 16:40:54 2015
@@ -1,4 +1,4 @@
-package org.hps.recon.ecal.triggerbank;
+package org.hps.record.triggerbank;
/**
* Class <code>SSPCosmicTrigger</code> represents an SSP trigger for
Copied: java/trunk/record-util/src/main/java/org/hps/record/triggerbank/SSPData.java (from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/SSPData.java)
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/SSPData.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/record/triggerbank/SSPData.java Thu Aug 20 16:40:54 2015
@@ -1,4 +1,4 @@
-package org.hps.recon.ecal.triggerbank;
+package org.hps.record.triggerbank;
import org.lcsim.event.GenericObject;
Copied: java/trunk/record-util/src/main/java/org/hps/record/triggerbank/SSPNumberedTrigger.java (from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/SSPNumberedTrigger.java)
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/SSPNumberedTrigger.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/record/triggerbank/SSPNumberedTrigger.java Thu Aug 20 16:40:54 2015
@@ -1,4 +1,4 @@
-package org.hps.recon.ecal.triggerbank;
+package org.hps.record.triggerbank;
/**
* Abstract class <code>SSPNumberedTrigger</code> is used as a base
Copied: java/trunk/record-util/src/main/java/org/hps/record/triggerbank/SSPPairTrigger.java (from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/SSPPairTrigger.java)
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/SSPPairTrigger.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/record/triggerbank/SSPPairTrigger.java Thu Aug 20 16:40:54 2015
@@ -1,4 +1,4 @@
-package org.hps.recon.ecal.triggerbank;
+package org.hps.record.triggerbank;
/**
Copied: java/trunk/record-util/src/main/java/org/hps/record/triggerbank/SSPSinglesTrigger.java (from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/SSPSinglesTrigger.java)
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/SSPSinglesTrigger.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/record/triggerbank/SSPSinglesTrigger.java Thu Aug 20 16:40:54 2015
@@ -1,4 +1,4 @@
-package org.hps.recon.ecal.triggerbank;
+package org.hps.record.triggerbank;
/**
Copied: java/trunk/record-util/src/main/java/org/hps/record/triggerbank/SSPTrigger.java (from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/SSPTrigger.java)
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/SSPTrigger.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/record/triggerbank/SSPTrigger.java Thu Aug 20 16:40:54 2015
@@ -1,4 +1,4 @@
-package org.hps.recon.ecal.triggerbank;
+package org.hps.record.triggerbank;
import java.util.logging.Level;
import java.util.logging.Logger;
Copied: java/trunk/record-util/src/main/java/org/hps/record/triggerbank/SSPTriggerFactory.java (from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/SSPTriggerFactory.java)
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/SSPTriggerFactory.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/record/triggerbank/SSPTriggerFactory.java Thu Aug 20 16:40:54 2015
@@ -1,4 +1,4 @@
-package org.hps.recon.ecal.triggerbank;
+package org.hps.record.triggerbank;
/**
* Class <code>SSPTriggerFactory</code> builds <code>SSPTrigger<code>
Copied: java/trunk/record-util/src/main/java/org/hps/record/triggerbank/TDCData.java (from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/TDCData.java)
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/TDCData.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/record/triggerbank/TDCData.java Thu Aug 20 16:40:54 2015
@@ -1,4 +1,4 @@
-package org.hps.recon.ecal.triggerbank;
+package org.hps.record.triggerbank;
import java.util.ArrayList;
import java.util.List;
Copied: java/trunk/record-util/src/main/java/org/hps/record/triggerbank/TIData.java (from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/TIData.java)
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/TIData.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/record/triggerbank/TIData.java Thu Aug 20 16:40:54 2015
@@ -1,4 +1,4 @@
-package org.hps.recon.ecal.triggerbank;
+package org.hps.record.triggerbank;
import org.lcsim.event.GenericObject;
Copied: java/trunk/record-util/src/main/java/org/hps/record/triggerbank/TestRunTriggerData.java (from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/TestRunTriggerData.java)
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/TestRunTriggerData.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/record/triggerbank/TestRunTriggerData.java Thu Aug 20 16:40:54 2015
@@ -1,4 +1,4 @@
-package org.hps.recon.ecal.triggerbank;
+package org.hps.record.triggerbank;
import org.lcsim.event.GenericObject;
Copied: java/trunk/record-util/src/main/java/org/hps/record/triggerbank/TriggerModule.java (from r3385, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/TriggerModule.java)
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/triggerbank/TriggerModule.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/record/triggerbank/TriggerModule.java Thu Aug 20 16:40:54 2015
@@ -1,11 +1,11 @@
-package org.hps.recon.ecal.triggerbank;
+package org.hps.record.triggerbank;
import java.util.HashMap;
import java.util.Map;
import java.util.StringTokenizer;
-import org.hps.recon.ecal.daqconfig.PairTriggerConfig;
-import org.hps.recon.ecal.daqconfig.SinglesTriggerConfig;
+import org.hps.record.daqconfig.PairTriggerConfig;
+import org.hps.record.daqconfig.SinglesTriggerConfig;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.Cluster;
Modified: java/trunk/users/src/main/java/org/hps/users/baltzell/EcalRawConverter.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/baltzell/EcalRawConverter.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/baltzell/EcalRawConverter.java Thu Aug 20 16:40:54 2015
@@ -3,6 +3,7 @@
import hep.aida.IFitResult;
//import hep.aida.IHistogram1D;
//import hep.aida.IHistogram2D;
+
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@ -19,8 +20,8 @@
import org.hps.recon.ecal.CalorimeterHitUtilities;
import org.hps.recon.ecal.EcalTimeWalk;
import org.hps.recon.ecal.EcalUtils;
-import org.hps.recon.ecal.daqconfig.ConfigurationManager;
-import org.hps.recon.ecal.daqconfig.FADCConfig;
+import org.hps.record.daqconfig.ConfigurationManager;
+import org.hps.record.daqconfig.FADCConfig;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
import org.lcsim.event.GenericObject;
Modified: java/trunk/users/src/main/java/org/hps/users/baltzell/EcalRawConverterDriver.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/baltzell/EcalRawConverterDriver.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/baltzell/EcalRawConverterDriver.java Thu Aug 20 16:40:54 2015
@@ -6,7 +6,7 @@
import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.conditions.ecal.EcalChannelConstants;
import org.hps.conditions.ecal.EcalConditions;
-import org.hps.recon.ecal.daqconfig.ConfigurationManager;
+import org.hps.record.daqconfig.ConfigurationManager;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
import org.lcsim.event.GenericObject;
Modified: java/trunk/users/src/main/java/org/hps/users/celentan/DummyDriverRaw.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/celentan/DummyDriverRaw.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/celentan/DummyDriverRaw.java Thu Aug 20 16:40:54 2015
@@ -5,8 +5,8 @@
import org.lcsim.event.EventHeader;
import org.lcsim.geometry.Detector;
import org.lcsim.util.Driver;
-import org.hps.recon.ecal.triggerbank.AbstractIntData;
-import org.hps.recon.ecal.triggerbank.SSPData;
+import org.hps.record.triggerbank.AbstractIntData;
+import org.hps.record.triggerbank.SSPData;
import org.lcsim.event.GenericObject;
public class DummyDriverRaw extends Driver {
Modified: java/trunk/users/src/main/java/org/hps/users/holly/EcalRawConverter.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/holly/EcalRawConverter.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/holly/EcalRawConverter.java Thu Aug 20 16:40:54 2015
@@ -9,8 +9,6 @@
import org.hps.conditions.ecal.EcalChannel;
import org.hps.conditions.ecal.EcalChannelConstants;
import org.hps.conditions.ecal.EcalConditions;
-import org.hps.recon.ecal.daqconfig.ConfigurationManager;
-import org.hps.recon.ecal.daqconfig.FADCConfig;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
import org.lcsim.event.GenericObject;
@@ -21,6 +19,8 @@
import org.hps.recon.ecal.EcalUtils;
import org.hps.recon.ecal.EcalTimeWalk;
import org.hps.recon.ecal.CalorimeterHitUtilities;
+import org.hps.record.daqconfig.ConfigurationManager;
+import org.hps.record.daqconfig.FADCConfig;
/**
* This class is used to convert {@link org.lcsim.event.RawCalorimeterHit}
Modified: java/trunk/users/src/main/java/org/hps/users/kmccarty/InvariantMassPairDriver.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/kmccarty/InvariantMassPairDriver.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/kmccarty/InvariantMassPairDriver.java Thu Aug 20 16:40:54 2015
@@ -7,7 +7,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.hps.recon.ecal.triggerbank.TriggerModule;
+import org.hps.record.triggerbank.TriggerModule;
import org.lcsim.event.Cluster;
import org.lcsim.event.EventHeader;
import org.lcsim.event.ReconstructedParticle;
Modified: java/trunk/users/src/main/java/org/hps/users/kmccarty/MTEAnalysis.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/kmccarty/MTEAnalysis.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/kmccarty/MTEAnalysis.java Thu Aug 20 16:40:54 2015
@@ -10,8 +10,8 @@
import java.util.Map;
import java.util.Map.Entry;
-import org.hps.recon.ecal.triggerbank.AbstractIntData;
-import org.hps.recon.ecal.triggerbank.TIData;
+import org.hps.record.triggerbank.AbstractIntData;
+import org.hps.record.triggerbank.TIData;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.Cluster;
import org.lcsim.event.EventHeader;
Modified: java/trunk/users/src/main/java/org/hps/users/kmccarty/TriggerPlotsModule.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/kmccarty/TriggerPlotsModule.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/kmccarty/TriggerPlotsModule.java Thu Aug 20 16:40:54 2015
@@ -3,7 +3,7 @@
import hep.aida.IHistogram1D;
import hep.aida.IHistogram2D;
-import org.hps.recon.ecal.triggerbank.TriggerModule;
+import org.hps.record.triggerbank.TriggerModule;
import org.lcsim.event.Cluster;
import org.lcsim.util.aida.AIDA;
Modified: java/trunk/users/src/main/java/org/hps/users/luca/FeeCalibHistCreator.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/luca/FeeCalibHistCreator.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/luca/FeeCalibHistCreator.java Thu Aug 20 16:40:54 2015
@@ -6,19 +6,19 @@
package org.hps.users.luca;
import hep.aida.IHistogram1D;
import hep.aida.IHistogram2D;
+
import java.io.FileWriter;
import java.io.IOException;
-
import java.util.ArrayList;
import java.util.List;
+
import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.conditions.ecal.EcalChannel;
-
import org.hps.conditions.ecal.EcalChannel.EcalChannelCollection;
import org.hps.conditions.ecal.EcalChannelConstants;
import org.hps.conditions.ecal.EcalConditions;
-import org.hps.recon.ecal.triggerbank.AbstractIntData;
-import org.hps.recon.ecal.triggerbank.TIData;
+import org.hps.record.triggerbank.AbstractIntData;
+import org.hps.record.triggerbank.TIData;
import org.lcsim.conditions.ConditionsManager;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.Cluster;
Modified: java/trunk/users/src/main/java/org/hps/users/luca/rate.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/luca/rate.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/luca/rate.java Thu Aug 20 16:40:54 2015
@@ -9,8 +9,10 @@
import org.lcsim.util.Driver;
+
import hep.aida.IHistogram1D;
import hep.aida.IHistogram2D;
+
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileWriter;
@@ -22,11 +24,9 @@
import java.util.List;
import org.hps.conditions.ecal.EcalChannel.EcalChannelCollection;
-
import org.hps.conditions.ecal.EcalConditions;
-import org.hps.recon.ecal.triggerbank.AbstractIntData;
-import org.hps.recon.ecal.triggerbank.TIData;
-
+import org.hps.record.triggerbank.AbstractIntData;
+import org.hps.record.triggerbank.TIData;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.Cluster;
import org.lcsim.event.EventHeader;
Modified: java/trunk/users/src/main/java/org/hps/users/luca/ratetest.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/luca/ratetest.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/luca/ratetest.java Thu Aug 20 16:40:54 2015
@@ -9,8 +9,10 @@
import org.lcsim.util.Driver;
+
import hep.aida.IHistogram1D;
import hep.aida.IHistogram2D;
+
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileWriter;
@@ -22,11 +24,9 @@
import java.util.List;
import org.hps.conditions.ecal.EcalChannel.EcalChannelCollection;
-
import org.hps.conditions.ecal.EcalConditions;
-import org.hps.recon.ecal.triggerbank.AbstractIntData;
-import org.hps.recon.ecal.triggerbank.TIData;
-
+import org.hps.record.triggerbank.AbstractIntData;
+import org.hps.record.triggerbank.TIData;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.Cluster;
import org.lcsim.event.EventHeader;
Modified: java/trunk/users/src/main/java/org/hps/users/meeg/TDCPrintDriver.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/meeg/TDCPrintDriver.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/meeg/TDCPrintDriver.java Thu Aug 20 16:40:54 2015
@@ -2,12 +2,13 @@
import java.util.ArrayList;
import java.util.List;
+
import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.conditions.ecal.EcalConditions;
import org.hps.recon.ecal.FADCGenericHit;
-import org.hps.recon.ecal.triggerbank.AbstractIntData;
-import org.hps.recon.ecal.triggerbank.TDCData;
-import org.hps.recon.ecal.triggerbank.TDCData.TDCHit;
+import org.hps.record.triggerbank.AbstractIntData;
+import org.hps.record.triggerbank.TDCData;
+import org.hps.record.triggerbank.TDCData.TDCHit;
import org.lcsim.event.EventHeader;
import org.lcsim.event.GenericObject;
import org.lcsim.event.RawTrackerHit;
Modified: java/trunk/users/src/main/java/org/hps/users/mgraham/PositronDebug.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/mgraham/PositronDebug.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/mgraham/PositronDebug.java Thu Aug 20 16:40:54 2015
@@ -2,10 +2,12 @@
import hep.aida.IHistogram1D;
import hep.aida.IHistogram2D;
+
import java.util.ArrayList;
import java.util.List;
-import org.hps.recon.ecal.triggerbank.AbstractIntData;
-import org.hps.recon.ecal.triggerbank.TIData;
+
+import org.hps.record.triggerbank.AbstractIntData;
+import org.hps.record.triggerbank.TIData;
import org.lcsim.detector.tracker.silicon.HpsSiSensor;
import org.lcsim.event.EventHeader;
import org.lcsim.event.GenericObject;
Modified: java/trunk/users/src/main/java/org/hps/users/phansson/ROOTFlatTupleDriver.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/ROOTFlatTupleDriver.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/ROOTFlatTupleDriver.java Thu Aug 20 16:40:54 2015
@@ -21,8 +21,6 @@
import java.util.logging.Logger;
import org.hps.analysis.ecal.HPSMCParticlePlotsDriver;
-import org.hps.recon.ecal.triggerbank.AbstractIntData;
-import org.hps.recon.ecal.triggerbank.TestRunTriggerData;
import org.hps.recon.tracking.BeamlineConstants;
import org.hps.recon.tracking.EventQuality;
import org.hps.recon.tracking.HPSTrack;
@@ -31,6 +29,8 @@
import org.hps.recon.vertexing.TwoParticleVertexer;
import org.hps.recon.vertexing.TwoTrackFringeVertexer;
import org.hps.recon.vertexing.TwoTrackVertexer;
+import org.hps.record.triggerbank.AbstractIntData;
+import org.hps.record.triggerbank.TestRunTriggerData;
import org.lcsim.detector.IDetectorElement;
import org.lcsim.detector.identifier.IExpandedIdentifier;
import org.lcsim.detector.identifier.IIdentifierHelper;
