Commit in hps-java/src/main on MAIN | |||
resources/org/lcsim/hps/steering/SvtEventDisplay.lcsim | +41 | added 1.1 | |
/OnlineTracking.lcsim | +62 | -16 | 1.5 -> 1.6 |
/HitRecoMonitoring.lcsim | +11 | -6 | 1.5 -> 1.6 |
java/org/lcsim/hps/monitoring/svt/SVTEventDisplay.java | +5 | -11 | 1.1 -> 1.2 |
/SVTHitReconstructionPlots.java | +42 | -2 | 1.4 -> 1.5 |
java/org/lcsim/hps/recon/tracking/TrackerReconDriver.java | +6 | -4 | 1.17 -> 1.18 |
/HPSRawTrackerHitFitterDriver.java | +5 | 1.9 -> 1.10 | |
/HPSSVTCalibrationConstants.java | +2 | -1 | 1.6 -> 1.7 |
+174 | -40 |
More SVT monitoring stuff
diff -N SvtEventDisplay.lcsim --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ SvtEventDisplay.lcsim 3 May 2012 20:50:29 -0000 1.1 @@ -0,0 +1,41 @@
+<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" + xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd"> + <control> + <numberOfEvents>-1</numberOfEvents> + <printInputFiles>true</printInputFiles> + <printDriversDetailed>true</printDriversDetailed> + </control> + <execute> + <driver name="SVTSetupDriver"/> + <driver name="HPSSVTDAQMaps"/> + <driver name="RawTrackerHitMaker"/> + <driver name="SVTEventDisplay"/> + <driver name="CleanupDriver"/> + </execute> + <drivers> + <driver name="RawTrackerHitFitterDriver" + type="org.lcsim.hps.recon.tracking.HPSRawTrackerHitFitterDriver"> + <fitAlgorithm>Analytic</fitAlgorithm> + </driver> + + <driver name="SVTEventDisplay" + type="org.lcsim.hps.monitoring.svt.SVTEventDisplay"> + <rawTrackerHitCollectionName>SVTRawTrackerHits</rawTrackerHitCollectionName> + </driver> + + <driver name="SVTSetupDriver" + type="org.lcsim.hps.recon.tracking.HPSSVTSensorSetup"> + </driver> + + <driver name="HPSSVTDAQMaps" type="org.lcsim.hps.recon.tracking.HPSSVTDAQMaps"/> + + <driver name="RawTrackerHitMaker" type="org.lcsim.hps.recon.tracking.SVTDataToRawTrackerHitDriver"/> + + <driver name="CleanupDriver" + type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver"> + <collectionNames>TrackerHits SVTRawTrackerHits SVTFittedRawTrackerHits</collectionNames> + </driver> + + + </drivers> +</lcsim>
diff -u -r1.5 -r1.6 --- OnlineTracking.lcsim 29 Apr 2012 02:10:06 -0000 1.5 +++ OnlineTracking.lcsim 3 May 2012 20:50:29 -0000 1.6 @@ -4,27 +4,59 @@
<driver name="EventMarkerDriver"/> <driver name="SVTSetupDriver"/> <driver name="HPSSVTDAQMaps"/>
- <driver name="SVTDataToRawTrackerHitDriver"/> - <driver name="HPSRawTrackerHitFitterDriver"/> - <driver name="TrackerHitDriver"/>
+ <driver name="RawTrackerHitMaker"/> +<!-- <driver name="SVTEventPlots"/> --> + <!-- <driver name="SVTPulsePlots"/> --> + <driver name="RawTrackerHitFitterDriver"/> + <driver name="TrackerHitDriver"/> +<!-- <driver name="SVTHitRecoPlots"/> -->
<driver name="TrackerReconDriver"/>
+ <driver name="TrackingReconstructionPlots"/> + + <driver name="CleanupDriver"/> +
</execute>
- <drivers>
+ <drivers> + <driver name="RawTrackerHitFitterDriver" + type="org.lcsim.hps.recon.tracking.HPSRawTrackerHitFitterDriver"> + <rawHitCollectionName>SVTRawTrackerHits</rawHitCollectionName> + <fittedHitCollectionName>SVTFittedRawTrackerHits</fittedHitCollectionName> + <fitAlgorithm>Analytic</fitAlgorithm> + </driver> + + <driver name="TrackerHitDriver" + type="org.lcsim.hps.users.mgraham.DataTrackerHitDriver"/> + + <driver name="SVTEventPlots" + type="org.lcsim.hps.monitoring.svt.SVTEventInfo"> + <rawTrackerHitCollectionName>SVTRawTrackerHits</rawTrackerHitCollectionName> + </driver> + + <driver name="SVTHitRecoPlots" + type="org.lcsim.hps.monitoring.svt.SVTHitReconstructionPlots"> + <rawTrackerHitCollectionName>SVTRawTrackerHits</rawTrackerHitCollectionName> + <fittedTrackerHitCollectionName>SVTFittedRawTrackerHits</fittedTrackerHitCollectionName> + </driver> + + <driver name="SVTPulsePlots" + type="org.lcsim.hps.monitoring.svt.SVTHitPulsePlots"> + <rawTrackerHitCollectionName>SVTRawTrackerHits</rawTrackerHitCollectionName> + </driver> + + <driver name="SVTEventDisplay" + type="org.lcsim.hps.monitoring.svt.SVTEventDisplay"> + <rawTrackerHitCollectionName>SVTRawTrackerHits</rawTrackerHitCollectionName> + </driver> + + <driver name="SVTSetupDriver" + type="org.lcsim.hps.recon.tracking.HPSSVTSensorSetup"> + </driver>
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver"> <eventInterval>1</eventInterval>
- </driver> - <driver name="SVTSetupDriver" type="org.lcsim.hps.recon.tracking.HPSSVTSensorSetup">
</driver>
- <driver name="HPSSVTDAQMaps" type="org.lcsim.hps.recon.tracking.HPSSVTDAQMaps"/> - <driver name="SVTDataToRawTrackerHitDriver" type="org.lcsim.hps.recon.tracking.SVTDataToRawTrackerHitDriver"/> - <driver name="HPSRawTrackerHitFitterDriver" type="org.lcsim.hps.recon.tracking.HPSRawTrackerHitFitterDriver"> - <fitAlgorithm>Analytic</fitAlgorithm> - </driver> - <driver name="TrackerHitDriver" type="org.lcsim.hps.users.mgraham.DataTrackerHitDriver"> - <debug>true</debug> - <readoutCollectionName>SVTRawTrackerHits</readoutCollectionName> - </driver>
+ <driver name="HPSSVTDAQMaps" type="org.lcsim.hps.recon.tracking.HPSSVTDAQMaps"/> +
<driver name="TrackerReconDriver" type="org.lcsim.hps.recon.tracking.TrackerReconDriver"> <debug>true</debug>
@@ -32,5 +64,19 @@
<stripMaxSeparation>20.0</stripMaxSeparation> <stripTolerance>1.0</stripTolerance> </driver>
- </drivers>
+ + <driver name="RawTrackerHitMaker" type="org.lcsim.hps.recon.tracking.SVTDataToRawTrackerHitDriver"> + <rawTrackerHitOutputCollectionName>SVTRawTrackerHits</rawTrackerHitOutputCollectionName> + </driver> + + <driver name="TrackingReconstructionPlots" type="org.lcsim.hps.monitoring.svt.TrackingReconstructionPlots"> + </driver> + + <driver name="CleanupDriver" + type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver"> + <collectionNames>TrackerHits SVTRawTrackerHits SVTFittedRawTrackerHits</collectionNames> + </driver> + + + </drivers>
</lcsim>
\ No newline at end of file
diff -u -r1.5 -r1.6 --- HitRecoMonitoring.lcsim 3 May 2012 13:54:32 -0000 1.5 +++ HitRecoMonitoring.lcsim 3 May 2012 20:50:29 -0000 1.6 @@ -10,18 +10,19 @@
<driver name="SVTSetupDriver"/> <driver name="HPSSVTDAQMaps"/> <driver name="RawTrackerHitMaker"/>
- <driver name="SVTEventPlots"/> - <!-- <driver name="SVTEventDisplay"/> -->
+ <driver name="SVTEventPlots"/>
<driver name="SVTPulsePlots"/>
- <!-- <driver name="RawTrackerHitFitterDriver"/> --> - <!-- <driver name="TrackerHitDriver"/> --> - <!-- <driver name="SVTHitRecoPlots"/> -->
+ <driver name="RawTrackerHitFitterDriver"/> + <driver name="TrackerHitDriver"/> + <driver name="SVTHitRecoPlots"/>
<driver name="CleanupDriver"/> </execute> <drivers> <driver name="RawTrackerHitFitterDriver" type="org.lcsim.hps.recon.tracking.HPSRawTrackerHitFitterDriver">
+ <rawHitCollectionName>SVTRawTrackerHits</rawHitCollectionName> + <fittedHitCollectionName>SVTFittedRawTrackerHits</fittedHitCollectionName>
<fitAlgorithm>Analytic</fitAlgorithm> </driver>
@@ -57,7 +58,11 @@
<eventInterval>1</eventInterval> </driver> <driver name="HPSSVTDAQMaps" type="org.lcsim.hps.recon.tracking.HPSSVTDAQMaps"/>
- <driver name="RawTrackerHitMaker" type="org.lcsim.hps.recon.tracking.SVTDataToRawTrackerHitDriver"/>
+ + + <driver name="RawTrackerHitMaker" type="org.lcsim.hps.recon.tracking.SVTDataToRawTrackerHitDriver"> + <rawTrackerHitOutputCollectionName>SVTRawTrackerHits</rawTrackerHitOutputCollectionName> + </driver>
<driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
diff -u -r1.1 -r1.2 --- SVTEventDisplay.java 3 May 2012 15:29:57 -0000 1.1 +++ SVTEventDisplay.java 3 May 2012 20:50:29 -0000 1.2 @@ -84,11 +84,7 @@
List<RawTrackerHit> rawHits = event.get(RawTrackerHit.class, rawTrackerHitCollectionName); for (RawTrackerHit hrth : rawHits) { fillPlots(hrth);
- } - - - -
+ }
} }
@@ -105,7 +101,7 @@
double ped = HPSSVTCalibrationConstants.getPedestal(sensor, strip); double noise = HPSSVTCalibrationConstants.getNoise(sensor, strip);
- System.out.println(position.z()+" " + position.y());
+// System.out.println(position.z()+" " + position.y());
// aida.cloud2D("SVT Raw Hits: z vs y").fill(position.z() / 10.0, position.y() / 10.0); // aida.histogram2D("SVT Raw Hits: z vs y").fill(position.z()/10.0,position.y()/10.0); // aida.histogram2D("SVT Raw Hits: z vs y").fill(position.z()/10.0,position.y()/10.0);
@@ -115,11 +111,9 @@
maxAdc=adcVal[i]-ped; } // if(noise<70){
- if(noise<70&&!mask(position)){ -
+ if(noise<70&&!mask(position)){
// svtDisp.fill(position.z()/10.0,position.y()/10.0);
- - svtDisp.fill(position.z()/10.0,position.y()/10.0,maxAdc);
+ svtDisp.fill(position.z()/10.0,position.y()/10.0,maxAdc*100);
} }
@@ -134,7 +128,7 @@
double z=pos.z(); if(z>300&&z<320)
- if(y>20&&y<50)
+ if(y>-50&&y<-20)
return true; return false;
diff -u -r1.4 -r1.5 --- SVTHitReconstructionPlots.java 3 May 2012 13:50:36 -0000 1.4 +++ SVTHitReconstructionPlots.java 3 May 2012 20:50:29 -0000 1.5 @@ -35,6 +35,7 @@
IPlotter plotter2; IPlotter plotter3; IPlotter plotter4;
+ IPlotter plotter5;
protected void detectorChanged(Detector detector) { this.detector = detector;
@@ -73,26 +74,35 @@
style4.dataStyle().fillStyle().setColor("yellow"); style4.dataStyle().errorBarStyle().setVisible(false); plotter4.createRegions(5, 4);
+ + plotter5 = fac.createPlotterFactory().create("HPS SVT Cluster Size Plots"); + plotters.add(plotter5); + IPlotterStyle style5 = plotter5.style(); + style5.dataStyle().fillStyle().setColor("green"); + style5.dataStyle().errorBarStyle().setVisible(false); + plotter5.createRegions(5, 4);
int ns = sensors.size(); for (int i = 0; i < ns; i++) {
- IHistogram1D timingPlot = aida.histogram1D(sensors.get(i).getName() + "_timing", 50, 0, 148);
+ IHistogram1D timingPlot = aida.histogram1D(sensors.get(i).getName() + "_timing", 50, 0, 25.0);
IHistogram1D amplitudePlot = aida.histogram1D(sensors.get(i).getName() + "_amplitude", 50, 0, 2000.0); IHistogram1D nrawPlot = aida.histogram1D(sensors.get(i).getName() + "_raw_hits", 10, 0, 9.0); IHistogram1D nrecoPlot = aida.histogram1D(sensors.get(i).getName() + "_reco_hits", 10, 0, 9.0);
- IHistogram1D nclustPlot = aida.histogram1D(sensors.get(i).getName() + "_clusters", 10, 0, 9.0);
+ IHistogram1D clusterSizePlot = aida.histogram1D(sensors.get(i).getName() + "_cluster_size", 9, 1, 9.0);
plotter.region(i).plot(timingPlot); plotter2.region(i).plot(amplitudePlot); plotter3.region(i).plot(nrawPlot); plotter4.region(i).plot(nrecoPlot);
+ plotter5.region(i).plot(clusterSizePlot);
} plotter.show(); plotter2.show(); plotter3.show(); plotter4.show();
+ plotter5.show();
}
@@ -112,6 +122,29 @@
} public void process(EventHeader event) {
+ if (!event.hasCollection(RawTrackerHit.class, rawTrackerHitCollectionName)) { + System.out.println(rawTrackerHitCollectionName + " does not exist; skipping event"); + int ns = sensors.size(); + for (int i = 0; i < ns; i++) { + aida.histogram1D(sensors.get(i).getName() + "_raw_hits").fill(0); + aida.histogram1D(sensors.get(i).getName() + "_reco_hits").fill(0); + } + + return; + } + + if (!event.hasCollection(HPSFittedRawTrackerHit.class, fittedTrackerHitCollectionName)) { + System.out.println(fittedTrackerHitCollectionName + " does not exist; skipping event"); + int ns = sensors.size(); + for (int i = 0; i < ns; i++) { + int nraw = sensors.get(i).getReadout().getHits(RawTrackerHit.class).size(); + aida.histogram1D(sensors.get(i).getName() + "_raw_hits").fill(nraw); + aida.histogram1D(sensors.get(i).getName() + "_reco_hits").fill(0); + } + return; + } + +
if (!HPSSVTCalibrationConstants.calibrationLoaded()) { HPSSVTCalibrationConstants.loadCalibrationConstants(); }
@@ -133,6 +166,13 @@
aida.histogram1D(sensorName + "_raw_hits").fill(nraw); aida.histogram1D(sensorName + "_reco_hits").fill(nreco); }
+ for(SiTrackerHitStrip1D cluster : stripHits){ + SiSensor sensor=cluster.getSensor(); + String sensorName = sensor.getName(); + int clusterSize=cluster.getRawHits().size(); + aida.histogram1D(sensorName + "_cluster_size").fill(clusterSize); + } +
} public void endOfData() {
diff -u -r1.17 -r1.18 --- TrackerReconDriver.java 28 Apr 2012 21:03:47 -0000 1.17 +++ TrackerReconDriver.java 3 May 2012 20:50:29 -0000 1.18 @@ -15,6 +15,7 @@
import org.lcsim.recon.tracking.seedtracker.SeedStrategy; import org.lcsim.recon.tracking.seedtracker.SeedTracker; import org.lcsim.recon.tracking.seedtracker.StrategyXMLUtils;
+import org.lcsim.recon.tracking.seedtracker.diagnostic.SeedTrackerDiagnostics;
import org.lcsim.util.Driver; /**
@@ -23,7 +24,7 @@
* with the {@link TrackerDigiDriver} digitization Driver. * * @author jeremym
- * @version $Id: TrackerReconDriver.java,v 1.17 2012/04/28 21:03:47 meeg Exp $
+ * @version $Id: TrackerReconDriver.java,v 1.18 2012/05/03 20:50:29 mgraham Exp $
*/ public final class TrackerReconDriver extends Driver {
@@ -37,7 +38,7 @@
// Cache detector object. Detector detector = null; // Default B-field value.
- private double bfield = 0.5;
+ private double bfield = 0.8;
// Name of the SVT subdetector. private String subdetectorName = "Tracker"; // SimTrackerHit input collection for readout cleanup.
@@ -200,8 +201,9 @@
stFinal.setInputCollectionName(stInputCollectionName); stFinal.setTrkCollectionName(trackCollectionName); stFinal.setBField(bfield);
- stFinal.setSectorParams(false); //this doesn't actually seem to do anything -// stFinal.setSectorParams(1, 10000);
+ stFinal.setDiagnostics(new SeedTrackerDiagnostics()); +// stFinal.setSectorParams(false); //this doesn't actually seem to do anything + stFinal.setSectorParams(1, 10000);
add(stFinal); //
diff -u -r1.9 -r1.10 --- HPSRawTrackerHitFitterDriver.java 30 Apr 2012 16:13:30 -0000 1.9 +++ HPSRawTrackerHitFitterDriver.java 3 May 2012 20:50:29 -0000 1.10 @@ -56,6 +56,11 @@
@Override public void process(EventHeader event) {
+ if (!event.hasCollection(RawTrackerHit.class, rawHitCollectionName)) { + System.out.println(rawHitCollectionName + " does not exist; skipping event"); + return; + } +
if (!HPSSVTCalibrationConstants.calibrationLoaded()) { HPSSVTCalibrationConstants.loadCalibrationConstants(); }
diff -u -r1.6 -r1.7 --- HPSSVTCalibrationConstants.java 30 Apr 2012 16:13:30 -0000 1.6 +++ HPSSVTCalibrationConstants.java 3 May 2012 20:50:29 -0000 1.7 @@ -145,7 +145,8 @@
constants.setTp(value); } else { // System.out.println("Couldn't get Tp for sensor " + sensor.getName() + ", channel " + channel);
- constants.setTp(35.0);
+// constants.setTp(35.0);
+ constants.setTp(45.0);
} return constants;
Use REPLY-ALL to reply to list
To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1