java/trunk/hps-java/src/main/java/org/lcsim/hps/users/omoreno
--- java/trunk/hps-java/src/main/java/org/lcsim/hps/users/omoreno/SvtPerformance.java 2013-11-27 21:27:16 UTC (rev 48)
+++ java/trunk/hps-java/src/main/java/org/lcsim/hps/users/omoreno/SvtPerformance.java 2013-11-27 21:45:34 UTC (rev 49)
@@ -226,7 +226,10 @@
performanceWriter.write("! chi_squared D\n");
performanceWriter.write("! hit_x D\n");
performanceWriter.write("! hit_y D\n");
+ performanceWriter.write("! trk_chi_squared D\n");
+ performanceWriter.write("! hit_time D\n");
+
} catch(IOException exception){
exception.printStackTrace();
}
@@ -247,6 +250,8 @@
}
}
+ //--- Sample Plots ---//
+ //--------------------//
if(plotSamples){
try {
@@ -273,14 +278,15 @@
samplesWriter.write("! sample4 I\n");
samplesWriter.write("! sample5 I\n");
samplesWriter.write("! sample6 I\n");
+ samplesWriter.write("! pedestal D\n");
+
} catch(IOException exception){
}
}
-
if(batchMode) return;
// Show the plotters
@@ -304,12 +310,16 @@
HPSShapeFitParameters fit = null;
double clusterAmplitude, maxClusterAmplitude;
double noise = 0;
- double chi_squared = -1;
- double hitX, hitY;
+ double chiSquared = -1;
+ double trkChiSquared = 0;
+ double hitTime = 0;
+ double hitX, hitY, pedestal;
short[] samples;
// Loop over all tracks in an event
for (Track track : tracks) {
+ trkChiSquared = 0;
+ trkChiSquared = track.getChi2();
if((new BasicHep3Vector(track.getTrackStates().get(0).getMomentum())).magnitude() <= .500) continue;
@@ -323,8 +333,11 @@
hitY = trackerHit.getPosition()[2];
// Loop over the strip hits used to crate the stereo hit
+ hitTime = 0;
for (HelicalTrackStrip stripHit : ((HelicalTrackCross) trackerHit).getStrips()) {
+ hitTime = stripHit.time();
+
sensor = (HpsSiSensor) ((RawTrackerHit) stripHit.rawhits().get(0)).getDetectorElement();
if (sensor.isTopLayer())
topClusters[sensor.getLayerNumber() - 1] += 1;
@@ -336,7 +349,7 @@
hitsPerCluster = stripHit.rawhits().size();
noise = 0;
bad_channel = 0;
- chi_squared = -1;
+ chiSquared = -1;
for (Object rh : stripHit.rawhits()) {
RawTrackerHit rawHit = (RawTrackerHit) rh;
@@ -349,6 +362,7 @@
if(plotSamples){
samples = rawHit.getADCValues();
+ pedestal = sensor.getPedestal(channel);
try {
if(sensor.isTopLayer()){
@@ -357,20 +371,12 @@
samplesWriter.write(runNumber + " " + eventNumber + " 1 " + sensor.getLayerNumber() + " ");
}
samplesWriter.write(channel + " " + samples[0] + " " + samples[1] + " " + samples[2] + " "
- + samples[3] + " " + samples[4] + " " + samples[5] + "\n");
+ + samples[3] + " " + samples[4] + " " + samples[5] + " " + pedestal + "\n");
} catch (IOException exception) {
exception.printStackTrace();
}
}
-
- /*
- if(sensor.getNoise(channel) > 80
- || sensor.getNoise(channel+1) > 80
- || sensor.getNoise(channel-1) > 80){
- bad_channel = 1;
- }*/
-
constants = HPSSVTCalibrationConstants.getChannelConstants(sensor, channel);
fit = shaperFitter.fitShape(rawHit, constants);
if (fit.getAmp() > maxClusterAmplitude) {
@@ -378,7 +384,7 @@
maxClusterAmplitude = fit.getAmp();
}
if(stripHit.rawhits().size() == 1){
- chi_squared = fit.getChiSq();
+ chiSquared = fit.getChiSq();
}
noise += Math.pow(sensor.getNoise(channel), 2);
clusterAmplitude += fit.getAmp();
@@ -396,7 +402,8 @@
performanceWriter.write(runNumber + " " + eventNumber + " 1 " + sensor.getLayerNumber() + " ");
}
performanceWriter.write(maxClusterChannel + " " + clusterAmplitude + " " + noise + " " + hitsPerCluster + " "
- + bad_channel + " " + chi_squared + " " + hitX + " " + hitY + "\n");
+ + bad_channel + " " + chiSquared + " " + hitX + " " + hitY + " " + trkChiSquared + " "
+ + hitTime + "\n");
} catch (IOException exception) {
exception.printStackTrace();
}