Author: [log in to unmask]
Date: Sat Jan 3 21:08:32 2015
New Revision: 1861
Log:
Move HPSSVTConstants to better package in tracking module.
Added:
java/trunk/tracking/src/main/java/org/hps/readout/svt/HPSSVTConstants.java
- copied, changed from r1860, java/trunk/tracking/src/main/java/org/hps/recon/tracking/HPSSVTConstants.java
Removed:
java/trunk/tracking/src/main/java/org/hps/recon/tracking/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/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 21:08:32 2015
@@ -10,8 +10,8 @@
import org.hps.conditions.database.DatabaseConditionsManager;
//import org.hps.conditions.deprecated.SvtUtils;
import org.hps.readout.svt.FpgaData;
+import org.hps.readout.svt.HPSSVTConstants;
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 21:08:32 2015
@@ -19,8 +19,8 @@
import org.lcsim.lcio.LCIOConstants;
//===> import org.hps.conditions.deprecated.SvtUtils;
import org.hps.readout.svt.FpgaData;
+import org.hps.readout.svt.HPSSVTConstants;
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 21:08:32 2015
@@ -14,9 +14,10 @@
//===> import org.hps.conditions.deprecated.HPSSVTCalibrationConstants;
+
+import org.hps.readout.svt.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 21:08:32 2015
@@ -1,21 +1,22 @@
package org.hps.readout.svt;
//--- java ---//
-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 static org.hps.readout.svt.HPSSVTConstants.ADC_TEMP_COUNT;
+import static org.hps.readout.svt.HPSSVTConstants.BETA;
+import static org.hps.readout.svt.HPSSVTConstants.CONST_A;
+import static org.hps.readout.svt.HPSSVTConstants.MAX_TEMP;
+import static org.hps.readout.svt.HPSSVTConstants.MIN_TEMP;
+import static org.hps.readout.svt.HPSSVTConstants.R_DIV;
+import static org.hps.readout.svt.HPSSVTConstants.TEMP_INC;
+import static org.hps.readout.svt.HPSSVTConstants.TEMP_K0;
+import static org.hps.readout.svt.HPSSVTConstants.TEMP_MASK;
+import static org.hps.readout.svt.HPSSVTConstants.V_MAX;
+import static org.hps.readout.svt.HPSSVTConstants.V_REF;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+
//--- org.lcsim ---//
@@ -30,8 +31,6 @@
* @author Omar Moreno <[log in to unmask]>
* @version $Id: FpgaData.java,v 1.3 2012/08/16 01:06:30 meeg Exp $
*/
-// FIXME: This seems like it might belong in org.hps.evio where it is used most.
-// It is also used by the apv25 package so leaving here for now. --JM
public class FpgaData implements GenericObject {
int fpgaID;
Copied: java/trunk/tracking/src/main/java/org/hps/readout/svt/HPSSVTConstants.java (from r1860, java/trunk/tracking/src/main/java/org/hps/recon/tracking/HPSSVTConstants.java)
=============================================================================
--- java/trunk/tracking/src/main/java/org/hps/recon/tracking/HPSSVTConstants.java (original)
+++ java/trunk/tracking/src/main/java/org/hps/readout/svt/HPSSVTConstants.java Sat Jan 3 21:08:32 2015
@@ -1,4 +1,4 @@
-package org.hps.recon.tracking;
+package org.hps.readout.svt;
/**
*
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 21:08:32 2015
@@ -2,15 +2,15 @@
//--- Constants ---//
-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;
+import static org.hps.readout.svt.HPSSVTConstants.APV_MASK;
+import static org.hps.readout.svt.HPSSVTConstants.CHANNEL_MASK;
+import static org.hps.readout.svt.HPSSVTConstants.FPGA_MASK;
+import static org.hps.readout.svt.HPSSVTConstants.HYBRID_MASK;
+import static org.hps.readout.svt.HPSSVTConstants.SAMPLE_MASK;
+import static org.hps.readout.svt.HPSSVTConstants.TEMP_MASK;
+import static org.hps.readout.svt.HPSSVTConstants.TOTAL_APV25_CHANNELS;
+import static org.hps.readout.svt.HPSSVTConstants.TOTAL_APV25_PER_HYBRID;
+import static org.hps.readout.svt.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 21:08:32 2015
@@ -26,7 +26,6 @@
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/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 21:08:32 2015
@@ -11,6 +11,7 @@
import org.apache.commons.math3.special.Gamma;
+import org.hps.readout.svt.HPSSVTConstants;
//===> import org.hps.conditions.deprecated.HPSSVTCalibrationConstants;
import org.lcsim.detector.identifier.IIdentifier;
import org.lcsim.detector.tracker.silicon.HpsSiSensor;
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 21:08:32 2015
@@ -7,7 +7,9 @@
//===> import org.hps.conditions.deprecated.HPSSVTCalibrationConstants.ChannelConstants;
+
import org.hps.readout.ecal.ReadoutTimestamp;
+import org.hps.readout.svt.HPSSVTConstants;
import org.lcsim.detector.tracker.silicon.HpsSiSensor;
//===> import org.lcsim.detector.tracker.silicon.SiSensor;
import org.lcsim.event.EventHeader;
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 21:08:32 2015
@@ -4,6 +4,7 @@
import java.util.Collection;
import org.apache.commons.math3.special.Gamma;
+import org.hps.readout.svt.HPSSVTConstants;
//===> import org.hps.conditions.deprecated.HPSSVTCalibrationConstants.ChannelConstants;
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 21:08:32 2015
@@ -22,6 +22,7 @@
import org.freehep.math.minuit.MnUserParameters;
//===> import org.hps.conditions.deprecated.HPSSVTCalibrationConstants.ChannelConstants;
+import org.hps.readout.svt.HPSSVTConstants;
import org.lcsim.detector.tracker.silicon.HpsSiSensor;
import org.lcsim.event.RawTrackerHit;
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 21:08:32 2015
@@ -1,6 +1,6 @@
package org.hps.users.omoreno;
-import static org.hps.recon.tracking.HPSSVTConstants.TOTAL_STRIPS_PER_SENSOR;
+import static org.hps.readout.svt.HPSSVTConstants.TOTAL_STRIPS_PER_SENSOR;
import hep.aida.IHistogram1D;
import hep.aida.IHistogram2D;
import hep.aida.IPlotter;
