63 modified files
java/trunk/users
--- java/trunk/users/pom.xml 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/pom.xml 2014-03-26 04:20:57 UTC (rev 371)
@@ -21,8 +21,8 @@
<dependencies>
<dependency>
<groupId>org.hps</groupId>
- <artifactId>hps-java</artifactId>
- </dependency>
+ <artifactId>hps-analysis</artifactId>
+ </dependency>
</dependencies>
<build>
java/trunk/users/src/main/java/org/hps/users/holly
--- java/trunk/users/src/main/java/org/hps/users/holly/EcalClusterIC.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/hps/users/holly/EcalClusterIC.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -1,24 +1,19 @@
package org.hps.users.holly;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
+import org.hps.recon.ecal.HPSEcalCluster;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
import org.lcsim.geometry.Detector;
import org.lcsim.geometry.subdetector.HPSEcal3;
import org.lcsim.geometry.subdetector.HPSEcal3.NeighborMap;
-import org.lcsim.hps.recon.ecal.ECalUtils;
-import org.lcsim.hps.recon.ecal.HPSEcalCluster;
import org.lcsim.lcio.LCIOConstants;
import org.lcsim.util.Driver;
java/trunk/users/src/main/java/org/hps/users/holly
--- java/trunk/users/src/main/java/org/hps/users/holly/EcalClustererCosmics.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/hps/users/holly/EcalClustererCosmics.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -6,13 +6,13 @@
import java.util.Map;
import java.util.Set;
+import org.hps.recon.ecal.ECalUtils;
+import org.hps.recon.ecal.HPSEcalCluster;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
import org.lcsim.geometry.Detector;
import org.lcsim.geometry.subdetector.HPSEcal3;
import org.lcsim.geometry.subdetector.HPSEcal3.NeighborMap;
-import org.lcsim.hps.recon.ecal.ECalUtils;
-import org.lcsim.hps.recon.ecal.HPSEcalCluster;
import org.lcsim.lcio.LCIOConstants;
import org.lcsim.util.Driver;
java/trunk/users/src/main/java/org/lcsim/hps/users/gcharles
--- java/trunk/users/src/main/java/org/lcsim/hps/users/gcharles/FADCSignalAnalysis.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/gcharles/FADCSignalAnalysis.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -5,12 +5,12 @@
import java.util.List;
+import org.hps.readout.ecal.FADCEcalReadoutDriver;
+import org.hps.readout.ecal.RingBuffer;
+import org.hps.recon.ecal.ECalUtils;
+import org.hps.recon.ecal.EcalRawConverterDriver;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
-import org.lcsim.hps.readout.ecal.FADCEcalReadoutDriver;
-import org.lcsim.hps.recon.ecal.ECalUtils;
-import org.lcsim.hps.recon.ecal.EcalRawConverterDriver;
-import org.lcsim.hps.util.RingBuffer;
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
java/trunk/users/src/main/java/org/lcsim/hps/users/meeg
--- java/trunk/users/src/main/java/org/lcsim/hps/users/meeg/HPSEcalPrintDriver.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/meeg/HPSEcalPrintDriver.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -4,12 +4,12 @@
import java.io.PrintWriter;
import java.util.List;
+import org.hps.readout.ecal.ClockSingleton;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
import org.lcsim.geometry.Detector;
import org.lcsim.geometry.IDDecoder;
import org.lcsim.geometry.subdetector.HPSEcal3;
-import org.lcsim.hps.util.ClockSingleton;
import org.lcsim.util.Driver;
/**
java/trunk/users/src/main/java/org/lcsim/hps/users/meeg
--- java/trunk/users/src/main/java/org/lcsim/hps/users/meeg/HitTimePrintDriver.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/meeg/HitTimePrintDriver.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -1,10 +1,11 @@
package org.lcsim.hps.users.meeg;
import java.util.List;
+
+import org.hps.readout.ecal.ReadoutTimestamp;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
import org.lcsim.event.TrackerHit;
-import org.lcsim.hps.readout.ecal.ReadoutTimestamp;
import org.lcsim.util.Driver;
/**
java/trunk/users/src/main/java/org/lcsim/hps/users/meeg
--- java/trunk/users/src/main/java/org/lcsim/hps/users/meeg/LCIOTrackAnalysis.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/meeg/LCIOTrackAnalysis.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -2,10 +2,13 @@
import hep.physics.vec.BasicHep3Vector;
import hep.physics.vec.Hep3Vector;
+
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
+
+import org.hps.conditions.deprecated.SvtUtils;
import org.lcsim.detector.identifier.IIdentifier;
import org.lcsim.detector.identifier.Identifier;
import org.lcsim.event.MCParticle;
@@ -13,7 +16,6 @@
import org.lcsim.event.RelationalTable;
import org.lcsim.event.Track;
import org.lcsim.event.TrackerHit;
-import org.lcsim.hps.recon.tracking.SvtUtils;
/**
*
java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham
--- java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham/DetailedAnalysisDriver.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham/DetailedAnalysisDriver.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -4,35 +4,40 @@
*/
package org.lcsim.hps.users.mgraham;
-import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import hep.aida.IAnalysisFactory;
+import hep.aida.IHistogram1D;
+import hep.aida.IHistogramFactory;
+import hep.aida.IProfile1D;
import hep.physics.matrix.SymmetricMatrix;
import hep.physics.vec.BasicHep3Vector;
import hep.physics.vec.Hep3Vector;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import hep.aida.*;
-
-import hep.physics.matrix.BasicMatrix;
import hep.physics.vec.VecOp;
+
import java.io.FileWriter;
+import java.io.IOException;
import java.io.PrintWriter;
import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.hps.recon.tracking.FindableTrack;
+import org.hps.recon.tracking.StraightLineTrack;
+import org.hps.recon.tracking.TrackAnalysis;
+import org.hps.recon.vertexing.BilliorTrack;
+import org.hps.recon.vertexing.BilliorVertex;
+import org.hps.recon.vertexing.BilliorVertexer;
import org.lcsim.detector.IDetectorElement;
-import org.lcsim.detector.tracker.silicon.SiTrackerModule;
import org.lcsim.event.EventHeader;
import org.lcsim.event.LCRelation;
import org.lcsim.event.MCParticle;
-import org.lcsim.event.RelationalTable;
-import org.lcsim.event.Track;
import org.lcsim.event.RawTrackerHit;
+import org.lcsim.event.RelationalTable;
import org.lcsim.event.SimTrackerHit;
+import org.lcsim.event.Track;
import org.lcsim.event.TrackerHit;
import org.lcsim.event.base.BaseRelationalTable;
import org.lcsim.fit.helicaltrack.HelicalTrackCross;
@@ -43,12 +48,6 @@
import org.lcsim.fit.helicaltrack.HelixUtils;
import org.lcsim.fit.helicaltrack.TrackDirection;
import org.lcsim.geometry.Detector;
-import org.lcsim.hps.recon.vertexing.BilliorTrack;
-import org.lcsim.hps.recon.vertexing.BilliorVertex;
-import org.lcsim.hps.recon.vertexing.StraightLineTrack;
-import org.lcsim.hps.recon.tracking.FindableTrack;
-import org.lcsim.hps.recon.tracking.TrackAnalysis;
-import org.lcsim.hps.recon.vertexing.BilliorVertexer;
import org.lcsim.recon.tracking.digitization.sisim.SiTrackerHitStrip1D;
import org.lcsim.recon.tracking.seedtracker.SeedCandidate;
import org.lcsim.recon.tracking.seedtracker.SeedTrack;
java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham
--- java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham/ElwinsTrackingRecon.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham/ElwinsTrackingRecon.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -1,7 +1,10 @@
package org.lcsim.hps.users.mgraham;
-import Jama.*;
-import hep.aida.*;
+import hep.aida.IAnalysisFactory;
+import hep.aida.IHistogram1D;
+import hep.aida.IHistogram2D;
+import hep.aida.IPlotter;
+import hep.aida.IPlotterStyle;
import hep.physics.matrix.SymmetricMatrix;
import hep.physics.vec.Hep3Vector;
@@ -11,25 +14,34 @@
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.hps.conditions.deprecated.BeamlineConstants;
+import org.hps.conditions.deprecated.SvtUtils;
+import org.hps.recon.ecal.HPSEcalCluster;
+import org.hps.recon.tracking.DumbShaperFit;
+import org.hps.recon.tracking.HPSShaperFitAlgorithm;
+import org.hps.recon.tracking.HPSTrack;
+import org.hps.recon.tracking.HelixConverter;
+import org.hps.recon.tracking.StraightLineTrack;
+import org.hps.util.AIDAFrame;
+import org.hps.util.Resettable;
import org.lcsim.detector.tracker.silicon.SiSensor;
-import org.lcsim.event.*;
+import org.lcsim.event.EventHeader;
+import org.lcsim.event.RawTrackerHit;
+import org.lcsim.event.Track;
+import org.lcsim.event.TrackerHit;
import org.lcsim.fit.helicaltrack.HelicalTrackCross;
import org.lcsim.fit.helicaltrack.HelicalTrackFit;
import org.lcsim.fit.helicaltrack.HelicalTrackHit;
import org.lcsim.geometry.Detector;
import org.lcsim.geometry.IDDecoder;
-import org.lcsim.hps.event.BeamlineConstants;
-import org.lcsim.hps.monitoring.deprecated.AIDAFrame;
-import org.lcsim.hps.monitoring.deprecated.Resettable;
-import org.lcsim.hps.recon.ecal.HPSEcalCluster;
-import org.lcsim.hps.recon.tracking.*;
-import org.lcsim.hps.recon.vertexing.HelixConverter;
-import org.lcsim.hps.recon.vertexing.StraightLineTrack;
import org.lcsim.recon.tracking.seedtracker.SeedCandidate;
import org.lcsim.recon.tracking.seedtracker.SeedTrack;
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
+import Jama.Matrix;
+import Jama.SingularValueDecomposition;
+
/**
*
* @author elwinm
java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham
--- java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham/ExamplePlotter.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham/ExamplePlotter.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -11,16 +11,16 @@
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.hps.conditions.deprecated.BeamlineConstants;
+import org.hps.recon.tracking.HPSTrack;
+import org.hps.recon.tracking.HelixConverter;
+import org.hps.recon.tracking.StraightLineTrack;
+import org.hps.util.AIDAFrame;
+import org.hps.util.Resettable;
import org.lcsim.event.EventHeader;
import org.lcsim.event.Track;
import org.lcsim.fit.helicaltrack.HelicalTrackFit;
import org.lcsim.geometry.Detector;
-import org.lcsim.hps.event.BeamlineConstants;
-import org.lcsim.hps.monitoring.deprecated.AIDAFrame;
-import org.lcsim.hps.monitoring.deprecated.Resettable;
-import org.lcsim.hps.recon.tracking.HPSTrack;
-import org.lcsim.hps.recon.vertexing.HelixConverter;
-import org.lcsim.hps.recon.vertexing.StraightLineTrack;
import org.lcsim.recon.tracking.seedtracker.SeedCandidate;
import org.lcsim.recon.tracking.seedtracker.SeedTrack;
import org.lcsim.util.Driver;
java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham
--- java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham/FastTrackAnalysisDriver.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham/FastTrackAnalysisDriver.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -1,7 +1,6 @@
package org.lcsim.hps.users.mgraham;
import hep.aida.IAnalysisFactory;
-import hep.physics.matrix.BasicMatrix;
import hep.physics.matrix.SymmetricMatrix;
import hep.physics.vec.BasicHep3Vector;
import hep.physics.vec.Hep3Vector;
@@ -18,6 +17,12 @@
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.hps.recon.tracking.FindableTrack;
+import org.hps.recon.tracking.StraightLineTrack;
+import org.hps.recon.tracking.TrackAnalysis;
+import org.hps.recon.vertexing.BilliorTrack;
+import org.hps.recon.vertexing.BilliorVertex;
+import org.hps.recon.vertexing.BilliorVertexer;
import org.lcsim.event.EventHeader;
import org.lcsim.event.LCRelation;
import org.lcsim.event.MCParticle;
@@ -33,12 +38,6 @@
import org.lcsim.fit.helicaltrack.HelicalTrackStrip;
import org.lcsim.fit.helicaltrack.HelixUtils;
import org.lcsim.fit.helicaltrack.TrackDirection;
-import org.lcsim.hps.recon.vertexing.BilliorTrack;
-import org.lcsim.hps.recon.vertexing.BilliorVertex;
-import org.lcsim.hps.recon.vertexing.StraightLineTrack;
-import org.lcsim.hps.recon.tracking.FindableTrack;
-import org.lcsim.hps.recon.tracking.TrackAnalysis;
-import org.lcsim.hps.recon.vertexing.BilliorVertexer;
import org.lcsim.recon.tracking.digitization.sisim.SiTrackerHitStrip1D;
import org.lcsim.recon.tracking.seedtracker.SeedCandidate;
import org.lcsim.recon.tracking.seedtracker.SeedTrack;
java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham
--- java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham/HelicalTrackHitResidualsDriver.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham/HelicalTrackHitResidualsDriver.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -7,27 +7,31 @@
import hep.aida.ref.plotter.PlotterRegion;
import hep.physics.vec.BasicHep3Vector;
import hep.physics.vec.Hep3Vector;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
+
+import org.hps.conditions.deprecated.SvtUtils;
+import org.hps.recon.tracking.EventQuality;
+import org.hps.recon.tracking.TrackUtils;
+import org.hps.util.AIDAFrame;
import org.lcsim.detector.tracker.silicon.SiSensor;
-import org.lcsim.event.*;
-import org.lcsim.fit.helicaltrack.HelicalTrackCross;
+import org.lcsim.event.EventHeader;
+import org.lcsim.event.RawTrackerHit;
+import org.lcsim.event.Track;
+import org.lcsim.event.TrackerHit;
import org.lcsim.fit.helicaltrack.HelicalTrackFit;
import org.lcsim.fit.helicaltrack.HelicalTrackHit;
import org.lcsim.geometry.Detector;
-import org.lcsim.hps.monitoring.deprecated.AIDAFrame;
-import org.lcsim.hps.recon.tracking.SvtUtils;
-import org.lcsim.hps.recon.tracking.TrackUtils;
import org.lcsim.hps.users.phansson.TrigRateDriver;
import org.lcsim.recon.tracking.seedtracker.SeedCandidate;
import org.lcsim.recon.tracking.seedtracker.SeedTrack;
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
-import org.lcsim.hps.recon.tracking.EventQuality;
/**
*
java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham
--- java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham/HitTimePlotter.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham/HitTimePlotter.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -1,30 +1,33 @@
package org.lcsim.hps.users.mgraham;
-import hep.aida.*;
-import hep.physics.vec.Hep3Vector;
+import hep.aida.IAnalysisFactory;
+import hep.aida.IFitFactory;
+import hep.aida.IFitResult;
+import hep.aida.IFitter;
+import hep.aida.IHistogram1D;
+import hep.aida.IPlotter;
+import hep.aida.IPlotterStyle;
+
import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
+
+import org.hps.readout.ecal.ReadoutTimestamp;
+import org.hps.util.AIDAFrame;
+import org.hps.util.Resettable;
import org.lcsim.detector.identifier.IIdentifier;
import org.lcsim.detector.identifier.IIdentifierHelper;
import org.lcsim.detector.tracker.silicon.SiSensor;
-import org.lcsim.event.*;
-import org.lcsim.event.base.BaseTrack;
-import org.lcsim.fit.helicaltrack.HelicalTrackFit;
+import org.lcsim.event.CalorimeterHit;
+import org.lcsim.event.EventHeader;
+import org.lcsim.event.RawTrackerHit;
+import org.lcsim.event.Track;
+import org.lcsim.event.TrackerHit;
import org.lcsim.fit.helicaltrack.HelicalTrackHit;
import org.lcsim.geometry.Detector;
-import org.lcsim.hps.monitoring.deprecated.AIDAFrame;
-import org.lcsim.hps.monitoring.deprecated.Resettable;
-import org.lcsim.hps.readout.ecal.ReadoutTimestamp;
-import org.lcsim.hps.recon.tracking.HPSSVTCalibrationConstants;
-import org.lcsim.hps.recon.tracking.HPSTrack;
-import org.lcsim.hps.recon.vertexing.HelixConverter;
-import org.lcsim.hps.recon.vertexing.StraightLineTrack;
-import org.lcsim.recon.tracking.seedtracker.SeedCandidate;
-import org.lcsim.recon.tracking.seedtracker.SeedTrack;
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham
--- java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham/JasAnalysisDriver.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham/JasAnalysisDriver.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -20,6 +20,13 @@
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.hps.recon.tracking.FindableTrack;
+import org.hps.recon.tracking.StraightLineTrack;
+import org.hps.recon.tracking.TrackAnalysis;
+import org.hps.recon.vertexing.BFitter;
+import org.hps.recon.vertexing.BilliorTrack;
+import org.hps.recon.vertexing.BilliorVertex;
+import org.hps.recon.vertexing.BilliorVertexer;
import org.lcsim.event.EventHeader;
import org.lcsim.event.LCRelation;
import org.lcsim.event.MCParticle;
@@ -34,13 +41,6 @@
import org.lcsim.fit.helicaltrack.HelicalTrackHit;
import org.lcsim.fit.helicaltrack.HelixParamCalculator;
import org.lcsim.fit.helicaltrack.HelixUtils;
-import org.lcsim.hps.recon.vertexing.BFitter;
-import org.lcsim.hps.recon.vertexing.BilliorTrack;
-import org.lcsim.hps.recon.vertexing.BilliorVertex;
-import org.lcsim.hps.recon.vertexing.StraightLineTrack;
-import org.lcsim.hps.recon.tracking.FindableTrack;
-import org.lcsim.hps.recon.tracking.TrackAnalysis;
-import org.lcsim.hps.recon.vertexing.*;
import org.lcsim.recon.tracking.digitization.sisim.SiTrackerHitStrip1D;
import org.lcsim.recon.tracking.seedtracker.SeedCandidate;
import org.lcsim.recon.tracking.seedtracker.SeedTrack;
java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham
--- java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham/KalmanFilterDriver.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham/KalmanFilterDriver.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -5,31 +5,31 @@
package org.lcsim.hps.users.mgraham;
import hep.physics.vec.Hep3Vector;
+
import java.util.List;
+
+import org.hps.recon.tracking.TrackAnalysis;
+import org.hps.recon.tracking.TrackUtils;
import org.lcsim.event.EventHeader;
import org.lcsim.event.LCRelation;
import org.lcsim.event.MCParticle;
import org.lcsim.event.RelationalTable;
import org.lcsim.event.Track;
-import org.lcsim.geometry.Detector;
-import org.lcsim.hps.recon.tracking.kalman.FullFitKalman;
-import org.lcsim.hps.recon.tracking.kalman.ShapeDispatcher;
-import org.lcsim.hps.recon.tracking.kalman.TrackUtils;
-import org.lcsim.recon.tracking.trfbase.ETrack;
-import org.lcsim.util.Driver;
import org.lcsim.event.TrackerHit;
import org.lcsim.event.base.BaseRelationalTable;
import org.lcsim.fit.helicaltrack.HelicalTrackFit;
import org.lcsim.fit.helicaltrack.HelixUtils;
-import org.lcsim.hps.recon.tracking.TrackAnalysis;
+import org.lcsim.geometry.Detector;
+import org.lcsim.recon.tracking.trfbase.ETrack;
import org.lcsim.recon.tracking.trfbase.PropDir;
import org.lcsim.recon.tracking.trfbase.Propagator;
import org.lcsim.recon.tracking.trfbase.TrackError;
import org.lcsim.recon.tracking.trfbase.TrackVector;
import org.lcsim.recon.tracking.trfbase.VTrack;
import org.lcsim.recon.tracking.trfdca.SurfDCA;
+import org.lcsim.recon.tracking.trffit.FullFitKalman;
import org.lcsim.recon.tracking.trffit.HTrack;
-import org.lcsim.recon.tracking.trfxyp.SurfXYPlane;
+import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
/**
java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham
--- java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham/KalmanGeom.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham/KalmanGeom.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -26,12 +26,6 @@
import org.lcsim.fit.helicaltrack.HelicalTrackFit;
import org.lcsim.fit.helicaltrack.HelicalTrackStrip;
import org.lcsim.geometry.Detector;
-import org.lcsim.hps.recon.tracking.kalman.KalmanSurface;
-import org.lcsim.hps.recon.tracking.kalman.PropDCAXY;
-import org.lcsim.hps.recon.tracking.kalman.PropXYDCA;
-import org.lcsim.hps.recon.tracking.kalman.PropXYXY;
-import org.lcsim.hps.recon.tracking.kalman.ShapeDispatcher;
-import org.lcsim.hps.recon.tracking.kalman.util.PropDCAZ;
import org.lcsim.recon.tracking.trfbase.ETrack;
import org.lcsim.recon.tracking.trfbase.PropDispatch;
import org.lcsim.recon.tracking.trfbase.Propagator;
@@ -46,6 +40,7 @@
import org.lcsim.recon.tracking.trffit.HTrack;
import org.lcsim.recon.tracking.trfxyp.ClusXYPlane2;
import org.lcsim.recon.tracking.trfxyp.HitXYPlane2;
+import org.lcsim.recon.tracking.trfxyp.PropXYXY;
import org.lcsim.recon.tracking.trfxyp.SurfXYPlane;
import org.lcsim.recon.tracking.trfzp.PropZZ;
import org.lcsim.recon.tracking.trfzp.SurfZPlane;
java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham
--- java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham/MainJASDriver.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham/MainJASDriver.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -1,8 +1,10 @@
package org.lcsim.hps.users.mgraham;
-import org.lcsim.hps.recon.tracking.DataTrackerHitDriver;
-import org.lcsim.hps.conditions.CalibrationDriver;
-import org.lcsim.hps.recon.tracking.*;
+import org.hps.conditions.deprecated.CalibrationDriver;
+import org.hps.recon.tracking.DataTrackerHitDriver;
+import org.hps.recon.tracking.HPSRawTrackerHitFitterDriver;
+import org.hps.recon.tracking.HelicalTrackHitDriver;
+import org.hps.recon.tracking.TrackerReconDriver;
import org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup;
import org.lcsim.util.Driver;
java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham
--- java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham/MyLCIOWriterDriver.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham/MyLCIOWriterDriver.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -1,10 +1,11 @@
package org.lcsim.hps.users.mgraham;
import java.io.IOException;
+
import org.lcsim.event.EventHeader;
import org.lcsim.event.Track;
+import org.lcsim.lcio.LCIOWriter;
import org.lcsim.util.Driver;
-import org.lcsim.lcio.LCIOWriter;
/**
*
java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham
--- java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham/PropXYXY_Test.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham/PropXYXY_Test.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -9,7 +9,6 @@
package org.lcsim.hps.users.mgraham;
//import junit.framework.TestCase;
-import org.lcsim.hps.recon.tracking.kalman.PropXYXY;
import org.lcsim.recon.tracking.spacegeom.SpacePath;
import org.lcsim.recon.tracking.spacegeom.SpacePoint;
import org.lcsim.recon.tracking.trfbase.ETrack;
@@ -22,6 +21,7 @@
import org.lcsim.recon.tracking.trfbase.TrackVector;
import org.lcsim.recon.tracking.trfbase.VTrack;
import org.lcsim.recon.tracking.trfutil.Assert;
+import org.lcsim.recon.tracking.trfxyp.PropXYXY;
import org.lcsim.recon.tracking.trfxyp.SurfXYPlane;
import org.lcsim.util.Driver;
java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham
--- java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham/SingleSensorHelicalTrackHitDriver.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham/SingleSensorHelicalTrackHitDriver.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -4,27 +4,28 @@
*/
package org.lcsim.hps.users.mgraham;
-import org.lcsim.hps.recon.tracking.*;
import hep.physics.vec.Hep3Vector;
import hep.physics.vec.VecOp;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+
+import org.hps.recon.tracking.HPSTransformations;
import org.lcsim.detector.IDetectorElement;
import org.lcsim.detector.ITransform3D;
import org.lcsim.detector.tracker.silicon.SiTrackerModule;
-import org.lcsim.event.base.MyLCRelation;
import org.lcsim.event.EventHeader;
import org.lcsim.event.LCRelation;
import org.lcsim.event.MCParticle;
import org.lcsim.event.RawTrackerHit;
+import org.lcsim.event.base.MyLCRelation;
import org.lcsim.fit.helicaltrack.HelicalTrackCross;
import org.lcsim.fit.helicaltrack.HelicalTrackHit;
import org.lcsim.fit.helicaltrack.HelicalTrackStrip;
import org.lcsim.geometry.Detector;
import org.lcsim.geometry.subdetector.BarrelEndcapFlag;
-import org.lcsim.hps.event.HPSTransformations;
import org.lcsim.recon.tracking.digitization.sisim.SiTrackerHit;
import org.lcsim.recon.tracking.digitization.sisim.SiTrackerHitStrip1D;
import org.lcsim.recon.tracking.digitization.sisim.TrackerHitType;
java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham
--- java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham/SingleSensorTrackerReconDriver.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham/SingleSensorTrackerReconDriver.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -1,17 +1,17 @@
package org.lcsim.hps.users.mgraham;
-import org.lcsim.hps.recon.tracking.*;
import hep.physics.vec.BasicHep3Vector;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import org.hps.recon.tracking.HPSTransformations;
+import org.hps.recon.tracking.SeedTracker;
+import org.hps.recon.tracking.TrackerDigiDriver;
import org.lcsim.event.EventHeader;
import org.lcsim.event.Track;
import org.lcsim.fit.helicaltrack.HelicalTrackHit;
import org.lcsim.geometry.Detector;
-import org.lcsim.hps.event.HPSTransformations;
import org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver;
import org.lcsim.recon.tracking.seedtracker.SeedStrategy;
import org.lcsim.recon.tracking.seedtracker.StrategyXMLUtils;
java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham
--- java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham/TestAnalysisDriver.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham/TestAnalysisDriver.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -6,21 +6,22 @@
import hep.aida.IAnalysisFactory;
import hep.aida.IProfile1D;
+
import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.lcsim.event.*;
+
+import org.hps.recon.tracking.HPSFittedRawTrackerHit;
+import org.hps.recon.tracking.TrackAnalysis;
+import org.lcsim.event.EventHeader;
+import org.lcsim.event.RawTrackerHit;
+import org.lcsim.event.RelationalTable;
+import org.lcsim.event.Track;
import org.lcsim.event.base.BaseRelationalTable;
-import org.lcsim.fit.helicaltrack.HelicalTrackFit;
-import org.lcsim.fit.helicaltrack.HelicalTrackHit;
-import org.lcsim.hps.recon.tracking.HPSFittedRawTrackerHit;
-import org.lcsim.hps.recon.tracking.TrackAnalysis;
import org.lcsim.recon.tracking.digitization.sisim.SiTrackerHitStrip1D;
-import org.lcsim.recon.tracking.seedtracker.SeedCandidate;
-import org.lcsim.recon.tracking.seedtracker.SeedTrack;
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham
--- java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham/TrackExtrapolationAnalysis.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham/TrackExtrapolationAnalysis.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -1,27 +1,26 @@
package org.lcsim.hps.users.mgraham;
-import hep.aida.*;
+import hep.aida.IAnalysisFactory;
+import hep.aida.IHistogram1D;
+import hep.aida.IHistogram2D;
+import hep.aida.IPlotter;
+import hep.aida.IPlotterStyle;
import hep.physics.vec.Hep3Vector;
-import java.io.FileNotFoundException;
-import java.io.IOException;
import java.util.List;
import java.util.Map;
-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.HPSTrack;
+import org.hps.recon.tracking.HelixConverter;
+import org.hps.recon.tracking.StraightLineTrack;
+import org.hps.recon.tracking.TrackUtils;
+import org.hps.util.AIDAFrame;
import org.lcsim.event.EventHeader;
import org.lcsim.event.Track;
import org.lcsim.fit.helicaltrack.HelicalTrackFit;
-import org.lcsim.fit.helicaltrack.HelixUtils;
import org.lcsim.geometry.Detector;
-import org.lcsim.hps.event.BeamlineConstants;
-import org.lcsim.hps.monitoring.deprecated.AIDAFrame;
-import org.lcsim.hps.recon.ecal.HPSEcalCluster;
-import org.lcsim.hps.recon.tracking.HPSTrack;
-import org.lcsim.hps.recon.tracking.TrackUtils;
-import org.lcsim.hps.recon.vertexing.HelixConverter;
-import org.lcsim.hps.recon.vertexing.StraightLineTrack;
import org.lcsim.recon.tracking.seedtracker.SeedCandidate;
import org.lcsim.recon.tracking.seedtracker.SeedTrack;
import org.lcsim.util.Driver;
java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham
--- java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham/TwoTrackAnalysis.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham/TwoTrackAnalysis.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -1,7 +1,5 @@
package org.lcsim.hps.users.mgraham;
-import Jama.Matrix;
-import Jama.SingularValueDecomposition;
import hep.aida.IAnalysisFactory;
import hep.aida.IHistogram1D;
import hep.aida.IHistogram2D;
@@ -19,23 +17,26 @@
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.hps.conditions.deprecated.BeamlineConstants;
+import org.hps.recon.tracking.HPSTrack;
+import org.hps.recon.tracking.HelixConverter;
+import org.hps.recon.tracking.StraightLineTrack;
+import org.hps.util.AIDAFrame;
+import org.hps.util.Resettable;
import org.lcsim.event.EventHeader;
import org.lcsim.event.Track;
import org.lcsim.event.TrackerHit;
import org.lcsim.fit.helicaltrack.HelicalTrackFit;
import org.lcsim.fit.helicaltrack.HelicalTrackHit;
import org.lcsim.geometry.Detector;
-import org.lcsim.hps.event.BeamlineConstants;
-import org.lcsim.hps.monitoring.deprecated.AIDAFrame;
-import org.lcsim.hps.monitoring.deprecated.Resettable;
-import org.lcsim.hps.recon.tracking.HPSTrack;
-import org.lcsim.hps.recon.vertexing.HelixConverter;
-import org.lcsim.hps.recon.vertexing.StraightLineTrack;
import org.lcsim.recon.tracking.seedtracker.SeedCandidate;
import org.lcsim.recon.tracking.seedtracker.SeedTrack;
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
+import Jama.Matrix;
+import Jama.SingularValueDecomposition;
+
/**
*
* @author mgraham
java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham/alignment
--- java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham/alignment/AlignmentParameters.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham/alignment/AlignmentParameters.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -7,6 +7,7 @@
import hep.physics.vec.Hep3Matrix;
import hep.physics.vec.Hep3Vector;
import hep.physics.vec.VecOp;
+
import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
@@ -16,6 +17,8 @@
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
+
+import org.hps.recon.tracking.HPSTransformations;
import org.lcsim.detector.IDetectorElement;
import org.lcsim.detector.ITransform3D;
import org.lcsim.detector.tracker.silicon.ChargeCarrier;
@@ -31,7 +34,6 @@
import org.lcsim.fit.helicaltrack.HelixUtils;
import org.lcsim.fit.helicaltrack.MultipleScatter;
import org.lcsim.fit.helicaltrack.TrackDirection;
-import org.lcsim.hps.event.HPSTransformations;
import org.lcsim.recon.tracking.seedtracker.SeedCandidate;
import org.lcsim.recon.tracking.seedtracker.SeedTrack;
java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham/alignment
--- java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham/alignment/HPSStrips.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham/alignment/HPSStrips.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -10,18 +10,20 @@
*/
//import static org.lcsim.units.clhep.SystemOfUnits.*;
-import org.lcsim.detector.IDetectorElement;
-import org.lcsim.detector.ITransform3D;
-import org.lcsim.detector.Transform3D;
+import hep.physics.vec.BasicHep3Vector;
import hep.physics.vec.Hep3Vector;
-import hep.physics.vec.BasicHep3Vector;
import hep.physics.vec.VecOp;
+
import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
import java.util.SortedMap;
import java.util.TreeMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.List;
+
+import org.lcsim.detector.IDetectorElement;
+import org.lcsim.detector.ITransform3D;
+import org.lcsim.detector.Transform3D;
import org.lcsim.detector.solids.GeomOp2D;
import org.lcsim.detector.solids.GeomOp3D;
import org.lcsim.detector.solids.Line3D;
@@ -31,7 +33,6 @@
import org.lcsim.detector.tracker.silicon.ChargeCarrier;
import org.lcsim.detector.tracker.silicon.ChargeDistribution;
import org.lcsim.detector.tracker.silicon.SiSensor;
-import org.lcsim.detector.tracker.silicon.SiSensorElectrodes;
import org.lcsim.detector.tracker.silicon.SiStrips;
/**
java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham/alignment
--- java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham/alignment/RunAlignment.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham/alignment/RunAlignment.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -1,6 +1,5 @@
package org.lcsim.hps.users.mgraham.alignment;
-import hep.aida.IAnalysisFactory;
import java.io.IOException;
import java.util.List;
import java.util.logging.Level;
java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham/jlabrotation
--- java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham/jlabrotation/DetailedAnalysisDriver.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/mgraham/jlabrotation/DetailedAnalysisDriver.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -4,34 +4,38 @@
*/
package org.lcsim.hps.users.mgraham.jlabrotation;
-import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import hep.aida.IAnalysisFactory;
+import hep.aida.IHistogram1D;
+import hep.aida.IHistogramFactory;
+import hep.aida.IProfile1D;
import hep.physics.matrix.SymmetricMatrix;
import hep.physics.vec.BasicHep3Vector;
import hep.physics.vec.Hep3Vector;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import hep.aida.*;
-
-import hep.physics.matrix.BasicMatrix;
import hep.physics.vec.VecOp;
+
import java.io.FileWriter;
+import java.io.IOException;
import java.io.PrintWriter;
import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.hps.recon.tracking.FindableTrack;
+import org.hps.recon.tracking.StraightLineTrack;
+import org.hps.recon.tracking.TrackAnalysis;
+import org.hps.recon.vertexing.BilliorTrack;
import org.lcsim.detector.IDetectorElement;
import org.lcsim.event.EventHeader;
import org.lcsim.event.LCRelation;
import org.lcsim.event.MCParticle;
-import org.lcsim.event.RelationalTable;
-import org.lcsim.event.Track;
import org.lcsim.event.RawTrackerHit;
+import org.lcsim.event.RelationalTable;
import org.lcsim.event.SimTrackerHit;
+import org.lcsim.event.Track;
import org.lcsim.event.TrackerHit;
import org.lcsim.event.base.BaseRelationalTable;
import org.lcsim.fit.helicaltrack.HelicalTrackCross;
@@ -41,11 +45,6 @@
import org.lcsim.fit.helicaltrack.HelixParamCalculator;
import org.lcsim.fit.helicaltrack.HelixUtils;
import org.lcsim.fit.helicaltrack.TrackDirection;
-import org.lcsim.hps.recon.vertexing.BilliorTrack;
-import org.lcsim.hps.recon.vertexing.BilliorVertex;
-import org.lcsim.hps.recon.vertexing.StraightLineTrack;
-import org.lcsim.hps.recon.tracking.FindableTrack;
-import org.lcsim.hps.recon.tracking.TrackAnalysis;
import org.lcsim.recon.tracking.digitization.sisim.SiTrackerHitStrip1D;
import org.lcsim.recon.tracking.seedtracker.SeedCandidate;
import org.lcsim.recon.tracking.seedtracker.SeedTrack;
java/trunk/users/src/main/java/org/lcsim/hps/users/ngraf
--- java/trunk/users/src/main/java/org/lcsim/hps/users/ngraf/NearestNeighborClusterDriver.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/ngraf/NearestNeighborClusterDriver.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -4,17 +4,14 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+
+import org.hps.recon.ecal.ECalUtils;
import org.lcsim.event.CalorimeterHit;
-import org.lcsim.event.Cluster;
import org.lcsim.event.EventHeader;
-import org.lcsim.event.MCParticle;
-import org.lcsim.event.SimCalorimeterHit;
import org.lcsim.geometry.Detector;
import org.lcsim.geometry.subdetector.HPSEcal3;
-import org.lcsim.hps.recon.ecal.ECalUtils;
import org.lcsim.lcio.LCIOConstants;
import org.lcsim.util.Driver;
-import org.lcsim.util.aida.AIDA;
/**
* This is a test
java/trunk/users/src/main/java/org/lcsim/hps/users/omoreno
--- java/trunk/users/src/main/java/org/lcsim/hps/users/omoreno/PlotUtils.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/omoreno/PlotUtils.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -1,25 +1,16 @@
package org.lcsim.hps.users.omoreno;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.lcsim.detector.tracker.silicon.SiSensor;
-import org.lcsim.hps.monitoring.deprecated.AIDAFrame;
-import org.lcsim.hps.recon.tracking.SvtUtils;
-import org.lcsim.util.aida.AIDA;
-
-import hep.aida.IHistogram2D;
-
import hep.aida.ICloud2D;
//--- hep ---//
import hep.aida.IHistogram1D;
import hep.aida.IHistogram2D;
import hep.aida.IPlotter;
import hep.aida.IPlotterStyle;
-import hep.physics.vec.Hep3Vector;
+import org.hps.conditions.deprecated.SvtUtils;
+import org.lcsim.detector.tracker.silicon.SiSensor;
+import org.lcsim.util.aida.AIDA;
+
public class PlotUtils {
// Default ctor
java/trunk/users/src/main/java/org/lcsim/hps/users/omoreno
--- java/trunk/users/src/main/java/org/lcsim/hps/users/omoreno/ReconstructedParticleChecker.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/omoreno/ReconstructedParticleChecker.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -1,10 +1,6 @@
package org.lcsim.hps.users.omoreno;
//--- java ---//
-import java.util.ArrayList;
-import java.util.List;
-
-
//--- hep ---//
import hep.aida.IHistogram1D;
import hep.aida.IPlotter;
@@ -12,18 +8,19 @@
import hep.physics.vec.Hep3Vector;
import hep.physics.vec.VecOp;
+import java.util.ArrayList;
+import java.util.List;
+import org.hps.recon.tracking.TrackUtils;
+import org.lcsim.event.Cluster;
//--- lcsim ---//
import org.lcsim.event.EventHeader;
import org.lcsim.event.ReconstructedParticle;
import org.lcsim.event.Track;
-import org.lcsim.event.Cluster;
+import org.lcsim.geometry.Detector;
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
-import org.lcsim.geometry.Detector;
-
//--- hps-java ---//
-import org.lcsim.hps.recon.tracking.TrackUtils;
/**
*
java/trunk/users/src/main/java/org/lcsim/hps/users/omoreno
--- java/trunk/users/src/main/java/org/lcsim/hps/users/omoreno/SimpleSvtTrigger.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/omoreno/SimpleSvtTrigger.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -5,17 +5,16 @@
import java.util.List;
import java.util.Set;
-//--- lcsim ---//
-import org.lcsim.util.Driver;
+import org.hps.conditions.deprecated.SvtUtils;
+import org.hps.recon.tracking.FindableTrack;
+import org.hps.recon.tracking.apv25.Apv25Full;
import org.lcsim.detector.tracker.silicon.SiSensor;
import org.lcsim.event.EventHeader;
import org.lcsim.event.MCParticle;
import org.lcsim.event.SimTrackerHit;
-
+//--- lcsim ---//
+import org.lcsim.util.Driver;
//--- hps-java ---//
-import org.lcsim.hps.recon.tracking.FindableTrack;
-import org.lcsim.hps.recon.tracking.SvtUtils;
-import org.lcsim.hps.recon.tracking.apv25.Apv25Full;
public class SimpleSvtTrigger extends Driver {
java/trunk/users/src/main/java/org/lcsim/hps/users/omoreno
--- java/trunk/users/src/main/java/org/lcsim/hps/users/omoreno/SvtHitCorrelations.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/omoreno/SvtHitCorrelations.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -1,24 +1,23 @@
package org.lcsim.hps.users.omoreno;
//--- java ---//
+//--- aida ---//
+import hep.aida.IPlotter;
+
import java.util.ArrayList;
import java.util.List;
-//--- org.lcsim ---//
-import org.lcsim.util.Driver;
-import org.lcsim.util.aida.AIDA;
+import org.hps.conditions.deprecated.SvtUtils;
+import org.hps.util.AIDAFrame;
import org.lcsim.detector.tracker.silicon.SiSensor;
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
import org.lcsim.geometry.Detector;
-
+//--- org.lcsim ---//
+import org.lcsim.util.Driver;
+import org.lcsim.util.aida.AIDA;
//--- hps-java ---//
-import org.lcsim.hps.monitoring.deprecated.AIDAFrame;
-import org.lcsim.hps.recon.tracking.SvtUtils;
-//--- aida ---//
-import hep.aida.IPlotter;
-
/**
*
* @author Omar Moreno
java/trunk/users/src/main/java/org/lcsim/hps/users/omoreno
--- java/trunk/users/src/main/java/org/lcsim/hps/users/omoreno/SvtHitEfficiency.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/omoreno/SvtHitEfficiency.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -16,14 +16,17 @@
import java.util.List;
import java.util.Map;
-
-//--- lcsim ---//
-import org.lcsim.util.Driver;
-import org.lcsim.util.aida.AIDA;
+import org.hps.conditions.deprecated.HPSSVTCalibrationConstants;
+import org.hps.conditions.deprecated.SvtUtils;
+import org.hps.recon.ecal.HPSEcalCluster;
+import org.hps.recon.tracking.TrackUtils;
+import org.hps.recon.tracking.TrackerHitUtils;
+import org.hps.util.AIDAFrame;
import org.lcsim.detector.ITransform3D;
import org.lcsim.detector.solids.Box;
import org.lcsim.detector.solids.Point3D;
import org.lcsim.detector.solids.Polygon3D;
+import org.lcsim.detector.tracker.silicon.ChargeCarrier;
import org.lcsim.detector.tracker.silicon.SiSensor;
import org.lcsim.detector.tracker.silicon.SiStrips;
import org.lcsim.event.EventHeader;
@@ -31,14 +34,10 @@
import org.lcsim.event.TrackerHit;
import org.lcsim.fit.helicaltrack.HelicalTrackHit;
import org.lcsim.geometry.Detector;
-import org.lcsim.detector.tracker.silicon.ChargeCarrier;
-import org.lcsim.hps.recon.tracking.HPSSVTCalibrationConstants;
+//--- lcsim ---//
+import org.lcsim.util.Driver;
+import org.lcsim.util.aida.AIDA;
//--- hps-java ---//
-import org.lcsim.hps.recon.tracking.SvtUtils;
-import org.lcsim.hps.recon.tracking.TrackUtils;
-import org.lcsim.hps.recon.tracking.TrackerHitUtils;
-import org.lcsim.hps.monitoring.deprecated.AIDAFrame;
-import org.lcsim.hps.recon.ecal.HPSEcalCluster;
public class SvtHitEfficiency extends Driver {
java/trunk/users/src/main/java/org/lcsim/hps/users/omoreno
--- java/trunk/users/src/main/java/org/lcsim/hps/users/omoreno/SvtPerformance.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/omoreno/SvtPerformance.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -12,23 +12,21 @@
import java.util.ArrayList;
import java.util.List;
+import org.hps.conditions.deprecated.HPSSVTCalibrationConstants;
+import org.hps.conditions.deprecated.HPSSVTCalibrationConstants.ChannelConstants;
+import org.hps.recon.tracking.HPSShapeFitParameters;
+import org.hps.recon.tracking.HPSShaperAnalyticFitAlgorithm;
import org.lcsim.detector.tracker.silicon.HpsSiSensor;
-import org.lcsim.geometry.Detector;
-
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
import org.lcsim.event.Track;
import org.lcsim.event.TrackerHit;
import org.lcsim.fit.helicaltrack.HelicalTrackCross;
import org.lcsim.fit.helicaltrack.HelicalTrackStrip;
+import org.lcsim.geometry.Detector;
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
-import org.lcsim.hps.recon.tracking.HPSSVTCalibrationConstants;
-import org.lcsim.hps.recon.tracking.HPSSVTCalibrationConstants.ChannelConstants;
-import org.lcsim.hps.recon.tracking.HPSShapeFitParameters;
-import org.lcsim.hps.recon.tracking.HPSShaperAnalyticFitAlgorithm;
-
/**
* Driver that looks at the performance of the SVT.
*
java/trunk/users/src/main/java/org/lcsim/hps/users/omoreno
--- java/trunk/users/src/main/java/org/lcsim/hps/users/omoreno/SvtQA.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/omoreno/SvtQA.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -15,6 +15,15 @@
import java.util.Map;
import java.util.Set;
+import org.hps.conditions.deprecated.HPSSVTCalibrationConstants;
+import org.hps.conditions.deprecated.HPSSVTCalibrationConstants.ChannelConstants;
+import org.hps.conditions.deprecated.SvtUtils;
+import org.hps.recon.tracking.HPSFittedRawTrackerHit;
+import org.hps.recon.tracking.HPSShapeFitParameters;
+import org.hps.recon.tracking.HPSShaperAnalyticFitAlgorithm;
+import org.hps.recon.tracking.TrackUtils;
+import org.hps.recon.tracking.apv25.SvtReadout;
+import org.hps.util.AIDAFrame;
//--- lcsim ---//
import org.lcsim.detector.tracker.silicon.SiSensor;
import org.lcsim.event.EventHeader;
@@ -29,21 +38,9 @@
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
+import static org.hps.conditions.deprecated.HPSSVTConstants.TOTAL_STRIPS_PER_SENSOR;
//--- hps-java ---//
-import org.lcsim.hps.monitoring.deprecated.AIDAFrame;
-import org.lcsim.hps.recon.tracking.HPSFittedRawTrackerHit;
-import org.lcsim.hps.recon.tracking.HPSSVTCalibrationConstants;
-import org.lcsim.hps.recon.tracking.HPSSVTCalibrationConstants.ChannelConstants;
-import org.lcsim.hps.recon.tracking.HPSShapeFitParameters;
-import org.lcsim.hps.recon.tracking.HPSShaperAnalyticFitAlgorithm;
-import org.lcsim.hps.recon.tracking.SvtUtils;
-import org.lcsim.hps.recon.tracking.TrackUtils;
-import org.lcsim.hps.util.Pair;
-import org.lcsim.hps.recon.tracking.apv25.SvtReadout;
-
-
//--- Constants ---//
-import static org.lcsim.hps.recon.tracking.HPSSVTConstants.TOTAL_STRIPS_PER_SENSOR;
/**
* SVT Quality Assurance Driver
java/trunk/users/src/main/java/org/lcsim/hps/users/omoreno
--- java/trunk/users/src/main/java/org/lcsim/hps/users/omoreno/SvtTrackAnalysis.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/omoreno/SvtTrackAnalysis.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -1,13 +1,19 @@
package org.lcsim.hps.users.omoreno;
//--- java ---//
+//--- hep ---//
+import hep.aida.IPlotter;
+import hep.physics.vec.Hep3Vector;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
-
+import org.hps.recon.ecal.HPSEcalCluster;
+import org.hps.recon.tracking.TrackUtils;
+import org.hps.util.AIDAFrame;
+import org.hps.util.Resettable;
//--- org.lcsim ---//
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
@@ -17,21 +23,7 @@
import org.lcsim.recon.tracking.seedtracker.SeedTrack;
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
-
-
-
-//--- hep ---//
-import hep.aida.IPlotter;
-import hep.physics.vec.Hep3Vector;
-
-
-
//--- hps-java ---//
-import org.lcsim.hps.monitoring.deprecated.AIDAFrame;
-import org.lcsim.hps.monitoring.deprecated.Resettable;
-import org.lcsim.hps.recon.ecal.HPSEcalCluster;
-import org.lcsim.hps.recon.tracking.HPSFittedRawTrackerHit;
-import org.lcsim.hps.recon.tracking.TrackUtils;
/**
*
java/trunk/users/src/main/java/org/lcsim/hps/users/omoreno
--- java/trunk/users/src/main/java/org/lcsim/hps/users/omoreno/SvtTrackRecoEfficiency.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/omoreno/SvtTrackRecoEfficiency.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -1,33 +1,28 @@
package org.lcsim.hps.users.omoreno;
//--- java ---//
-import java.io.BufferedWriter;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.ArrayList;
-
//--- aida ---//
import hep.aida.IHistogram1D;
import hep.aida.IHistogram2D;
import hep.aida.IPlotter;
-
import hep.physics.vec.BasicHep3Vector;
//--- hep ---//
import hep.physics.vec.Hep3Vector;
import hep.physics.vec.VecOp;
+import java.io.BufferedWriter;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
-import org.lcsim.recon.tracking.digitization.sisim.SiTrackerHit;
-import org.lcsim.recon.tracking.seedtracker.SeedStrategy;
-import org.lcsim.recon.tracking.seedtracker.StrategyXMLUtils;
-//--- lcsim ---//
-import org.lcsim.util.Driver;
-import org.lcsim.util.aida.AIDA;
+import org.hps.conditions.deprecated.SvtUtils;
+import org.hps.recon.tracking.FindableTrack;
+import org.hps.recon.tracking.TrackAnalysis;
import org.lcsim.detector.tracker.silicon.SiSensor;
import org.lcsim.event.EventHeader;
import org.lcsim.event.MCParticle;
@@ -40,14 +35,13 @@
import org.lcsim.fit.helicaltrack.HelicalTrackHit;
import org.lcsim.fit.helicaltrack.HelicalTrackStrip;
import org.lcsim.geometry.Detector;
-
-import org.lcsim.hps.recon.tracking.FindableTrack.Ignore;
-import org.lcsim.hps.recon.tracking.HPSFittedRawTrackerHit;
+import org.lcsim.recon.tracking.digitization.sisim.SiTrackerHit;
+import org.lcsim.recon.tracking.seedtracker.SeedStrategy;
+import org.lcsim.recon.tracking.seedtracker.StrategyXMLUtils;
+//--- lcsim ---//
+import org.lcsim.util.Driver;
+import org.lcsim.util.aida.AIDA;
//--- hps-java ---//
-import org.lcsim.hps.recon.tracking.SvtUtils;
-import org.lcsim.hps.recon.tracking.TrackAnalysis;
-import org.lcsim.hps.recon.tracking.TrackUtils;
-import org.lcsim.hps.recon.tracking.FindableTrack;
/**
*
java/trunk/users/src/main/java/org/lcsim/hps/users/omoreno
--- java/trunk/users/src/main/java/org/lcsim/hps/users/omoreno/SvtTrackingPerformance.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/omoreno/SvtTrackingPerformance.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -4,17 +4,13 @@
import java.util.ArrayList;
import java.util.List;
+import org.hps.util.Resettable;
//--- org.lcsim ---//
import org.lcsim.event.EventHeader;
-import org.lcsim.event.Track;
import org.lcsim.fit.helicaltrack.HelicalTrackHit;
import org.lcsim.geometry.Detector;
-import org.lcsim.recon.tracking.seedtracker.SeedTrack;
import org.lcsim.util.Driver;
-import org.lcsim.util.aida.AIDA;
-
//--- hps-java ---//
-import org.lcsim.hps.monitoring.deprecated.Resettable;
/**
*
java/trunk/users/src/main/java/org/lcsim/hps/users/omoreno
--- java/trunk/users/src/main/java/org/lcsim/hps/users/omoreno/TestRunTrackReconEfficiency.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/omoreno/TestRunTrackReconEfficiency.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -1,10 +1,6 @@
package org.lcsim.hps.users.omoreno;
//--- java ---//
-import java.util.ArrayList;
-import java.util.List;
-
-
//--- hep ---//
import hep.aida.IHistogram1D;
import hep.aida.IPlotter;
@@ -12,18 +8,19 @@
import hep.physics.vec.Hep3Vector;
import hep.physics.vec.VecOp;
+import java.util.ArrayList;
+import java.util.List;
+import org.hps.recon.ecal.HPSEcalCluster;
+import org.hps.recon.tracking.TrackUtils;
+import org.lcsim.event.EventHeader;
+import org.lcsim.event.GenericObject;
+import org.lcsim.event.Track;
+import org.lcsim.geometry.Detector;
//--- lcsim ---//
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
-import org.lcsim.event.EventHeader;
-import org.lcsim.geometry.Detector;
-import org.lcsim.event.Track;
-import org.lcsim.event.GenericObject;
-
//--- hps-java ---//
-import org.lcsim.hps.recon.tracking.TrackUtils;
-import org.lcsim.hps.recon.ecal.HPSEcalCluster;
/**
* Class to calculate track reconstruction efficiency using a tag and probe
java/trunk/users/src/main/java/org/lcsim/hps/users/phansson
--- java/trunk/users/src/main/java/org/lcsim/hps/users/phansson/CmpGenToFittedTracksDriver.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/phansson/CmpGenToFittedTracksDriver.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -5,18 +5,19 @@
import hep.aida.IPlotter;
import hep.physics.vec.BasicHep3Vector;
import hep.physics.vec.Hep3Vector;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
+
+import org.hps.util.AIDAFrame;
import org.lcsim.event.EventHeader;
import org.lcsim.event.Track;
import org.lcsim.event.TrackerHit;
import org.lcsim.fit.helicaltrack.HelicalTrackFit;
import org.lcsim.geometry.Detector;
-import org.lcsim.hps.monitoring.deprecated.AIDAFrame;
-import org.lcsim.hps.recon.tracking.TrackUtils;
import org.lcsim.recon.tracking.seedtracker.SeedCandidate;
import org.lcsim.recon.tracking.seedtracker.SeedTrack;
import org.lcsim.util.Driver;
java/trunk/users/src/main/java/org/lcsim/hps/users/phansson
--- java/trunk/users/src/main/java/org/lcsim/hps/users/phansson/ECalGainDriver.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/phansson/ECalGainDriver.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -1,13 +1,17 @@
package org.lcsim.hps.users.phansson;
-import org.lcsim.hps.recon.ecal.*;
-
-import hep.aida.*;
+import hep.aida.IAnalysisFactory;
+import hep.aida.IHistogram1D;
+import hep.aida.IHistogram2D;
+import hep.aida.IPlotter;
+import hep.aida.IPlotterStyle;
import hep.aida.ref.plotter.PlotterRegion;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.io.*;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.PrintWriter;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -16,17 +20,18 @@
import javax.swing.JComboBox;
import javax.swing.JLabel;
+import org.hps.conditions.deprecated.EcalConditions;
+import org.hps.recon.ecal.HPSEcalCluster;
+import org.hps.recon.tracking.EcalTrackMatch;
+import org.hps.recon.tracking.TrackUtils;
+import org.hps.util.AIDAFrame;
+import org.hps.util.Redrawable;
+import org.hps.util.Resettable;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
import org.lcsim.event.Track;
import org.lcsim.event.base.BaseTrack;
import org.lcsim.geometry.Detector;
-import org.lcsim.hps.monitoring.deprecated.AIDAFrame;
-import org.lcsim.hps.monitoring.deprecated.Redrawable;
-import org.lcsim.hps.monitoring.deprecated.Resettable;
-import org.lcsim.hps.recon.ecal.HPSEcalCluster;
-import org.lcsim.hps.recon.tracking.EcalTrackMatch;
-import org.lcsim.hps.recon.tracking.TrackUtils;
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
java/trunk/users/src/main/java/org/lcsim/hps/users/phansson
--- java/trunk/users/src/main/java/org/lcsim/hps/users/phansson/ECalHitMapPlots.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/phansson/ECalHitMapPlots.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -4,12 +4,17 @@
*/
package org.lcsim.hps.users.phansson;
-import hep.aida.*;
+import hep.aida.IAnalysisFactory;
+import hep.aida.IHistogram1D;
import hep.aida.IHistogram2D;
+import hep.aida.IHistogramFactory;
import hep.aida.IPlotter;
+import hep.aida.IPlotterStyle;
import hep.aida.ITree;
import hep.aida.ref.plotter.PlotterRegion;
+
import java.io.IOException;
+
import org.lcsim.util.aida.AIDA;
/**
java/trunk/users/src/main/java/org/lcsim/hps/users/phansson
--- java/trunk/users/src/main/java/org/lcsim/hps/users/phansson/FastTrack.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/phansson/FastTrack.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -6,11 +6,7 @@
import hep.physics.vec.BasicHep3Vector;
import hep.physics.vec.Hep3Vector;
-import java.util.List;
-import org.lcsim.detector.identifier.IIdentifier;
-import org.lcsim.detector.tracker.silicon.*;
-import org.lcsim.event.RawTrackerHit;
-import org.lcsim.event.TrackerHit;
+
import org.lcsim.recon.tracking.digitization.sisim.SiTrackerHitStrip1D;
/**
java/trunk/users/src/main/java/org/lcsim/hps/users/phansson
--- java/trunk/users/src/main/java/org/lcsim/hps/users/phansson/FastTrackResidualDriver.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/phansson/FastTrackResidualDriver.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -4,23 +4,30 @@
*/
package org.lcsim.hps.users.phansson;
-import hep.aida.*;
+import hep.aida.IAnalysisFactory;
+import hep.aida.IHistogram1D;
+import hep.aida.IHistogram2D;
+import hep.aida.IHistogramFactory;
+import hep.aida.IPlotter;
+import hep.aida.IPlotterStyle;
import hep.aida.ref.plotter.PlotterRegion;
import hep.physics.vec.BasicHep3Vector;
import hep.physics.vec.Hep3Vector;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
+
+import org.hps.recon.ecal.HPSEcalCluster;
import org.lcsim.detector.identifier.IIdentifier;
import org.lcsim.detector.identifier.IIdentifierHelper;
-import org.lcsim.detector.tracker.silicon.*;
-import org.lcsim.event.*;
+import org.lcsim.detector.tracker.silicon.SiSensor;
+import org.lcsim.event.EventHeader;
import org.lcsim.geometry.Detector;
import org.lcsim.geometry.IDDecoder;
import org.lcsim.geometry.Subdetector;
-import org.lcsim.hps.recon.ecal.HPSEcalCluster;
import org.lcsim.recon.tracking.digitization.sisim.SiTrackerHitStrip1D;
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
java/trunk/users/src/main/java/org/lcsim/hps/users/phansson
--- java/trunk/users/src/main/java/org/lcsim/hps/users/phansson/MPAlignmentInputCalculator.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/phansson/MPAlignmentInputCalculator.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -17,9 +17,9 @@
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.hps.recon.tracking.TrackerHitUtils;
import org.lcsim.event.Track;
import org.lcsim.fit.helicaltrack.HelicalTrackFit;
-import org.lcsim.hps.recon.tracking.TrackerHitUtils;
import org.lcsim.hps.users.mgraham.alignment.RunAlignment;
import org.lcsim.util.aida.AIDA;
java/trunk/users/src/main/java/org/lcsim/hps/users/phansson
--- java/trunk/users/src/main/java/org/lcsim/hps/users/phansson/ModuleMPAlignmentInput.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/phansson/ModuleMPAlignmentInput.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -1,24 +1,36 @@
package org.lcsim.hps.users.phansson;
-import hep.aida.*;
+import hep.aida.ICloud1D;
+import hep.aida.IDataPointSet;
+import hep.aida.IDataPointSetFactory;
+import hep.aida.IHistogram;
+import hep.aida.IPlotter;
+import hep.aida.IProfile1D;
import hep.aida.ref.plotter.PlotterRegion;
import hep.physics.matrix.BasicMatrix;
import hep.physics.matrix.MatrixOp;
import hep.physics.vec.BasicHep3Vector;
import hep.physics.vec.Hep3Vector;
import hep.physics.vec.VecOp;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
+
+import org.hps.conditions.deprecated.SvtUtils;
+import org.hps.recon.tracking.TrackUtils;
+import org.hps.util.AIDAFrame;
import org.lcsim.detector.tracker.silicon.SiSensor;
import org.lcsim.event.RawTrackerHit;
import org.lcsim.event.Track;
import org.lcsim.event.TrackerHit;
-import org.lcsim.fit.helicaltrack.*;
-import org.lcsim.hps.monitoring.deprecated.AIDAFrame;
-import org.lcsim.hps.recon.tracking.SvtUtils;
-import org.lcsim.hps.recon.tracking.TrackUtils;
+import org.lcsim.fit.helicaltrack.HelicalTrackCross;
+import org.lcsim.fit.helicaltrack.HelicalTrackHit;
+import org.lcsim.fit.helicaltrack.HelicalTrackStrip;
+import org.lcsim.fit.helicaltrack.HelixUtils;
+import org.lcsim.fit.helicaltrack.MultipleScatter;
+import org.lcsim.fit.helicaltrack.TrackDirection;
import org.lcsim.recon.tracking.seedtracker.SeedCandidate;
import org.lcsim.recon.tracking.seedtracker.SeedTrack;
java/trunk/users/src/main/java/org/lcsim/hps/users/phansson
--- java/trunk/users/src/main/java/org/lcsim/hps/users/phansson/MultScatAnalysis.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/phansson/MultScatAnalysis.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -1,37 +1,40 @@
package org.lcsim.hps.users.phansson;
-import hep.aida.*;
+import hep.aida.IAnalysisFactory;
+import hep.aida.IHistogram;
+import hep.aida.IHistogram1D;
+import hep.aida.IHistogram2D;
+import hep.aida.IHistogramFactory;
+import hep.aida.IPlotter;
+import hep.aida.IPlotterStyle;
import hep.aida.ref.plotter.PlotterRegion;
-import hep.physics.vec.BasicHepLorentzVector;
import hep.physics.vec.Hep3Vector;
-import hep.physics.vec.HepLorentzVector;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.HashSet;
import java.util.List;
-import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.lcsim.detector.identifier.*;
+import org.hps.conditions.deprecated.EcalConditions;
+import org.hps.recon.ecal.HPSEcalCluster;
+import org.hps.recon.ecal.TriggerData;
+import org.hps.recon.tracking.EcalTrackMatch;
+import org.hps.recon.tracking.TrackUtils;
+import org.hps.util.AIDAFrame;
+import org.lcsim.detector.identifier.ExpandedIdentifier;
+import org.lcsim.detector.identifier.IExpandedIdentifier;
+import org.lcsim.detector.identifier.IIdentifier;
+import org.lcsim.detector.identifier.IIdentifierHelper;
import org.lcsim.event.CalorimeterHit;
-import org.lcsim.event.Cluster;
import org.lcsim.event.EventHeader;
import org.lcsim.event.Track;
+import org.lcsim.event.base.BaseCluster;
import org.lcsim.geometry.Detector;
import org.lcsim.geometry.IDDecoder;
import org.lcsim.geometry.Subdetector;
-import org.lcsim.hps.evio.TriggerData;
-import org.lcsim.hps.monitoring.deprecated.AIDAFrame;
-import org.lcsim.hps.recon.ecal.HPSEcalCluster;
-import org.lcsim.hps.recon.ecal.EcalConditions;
-import org.lcsim.hps.recon.tracking.EcalTrackMatch;
-import org.lcsim.hps.recon.tracking.TrackUtils;
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
-import org.lcsim.event.base.BaseCluster;
-import org.lcsim.recon.tracking.seedtracker.SeedTrack;
/**
*
java/trunk/users/src/main/java/org/lcsim/hps/users/phansson
--- java/trunk/users/src/main/java/org/lcsim/hps/users/phansson/ParticleHelixProducer.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/phansson/ParticleHelixProducer.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -12,6 +12,9 @@
import java.util.HashMap;
import java.util.List;
+import org.hps.analysis.ecal.HPSMCParticlePlotsDriver;
+import org.hps.recon.tracking.HPSTrack;
+import org.hps.recon.tracking.TrackerHitUtils;
import org.lcsim.constants.Constants;
import org.lcsim.event.EventHeader;
import org.lcsim.event.MCParticle;
@@ -20,9 +23,6 @@
import org.lcsim.fit.helicaltrack.HelixParamCalculator;
import org.lcsim.fit.helicaltrack.MultipleScatter;
import org.lcsim.geometry.Detector;
-import org.lcsim.hps.analysis.ecal.HPSMCParticlePlotsDriver;
-import org.lcsim.hps.recon.tracking.HPSTrack;
-import org.lcsim.hps.recon.tracking.TrackerHitUtils;
import org.lcsim.recon.tracking.digitization.sisim.TrackerHitType;
import org.lcsim.recon.tracking.digitization.sisim.TrackerHitType.CoordinateSystem;
import org.lcsim.util.Driver;
java/trunk/users/src/main/java/org/lcsim/hps/users/phansson
--- java/trunk/users/src/main/java/org/lcsim/hps/users/phansson/PolarCount.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/phansson/PolarCount.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -5,9 +5,6 @@
package org.lcsim.hps.users.phansson;
-import hep.aida.IHistogram1D;
-import java.util.ArrayList;
-import java.util.List;
/**
*
java/trunk/users/src/main/java/org/lcsim/hps/users/phansson
--- java/trunk/users/src/main/java/org/lcsim/hps/users/phansson/ROOTFlatTupleDriver.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/phansson/ROOTFlatTupleDriver.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -20,12 +20,21 @@
import java.util.logging.Level;
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.recon.ecal.HPSEcalCluster;
+import org.hps.recon.ecal.TriggerData;
+import org.hps.recon.tracking.EventQuality;
+import org.hps.recon.tracking.HPSTrack;
+import org.hps.recon.tracking.StraightLineTrack;
+import org.hps.recon.tracking.TrackUtils;
+import org.hps.recon.vertexing.TwoParticleVertexer;
+import org.hps.recon.vertexing.TwoTrackFringeVertexer;
+import org.hps.recon.vertexing.TwoTrackVertexer;
import org.lcsim.detector.IDetectorElement;
-import org.lcsim.detector.identifier.ExpandedIdentifier;
import org.lcsim.detector.identifier.IExpandedIdentifier;
-import org.lcsim.detector.identifier.IIdentifier;
import org.lcsim.detector.identifier.IIdentifierHelper;
-import org.lcsim.detector.identifier.IdentifierHelper;
import org.lcsim.detector.tracker.silicon.DopedSilicon;
import org.lcsim.detector.tracker.silicon.SiSensor;
import org.lcsim.event.EventHeader;
@@ -33,6 +42,8 @@
import org.lcsim.event.MCParticle;
import org.lcsim.event.Track;
import org.lcsim.event.TrackerHit;
+import org.lcsim.event.Vertex;
+import org.lcsim.event.base.ParticleTypeClassifier;
import org.lcsim.fit.helicaltrack.HelicalTrackCross;
import org.lcsim.fit.helicaltrack.HelicalTrackFit;
import org.lcsim.fit.helicaltrack.HelicalTrackHit;
@@ -40,21 +51,6 @@
import org.lcsim.fit.helicaltrack.HitIdentifier;
import org.lcsim.geometry.Detector;
import org.lcsim.geometry.compact.Subdetector;
-import org.lcsim.geometry.subdetector.HPSEcal3;
-import org.lcsim.hps.analysis.ecal.HPSMCParticlePlotsDriver;
-import org.lcsim.hps.event.BeamlineConstants;
-import org.lcsim.hps.evio.TriggerData;
-import org.lcsim.hps.recon.ecal.HPSEcalCluster;
-import org.lcsim.hps.recon.tracking.EventQuality;
-import org.lcsim.hps.recon.tracking.HPSTrack;
-import org.lcsim.hps.recon.tracking.SvtUtils;
-import org.lcsim.hps.recon.tracking.TrackUtils;
-import org.lcsim.hps.recon.vertexing.StraightLineTrack;
-import org.lcsim.hps.recon.vertexing.TwoParticleVertexer;
-import org.lcsim.hps.recon.vertexing.TwoTrackFringeVertexer;
-import org.lcsim.hps.recon.vertexing.TwoTrackVertexer;
-import org.lcsim.event.Vertex;
-import org.lcsim.event.base.ParticleTypeClassifier;
import org.lcsim.recon.tracking.digitization.sisim.SiTrackerHitStrip1D;
import org.lcsim.recon.tracking.seedtracker.SeedTrack;
import org.lcsim.util.Driver;
java/trunk/users/src/main/java/org/lcsim/hps/users/phansson
--- java/trunk/users/src/main/java/org/lcsim/hps/users/phansson/ResLimit.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/phansson/ResLimit.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -4,7 +4,9 @@
*/
package org.lcsim.hps.users.phansson;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
java/trunk/users/src/main/java/org/lcsim/hps/users/phansson
--- java/trunk/users/src/main/java/org/lcsim/hps/users/phansson/RunMPAlignment.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/phansson/RunMPAlignment.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -1,19 +1,19 @@
package org.lcsim.hps.users.phansson;
import hep.physics.vec.BasicHep3Vector;
-import hep.physics.vec.Hep3Vector;
+
import java.io.BufferedReader;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.lcsim.event.*;
-import org.lcsim.fit.helicaltrack.HelicalTrackStrip;
+
+import org.lcsim.event.EventHeader;
+import org.lcsim.event.Track;
+import org.lcsim.event.TrackerHit;
import org.lcsim.geometry.Detector;
-import org.lcsim.recon.tracking.digitization.sisim.SiTrackerHit;
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
java/trunk/users/src/main/java/org/lcsim/hps/users/phansson
--- java/trunk/users/src/main/java/org/lcsim/hps/users/phansson/SimpleResiduals.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/phansson/SimpleResiduals.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -10,17 +10,25 @@
import hep.aida.IPlotter;
import hep.physics.vec.BasicHep3Vector;
import hep.physics.vec.Hep3Vector;
-import hep.physics.vec.VecOp;
+
import java.io.IOException;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
+
+import org.hps.recon.ecal.HPSEcalCluster;
import org.lcsim.detector.identifier.IIdentifier;
-import org.lcsim.detector.tracker.silicon.*;
-import org.lcsim.event.*;
+import org.lcsim.detector.tracker.silicon.ChargeCarrier;
+import org.lcsim.detector.tracker.silicon.SiSensor;
+import org.lcsim.detector.tracker.silicon.SiSensorElectrodes;
+import org.lcsim.detector.tracker.silicon.SiStrips;
+import org.lcsim.detector.tracker.silicon.SiTrackerIdentifierHelper;
+import org.lcsim.event.CalorimeterHit;
+import org.lcsim.event.EventHeader;
+import org.lcsim.event.RawTrackerHit;
+import org.lcsim.event.Track;
+import org.lcsim.event.TrackerHit;
import org.lcsim.fit.helicaltrack.HelicalTrackCross;
import org.lcsim.fit.helicaltrack.HelicalTrackFit;
import org.lcsim.fit.helicaltrack.HelicalTrackHit;
@@ -29,8 +37,6 @@
import org.lcsim.geometry.Detector;
import org.lcsim.geometry.IDDecoder;
import org.lcsim.geometry.Subdetector;
-import org.lcsim.hps.recon.ecal.HPSEcalCluster;
-import org.lcsim.recon.tracking.digitization.sisim.SiTrackerHit;
import org.lcsim.recon.tracking.digitization.sisim.SiTrackerHitStrip1D;
import org.lcsim.recon.tracking.seedtracker.SeedCandidate;
import org.lcsim.recon.tracking.seedtracker.SeedTrack;
java/trunk/users/src/main/java/org/lcsim/hps/users/phansson
--- java/trunk/users/src/main/java/org/lcsim/hps/users/phansson/StripMPAlignmentInput.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/phansson/StripMPAlignmentInput.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -1,6 +1,11 @@
package org.lcsim.hps.users.phansson;
-import hep.aida.*;
+import hep.aida.ICloud1D;
+import hep.aida.IDataPointSet;
+import hep.aida.IDataPointSetFactory;
+import hep.aida.IHistogram;
+import hep.aida.IPlotter;
+import hep.aida.IProfile1D;
import hep.aida.ref.plotter.PlotterRegion;
import hep.physics.matrix.BasicMatrix;
import hep.physics.matrix.MatrixOp;
@@ -8,18 +13,25 @@
import hep.physics.vec.Hep3Matrix;
import hep.physics.vec.Hep3Vector;
import hep.physics.vec.VecOp;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
+
+import org.hps.conditions.deprecated.SvtUtils;
+import org.hps.recon.tracking.TrackUtils;
+import org.hps.util.AIDAFrame;
import org.lcsim.detector.tracker.silicon.SiSensor;
import org.lcsim.event.RawTrackerHit;
import org.lcsim.event.Track;
import org.lcsim.event.TrackerHit;
-import org.lcsim.fit.helicaltrack.*;
-import org.lcsim.hps.monitoring.deprecated.AIDAFrame;
-import org.lcsim.hps.recon.tracking.SvtUtils;
-import org.lcsim.hps.recon.tracking.TrackUtils;
+import org.lcsim.fit.helicaltrack.HelicalTrackCross;
+import org.lcsim.fit.helicaltrack.HelicalTrackHit;
+import org.lcsim.fit.helicaltrack.HelicalTrackStrip;
+import org.lcsim.fit.helicaltrack.HelixUtils;
+import org.lcsim.fit.helicaltrack.MultipleScatter;
+import org.lcsim.fit.helicaltrack.TrackDirection;
import org.lcsim.recon.tracking.seedtracker.SeedCandidate;
import org.lcsim.recon.tracking.seedtracker.SeedTrack;
java/trunk/users/src/main/java/org/lcsim/hps/users/phansson
--- java/trunk/users/src/main/java/org/lcsim/hps/users/phansson/TrigRateAna.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/phansson/TrigRateAna.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -4,8 +4,15 @@
*/
package org.lcsim.hps.users.phansson;
-import hep.aida.*;
+import hep.aida.IAnalysisFactory;
+import hep.aida.IDataPointSet;
+import hep.aida.IHistogram1D;
+import hep.aida.IHistogram2D;
+import hep.aida.IHistogramFactory;
+import hep.aida.IPlotter;
+import hep.aida.ITree;
import hep.aida.ref.plotter.PlotterRegion;
+
import java.io.BufferedReader;
import java.io.FileNotFoundException;
import java.io.FileReader;
@@ -16,6 +23,7 @@
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
+
import org.lcsim.util.aida.AIDA;
java/trunk/users/src/main/java/org/lcsim/hps/users/phansson
--- java/trunk/users/src/main/java/org/lcsim/hps/users/phansson/TrigRateDriver.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/phansson/TrigRateDriver.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -4,7 +4,13 @@
*/
package org.lcsim.hps.users.phansson;
-import hep.aida.*;
+import hep.aida.IAnalysisFactory;
+import hep.aida.IHistogram;
+import hep.aida.IHistogram1D;
+import hep.aida.IHistogram2D;
+import hep.aida.IHistogramFactory;
+import hep.aida.IPlotter;
+import hep.aida.IPlotterStyle;
import hep.aida.ref.plotter.PlotterRegion;
import java.io.IOException;
@@ -13,6 +19,11 @@
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.EcalTrackMatch;
+import org.hps.util.AIDAFrame;
import org.lcsim.detector.identifier.ExpandedIdentifier;
import org.lcsim.detector.identifier.IExpandedIdentifier;
import org.lcsim.detector.identifier.IIdentifier;
@@ -23,11 +34,6 @@
import org.lcsim.geometry.Detector;
import org.lcsim.geometry.IDDecoder;
import org.lcsim.geometry.Subdetector;
-import org.lcsim.hps.event.BeamlineConstants;
-import org.lcsim.hps.monitoring.deprecated.AIDAFrame;
-import org.lcsim.hps.recon.ecal.HPSEcalCluster;
-import org.lcsim.hps.recon.ecal.EcalConditions;
-import org.lcsim.hps.recon.tracking.EcalTrackMatch;
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
java/trunk/users/src/main/java/org/lcsim/hps/users/phansson
--- java/trunk/users/src/main/java/org/lcsim/hps/users/phansson/TriggerTurnOnAnalysis.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/phansson/TriggerTurnOnAnalysis.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -4,20 +4,25 @@
*/
package org.lcsim.hps.users.phansson;
-import hep.aida.*;
+import hep.aida.IAnalysisFactory;
+import hep.aida.IHistogram1D;
+import hep.aida.IHistogram2D;
+import hep.aida.IHistogramFactory;
+import hep.aida.IPlotter;
import hep.physics.vec.Hep3Vector;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
+
+import org.hps.analysis.ecal.HPSMCParticlePlotsDriver;
+import org.hps.recon.ecal.HPSEcalCluster;
+import org.hps.recon.ecal.TriggerData;
import org.lcsim.event.EventHeader;
import org.lcsim.event.MCParticle;
-import org.lcsim.event.base.ParticleTypeClassifier;
import org.lcsim.geometry.Detector;
-import org.lcsim.hps.analysis.ecal.HPSMCParticlePlotsDriver;
-import org.lcsim.hps.evio.TriggerData;
-import org.lcsim.hps.recon.ecal.HPSEcalCluster;
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
java/trunk/users/src/main/java/org/lcsim/hps/users/phansson
--- java/trunk/users/src/main/java/org/lcsim/hps/users/phansson/TruthMomentumResolutionDriver.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/phansson/TruthMomentumResolutionDriver.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -1,18 +1,27 @@
package org.lcsim.hps.users.phansson;
-import hep.aida.*;
+import hep.aida.IAnalysisFactory;
+import hep.aida.ICloud1D;
+import hep.aida.IDataPointSet;
+import hep.aida.IDataPointSetFactory;
+import hep.aida.IHistogram1D;
+import hep.aida.IPlotter;
+import hep.aida.IPlotterStyle;
+
import java.io.IOException;
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.hps.analysis.ecal.HPSMCParticlePlotsDriver;
+import org.hps.util.AIDAFrame;
import org.lcsim.event.EventHeader;
import org.lcsim.event.MCParticle;
import org.lcsim.event.Track;
import org.lcsim.event.base.ParticleTypeClassifier;
import org.lcsim.geometry.Detector;
-import org.lcsim.hps.analysis.ecal.HPSMCParticlePlotsDriver;
-import org.lcsim.hps.monitoring.deprecated.AIDAFrame;
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
java/trunk/users/src/main/java/org/lcsim/hps/users/phansson
--- java/trunk/users/src/main/java/org/lcsim/hps/users/phansson/ecalGainAna.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/phansson/ecalGainAna.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -1,15 +1,29 @@
package org.lcsim.hps.users.phansson;
-import hep.aida.*;
+import hep.aida.IAnalysisFactory;
+import hep.aida.IDataPointSet;
+import hep.aida.IDataPointSetFactory;
+import hep.aida.IHistogram1D;
+import hep.aida.IHistogram2D;
+import hep.aida.IHistogramFactory;
+import hep.aida.IPlotter;
+import hep.aida.ITree;
+import hep.aida.ITreeFactory;
+
import java.io.IOException;
import java.io.PrintStream;
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.apache.commons.cli.*;
+
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.apache.commons.cli.PosixParser;
+import org.hps.conditions.deprecated.EcalConditions;
+import org.hps.recon.ecal.ECalUtils;
import org.lcsim.geometry.util.DetectorLocator;
-import org.lcsim.hps.recon.ecal.ECalUtils;
-import org.lcsim.hps.recon.ecal.EcalConditions;
-import org.lcsim.util.aida.AIDA;
/**
*
java/trunk/users/src/main/java/org/lcsim/hps/users/phansson
--- java/trunk/users/src/main/java/org/lcsim/hps/users/phansson/ecalPlots.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/phansson/ecalPlots.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -4,14 +4,23 @@
*/
package org.lcsim.hps.users.phansson;
-import hep.aida.*;
+import hep.aida.IAnalysisFactory;
+import hep.aida.IHistogram1D;
+import hep.aida.ITree;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.apache.commons.cli.*;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.apache.commons.cli.PosixParser;
+
/**
*
* @author phansson
java/trunk/users/src/main/java/org/lcsim/hps/users/phansson
--- java/trunk/users/src/main/java/org/lcsim/hps/users/phansson/trigRate.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/phansson/trigRate.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -4,15 +4,21 @@
*/
package org.lcsim.hps.users.phansson;
-import hep.aida.*;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
+import hep.aida.IAnalysisFactory;
+import hep.aida.ITree;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.cli.*;
-import org.lcsim.util.aida.AIDA;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.apache.commons.cli.PosixParser;
+
/**
*
* @author phansson
java/trunk/users/src/main/java/org/lcsim/hps/users/sarah
--- java/trunk/users/src/main/java/org/lcsim/hps/users/sarah/ExamplePlotter.java 2014-03-26 04:02:14 UTC (rev 370)
+++ java/trunk/users/src/main/java/org/lcsim/hps/users/sarah/ExamplePlotter.java 2014-03-26 04:20:57 UTC (rev 371)
@@ -1,16 +1,17 @@
package org.lcsim.hps.users.sarah;
-import org.lcsim.hps.users.mgraham.*;
import hep.aida.IAnalysisFactory;
import hep.aida.IHistogram1D;
import hep.aida.IPlotter;
import hep.aida.IPlotterStyle;
+
import java.util.List;
+
+import org.hps.util.AIDAFrame;
+import org.hps.util.Resettable;
import org.lcsim.event.EventHeader;
import org.lcsim.event.Track;
import org.lcsim.geometry.Detector;
-import org.lcsim.hps.monitoring.deprecated.AIDAFrame;
-import org.lcsim.hps.monitoring.deprecated.Resettable;
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
SVNspam 0.1