Commit in hps-java/src/main on MAIN | |||
java/org/lcsim/hps/recon/tracking/SVTDataToRawTrackerHitDriver.java | +3 | -2 | 1.7 -> 1.8 |
resources/org/lcsim/hps/steering/HitRecoMonitoring.lcsim | +10 | -4 | 1.3 -> 1.4 |
java/org/lcsim/hps/monitoring/svt/SVTHitPulsePlots.java | +19 | -3 | 1.4 -> 1.5 |
+32 | -9 |
Change pulse monitor to only plot hits on strip that has an adjacent hit.
diff -u -r1.7 -r1.8 --- SVTDataToRawTrackerHitDriver.java 30 Apr 2012 23:06:32 -0000 1.7 +++ SVTDataToRawTrackerHitDriver.java 2 May 2012 02:21:55 -0000 1.8 @@ -74,8 +74,9 @@
} long cell_id = sensor.makeStripId(sensorChannel, sideNumber).getValue();
- - hits.add(new BaseRawTrackerHit(hitTime, cell_id, data, null, sensor));
+ RawTrackerHit myHit=new BaseRawTrackerHit(hitTime, cell_id, data, null, sensor); + myHit.getDetectorElement().getReadout().addHit((myHit)); + hits.add(new BaseRawTrackerHit(hitTime, cell_id, data, null, sensor));
} System.out.println(this.getClass().getSimpleName() + " made " + hits.size()
diff -u -r1.3 -r1.4 --- HitRecoMonitoring.lcsim 1 May 2012 17:59:22 -0000 1.3 +++ HitRecoMonitoring.lcsim 2 May 2012 02:21:55 -0000 1.4 @@ -9,11 +9,12 @@
<driver name="EventMarkerDriver"/> <driver name="SVTSetupDriver"/> <driver name="HPSSVTDAQMaps"/>
- <driver name="RawTrackerHitMaker"/>
+ <driver name="RawTrackerHitMaker"/>
<driver name="SVTPulsePlots"/>
- <driver name="RawTrackerHitFitterDriver"/> - <driver name="TrackerHitDriver"/> - <driver name="SVTHitRecoPlots"/>
+<!-- <driver name="RawTrackerHitFitterDriver"/> --> + <driver name="SVTEventPlots"/> +<!-- <driver name="TrackerHitDriver"/> --> +<!-- <driver name="SVTHitRecoPlots"/> -->
<driver name="CleanupDriver"/> </execute>
@@ -27,6 +28,11 @@
<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>
diff -u -r1.4 -r1.5 --- SVTHitPulsePlots.java 2 May 2012 01:46:10 -0000 1.4 +++ SVTHitPulsePlots.java 2 May 2012 02:21:55 -0000 1.5 @@ -3,6 +3,9 @@
import hep.aida.*; import java.util.ArrayList; import java.util.List;
+import org.lcsim.detector.identifier.IExpandedIdentifier; +import org.lcsim.detector.identifier.IIdentifier; +import org.lcsim.detector.identifier.IIdentifierDictionary;
import org.lcsim.detector.tracker.silicon.SiSensor; import org.lcsim.event.EventHeader; import org.lcsim.event.RawTrackerHit;
@@ -23,6 +26,8 @@
private String trackerName = "Tracker"; private int eventCount; private Detector detector = null;
+ private IPlotter plotter3; +
protected void detectorChanged(Detector detector) { this.detector = detector;
@@ -35,7 +40,7 @@
IAnalysisFactory fac = aida.analysisFactory();
- IPlotter plotter3 = fac.createPlotterFactory().create("HPS SVT Pulse Plots: Raw Hits");
+ plotter3 = fac.createPlotterFactory().create("HPS SVT Pulse Plots: Raw Hits");
plotters.add(plotter3); IPlotterStyle style3 = plotter3.style(); style3.statisticsBoxStyle().setVisible(false);
@@ -67,7 +72,7 @@
HPSSVTCalibrationConstants.loadCalibrationConstants(); } List<RawTrackerHit> rawHits = event.get(RawTrackerHit.class, "SVTRawTrackerHits");
- for (RawTrackerHit hrth : rawHits) {
+ for (RawTrackerHit hrth : rawHits) {
fillPulsePlot(hrth); }
@@ -89,6 +94,13 @@
} }
+ public void endOfData(EventHeader event) { + if (plotter3 != null) { + plotter3.hide(); + } + + } +
private boolean hasAdjacentHit(RawTrackerHit hit){ List<RawTrackerHit> hitsOnSensor=((SiSensor)hit.getDetectorElement()).getReadout().getHits(RawTrackerHit.class);
@@ -96,10 +108,14 @@
for(RawTrackerHit sensorHit : hitsOnSensor){ int thisStrip=sensorHit.getIdentifierFieldValue("strip");
- if(Math.abs(thisStrip-strip)==1)
+ System.out.println("hit strip = "+strip+"; other strips = "+thisStrip); + if(Math.abs(thisStrip-strip)==1)
return true; } return false; }
+ + +
}
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