Author: [log in to unmask]
Date: Sat Jan 3 20:44:44 2015
New Revision: 1860
Log:
Move HPSSVTConstants from conditions module to tracking.
Added:
java/trunk/tracking/src/main/java/org/hps/recon/tracking/HPSSVTConstants.java
- copied, changed from r1812, java/trunk/conditions/src/main/java/org/hps/conditions/deprecated/HPSSVTConstants.java
Removed:
java/trunk/conditions/src/main/java/org/hps/conditions/deprecated/HPSSVTConstants.java
Modified:
java/trunk/evio/src/main/java/org/hps/evio/SVTEvioReader.java
java/trunk/evio/src/main/java/org/hps/evio/SVTHitWriter.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTPulseFitPlots.java
java/trunk/tracking/src/main/java/org/hps/readout/svt/FpgaData.java
java/trunk/tracking/src/main/java/org/hps/readout/svt/SVTData.java
java/trunk/tracking/src/main/java/org/hps/readout/svt/SimpleSvtReadout.java
java/trunk/tracking/src/main/java/org/hps/recon/tracking/FieldMap.java
java/trunk/tracking/src/main/java/org/hps/recon/tracking/NearestNeighborRMSClusterer.java
java/trunk/tracking/src/main/java/org/hps/recon/tracking/RawTrackerHitFitterDriver.java
java/trunk/tracking/src/main/java/org/hps/recon/tracking/ShaperAnalyticFitAlgorithm.java
java/trunk/tracking/src/main/java/org/hps/recon/tracking/ShaperLinearFitAlgorithm.java
java/trunk/users/src/main/java/org/hps/users/omoreno/SvtQA.java
Modified: java/trunk/evio/src/main/java/org/hps/evio/SVTEvioReader.java
=============================================================================
--- java/trunk/evio/src/main/java/org/hps/evio/SVTEvioReader.java (original)
+++ java/trunk/evio/src/main/java/org/hps/evio/SVTEvioReader.java Sat Jan 3 20:44:44 2015
@@ -8,10 +8,10 @@
import java.util.Map;
import org.hps.conditions.database.DatabaseConditionsManager;
-import org.hps.conditions.deprecated.HPSSVTConstants;
//import org.hps.conditions.deprecated.SvtUtils;
import org.hps.readout.svt.FpgaData;
import org.hps.readout.svt.SVTData;
+import org.hps.recon.tracking.HPSSVTConstants;
import org.hps.util.Pair;
import org.jlab.coda.jevio.BaseStructure;
import org.jlab.coda.jevio.EvioEvent;
Modified: java/trunk/evio/src/main/java/org/hps/evio/SVTHitWriter.java
=============================================================================
--- java/trunk/evio/src/main/java/org/hps/evio/SVTHitWriter.java (original)
+++ java/trunk/evio/src/main/java/org/hps/evio/SVTHitWriter.java Sat Jan 3 20:44:44 2015
@@ -17,10 +17,10 @@
import org.lcsim.event.RawTrackerHit;
import org.lcsim.geometry.Subdetector;
import org.lcsim.lcio.LCIOConstants;
-import org.hps.conditions.deprecated.HPSSVTConstants;
//===> import org.hps.conditions.deprecated.SvtUtils;
import org.hps.readout.svt.FpgaData;
import org.hps.readout.svt.SVTData;
+import org.hps.recon.tracking.HPSSVTConstants;
import static org.hps.evio.EventConstants.SVT_BANK_NUMBER;
import static org.hps.evio.EventConstants.SVT_BANK_TAG;
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTPulseFitPlots.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTPulseFitPlots.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTPulseFitPlots.java Sat Jan 3 20:44:44 2015
@@ -13,10 +13,10 @@
//===> import org.hps.conditions.deprecated.HPSSVTCalibrationConstants;
-import org.hps.conditions.deprecated.HPSSVTConstants;
+
//===> import org.hps.conditions.deprecated.SvtUtils;
import org.hps.recon.tracking.FittedRawTrackerHit;
-
+import org.hps.recon.tracking.HPSSVTConstants;
import org.lcsim.detector.tracker.silicon.HpsSiSensor;
import org.lcsim.event.EventHeader;
import org.lcsim.geometry.Detector;
Modified: java/trunk/tracking/src/main/java/org/hps/readout/svt/FpgaData.java
=============================================================================
--- java/trunk/tracking/src/main/java/org/hps/readout/svt/FpgaData.java (original)
+++ java/trunk/tracking/src/main/java/org/hps/readout/svt/FpgaData.java Sat Jan 3 20:44:44 2015
@@ -1,21 +1,22 @@
package org.hps.readout.svt;
//--- java ---//
-import static org.hps.conditions.deprecated.HPSSVTConstants.ADC_TEMP_COUNT;
-import static org.hps.conditions.deprecated.HPSSVTConstants.BETA;
-import static org.hps.conditions.deprecated.HPSSVTConstants.CONST_A;
-import static org.hps.conditions.deprecated.HPSSVTConstants.MAX_TEMP;
-import static org.hps.conditions.deprecated.HPSSVTConstants.MIN_TEMP;
-import static org.hps.conditions.deprecated.HPSSVTConstants.R_DIV;
-import static org.hps.conditions.deprecated.HPSSVTConstants.TEMP_INC;
-import static org.hps.conditions.deprecated.HPSSVTConstants.TEMP_K0;
-import static org.hps.conditions.deprecated.HPSSVTConstants.TEMP_MASK;
-import static org.hps.conditions.deprecated.HPSSVTConstants.V_MAX;
-import static org.hps.conditions.deprecated.HPSSVTConstants.V_REF;
+import static org.hps.recon.tracking.HPSSVTConstants.ADC_TEMP_COUNT;
+import static org.hps.recon.tracking.HPSSVTConstants.BETA;
+import static org.hps.recon.tracking.HPSSVTConstants.CONST_A;
+import static org.hps.recon.tracking.HPSSVTConstants.MAX_TEMP;
+import static org.hps.recon.tracking.HPSSVTConstants.MIN_TEMP;
+import static org.hps.recon.tracking.HPSSVTConstants.R_DIV;
+import static org.hps.recon.tracking.HPSSVTConstants.TEMP_INC;
+import static org.hps.recon.tracking.HPSSVTConstants.TEMP_K0;
+import static org.hps.recon.tracking.HPSSVTConstants.TEMP_MASK;
+import static org.hps.recon.tracking.HPSSVTConstants.V_MAX;
+import static org.hps.recon.tracking.HPSSVTConstants.V_REF;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+
//--- org.lcsim ---//
import org.lcsim.event.GenericObject;
Modified: java/trunk/tracking/src/main/java/org/hps/readout/svt/SVTData.java
=============================================================================
--- java/trunk/tracking/src/main/java/org/hps/readout/svt/SVTData.java (original)
+++ java/trunk/tracking/src/main/java/org/hps/readout/svt/SVTData.java Sat Jan 3 20:44:44 2015
@@ -2,15 +2,15 @@
//--- Constants ---//
-import static org.hps.conditions.deprecated.HPSSVTConstants.APV_MASK;
-import static org.hps.conditions.deprecated.HPSSVTConstants.CHANNEL_MASK;
-import static org.hps.conditions.deprecated.HPSSVTConstants.FPGA_MASK;
-import static org.hps.conditions.deprecated.HPSSVTConstants.HYBRID_MASK;
-import static org.hps.conditions.deprecated.HPSSVTConstants.SAMPLE_MASK;
-import static org.hps.conditions.deprecated.HPSSVTConstants.TEMP_MASK;
-import static org.hps.conditions.deprecated.HPSSVTConstants.TOTAL_APV25_CHANNELS;
-import static org.hps.conditions.deprecated.HPSSVTConstants.TOTAL_APV25_PER_HYBRID;
-import static org.hps.conditions.deprecated.HPSSVTConstants.TOTAL_NUMBER_OF_SAMPLES;
+import static org.hps.recon.tracking.HPSSVTConstants.APV_MASK;
+import static org.hps.recon.tracking.HPSSVTConstants.CHANNEL_MASK;
+import static org.hps.recon.tracking.HPSSVTConstants.FPGA_MASK;
+import static org.hps.recon.tracking.HPSSVTConstants.HYBRID_MASK;
+import static org.hps.recon.tracking.HPSSVTConstants.SAMPLE_MASK;
+import static org.hps.recon.tracking.HPSSVTConstants.TEMP_MASK;
+import static org.hps.recon.tracking.HPSSVTConstants.TOTAL_APV25_CHANNELS;
+import static org.hps.recon.tracking.HPSSVTConstants.TOTAL_APV25_PER_HYBRID;
+import static org.hps.recon.tracking.HPSSVTConstants.TOTAL_NUMBER_OF_SAMPLES;
/**
*
Modified: java/trunk/tracking/src/main/java/org/hps/readout/svt/SimpleSvtReadout.java
=============================================================================
--- java/trunk/tracking/src/main/java/org/hps/readout/svt/SimpleSvtReadout.java (original)
+++ java/trunk/tracking/src/main/java/org/hps/readout/svt/SimpleSvtReadout.java Sat Jan 3 20:44:44 2015
@@ -11,7 +11,6 @@
import org.lcsim.detector.tracker.silicon.HpsSiSensor;
import org.lcsim.detector.tracker.silicon.SiSensor;
import org.lcsim.geometry.Detector;
-
import org.lcsim.lcio.LCIOConstants;
import org.lcsim.event.EventHeader;
import org.lcsim.event.LCRelation;
@@ -19,17 +18,15 @@
import org.lcsim.event.SimTrackerHit;
import org.lcsim.event.base.BaseLCRelation;
import org.lcsim.event.base.BaseRawTrackerHit;
-
import org.lcsim.recon.tracking.digitization.sisim.CDFSiSensorSim;
import org.lcsim.recon.tracking.digitization.sisim.SiElectrodeData;
import org.lcsim.recon.tracking.digitization.sisim.SiElectrodeDataCollection;
import org.lcsim.recon.tracking.digitization.sisim.SiSensorSim;
import org.lcsim.recon.tracking.digitization.sisim.config.SimTrackerHitReadoutDriver;
-
-import org.hps.conditions.deprecated.HPSSVTConstants;
import org.hps.readout.ecal.ClockSingleton;
import org.hps.readout.ecal.ReadoutTimestamp;
import org.hps.readout.ecal.TriggerableDriver;
+import org.hps.recon.tracking.HPSSVTConstants;
import org.hps.util.RandomGaussian;
/**
Modified: java/trunk/tracking/src/main/java/org/hps/recon/tracking/FieldMap.java
=============================================================================
--- java/trunk/tracking/src/main/java/org/hps/recon/tracking/FieldMap.java (original)
+++ java/trunk/tracking/src/main/java/org/hps/recon/tracking/FieldMap.java Sat Jan 3 20:44:44 2015
@@ -13,10 +13,8 @@
import org.hps.util.Pair;
/**
- * @author Mathew Graham <[log in to unmask]> $Id: FieldMap.java,v 1.14
- * 2012/07/23 23:02:57 mgraham Exp $
+ * @author Mathew Graham <[log in to unmask]>
*/
-// FIXME: Delete me.
public class FieldMap {
// TODO: Change all pairs such that FPGA is the fist value
Copied: java/trunk/tracking/src/main/java/org/hps/recon/tracking/HPSSVTConstants.java (from r1812, java/trunk/conditions/src/main/java/org/hps/conditions/deprecated/HPSSVTConstants.java)
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/deprecated/HPSSVTConstants.java (original)
+++ java/trunk/tracking/src/main/java/org/hps/recon/tracking/HPSSVTConstants.java Sat Jan 3 20:44:44 2015
@@ -1,4 +1,4 @@
-package org.hps.conditions.deprecated;
+package org.hps.recon.tracking;
/**
*
Modified: java/trunk/tracking/src/main/java/org/hps/recon/tracking/NearestNeighborRMSClusterer.java
=============================================================================
--- java/trunk/tracking/src/main/java/org/hps/recon/tracking/NearestNeighborRMSClusterer.java (original)
+++ java/trunk/tracking/src/main/java/org/hps/recon/tracking/NearestNeighborRMSClusterer.java Sat Jan 3 20:44:44 2015
@@ -17,8 +17,6 @@
//===> import org.lcsim.detector.tracker.silicon.SiSensor;
import org.lcsim.detector.tracker.silicon.SiTrackerIdentifierHelper;
import org.lcsim.event.RawTrackerHit;
-
-import org.hps.conditions.deprecated.HPSSVTConstants;
/**
*
Modified: java/trunk/tracking/src/main/java/org/hps/recon/tracking/RawTrackerHitFitterDriver.java
=============================================================================
--- java/trunk/tracking/src/main/java/org/hps/recon/tracking/RawTrackerHitFitterDriver.java (original)
+++ java/trunk/tracking/src/main/java/org/hps/recon/tracking/RawTrackerHitFitterDriver.java Sat Jan 3 20:44:44 2015
@@ -6,7 +6,7 @@
import java.util.logging.Logger;
//===> import org.hps.conditions.deprecated.HPSSVTCalibrationConstants.ChannelConstants;
-import org.hps.conditions.deprecated.HPSSVTConstants;
+
import org.hps.readout.ecal.ReadoutTimestamp;
import org.lcsim.detector.tracker.silicon.HpsSiSensor;
//===> import org.lcsim.detector.tracker.silicon.SiSensor;
Modified: java/trunk/tracking/src/main/java/org/hps/recon/tracking/ShaperAnalyticFitAlgorithm.java
=============================================================================
--- java/trunk/tracking/src/main/java/org/hps/recon/tracking/ShaperAnalyticFitAlgorithm.java (original)
+++ java/trunk/tracking/src/main/java/org/hps/recon/tracking/ShaperAnalyticFitAlgorithm.java Sat Jan 3 20:44:44 2015
@@ -5,7 +5,6 @@
import org.apache.commons.math3.special.Gamma;
//===> import org.hps.conditions.deprecated.HPSSVTCalibrationConstants.ChannelConstants;
-import org.hps.conditions.deprecated.HPSSVTConstants;
import org.lcsim.detector.tracker.silicon.HpsSiSensor;
import org.lcsim.event.RawTrackerHit;
Modified: java/trunk/tracking/src/main/java/org/hps/recon/tracking/ShaperLinearFitAlgorithm.java
=============================================================================
--- java/trunk/tracking/src/main/java/org/hps/recon/tracking/ShaperLinearFitAlgorithm.java (original)
+++ java/trunk/tracking/src/main/java/org/hps/recon/tracking/ShaperLinearFitAlgorithm.java Sat Jan 3 20:44:44 2015
@@ -24,8 +24,6 @@
import org.lcsim.detector.tracker.silicon.HpsSiSensor;
import org.lcsim.event.RawTrackerHit;
-
-import org.hps.conditions.deprecated.HPSSVTConstants;
/**
* Fast fitter; currently only fits single hits. Uses Tp from ChannelConstants;
Modified: java/trunk/users/src/main/java/org/hps/users/omoreno/SvtQA.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/omoreno/SvtQA.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/omoreno/SvtQA.java Sat Jan 3 20:44:44 2015
@@ -1,6 +1,6 @@
package org.hps.users.omoreno;
-import static org.hps.conditions.deprecated.HPSSVTConstants.TOTAL_STRIPS_PER_SENSOR;
+import static org.hps.recon.tracking.HPSSVTConstants.TOTAL_STRIPS_PER_SENSOR;
import hep.aida.IHistogram1D;
import hep.aida.IHistogram2D;
import hep.aida.IPlotter;
@@ -25,7 +25,6 @@
import org.lcsim.recon.tracking.seedtracker.SeedTrack;
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
-
import org.hps.recon.tracking.FittedRawTrackerHit;
import org.hps.recon.tracking.ShapeFitParameters;
import org.hps.recon.tracking.ShaperAnalyticFitAlgorithm;
