Author: [log in to unmask]
Date: Sat Jan 3 20:26:18 2015
New Revision: 1859
Log:
Move some classes from deprecated conditions package to tracking module.
Added:
java/trunk/tracking/src/main/java/org/hps/recon/tracking/BeamSpot.java
- copied, changed from r1812, java/trunk/conditions/src/main/java/org/hps/conditions/deprecated/BeamSpot.java
java/trunk/tracking/src/main/java/org/hps/recon/tracking/BeamlineConstants.java
- copied, changed from r1812, java/trunk/conditions/src/main/java/org/hps/conditions/deprecated/BeamlineConstants.java
java/trunk/tracking/src/main/java/org/hps/recon/tracking/FieldMap.java
- copied, changed from r1812, java/trunk/conditions/src/main/java/org/hps/conditions/deprecated/FieldMap.java
Removed:
java/trunk/conditions/src/main/java/org/hps/conditions/deprecated/BeamSpot.java
java/trunk/conditions/src/main/java/org/hps/conditions/deprecated/BeamlineConstants.java
java/trunk/conditions/src/main/java/org/hps/conditions/deprecated/FieldMap.java
Modified:
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/TrackingReconstructionPlots.java
java/trunk/recon/src/main/java/org/hps/recon/vertexing/TwoTrackFringeVertexer.java
java/trunk/recon/src/main/java/org/hps/recon/vertexing/TwoTrackVertexer.java
java/trunk/tracking/src/main/java/org/hps/recon/tracking/HPSTrack.java
java/trunk/tracking/src/main/java/org/hps/recon/tracking/TrackUtils.java
java/trunk/users/src/main/java/org/hps/users/mgraham/ExamplePlotter.java
java/trunk/users/src/main/java/org/hps/users/mgraham/TrackExtrapolationAnalysis.java
java/trunk/users/src/main/java/org/hps/users/mgraham/TwoTrackAnalysis.java
java/trunk/users/src/main/java/org/hps/users/phansson/ROOTFlatTupleDriver.java
java/trunk/users/src/main/java/org/hps/users/phansson/TrackingReconstructionPlots.java
java/trunk/users/src/main/java/org/hps/users/phansson/TrigRateDriver.java
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/TrackingReconstructionPlots.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/TrackingReconstructionPlots.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/TrackingReconstructionPlots.java Sat Jan 3 20:26:18 2015
@@ -14,11 +14,11 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.hps.conditions.deprecated.BeamlineConstants;
//===> import org.hps.conditions.deprecated.HPSSVTCalibrationConstants;
//===> import org.hps.conditions.deprecated.HPSSVTCalibrationConstants.ChannelConstants;
//===> import org.hps.conditions.deprecated.SvtUtils;
import org.hps.recon.ecal.HPSEcalCluster;
+import org.hps.recon.tracking.BeamlineConstants;
import org.hps.recon.tracking.DumbShaperFit;
import org.hps.recon.tracking.HelixConverter;
import org.hps.recon.tracking.ShapeFitParameters;
Modified: java/trunk/recon/src/main/java/org/hps/recon/vertexing/TwoTrackFringeVertexer.java
=============================================================================
--- java/trunk/recon/src/main/java/org/hps/recon/vertexing/TwoTrackFringeVertexer.java (original)
+++ java/trunk/recon/src/main/java/org/hps/recon/vertexing/TwoTrackFringeVertexer.java Sat Jan 3 20:26:18 2015
@@ -3,7 +3,7 @@
import hep.physics.vec.BasicHep3Vector;
import hep.physics.vec.Hep3Vector;
-import org.hps.conditions.deprecated.BeamlineConstants;
+import org.hps.recon.tracking.BeamlineConstants;
import org.hps.recon.tracking.HPSTrack;
import org.hps.recon.tracking.HelixConverter;
import org.hps.recon.tracking.StraightLineTrack;
Modified: java/trunk/recon/src/main/java/org/hps/recon/vertexing/TwoTrackVertexer.java
=============================================================================
--- java/trunk/recon/src/main/java/org/hps/recon/vertexing/TwoTrackVertexer.java (original)
+++ java/trunk/recon/src/main/java/org/hps/recon/vertexing/TwoTrackVertexer.java Sat Jan 3 20:26:18 2015
@@ -1,6 +1,6 @@
package org.hps.recon.vertexing;
-import org.hps.conditions.deprecated.BeamlineConstants;
+import org.hps.recon.tracking.BeamlineConstants;
import org.hps.recon.tracking.CoordinateTransformations;
import org.hps.recon.tracking.TrackUtils;
import org.lcsim.event.Track;
Copied: java/trunk/tracking/src/main/java/org/hps/recon/tracking/BeamSpot.java (from r1812, java/trunk/conditions/src/main/java/org/hps/conditions/deprecated/BeamSpot.java)
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/deprecated/BeamSpot.java (original)
+++ java/trunk/tracking/src/main/java/org/hps/recon/tracking/BeamSpot.java Sat Jan 3 20:26:18 2015
@@ -2,7 +2,7 @@
* To change this template, choose Tools | Templates
* and open the template in the editor.
*/
-package org.hps.conditions.deprecated;
+package org.hps.recon.tracking;
import hep.physics.matrix.SymmetricMatrix;
Copied: java/trunk/tracking/src/main/java/org/hps/recon/tracking/BeamlineConstants.java (from r1812, java/trunk/conditions/src/main/java/org/hps/conditions/deprecated/BeamlineConstants.java)
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/deprecated/BeamlineConstants.java (original)
+++ java/trunk/tracking/src/main/java/org/hps/recon/tracking/BeamlineConstants.java Sat Jan 3 20:26:18 2015
@@ -1,4 +1,4 @@
-package org.hps.conditions.deprecated;
+package org.hps.recon.tracking;
public final class BeamlineConstants {
Copied: java/trunk/tracking/src/main/java/org/hps/recon/tracking/FieldMap.java (from r1812, java/trunk/conditions/src/main/java/org/hps/conditions/deprecated/FieldMap.java)
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/deprecated/FieldMap.java (original)
+++ java/trunk/tracking/src/main/java/org/hps/recon/tracking/FieldMap.java Sat Jan 3 20:26:18 2015
@@ -1,4 +1,4 @@
-package org.hps.conditions.deprecated;
+package org.hps.recon.tracking;
import java.io.BufferedReader;
import java.io.IOException;
@@ -16,6 +16,7 @@
* @author Mathew Graham <[log in to unmask]> $Id: FieldMap.java,v 1.14
* 2012/07/23 23:02:57 mgraham Exp $
*/
+// FIXME: Delete me.
public class FieldMap {
// TODO: Change all pairs such that FPGA is the fist value
Modified: java/trunk/tracking/src/main/java/org/hps/recon/tracking/HPSTrack.java
=============================================================================
--- java/trunk/tracking/src/main/java/org/hps/recon/tracking/HPSTrack.java (original)
+++ java/trunk/tracking/src/main/java/org/hps/recon/tracking/HPSTrack.java Sat Jan 3 20:26:18 2015
@@ -10,8 +10,6 @@
import java.util.List;
import java.util.Map;
-import org.hps.conditions.deprecated.BeamSpot;
-import org.hps.conditions.deprecated.FieldMap;
import org.hps.util.Pair;
import org.lcsim.event.MCParticle;
import org.lcsim.fit.helicaltrack.HelicalTrackFit;
Modified: java/trunk/tracking/src/main/java/org/hps/recon/tracking/TrackUtils.java
=============================================================================
--- java/trunk/tracking/src/main/java/org/hps/recon/tracking/TrackUtils.java (original)
+++ java/trunk/tracking/src/main/java/org/hps/recon/tracking/TrackUtils.java Sat Jan 3 20:26:18 2015
@@ -32,8 +32,6 @@
import org.lcsim.recon.tracking.seedtracker.SeedCandidate;
import org.lcsim.recon.tracking.seedtracker.SeedTrack;
import org.lcsim.util.swim.Helix;
-import org.hps.conditions.deprecated.BeamlineConstants;
-//===> import org.hps.conditions.deprecated.SvtUtils;
/**
* Assorted helper functions for the track and helix objects in lcsim. Re-use as much of HelixUtils
Modified: java/trunk/users/src/main/java/org/hps/users/mgraham/ExamplePlotter.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/mgraham/ExamplePlotter.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/mgraham/ExamplePlotter.java Sat Jan 3 20:26:18 2015
@@ -11,7 +11,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.hps.conditions.deprecated.BeamlineConstants;
+import org.hps.recon.tracking.BeamlineConstants;
import org.hps.recon.tracking.HPSTrack;
import org.hps.recon.tracking.HelixConverter;
import org.hps.recon.tracking.StraightLineTrack;
Modified: java/trunk/users/src/main/java/org/hps/users/mgraham/TrackExtrapolationAnalysis.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/mgraham/TrackExtrapolationAnalysis.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/mgraham/TrackExtrapolationAnalysis.java Sat Jan 3 20:26:18 2015
@@ -10,8 +10,8 @@
import java.util.List;
import java.util.Map;
-import org.hps.conditions.deprecated.BeamlineConstants;
import org.hps.recon.ecal.HPSEcalCluster;
+import org.hps.recon.tracking.BeamlineConstants;
import org.hps.recon.tracking.HPSTrack;
import org.hps.recon.tracking.HelixConverter;
import org.hps.recon.tracking.StraightLineTrack;
Modified: java/trunk/users/src/main/java/org/hps/users/mgraham/TwoTrackAnalysis.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/mgraham/TwoTrackAnalysis.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/mgraham/TwoTrackAnalysis.java Sat Jan 3 20:26:18 2015
@@ -17,7 +17,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.hps.conditions.deprecated.BeamlineConstants;
+import org.hps.recon.tracking.BeamlineConstants;
import org.hps.recon.tracking.HPSTrack;
import org.hps.recon.tracking.HelixConverter;
import org.hps.recon.tracking.StraightLineTrack;
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 Sat Jan 3 20:26:18 2015
@@ -21,10 +21,10 @@
import java.util.logging.Logger;
import org.hps.analysis.ecal.HPSMCParticlePlotsDriver;
-import org.hps.conditions.deprecated.BeamlineConstants;
//===> import org.hps.conditions.deprecated.SvtUtils;
import org.hps.readout.ecal.TriggerData;
import org.hps.recon.ecal.HPSEcalCluster;
+import org.hps.recon.tracking.BeamlineConstants;
import org.hps.recon.tracking.EventQuality;
import org.hps.recon.tracking.HPSTrack;
import org.hps.recon.tracking.StraightLineTrack;
Modified: java/trunk/users/src/main/java/org/hps/users/phansson/TrackingReconstructionPlots.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/TrackingReconstructionPlots.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/TrackingReconstructionPlots.java Sat Jan 3 20:26:18 2015
@@ -14,8 +14,8 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.hps.conditions.deprecated.BeamlineConstants;
import org.hps.recon.ecal.HPSEcalCluster;
+import org.hps.recon.tracking.BeamlineConstants;
import org.hps.recon.tracking.DumbShaperFit;
import org.hps.recon.tracking.HelixConverter;
import org.hps.recon.tracking.ShapeFitParameters;
Modified: java/trunk/users/src/main/java/org/hps/users/phansson/TrigRateDriver.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/TrigRateDriver.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/TrigRateDriver.java Sat Jan 3 20:26:18 2015
@@ -15,9 +15,9 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.hps.conditions.deprecated.BeamlineConstants;
import org.hps.conditions.deprecated.EcalConditions;
import org.hps.recon.ecal.HPSEcalCluster;
+import org.hps.recon.tracking.BeamlineConstants;
//import org.hps.util.AIDAFrame;
import org.lcsim.detector.identifier.ExpandedIdentifier;
import org.lcsim.detector.identifier.IExpandedIdentifier;
