Author: [log in to unmask]
Date: Mon Dec 7 13:33:05 2015
New Revision: 4020
Log:
move plot utils
Added:
java/trunk/tracking/src/main/java/org/hps/recon/tracking/SvtPlotUtils.java
- copied, changed from r4019, java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SvtPlotUtils.java
java/trunk/tracking/src/main/java/org/hps/recon/tracking/straight/
java/trunk/tracking/src/main/java/org/hps/recon/tracking/straight/STUtils.java
- copied, changed from r4017, java/trunk/users/src/main/java/org/hps/users/phansson/STUtils.java
java/trunk/tracking/src/main/java/org/hps/recon/tracking/straight/StraightThroughAnalysisDriver.java
- copied, changed from r4017, java/trunk/users/src/main/java/org/hps/users/phansson/StraightThroughAnalysisDriver.java
Removed:
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SvtPlotUtils.java
java/trunk/users/src/main/java/org/hps/users/phansson/STUtils.java
java/trunk/users/src/main/java/org/hps/users/phansson/StraightThroughAnalysisDriver.java
Modified:
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/PedestalPlots.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SampleZeroHVBiasChecker.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SensorOccupancyPlotsDriver.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SvtClusterPlots.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SvtHitPlots.java
java/trunk/parent/pom.xml
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/PedestalPlots.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/PedestalPlots.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/PedestalPlots.java Mon Dec 7 13:33:05 2015
@@ -23,6 +23,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.hps.recon.tracking.SvtPlotUtils;
//===> import org.hps.conditions.deprecated.HPSSVTCalibrationConstants;
//===> import org.hps.conditions.deprecated.SvtUtils;
import org.lcsim.detector.tracker.silicon.HpsSiSensor;
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SampleZeroHVBiasChecker.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SampleZeroHVBiasChecker.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SampleZeroHVBiasChecker.java Mon Dec 7 13:33:05 2015
@@ -28,6 +28,7 @@
import org.hps.conditions.svt.SvtBiasMyaDataReader;
import org.hps.conditions.svt.SvtBiasMyaDataReader.SvtBiasMyaRange;
import org.hps.conditions.svt.SvtBiasMyaDataReader.SvtBiasRunRange;
+import org.hps.recon.tracking.SvtPlotUtils;
import org.hps.record.epics.EpicsData;
import org.hps.record.triggerbank.AbstractIntData;
import org.hps.record.triggerbank.HeadBankData;
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SensorOccupancyPlotsDriver.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SensorOccupancyPlotsDriver.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SensorOccupancyPlotsDriver.java Mon Dec 7 13:33:05 2015
@@ -36,6 +36,7 @@
import org.lcsim.recon.tracking.digitization.sisim.SiTrackerHitStrip1D;
import org.lcsim.recon.tracking.digitization.sisim.TrackerHitType;
import org.lcsim.util.Driver;
+import org.hps.recon.tracking.SvtPlotUtils;
import org.hps.record.triggerbank.AbstractIntData;
import org.hps.record.triggerbank.TIData;
import org.lcsim.util.aida.AIDA;
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SvtClusterPlots.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SvtClusterPlots.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SvtClusterPlots.java Mon Dec 7 13:33:05 2015
@@ -16,6 +16,7 @@
import hep.aida.jfree.plotter.Plotter;
import hep.aida.jfree.plotter.PlotterRegion;
import hep.aida.ref.rootwriter.RootFileStore;
+
import java.util.HashSet;
import java.util.Set;
@@ -25,8 +26,8 @@
import org.lcsim.geometry.Detector;
import org.lcsim.recon.tracking.digitization.sisim.SiTrackerHitStrip1D;
import org.lcsim.util.Driver;
-
import org.hps.recon.tracking.FittedRawTrackerHit;
+import org.hps.recon.tracking.SvtPlotUtils;
import org.lcsim.detector.tracker.silicon.DopedSilicon;
import org.lcsim.util.aida.AIDA;
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SvtHitPlots.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SvtHitPlots.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SvtHitPlots.java Mon Dec 7 13:33:05 2015
@@ -16,6 +16,7 @@
import java.util.Map;
import java.util.Set;
+import org.hps.recon.tracking.SvtPlotUtils;
import org.lcsim.detector.tracker.silicon.HpsSiSensor;
import org.lcsim.util.Driver;
import org.lcsim.geometry.Detector;
Modified: java/trunk/parent/pom.xml
=============================================================================
--- java/trunk/parent/pom.xml (original)
+++ java/trunk/parent/pom.xml Mon Dec 7 13:33:05 2015
@@ -290,6 +290,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.lcsim</groupId>
+ <artifactId>lcsim-detector-framework</artifactId>
+ <version>3.1.6-SNAPSHOT</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<reporting>
Copied: java/trunk/tracking/src/main/java/org/hps/recon/tracking/SvtPlotUtils.java (from r4019, java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SvtPlotUtils.java)
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SvtPlotUtils.java (original)
+++ java/trunk/tracking/src/main/java/org/hps/recon/tracking/SvtPlotUtils.java Mon Dec 7 13:33:05 2015
@@ -1,6 +1,5 @@
-package org.hps.monitoring.drivers.svt;
-
-import hep.aida.IBaseHistogram;
+package org.hps.recon.tracking;
+
import hep.aida.IFitFactory;
import hep.aida.IFitResult;
import hep.aida.IFitter;
Copied: java/trunk/tracking/src/main/java/org/hps/recon/tracking/straight/STUtils.java (from r4017, java/trunk/users/src/main/java/org/hps/users/phansson/STUtils.java)
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/STUtils.java (original)
+++ java/trunk/tracking/src/main/java/org/hps/recon/tracking/straight/STUtils.java Mon Dec 7 13:33:05 2015
@@ -1,7 +1,7 @@
/**
*
*/
-package org.hps.users.phansson;
+package org.hps.recon.tracking.straight;
import hep.physics.matrix.BasicMatrix;
import hep.physics.vec.BasicHep3Matrix;
@@ -17,7 +17,7 @@
import org.apache.commons.math3.stat.regression.SimpleRegression;
import org.hps.recon.tracking.CoordinateTransformations;
-import org.hps.users.phansson.STUtils.STStereoTrack.VIEW;
+import org.hps.recon.tracking.straight.STUtils.STStereoTrack.VIEW;
import org.lcsim.detector.ITransform3D;
import org.lcsim.detector.tracker.silicon.HpsSiSensor;
import org.lcsim.event.EventHeader;
Copied: java/trunk/tracking/src/main/java/org/hps/recon/tracking/straight/StraightThroughAnalysisDriver.java (from r4017, java/trunk/users/src/main/java/org/hps/users/phansson/StraightThroughAnalysisDriver.java)
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/StraightThroughAnalysisDriver.java (original)
+++ java/trunk/tracking/src/main/java/org/hps/recon/tracking/straight/StraightThroughAnalysisDriver.java Mon Dec 7 13:33:05 2015
@@ -1,7 +1,7 @@
/**
*
*/
-package org.hps.users.phansson;
+package org.hps.recon.tracking.straight;
import hep.aida.IAnalysisFactory;
import hep.aida.IFitResult;
@@ -27,8 +27,8 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.hps.monitoring.drivers.svt.SvtPlotUtils;
-import org.hps.users.phansson.STUtils.STStereoTrack;
+import org.hps.recon.tracking.SvtPlotUtils;
+import org.hps.recon.tracking.straight.STUtils.STStereoTrack;
import org.lcsim.detector.converter.compact.subdetector.HpsTracker2;
import org.lcsim.detector.converter.compact.subdetector.SvtStereoLayer;
import org.lcsim.detector.tracker.silicon.HpsSiSensor;
