Author: [log in to unmask]
Date: Fri Mar 13 09:40:07 2015
New Revision: 2431
Log:
Changing package of daqconfig and triggerbank to ecal.recon prior to moving them into ecal-recon.
Added:
java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/
java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/
java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/
- copied from r2430, java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/daqconfig/
java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/triggerbank/
- copied from r2430, java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/triggerbank/
java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/triggerbank/TriggerModule.java
- copied, changed from r2430, java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/TriggerModule.java
Removed:
java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/TriggerModule.java
java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/daqconfig/
java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/triggerbank/
Modified:
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/event/ClusterMatchEvent.java
java/trunk/analysis/src/main/java/org/hps/analysis/trigger/event/ClusterMatchStatus.java
java/trunk/analysis/src/main/java/org/hps/analysis/trigger/event/ClusterMatchedPair.java
java/trunk/analysis/src/main/java/org/hps/analysis/trigger/event/TriggerEfficiencyModule.java
java/trunk/analysis/src/main/java/org/hps/analysis/trigger/event/TriggerMatchEvent.java
java/trunk/analysis/src/main/java/org/hps/analysis/trigger/event/TriggerMatchStatus.java
java/trunk/analysis/src/main/java/org/hps/analysis/trigger/event/TriggerMatchedPair.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/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-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/AbstractConfig.java
java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/ConfigurationManager.java
java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/DAQConfig.java
java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/DAQConfigDriver.java
java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/ESBCutConfig.java
java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/EvioDAQParser.java
java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/FADCConfig.java
java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/IDAQConfig.java
java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/LBOCutConfig.java
java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/PairTriggerConfig.java
java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/SSPConfig.java
java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/SinglesTriggerConfig.java
java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/UBOCutConfig.java
java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/ULBCutConfig.java
java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/triggerbank/AbstractIntData.java
java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/triggerbank/SSPCluster.java
java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/triggerbank/SSPCosmicTrigger.java
java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/triggerbank/SSPData.java
java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/triggerbank/SSPNumberedTrigger.java
java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/triggerbank/SSPPairTrigger.java
java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/triggerbank/SSPSinglesTrigger.java
java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/triggerbank/SSPTrigger.java
java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/triggerbank/SSPTriggerFactory.java
java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/triggerbank/TIData.java
java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/triggerbank/TestRunTriggerData.java
java/trunk/evio/src/main/java/org/hps/evio/LCSimEngRunEventBuilder.java
java/trunk/evio/src/main/java/org/hps/evio/LCSimTestRunEventBuilder.java
java/trunk/evio/src/main/java/org/hps/evio/TriggerConfigEvioReader.java
java/trunk/evio/src/main/java/org/hps/evio/TriggerDataWriter.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/steering-files/src/main/resources/org/hps/steering/monitoring/TriggerDiagnosticsMonitoring.lcsim
java/trunk/users/src/main/java/org/hps/users/celentan/DummyDriverRaw.java
java/trunk/users/src/main/java/org/hps/users/phansson/ROOTFlatTupleDriver.java
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 Fri Mar 13 09:40:07 2015
@@ -4,11 +4,13 @@
import hep.aida.IHistogram2D;
import hep.aida.IPlotter;
import hep.aida.IPlotterFactory;
+
import java.util.List;
-import org.hps.readout.ecal.triggerbank.AbstractIntData;
-import org.hps.readout.ecal.triggerbank.SSPData;
-import org.hps.readout.ecal.triggerbank.TestRunTriggerData;
+
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.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 Fri Mar 13 09:40:07 2015
@@ -28,19 +28,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.readout.ecal.TriggerModule;
-import org.hps.readout.ecal.triggerbank.AbstractIntData;
-import org.hps.readout.ecal.triggerbank.SSPCluster;
-import org.hps.readout.ecal.triggerbank.SSPData;
-import org.hps.readout.ecal.triggerbank.SSPNumberedTrigger;
-import org.hps.readout.ecal.triggerbank.SSPPairTrigger;
-import org.hps.readout.ecal.triggerbank.SSPSinglesTrigger;
-import org.hps.readout.ecal.triggerbank.SSPTrigger;
-import org.hps.readout.ecal.triggerbank.TIData;
-import org.hps.readout.ecal.daqconfig.ConfigurationManager;
-import org.hps.readout.ecal.daqconfig.DAQConfig;
-import org.hps.readout.ecal.daqconfig.PairTriggerConfig;
-import org.hps.readout.ecal.daqconfig.SinglesTriggerConfig;
+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.lcsim.event.CalorimeterHit;
import org.lcsim.event.Cluster;
import org.lcsim.event.EventHeader;
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/trigger/event/ClusterMatchEvent.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/trigger/event/ClusterMatchEvent.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/trigger/event/ClusterMatchEvent.java Fri Mar 13 09:40:07 2015
@@ -3,7 +3,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.hps.readout.ecal.triggerbank.SSPCluster;
+import org.hps.recon.ecal.triggerbank.SSPCluster;
import org.hps.analysis.trigger.util.TriggerDiagnosticUtil;
import org.lcsim.event.Cluster;
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/trigger/event/ClusterMatchStatus.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/trigger/event/ClusterMatchStatus.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/trigger/event/ClusterMatchStatus.java Fri Mar 13 09:40:07 2015
@@ -2,7 +2,7 @@
import java.util.List;
-import org.hps.readout.ecal.triggerbank.SSPCluster;
+import org.hps.recon.ecal.triggerbank.SSPCluster;
import org.lcsim.event.Cluster;
/**
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/trigger/event/ClusterMatchedPair.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/trigger/event/ClusterMatchedPair.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/trigger/event/ClusterMatchedPair.java Fri Mar 13 09:40:07 2015
@@ -2,7 +2,7 @@
import org.hps.analysis.trigger.util.Pair;
import org.hps.analysis.trigger.util.TriggerDiagnosticUtil;
-import org.hps.readout.ecal.triggerbank.SSPCluster;
+import org.hps.recon.ecal.triggerbank.SSPCluster;
import org.lcsim.event.Cluster;
/**
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/trigger/event/TriggerEfficiencyModule.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/trigger/event/TriggerEfficiencyModule.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/trigger/event/TriggerEfficiencyModule.java Fri Mar 13 09:40:07 2015
@@ -6,7 +6,7 @@
import org.hps.analysis.trigger.util.Pair;
import org.hps.analysis.trigger.util.PairTrigger;
import org.hps.analysis.trigger.util.SinglesTrigger;
-import org.hps.readout.ecal.triggerbank.SSPNumberedTrigger;
+import org.hps.recon.ecal.triggerbank.SSPNumberedTrigger;
import org.hps.analysis.trigger.util.Trigger;
import org.hps.analysis.trigger.util.TriggerDiagnosticUtil;
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/trigger/event/TriggerMatchEvent.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/trigger/event/TriggerMatchEvent.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/trigger/event/TriggerMatchEvent.java Fri Mar 13 09:40:07 2015
@@ -5,7 +5,7 @@
import org.hps.analysis.trigger.util.Pair;
import org.hps.analysis.trigger.util.Trigger;
-import org.hps.readout.ecal.triggerbank.SSPNumberedTrigger;
+import org.hps.recon.ecal.triggerbank.SSPNumberedTrigger;
/**
* Tracks trigger pairs that were matched within an event. This can also
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/trigger/event/TriggerMatchStatus.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/trigger/event/TriggerMatchStatus.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/trigger/event/TriggerMatchStatus.java Fri Mar 13 09:40:07 2015
@@ -3,7 +3,7 @@
import java.util.List;
import org.hps.analysis.trigger.util.Trigger;
-import org.hps.readout.ecal.triggerbank.SSPNumberedTrigger;
+import org.hps.recon.ecal.triggerbank.SSPNumberedTrigger;
/**
* Tracks the trigger diagnostic statistics for trigger matching.
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/trigger/event/TriggerMatchedPair.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/trigger/event/TriggerMatchedPair.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/trigger/event/TriggerMatchedPair.java Fri Mar 13 09:40:07 2015
@@ -4,9 +4,9 @@
import org.hps.analysis.trigger.util.PairTrigger;
import org.hps.analysis.trigger.util.SinglesTrigger;
import org.hps.analysis.trigger.util.Trigger;
-import org.hps.readout.ecal.triggerbank.SSPNumberedTrigger;
-import org.hps.readout.ecal.triggerbank.SSPPairTrigger;
-import org.hps.readout.ecal.triggerbank.SSPSinglesTrigger;
+import org.hps.recon.ecal.triggerbank.SSPNumberedTrigger;
+import org.hps.recon.ecal.triggerbank.SSPPairTrigger;
+import org.hps.recon.ecal.triggerbank.SSPSinglesTrigger;
/**
* Stores a pair of one simulated trigger and one SSP bank trigger that
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 Fri Mar 13 09:40:07 2015
@@ -1,6 +1,6 @@
package org.hps.analysis.trigger.util;
-import org.hps.readout.ecal.TriggerModule;
+import org.hps.recon.ecal.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 Fri Mar 13 09:40:07 2015
@@ -1,6 +1,6 @@
package org.hps.analysis.trigger.util;
-import org.hps.readout.ecal.TriggerModule;
+import org.hps.recon.ecal.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 Fri Mar 13 09:40:07 2015
@@ -2,7 +2,7 @@
import java.awt.Point;
-import org.hps.readout.ecal.triggerbank.SSPCluster;
+import org.hps.recon.ecal.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 Fri Mar 13 09:40:07 2015
@@ -9,6 +9,7 @@
import java.util.Queue;
import org.hps.recon.ecal.ECalUtils;
+import org.hps.recon.ecal.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/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 Fri Mar 13 09:40:07 2015
@@ -5,6 +5,7 @@
import java.util.List;
+import org.hps.recon.ecal.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 Fri Mar 13 09:40:07 2015
@@ -2,7 +2,8 @@
import java.util.ArrayList;
import java.util.List;
-import org.hps.readout.ecal.triggerbank.TestRunTriggerData;
+
+import org.hps.recon.ecal.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 Fri Mar 13 09:40:07 2015
@@ -9,8 +9,8 @@
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.hps.readout.ecal.triggerbank.TestRunTriggerData;
-
+
+import org.hps.recon.ecal.triggerbank.TestRunTriggerData;
import org.lcsim.event.EventHeader;
import org.lcsim.lcio.LCIOWriter;
Modified: java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/AbstractConfig.java
=============================================================================
--- java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/AbstractConfig.java (original)
+++ java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/AbstractConfig.java Fri Mar 13 09:40:07 2015
@@ -1,4 +1,4 @@
-package org.hps.readout.ecal.daqconfig;
+package org.hps.recon.ecal.daqconfig;
import java.util.ArrayList;
import java.util.List;
Modified: java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/ConfigurationManager.java
=============================================================================
--- java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/ConfigurationManager.java (original)
+++ java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/ConfigurationManager.java Fri Mar 13 09:40:07 2015
@@ -1,4 +1,4 @@
-package org.hps.readout.ecal.daqconfig;
+package org.hps.recon.ecal.daqconfig;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
Modified: java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/DAQConfig.java
=============================================================================
--- java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/DAQConfig.java (original)
+++ java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/DAQConfig.java Fri Mar 13 09:40:07 2015
@@ -1,4 +1,4 @@
-package org.hps.readout.ecal.daqconfig;
+package org.hps.recon.ecal.daqconfig;
/**
* Class <code>DAQConfig</code> holds all of the supported parameters
Modified: java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/DAQConfigDriver.java
=============================================================================
--- java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/DAQConfigDriver.java (original)
+++ java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/DAQConfigDriver.java Fri Mar 13 09:40:07 2015
@@ -1,4 +1,4 @@
-package org.hps.readout.ecal.daqconfig;
+package org.hps.recon.ecal.daqconfig;
import java.util.List;
Modified: java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/ESBCutConfig.java
=============================================================================
--- java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/ESBCutConfig.java (original)
+++ java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/ESBCutConfig.java Fri Mar 13 09:40:07 2015
@@ -1,4 +1,4 @@
-package org.hps.readout.ecal.daqconfig;
+package org.hps.recon.ecal.daqconfig;
/**
* Class <code>ESBCutConfig</code> is an implementation of the abstract
Modified: java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/EvioDAQParser.java
=============================================================================
--- java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/EvioDAQParser.java (original)
+++ java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/EvioDAQParser.java Fri Mar 13 09:40:07 2015
@@ -1,4 +1,4 @@
-package org.hps.readout.ecal.daqconfig;
+package org.hps.recon.ecal.daqconfig;
import java.util.ArrayList;
import java.util.Arrays;
Modified: java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/FADCConfig.java
=============================================================================
--- java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/FADCConfig.java (original)
+++ java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/FADCConfig.java Fri Mar 13 09:40:07 2015
@@ -1,4 +1,4 @@
-package org.hps.readout.ecal.daqconfig;
+package org.hps.recon.ecal.daqconfig;
import java.awt.Point;
import java.util.HashMap;
Modified: java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/IDAQConfig.java
=============================================================================
--- java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/IDAQConfig.java (original)
+++ java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/IDAQConfig.java Fri Mar 13 09:40:07 2015
@@ -1,4 +1,4 @@
-package org.hps.readout.ecal.daqconfig;
+package org.hps.recon.ecal.daqconfig;
/**
Modified: java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/LBOCutConfig.java
=============================================================================
--- java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/LBOCutConfig.java (original)
+++ java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/LBOCutConfig.java Fri Mar 13 09:40:07 2015
@@ -1,4 +1,4 @@
-package org.hps.readout.ecal.daqconfig;
+package org.hps.recon.ecal.daqconfig;
/**
* Class <code>LBOCutConfig</code> is an implementation of the abstract
Modified: java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/PairTriggerConfig.java
=============================================================================
--- java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/PairTriggerConfig.java (original)
+++ java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/PairTriggerConfig.java Fri Mar 13 09:40:07 2015
@@ -1,4 +1,4 @@
-package org.hps.readout.ecal.daqconfig;
+package org.hps.recon.ecal.daqconfig;
/**
* Class <code>PairTriggerConfig</code> holds the configuration data
Modified: java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/SSPConfig.java
=============================================================================
--- java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/SSPConfig.java (original)
+++ java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/SSPConfig.java Fri Mar 13 09:40:07 2015
@@ -1,4 +1,4 @@
-package org.hps.readout.ecal.daqconfig;
+package org.hps.recon.ecal.daqconfig;
/**
Modified: java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/SinglesTriggerConfig.java
=============================================================================
--- java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/SinglesTriggerConfig.java (original)
+++ java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/SinglesTriggerConfig.java Fri Mar 13 09:40:07 2015
@@ -1,4 +1,4 @@
-package org.hps.readout.ecal.daqconfig;
+package org.hps.recon.ecal.daqconfig;
/**
* Class <code>SinglesTriggerConfig</code> holds the configuration data
Modified: java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/UBOCutConfig.java
=============================================================================
--- java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/UBOCutConfig.java (original)
+++ java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/UBOCutConfig.java Fri Mar 13 09:40:07 2015
@@ -1,4 +1,4 @@
-package org.hps.readout.ecal.daqconfig;
+package org.hps.recon.ecal.daqconfig;
/**
* Class <code>UBOCutConfig</code> is an implementation of the abstract
Modified: java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/ULBCutConfig.java
=============================================================================
--- java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/ULBCutConfig.java (original)
+++ java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/daqconfig/ULBCutConfig.java Fri Mar 13 09:40:07 2015
@@ -1,4 +1,4 @@
-package org.hps.readout.ecal.daqconfig;
+package org.hps.recon.ecal.daqconfig;
/**
* Class <code>ULBCutConfig</code> is an implementation of the abstract
Modified: java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/triggerbank/AbstractIntData.java
=============================================================================
--- java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/triggerbank/AbstractIntData.java (original)
+++ java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/triggerbank/AbstractIntData.java Fri Mar 13 09:40:07 2015
@@ -1,4 +1,4 @@
-package org.hps.readout.ecal.triggerbank;
+package org.hps.recon.ecal.triggerbank;
import java.util.Arrays;
import org.lcsim.event.GenericObject;
Modified: java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/triggerbank/SSPCluster.java
=============================================================================
--- java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/triggerbank/SSPCluster.java (original)
+++ java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/triggerbank/SSPCluster.java Fri Mar 13 09:40:07 2015
@@ -1,4 +1,4 @@
-package org.hps.readout.ecal.triggerbank;
+package org.hps.recon.ecal.triggerbank;
import java.util.logging.Level;
import java.util.logging.Logger;
Modified: java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/triggerbank/SSPCosmicTrigger.java
=============================================================================
--- java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/triggerbank/SSPCosmicTrigger.java (original)
+++ java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/triggerbank/SSPCosmicTrigger.java Fri Mar 13 09:40:07 2015
@@ -1,4 +1,4 @@
-package org.hps.readout.ecal.triggerbank;
+package org.hps.recon.ecal.triggerbank;
/**
* Class <code>SSPCosmicTrigger</code> represents an SSP trigger for
Modified: java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/triggerbank/SSPData.java
=============================================================================
--- java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/triggerbank/SSPData.java (original)
+++ java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/triggerbank/SSPData.java Fri Mar 13 09:40:07 2015
@@ -1,4 +1,4 @@
-package org.hps.readout.ecal.triggerbank;
+package org.hps.recon.ecal.triggerbank;
import org.lcsim.event.GenericObject;
Modified: java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/triggerbank/SSPNumberedTrigger.java
=============================================================================
--- java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/triggerbank/SSPNumberedTrigger.java (original)
+++ java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/triggerbank/SSPNumberedTrigger.java Fri Mar 13 09:40:07 2015
@@ -1,4 +1,4 @@
-package org.hps.readout.ecal.triggerbank;
+package org.hps.recon.ecal.triggerbank;
/**
* Abstract class <code>SSPNumberedTrigger</code> is used as a base
Modified: java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/triggerbank/SSPPairTrigger.java
=============================================================================
--- java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/triggerbank/SSPPairTrigger.java (original)
+++ java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/triggerbank/SSPPairTrigger.java Fri Mar 13 09:40:07 2015
@@ -1,4 +1,4 @@
-package org.hps.readout.ecal.triggerbank;
+package org.hps.recon.ecal.triggerbank;
/**
Modified: java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/triggerbank/SSPSinglesTrigger.java
=============================================================================
--- java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/triggerbank/SSPSinglesTrigger.java (original)
+++ java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/triggerbank/SSPSinglesTrigger.java Fri Mar 13 09:40:07 2015
@@ -1,4 +1,4 @@
-package org.hps.readout.ecal.triggerbank;
+package org.hps.recon.ecal.triggerbank;
/**
Modified: java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/triggerbank/SSPTrigger.java
=============================================================================
--- java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/triggerbank/SSPTrigger.java (original)
+++ java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/triggerbank/SSPTrigger.java Fri Mar 13 09:40:07 2015
@@ -1,4 +1,4 @@
-package org.hps.readout.ecal.triggerbank;
+package org.hps.recon.ecal.triggerbank;
import java.util.logging.Level;
import java.util.logging.Logger;
Modified: java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/triggerbank/SSPTriggerFactory.java
=============================================================================
--- java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/triggerbank/SSPTriggerFactory.java (original)
+++ java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/triggerbank/SSPTriggerFactory.java Fri Mar 13 09:40:07 2015
@@ -1,4 +1,4 @@
-package org.hps.readout.ecal.triggerbank;
+package org.hps.recon.ecal.triggerbank;
/**
* Class <code>SSPTriggerFactory</code> builds <code>SSPTrigger<code>
Modified: java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/triggerbank/TIData.java
=============================================================================
--- java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/triggerbank/TIData.java (original)
+++ java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/triggerbank/TIData.java Fri Mar 13 09:40:07 2015
@@ -1,4 +1,4 @@
-package org.hps.readout.ecal.triggerbank;
+package org.hps.recon.ecal.triggerbank;
import org.lcsim.event.GenericObject;
Modified: java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/triggerbank/TestRunTriggerData.java
=============================================================================
--- java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/triggerbank/TestRunTriggerData.java (original)
+++ java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/triggerbank/TestRunTriggerData.java Fri Mar 13 09:40:07 2015
@@ -1,4 +1,4 @@
-package org.hps.readout.ecal.triggerbank;
+package org.hps.recon.ecal.triggerbank;
import org.lcsim.event.GenericObject;
Copied: java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/triggerbank/TriggerModule.java (from r2430, java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/TriggerModule.java)
=============================================================================
--- java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/TriggerModule.java (original)
+++ java/trunk/ecal-readout-sim/src/main/java/org/hps/recon/ecal/triggerbank/TriggerModule.java Fri Mar 13 09:40:07 2015
@@ -1,12 +1,11 @@
-package org.hps.readout.ecal;
+package org.hps.recon.ecal.triggerbank;
import java.awt.Point;
import java.util.HashMap;
import java.util.Map;
-import org.hps.readout.ecal.daqconfig.PairTriggerConfig;
-import org.hps.readout.ecal.daqconfig.SinglesTriggerConfig;
-import org.hps.readout.ecal.triggerbank.SSPCluster;
+import org.hps.recon.ecal.daqconfig.PairTriggerConfig;
+import org.hps.recon.ecal.daqconfig.SinglesTriggerConfig;
import org.lcsim.event.Cluster;
/**
Modified: java/trunk/evio/src/main/java/org/hps/evio/LCSimEngRunEventBuilder.java
=============================================================================
--- java/trunk/evio/src/main/java/org/hps/evio/LCSimEngRunEventBuilder.java (original)
+++ java/trunk/evio/src/main/java/org/hps/evio/LCSimEngRunEventBuilder.java Fri Mar 13 09:40:07 2015
@@ -7,13 +7,11 @@
import org.jlab.coda.jevio.BaseStructure;
import org.jlab.coda.jevio.EvioEvent;
-
import org.lcsim.event.EventHeader;
-
-import org.hps.readout.ecal.daqconfig.EvioDAQParser;
-import org.hps.readout.ecal.triggerbank.AbstractIntData;
-import org.hps.readout.ecal.triggerbank.SSPData;
-import org.hps.readout.ecal.triggerbank.TIData;
+import org.hps.recon.ecal.daqconfig.EvioDAQParser;
+import org.hps.recon.ecal.triggerbank.AbstractIntData;
+import org.hps.recon.ecal.triggerbank.SSPData;
+import org.hps.recon.ecal.triggerbank.TIData;
import org.hps.record.evio.EvioEventUtilities;
Modified: java/trunk/evio/src/main/java/org/hps/evio/LCSimTestRunEventBuilder.java
=============================================================================
--- java/trunk/evio/src/main/java/org/hps/evio/LCSimTestRunEventBuilder.java (original)
+++ java/trunk/evio/src/main/java/org/hps/evio/LCSimTestRunEventBuilder.java Fri Mar 13 09:40:07 2015
@@ -5,8 +5,9 @@
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.hps.readout.ecal.triggerbank.AbstractIntData;
-import org.hps.readout.ecal.triggerbank.TestRunTriggerData;
+
+import org.hps.recon.ecal.triggerbank.AbstractIntData;
+import org.hps.recon.ecal.triggerbank.TestRunTriggerData;
import org.hps.record.LCSimEventBuilder;
import org.hps.record.evio.EvioEventConstants;
import org.hps.record.evio.EvioEventUtilities;
Modified: java/trunk/evio/src/main/java/org/hps/evio/TriggerConfigEvioReader.java
=============================================================================
--- java/trunk/evio/src/main/java/org/hps/evio/TriggerConfigEvioReader.java (original)
+++ java/trunk/evio/src/main/java/org/hps/evio/TriggerConfigEvioReader.java Fri Mar 13 09:40:07 2015
@@ -5,7 +5,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.hps.readout.ecal.daqconfig.EvioDAQParser;
+import org.hps.recon.ecal.daqconfig.EvioDAQParser;
import org.jlab.coda.jevio.BaseStructure;
import org.jlab.coda.jevio.EvioEvent;
import org.lcsim.event.EventHeader;
Modified: java/trunk/evio/src/main/java/org/hps/evio/TriggerDataWriter.java
=============================================================================
--- java/trunk/evio/src/main/java/org/hps/evio/TriggerDataWriter.java (original)
+++ java/trunk/evio/src/main/java/org/hps/evio/TriggerDataWriter.java Fri Mar 13 09:40:07 2015
@@ -1,8 +1,9 @@
package org.hps.evio;
import java.util.List;
-import org.hps.readout.ecal.triggerbank.AbstractIntData;
-import org.hps.readout.ecal.triggerbank.TestRunTriggerData;
+
+import org.hps.recon.ecal.triggerbank.AbstractIntData;
+import org.hps.recon.ecal.triggerbank.TestRunTriggerData;
import org.jlab.coda.jevio.BaseStructure;
import org.jlab.coda.jevio.DataType;
import org.jlab.coda.jevio.EventBuilder;
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 Fri Mar 13 09:40:07 2015
@@ -6,9 +6,11 @@
import hep.aida.IPlotterFactory;
import hep.aida.IPlotterStyle;
import hep.aida.ref.plotter.PlotterRegion;
+
import java.util.List;
-import org.hps.readout.ecal.triggerbank.AbstractIntData;
-import org.hps.readout.ecal.triggerbank.TestRunTriggerData;
+
+import org.hps.recon.ecal.triggerbank.AbstractIntData;
+import org.hps.recon.ecal.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 Fri Mar 13 09:40:07 2015
@@ -9,8 +9,8 @@
import java.util.List;
import org.apache.commons.math.stat.StatUtils;
-import org.hps.readout.ecal.TriggerModule;
import org.hps.recon.ecal.ECalUtils;
+import org.hps.recon.ecal.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 Fri Mar 13 09:40:07 2015
@@ -9,15 +9,13 @@
import java.util.List;
import org.hps.recon.ecal.ECalUtils;
+import org.hps.recon.ecal.triggerbank.SSPData;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
import org.lcsim.event.GenericObject;
import org.lcsim.geometry.Detector;
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
-
-import org.hps.readout.ecal.triggerbank.SSPData;
-//import org.jfree.chart.ChartPanel;
/**
* The driver <code>EcalHitPlots</code> implements the histogram shown to the user
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/TriggerDiagnosticsMonitoring.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/TriggerDiagnosticsMonitoring.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/TriggerDiagnosticsMonitoring.lcsim Fri Mar 13 09:40:07 2015
@@ -22,7 +22,7 @@
<driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver">
<tag>pass0</tag>
</driver>
- <driver name="DAQConfig" type="org.hps.readout.ecal.daqconfig.DAQConfigDriver" />
+ <driver name="DAQConfig" type="org.hps.recon.ecal.daqconfig.DAQConfigDriver" />
<driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
<ecalCollectionName>EcalCalHits</ecalCollectionName>
<use2014Gain>false</use2014Gain>
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 Fri Mar 13 09:40:07 2015
@@ -6,10 +6,9 @@
import org.lcsim.geometry.Detector;
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
-
-import org.hps.readout.ecal.triggerbank.SSPData;
-import org.hps.readout.ecal.triggerbank.AbstractIntData;
import org.hps.recon.ecal.ECalUtils;
+import org.hps.recon.ecal.triggerbank.AbstractIntData;
+import org.hps.recon.ecal.triggerbank.SSPData;
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/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 Fri Mar 13 09:40:07 2015
@@ -7,6 +7,7 @@
import hep.physics.vec.BasicHep3Vector;
import hep.physics.vec.Hep3Vector;
import hep.physics.vec.VecOp;
+
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
@@ -18,9 +19,10 @@
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
+
import org.hps.analysis.ecal.HPSMCParticlePlotsDriver;
-import org.hps.readout.ecal.triggerbank.AbstractIntData;
-import org.hps.readout.ecal.triggerbank.TestRunTriggerData;
+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;
