Author: [log in to unmask]
Date: Sat Jan 3 15:40:55 2015
New Revision: 1837
Log:
Remove use of deprecated Resettable interface HPSJAVA-369
Removed:
java/trunk/util/src/main/java/org/hps/util/Resettable.java
Modified:
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTEventInfo.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTHitPulsePlots.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTHitRecoCorrelations.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTHitReconstructionPlots.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTPulseFitPlots.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTSimpleEventDisplay.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/TrackTimePlots.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/TrackingReconstructionPlots.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalHitPlots.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalMonitoringPlots.java
java/trunk/users/src/main/java/org/hps/users/jeremym/TestRunReconDriver.java
java/trunk/users/src/main/java/org/hps/users/mgraham/ExamplePlotter.java
java/trunk/users/src/main/java/org/hps/users/mgraham/HitTimePlotter.java
java/trunk/users/src/main/java/org/hps/users/mgraham/MainJASDriver.java
java/trunk/users/src/main/java/org/hps/users/mgraham/TwoTrackAnalysis.java
java/trunk/users/src/main/java/org/hps/users/omoreno/SvtTrackAnalysis.java
java/trunk/users/src/main/java/org/hps/users/omoreno/SvtTrackingPerformance.java
java/trunk/users/src/main/java/org/hps/users/phansson/ECalGainDriver.java
java/trunk/users/src/main/java/org/hps/users/phansson/EcalCrystalFilter.java
java/trunk/users/src/main/java/org/hps/users/phansson/TrackingReconstructionPlots.java
java/trunk/users/src/main/java/org/hps/users/sarah/ExamplePlotter.java
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTEventInfo.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTEventInfo.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTEventInfo.java Sat Jan 3 15:40:55 2015
@@ -30,7 +30,7 @@
*
* @author mgraham
*/
-public class SVTEventInfo extends Driver implements Resettable {
+public class SVTEventInfo extends Driver {
private List<IPlotter> plotters = new ArrayList<IPlotter>();
private AIDA aida = AIDA.defaultInstance();
@@ -177,15 +177,4 @@
return false;
return true;
}
-
- @Override
- public void reset() {
- aida.histogram1D("Total Number of Raw Hits in Top Half").reset();
- aida.histogram1D("Total Number of Raw Hits in Bottom Half").reset();
- aida.histogram1D("Number of Layers Hit in Top Half").reset();
- aida.profile1D("Number of Hits per layer in Top Half").reset();
- aida.histogram1D("Number of Layers Hit in Bottom Half").reset();
- aida.profile1D("Number of Hits per layer in Top Half").reset();
- aida.profile1D("Number of Hits per layer in Bottom Half").reset();
- }
}
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTHitPulsePlots.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTHitPulsePlots.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTHitPulsePlots.java Sat Jan 3 15:40:55 2015
@@ -31,7 +31,7 @@
*
* @author mgraham
*/
-public class SVTHitPulsePlots extends Driver implements Resettable {
+public class SVTHitPulsePlots extends Driver {
//private AIDAFrame plotterFrame;
private List<IPlotter> plotters = new ArrayList<IPlotter>();
@@ -170,15 +170,6 @@
return false;
}
-
- @Override
- public void reset() {
- int ns = sensors.size();
- for (int i = 0; i < ns; i++) {
- aida.histogram2D(sensors.get(i).getName() + "_AdcVsChan").reset();
- aida.profile1D(sensors.get(i).getName() + "_pulse").reset();
- }
- }
private int computePlotterRegion(SiSensor sensor) {
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTHitRecoCorrelations.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTHitRecoCorrelations.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTHitRecoCorrelations.java Sat Jan 3 15:40:55 2015
@@ -13,7 +13,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.hps.util.Resettable;
import org.lcsim.detector.identifier.IExpandedIdentifier;
import org.lcsim.detector.identifier.IIdentifier;
import org.lcsim.detector.identifier.IIdentifierDictionary;
@@ -31,7 +30,7 @@
*
* @author mgraham
*/
-public class SVTHitRecoCorrelations extends Driver implements Resettable {
+public class SVTHitRecoCorrelations extends Driver {
//private List<AIDAFrame> plotterFrame = new ArrayList<AIDAFrame>();
private List<IPlotter> plotters = new ArrayList<IPlotter>();
@@ -464,21 +463,6 @@
// plotterFrame.get(i).dispose();
//}
}
-
- @Override
- public void reset() {
- int ns = sensors.size();
- for (int i = 0; i < 5; i++) {
- for (int ii = 0; ii < 5; ii++) {
- aida.histogram2D("corr_TA_layer" + (i+1) + "_layer" + (ii+1)).reset();
- aida.histogram2D("corr_TS_layer" + (i+1) + "_layer" + (ii+1)).reset();
- aida.histogram2D("corrY_HTH_layer" + (i+1) + "_layer" + (ii+1)).reset();
- aida.histogram2D("corrX_HTH_layer" + (i+1) + "_layer" + (ii+1)).reset();
- }
- }
-
- }
-
private int getPhysLayer(int l,int side, boolean axial) {
if(side==0) {
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTHitReconstructionPlots.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTHitReconstructionPlots.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTHitReconstructionPlots.java Sat Jan 3 15:40:55 2015
@@ -36,7 +36,7 @@
*
* @author mgraham
*/
-public class SVTHitReconstructionPlots extends Driver implements Resettable {
+public class SVTHitReconstructionPlots extends Driver {
//private AIDAFrame plotterFrame;
private AIDA aida = AIDA.defaultInstance();
@@ -292,16 +292,6 @@
//plotterFrame.dispose();
}
- @Override
- public void reset() {
- for (SiSensor sensor : sensors) {
- aida.histogram1D(sensor.getName() + "_raw_hits").reset();
- aida.histogram1D(sensor.getName() + "_reco_hits").reset();
- aida.histogram1D(sensor.getName() + "_cluster_size").reset();
- aida.histogram1D(sensor.getName() + "_cluster_amp").reset();
- }
- }
-
private int computePlotterRegion(SiSensor sensor) {
IIdentifierHelper helper = sensor.getIdentifierHelper();
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTPulseFitPlots.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTPulseFitPlots.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTPulseFitPlots.java Sat Jan 3 15:40:55 2015
@@ -28,7 +28,7 @@
*
* @author mgraham
*/
-public class SVTPulseFitPlots extends Driver implements Resettable {
+public class SVTPulseFitPlots extends Driver {
private AIDA aida = AIDA.defaultInstance();
private String fittedTrackerHitCollectionName = "SVTFittedRawTrackerHits";
@@ -190,18 +190,6 @@
}
}
- public void reset() {
- for (int module = 0; module < 2; module++) {
- for (int layer = 0; layer < 10; layer++) {
- t0[module][layer].reset();
- amp[module][layer].reset();
- chiprob[module][layer].reset();
- t0a[module][layer].reset();
- shape[module][layer].reset();
- }
- }
- }
-
private int computePlotterRegion(int layer, int module) {
int iy = (layer - 1) / 2;
int ix = 0;
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTSimpleEventDisplay.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTSimpleEventDisplay.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTSimpleEventDisplay.java Sat Jan 3 15:40:55 2015
@@ -5,14 +5,8 @@
import hep.aida.IPlotterFactory;
//import hep.aida.jfree.plot.style.DefaultHistogram1DStyle;
-
-
import java.util.List;
-
-
-//===> import org.hps.conditions.deprecated.SvtUtils;
-import org.hps.util.Resettable;
import org.lcsim.detector.tracker.silicon.HpsSiSensor;
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
@@ -21,6 +15,7 @@
import org.lcsim.recon.tracking.digitization.sisim.SiTrackerHit;
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
+//===> import org.hps.conditions.deprecated.SvtUtils;
/**
* Plots hit counts for all SVT channels at each stage of reconstruction.
@@ -28,7 +23,7 @@
* event display by calling {@link #setSingleEvent(boolean)}.
*
*/
-public class SVTSimpleEventDisplay extends Driver implements Resettable {
+public class SVTSimpleEventDisplay extends Driver {
/*
* Names of collections.
@@ -342,12 +337,4 @@
hitCount[module].reset();
}
}
-
- /**
- * Reset this Driver's plots.
- */
- public void reset() {
- resetPlots();
- resetHitCountPlot();
- }
}
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 Sat Jan 3 15:40:55 2015
@@ -31,7 +31,7 @@
* @version $Id: SensorOccupancyPlotsDriver.java,v 1.8 2013/11/06 19:19:55 jeremy Exp $
*
*/
-public class SensorOccupancyPlotsDriver extends Driver implements Resettable {
+public class SensorOccupancyPlotsDriver extends Driver {
private String rawTrackerHitCollectionName = "SVTRawTrackerHits";
private String trackerName = "Tracker";
@@ -182,9 +182,4 @@
occupancyMap.put(sensor.getName(), new int[640]);
}
}
-
- public void reset() {
- eventCount = 0;
- resetOccupancyMap();
- }
}
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/TrackTimePlots.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/TrackTimePlots.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/TrackTimePlots.java Sat Jan 3 15:40:55 2015
@@ -28,7 +28,7 @@
*
* @author meeg
*/
-public class TrackTimePlots extends Driver implements Resettable {
+public class TrackTimePlots extends Driver {
//private AIDAFrame plotterFrame;
private AIDA aida = AIDA.defaultInstance();
@@ -341,18 +341,6 @@
//plotterFrame.dispose();
}
- @Override
- public void reset() {
- for (int module = 0; module < 2; module++) {
- for (int layer = 0; layer < 10; layer++) {
- trackHitT0[module][layer].reset();
- trackHitDt[module][layer].reset();
- t0[module][layer].reset();
- trackT0[module].reset();
- }
- }
- }
-
private int computePlotterRegion(int layer, int module) {
int iy = (layer - 1) / 2;
int ix = 0;
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 15:40:55 2015
@@ -51,7 +51,7 @@
*
* @author mgraham
*/
-public class TrackingReconstructionPlots extends Driver implements Resettable {
+public class TrackingReconstructionPlots extends Driver {
//private AIDAFrame plotterFrame;
//private AIDAFrame topFrame;
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalHitPlots.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalHitPlots.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalHitPlots.java Sat Jan 3 15:40:55 2015
@@ -34,7 +34,7 @@
* @author Andrea Celentano
*
*/
-public class EcalHitPlots extends Driver implements Resettable{
+public class EcalHitPlots extends Driver {
//AIDAFrame plotterFrame;
String inputCollection = "EcalCalHits";
@@ -272,14 +272,6 @@
}
@Override
- public void reset() {
- hitCountPlot.reset();
- hitTimePlot.reset();
- hitEnergyPlot.reset();
- hitMaxEnergyPlot.reset();
- }
-
- @Override
public void endOfData() {
//plotterFrame.dispose();
}
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalMonitoringPlots.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalMonitoringPlots.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalMonitoringPlots.java Sat Jan 3 15:40:55 2015
@@ -31,7 +31,7 @@
*/
// FIXME: Resettable and Redrawable are no longer handled by the monitoring application
// so those hooks should be removed or the functionality achieved some other way.
-public class EcalMonitoringPlots extends Driver implements Resettable, Redrawable {
+public class EcalMonitoringPlots extends Driver implements Redrawable {
String inputCollection = "EcalReadoutHits";
String clusterCollection = "EcalClusters";
@@ -192,19 +192,6 @@
}
@Override
- public void reset() {
- hitCountFillPlot.reset();
- hitCountDrawPlot.reset();
- clusterCountFillPlot.reset();
- clusterCountDrawPlot.reset();
-
- occupancyDrawPlot.reset();
- for (int id = 0; id < (47 * 11); id++) {
- occupancyFill[id]=0;
- }
- }
-
- @Override
public void redraw() {
hitCountDrawPlot.reset();
hitCountDrawPlot.add(hitCountFillPlot);
Modified: java/trunk/users/src/main/java/org/hps/users/jeremym/TestRunReconDriver.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/jeremym/TestRunReconDriver.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/jeremym/TestRunReconDriver.java Sat Jan 3 15:40:55 2015
@@ -28,9 +28,9 @@
public TestRunReconDriver() {
- CalibrationDriver calibrationDriver = new CalibrationDriver();
- calibrationDriver.setRunNumber(975);
- this.add(calibrationDriver);
+ //CalibrationDriver calibrationDriver = new CalibrationDriver();
+ //calibrationDriver.setRunNumber(975);
+ //this.add(calibrationDriver);
RawTrackerHitSensorSetup rawTrackerHitDriver = new RawTrackerHitSensorSetup();
this.add(rawTrackerHitDriver);
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 15:40:55 2015
@@ -29,7 +29,7 @@
@author mgraham
*/
-public class ExamplePlotter extends Driver implements Resettable {
+public class ExamplePlotter extends Driver {
//private AIDAFrame plotterFrame;
private AIDA aida = AIDA.defaultInstance();
Modified: java/trunk/users/src/main/java/org/hps/users/mgraham/HitTimePlotter.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/mgraham/HitTimePlotter.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/mgraham/HitTimePlotter.java Sat Jan 3 15:40:55 2015
@@ -34,7 +34,7 @@
*
* @author mgraham
*/
-public class HitTimePlotter extends Driver implements Resettable {
+public class HitTimePlotter extends Driver {
//private AIDAFrame plotterFrame;
private AIDA aida = AIDA.defaultInstance();
@@ -280,11 +280,6 @@
return region;
}
- @Override
- public void reset() {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
public void setOutputPlots(String output) {
this.outputPlots = output;
}
Modified: java/trunk/users/src/main/java/org/hps/users/mgraham/MainJASDriver.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/mgraham/MainJASDriver.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/mgraham/MainJASDriver.java Sat Jan 3 15:40:55 2015
@@ -19,7 +19,7 @@
public MainJASDriver() {
// add(new HPSSVTSensorSetup());
- add(new CalibrationDriver());
+ //add(new CalibrationDriver());
add(new RawTrackerHitSensorSetup());
// Can remove HPSRawTrackerHitFitterDriver and DataTrackerHitDriver for integrated MC
RawTrackerHitFitterDriver hitfitter=new RawTrackerHitFitterDriver();
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 15:40:55 2015
@@ -40,7 +40,7 @@
*
* @author mgraham
*/
-public class TwoTrackAnalysis extends Driver implements Resettable {
+public class TwoTrackAnalysis extends Driver {
public String outputTextName = "myevents.txt";
FileWriter fw;
@@ -951,11 +951,6 @@
}
}
- @Override
- public void reset() {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-
public void setOutputPlots(String output) {
this.outputPlots = output;
}
Modified: java/trunk/users/src/main/java/org/hps/users/omoreno/SvtTrackAnalysis.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/omoreno/SvtTrackAnalysis.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/omoreno/SvtTrackAnalysis.java Sat Jan 3 15:40:55 2015
@@ -31,7 +31,7 @@
*
*/
-public class SvtTrackAnalysis extends Driver implements Resettable {
+public class SvtTrackAnalysis extends Driver {
private String trackCollectionName = "MatchedTracks";
private String stripHitCollectionName = "StripClusterer_SiTrackerHitStrip1D";
@@ -370,10 +370,4 @@
System.out.println("Number of bottom tracks per event: " + tracksBottomRatio);
System.out.println("Number of two track events: " + twoTrackRatio);
}
-
- @Override
- public void reset() {
- aida.histogram2D("Track Position at Ecal").reset();
- aida.histogram2D("Track Position at Converter").reset();
- }
}
Modified: java/trunk/users/src/main/java/org/hps/users/omoreno/SvtTrackingPerformance.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/omoreno/SvtTrackingPerformance.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/omoreno/SvtTrackingPerformance.java Sat Jan 3 15:40:55 2015
@@ -4,12 +4,12 @@
import java.util.ArrayList;
import java.util.List;
-import org.hps.util.Resettable;
//--- org.lcsim ---//
import org.lcsim.event.EventHeader;
import org.lcsim.fit.helicaltrack.HelicalTrackHit;
import org.lcsim.geometry.Detector;
import org.lcsim.util.Driver;
+
//--- hps-java ---//
/**
@@ -17,75 +17,77 @@
* @author Omar Moreno <[log in to unmask]>
* @version $Id: SvtTrackingPerformance.java,v 1.2 2013/11/06 19:19:55 jeremy Exp $
*/
-public class SvtTrackingPerformance extends Driver implements Resettable {
+public class SvtTrackingPerformance extends Driver {
- boolean debug;
- int[] topLayer = new int[5];
- int[] bottomLayer = new int[5];
-
- // Collection names
- String stereoHitCollectionName = "RotatedHelicalTrackHits";
-
- public void reset() {
- // TODO Auto-generated method stub
- }
+ boolean debug;
+ int[] topLayer = new int[5];
+ int[] bottomLayer = new int[5];
-
- protected void detectorChanged(Detector detector){
-
- }
-
- public void process(EventHeader event){
-
- // Check if the event has stereo hits
- if(!event.hasCollection(HelicalTrackHit.class, stereoHitCollectionName)){
- System.out.println(
- this.getClass().getSimpleName() + " Stereo Hit Collection: "
- + stereoHitCollectionName + " was not found! Skipping event ..." );
- }
-
- // Get the list of HelicalTrackHits
- List<HelicalTrackHit> stereoHits = new ArrayList<HelicalTrackHit>();
-
- for(HelicalTrackHit stereoHit : stereoHits){
-
- // Loop over all stereo hits and arrange them by layer and by detector
- // volume
- int layer = this.getLayerNumber(stereoHit);
-
- //
- if(stereoHit.y() > 0) topLayer[layer - 1]++;
- else if(stereoHit.y() < 0) bottomLayer[layer - 1]++;
- else throw new RuntimeException("Invalid hit position - y = " + stereoHit.y());
- }
-
- // Check if there are four consecutive layers hit on either volume
-
-
- }
-
- private int getLayerNumber(HelicalTrackHit stereoHit){
-
- if(debug)
- System.out.println(this.getClass().getSimpleName() + " : Stereo Hit z position = " + stereoHit.z());
-
- // Get the position along z
- int z = Math.round((float) stereoHit.z());
-
- switch(z){
- case 100: return 1;
- case 200: return 2;
- case 300: return 3;
- case 500: return 4;
- case 700: return 5;
- default: throw new RuntimeException("Invalid value of z: " + z);
- }
- }
-
- private boolean consecutiveHits(int[] layer){
- for(int index = 0; index < 2; index++){
- if(layer[index] > 0 && layer[index + 1] > 0 && layer[index + 2] > 0 && layer[index +4] > 0) return true;
- }
- return false;
- }
+ // Collection names
+ String stereoHitCollectionName = "RotatedHelicalTrackHits";
+
+ protected void detectorChanged(Detector detector) {
+
+ }
+
+ public void process(EventHeader event) {
+
+ // Check if the event has stereo hits
+ if (!event.hasCollection(HelicalTrackHit.class, stereoHitCollectionName)) {
+ System.out.println(this.getClass().getSimpleName() + " Stereo Hit Collection: " + stereoHitCollectionName + " was not found! Skipping event ...");
+ }
+
+ // Get the list of HelicalTrackHits
+ List<HelicalTrackHit> stereoHits = new ArrayList<HelicalTrackHit>();
+
+ for (HelicalTrackHit stereoHit : stereoHits) {
+
+ // Loop over all stereo hits and arrange them by layer and by detector
+ // volume
+ int layer = this.getLayerNumber(stereoHit);
+
+ //
+ if (stereoHit.y() > 0)
+ topLayer[layer - 1]++;
+ else if (stereoHit.y() < 0)
+ bottomLayer[layer - 1]++;
+ else
+ throw new RuntimeException("Invalid hit position - y = " + stereoHit.y());
+ }
+
+ // Check if there are four consecutive layers hit on either volume
+
+ }
+
+ private int getLayerNumber(HelicalTrackHit stereoHit) {
+
+ if (debug)
+ System.out.println(this.getClass().getSimpleName() + " : Stereo Hit z position = " + stereoHit.z());
+
+ // Get the position along z
+ int z = Math.round((float) stereoHit.z());
+
+ switch (z) {
+ case 100:
+ return 1;
+ case 200:
+ return 2;
+ case 300:
+ return 3;
+ case 500:
+ return 4;
+ case 700:
+ return 5;
+ default:
+ throw new RuntimeException("Invalid value of z: " + z);
+ }
+ }
+
+ private boolean consecutiveHits(int[] layer) {
+ for (int index = 0; index < 2; index++) {
+ if (layer[index] > 0 && layer[index + 1] > 0 && layer[index + 2] > 0 && layer[index + 4] > 0)
+ return true;
+ }
+ return false;
+ }
}
Modified: java/trunk/users/src/main/java/org/hps/users/phansson/ECalGainDriver.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/ECalGainDriver.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/ECalGainDriver.java Sat Jan 3 15:40:55 2015
@@ -37,7 +37,7 @@
*
* @author phansson+
*/
-public class ECalGainDriver extends Driver implements Resettable, ActionListener, Redrawable {
+public class ECalGainDriver extends Driver implements ActionListener, Redrawable {
private int nevents = 0;
private boolean debug = true;
@@ -472,21 +472,6 @@
}
@Override
- public void reset() {
- if (plotter != null) {
- plotter.hide();
- plotter.destroyRegions();
- for (int x = -23; x <= 23; x++) { // slot
- for (int y = -5; y <= 5; y++) { // crate
- for (int iE = 0; iE <= 4; ++iE) {
- pePlots[x + 23][y + 5][iE].reset();
- }
- }
- }
- }
- }
-
- @Override
public void actionPerformed(ActionEvent ae) {
if (ae.getSource() == blankButton) {
plotter.region(2).clear();
Modified: java/trunk/users/src/main/java/org/hps/users/phansson/EcalCrystalFilter.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/EcalCrystalFilter.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/EcalCrystalFilter.java Sat Jan 3 15:40:55 2015
@@ -35,7 +35,7 @@
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
-public class EcalCrystalFilter extends Driver implements Resettable, ActionListener, Redrawable {
+public class EcalCrystalFilter extends Driver implements ActionListener, Redrawable {
private String inputCollection;
private String outputPlotFileName;
@@ -659,19 +659,6 @@
}
-// @Override
- public void reset() {
- if (plotter != null) {
- plotter.hide();
- plotter.destroyRegions();
- for (int x = -23; x <= 23; x++) { // slot
- for (int y = -5; y <= 5; y++) { // crate
- aPlots[x + 23][y + 5].reset();
- }
- }
- }
- }
-
@Override
public void process(EventHeader event) {
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 15:40:55 2015
@@ -48,7 +48,7 @@
*
* @author mgraham
*/
-public class TrackingReconstructionPlots extends Driver implements Resettable {
+public class TrackingReconstructionPlots extends Driver {
//private AIDAFrame plotterFrame;
//private AIDAFrame topFrame;
@@ -1048,59 +1048,4 @@
return closest;
}
-
- @Override
- public void reset() {
- aida.histogram1D("Track Momentum (Px)").reset();
- aida.histogram1D("Track Momentum (Py)").reset();
- aida.histogram1D("Track Momentum (Pz)").reset();
- aida.histogram1D("Track Chi2").reset();
- aida.histogram1D("Tracks per Event").reset();
- aida.histogram1D("X @ Z=-60cm").reset();
- aida.histogram1D("Y @ Z=-60cm").reset();
- aida.histogram1D("Hits per Track").reset();
- aida.histogram1D("Module 1 Residual X(mm)").reset();
- aida.histogram1D("Module 1 Residual Y(mm)").reset();
- aida.histogram1D("Module 2 Residual X(mm)").reset();
- aida.histogram1D("Module 2 Residual Y(mm)").reset();
- aida.histogram1D("Module 3 Residual X(mm)").reset();
- aida.histogram1D("Module 3 Residual Y(mm)").reset();
- aida.histogram1D("Module 4 Residual X(mm)").reset();
- aida.histogram1D("Module 4 Residual Y(mm)").reset();
- aida.histogram1D("Module 5 Residual X(mm)").reset();
- aida.histogram1D("Module 5 Residual Y(mm)").reset();
- aida.histogram1D("Module 1 Residual X(mm) Top").reset();
- aida.histogram1D("Module 1 Residual Y(mm) Top").reset();
- aida.histogram1D("Module 2 Residual X(mm) Top").reset();
- aida.histogram1D("Module 2 Residual Y(mm) Top").reset();
- aida.histogram1D("Module 3 Residual X(mm) Top").reset();
- aida.histogram1D("Module 3 Residual Y(mm) Top").reset();
- aida.histogram1D("Module 4 Residual X(mm) Top").reset();
- aida.histogram1D("Module 4 Residual Y(mm) Top").reset();
- aida.histogram1D("Module 5 Residual X(mm) Top").reset();
- aida.histogram1D("Module 5 Residual Y(mm) Top").reset();
- aida.histogram1D("Module 1 Residual X(mm) Bottom").reset();
- aida.histogram1D("Module 1 Residual Y(mm) Bottom").reset();
- aida.histogram1D("Module 2 Residual X(mm) Bottom").reset();
- aida.histogram1D("Module 2 Residual Y(mm) Bottom").reset();
- aida.histogram1D("Module 3 Residual X(mm) Bottom").reset();
- aida.histogram1D("Module 3 Residual Y(mm) Bottom").reset();
- aida.histogram1D("Module 4 Residual X(mm) Bottom").reset();
- aida.histogram1D("Module 4 Residual Y(mm) Bottom").reset();
- aida.histogram1D("Module 5 Residual X(mm) Bottom").reset();
- aida.histogram1D("Module 5 Residual Y(mm) Bottom").reset();
-
- aida.histogram2D("Energy Vs Momentum").reset();
- aida.histogram1D("Energy Over Momentum").reset();
- aida.histogram1D("deltaX").reset();
- aida.histogram1D("deltaY").reset();
-
- aida.histogram1D("Amp (HitOnTrack)").reset();
-
- aida.histogram1D("d0 ").reset();
- aida.histogram1D("sinphi ").reset();
- aida.histogram1D("omega ").reset();
- aida.histogram1D("tan(lambda) ").reset();
- aida.histogram1D("z0 ").reset();
- }
}
Modified: java/trunk/users/src/main/java/org/hps/users/sarah/ExamplePlotter.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/sarah/ExamplePlotter.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/sarah/ExamplePlotter.java Sat Jan 3 15:40:55 2015
@@ -18,7 +18,7 @@
@author mgraham
*/
-public class ExamplePlotter extends Driver implements Resettable {
+public class ExamplePlotter extends Driver {
//private AIDAFrame plotterFrame;
private AIDA aida = AIDA.defaultInstance();
@@ -63,9 +63,4 @@
aida.histogram1D("Track Chi2").fill(trk.getChi2());
}
}
-
- @Override
- public void reset() {
- throw new UnsupportedOperationException("Not supported yet.");
- }
}
