4 modified files
java/branches/hps-java_HPSJAVA-88/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt
--- java/branches/hps-java_HPSJAVA-88/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/PedestalPlots.java 2014-10-07 02:56:20 UTC (rev 1145)
+++ java/branches/hps-java_HPSJAVA-88/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/PedestalPlots.java 2014-10-07 08:10:51 UTC (rev 1146)
@@ -16,8 +16,10 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.hps.conditions.deprecated.HPSSVTCalibrationConstants;
+
+//===> import org.hps.conditions.deprecated.HPSSVTCalibrationConstants;
import org.hps.conditions.deprecated.SvtUtils;
+import org.lcsim.detector.tracker.silicon.HpsSiSensor;
import org.lcsim.detector.tracker.silicon.SiSensor;
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
@@ -28,7 +30,6 @@
/**
*
* @author Sho Uemura <[log in to unmask]>
- * @version $Id: $
*/
public class PedestalPlots extends Driver {
@@ -86,9 +87,10 @@
List<RawTrackerHit> rawTrackerHits = event.get(RawTrackerHit.class, rawTrackerHitCollectionName);
for (RawTrackerHit hit : rawTrackerHits) {
- SiSensor sensor = (SiSensor) hit.getDetectorElement();
+ HpsSiSensor sensor = (HpsSiSensor) hit.getDetectorElement();
int strip = hit.getIdentifierFieldValue("strip");
- double pedestal = HPSSVTCalibrationConstants.getPedestal(sensor, strip);
+ double pedestal = sensor.getPedestal(strip, 0);
+ //===> double pedestal = HPSSVTCalibrationConstants.getPedestal(sensor, strip);
hists.get(sensor).fill(strip, hit.getADCValues()[0] - pedestal);
if (plotTimeSeries) {
java/branches/hps-java_HPSJAVA-88/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt
--- java/branches/hps-java_HPSJAVA-88/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTHitPulsePlots.java 2014-10-07 02:56:20 UTC (rev 1145)
+++ java/branches/hps-java_HPSJAVA-88/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTHitPulsePlots.java 2014-10-07 08:10:51 UTC (rev 1146)
@@ -14,10 +14,12 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.hps.conditions.deprecated.HPSSVTCalibrationConstants;
+
+//===> import org.hps.conditions.deprecated.HPSSVTCalibrationConstants;
import org.hps.util.Resettable;
import org.lcsim.detector.identifier.IIdentifier;
import org.lcsim.detector.identifier.IIdentifierHelper;
+import org.lcsim.detector.tracker.silicon.HpsSiSensor;
import org.lcsim.detector.tracker.silicon.SiSensor;
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
@@ -124,17 +126,19 @@
private void fillPlots(RawTrackerHit hit) {
String sensorName = hit.getDetectorElement().getName();
- SiSensor sensor = (SiSensor) hit.getDetectorElement();
+ HpsSiSensor sensor = (HpsSiSensor) hit.getDetectorElement();
int strip = hit.getIdentifierFieldValue("strip");
short[] adcVal = hit.getADCValues();
- double ped = HPSSVTCalibrationConstants.getPedestal(sensor, strip);
- double noise = HPSSVTCalibrationConstants.getNoise(sensor, strip);
+ //===> double ped = HPSSVTCalibrationConstants.getPedestal(sensor, strip);
+ //===> double noise = HPSSVTCalibrationConstants.getNoise(sensor, strip);
for (int i = 0; i < 6; i++) {
- double pedSub = (adcVal[i] - ped);
+ //===> double pedSub = (adcVal[i] - ped);
+ double pedSub = (adcVal[i] - sensor.getPedestal(strip, i));
aida.histogram2D(sensorName + "_AdcVsChan").fill(pedSub, strip);
//only plot hits above threshold...
// if (pedSub / noise > 3 && hasAdjacentHit(hit) && noise < 70)
- if (hasAdjacentHit(hit) && noise < 100) {
+ //===> if (hasAdjacentHit(hit) && noise < 100) {
+ if (hasAdjacentHit(hit) && sensor.getNoise(strip, i) < 100) {
aida.profile1D(sensorName + "_pulse").fill(24.0 * i, pedSub);
}
}
java/branches/hps-java_HPSJAVA-88/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt
--- java/branches/hps-java_HPSJAVA-88/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTMonitoringPlots.java 2014-10-07 02:56:20 UTC (rev 1145)
+++ java/branches/hps-java_HPSJAVA-88/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTMonitoringPlots.java 2014-10-07 08:10:51 UTC (rev 1146)
@@ -6,11 +6,13 @@
import hep.aida.IProfile1D;
import java.util.List;
+
import org.apache.commons.math3.special.Gamma;
-import org.hps.conditions.deprecated.HPSSVTCalibrationConstants;
+//===> import org.hps.conditions.deprecated.HPSSVTCalibrationConstants;
import org.hps.conditions.deprecated.SvtUtils;
import org.hps.recon.tracking.FittedRawTrackerHit;
+import org.lcsim.detector.tracker.silicon.HpsSiSensor;
import org.lcsim.detector.tracker.silicon.SiSensor;
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
@@ -25,8 +27,6 @@
* to 20.
*
* @author Jeremy McCormick <[log in to unmask]>
- * @version $Id: SensorOccupancyPlotsDriver.java,v 1.12 2012/04/13 00:06:55
- * jeremy Exp $
*
*/
public class SVTMonitoringPlots extends Driver {
@@ -140,8 +140,9 @@
for (RawTrackerHit hit : rawTrackerHits) {
int layer = hit.getIdentifierFieldValue("layer"); // 1-10; axial layers are odd layers; stereo layers are even
int module = hit.getIdentifierFieldValue("module"); // 0-1; module number is top or bottom
- double pedestal = HPSSVTCalibrationConstants.getPedestal((SiSensor) hit.getDetectorElement(), hit.getIdentifierFieldValue("strip"));
- pedestalShifts[module][layer - 1].fill(hit.getIdentifierFieldValue("strip"), hit.getADCValues()[0] - pedestal);
+ //===> double pedestal = HPSSVTCalibrationConstants.getPedestal((SiSensor) hit.getDetectorElement(), hit.getIdentifierFieldValue("strip"));
+ double pedestal = ((HpsSiSensor) hit.getDetectorElement()).getPedestal(hit.getIdentifierFieldValue("strip"), 0);
+ pedestalShifts[module][layer - 1].fill(hit.getIdentifierFieldValue("strip"), hit.getADCValues()[0]- pedestal);
}
}
@@ -152,7 +153,8 @@
int module = fit.getRawTrackerHit().getIdentifierFieldValue("module"); // 0-1; module number is top or bottom
int strip = fit.getRawTrackerHit().getIdentifierFieldValue("strip");
if (fit.getShapeFitParameters().getChiProb() > Gamma.regularizedGammaQ(4, 5)) {
- double noise = HPSSVTCalibrationConstants.getNoise((SiSensor) fit.getRawTrackerHit().getDetectorElement(), strip);
+ //===> double noise = HPSSVTCalibrationConstants.getNoise((SiSensor) fit.getRawTrackerHit().getDetectorElement(), strip);
+ double noise = ((HpsSiSensor) fit.getRawTrackerHit().getDetectorElement()).getNoise(strip, 0);
if (fit.getAmp() > 4 * noise) {
t0s[module][layer - 1].fill(strip, fit.getT0());
}
java/branches/hps-java_HPSJAVA-88/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt
--- java/branches/hps-java_HPSJAVA-88/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTPulseFitPlots.java 2014-10-07 02:56:20 UTC (rev 1145)
+++ java/branches/hps-java_HPSJAVA-88/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/svt/SVTPulseFitPlots.java 2014-10-07 08:10:51 UTC (rev 1146)
@@ -11,11 +11,13 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.hps.conditions.deprecated.HPSSVTCalibrationConstants;
+
+//===> import org.hps.conditions.deprecated.HPSSVTCalibrationConstants;
import org.hps.conditions.deprecated.HPSSVTConstants;
import org.hps.conditions.deprecated.SvtUtils;
import org.hps.recon.tracking.FittedRawTrackerHit;
import org.hps.util.Resettable;
+import org.lcsim.detector.tracker.silicon.HpsSiSensor;
import org.lcsim.detector.tracker.silicon.SiSensor;
import org.lcsim.event.EventHeader;
import org.lcsim.geometry.Detector;
@@ -25,8 +27,6 @@
/**
*
* @author mgraham
- * @version $Id: SVTHitReconstructionPlots.java,v 1.14 2012/05/18 07:41:49 meeg
- * Exp $
*/
public class SVTPulseFitPlots extends Driver implements Resettable {
@@ -126,7 +126,7 @@
++eventCount;
List<FittedRawTrackerHit> fittedrawHits = event.get(FittedRawTrackerHit.class, fittedTrackerHitCollectionName);
for (FittedRawTrackerHit fit : fittedrawHits) {
- SiSensor sensor = (SiSensor) fit.getRawTrackerHit().getDetectorElement();
+ HpsSiSensor sensor = (HpsSiSensor) fit.getRawTrackerHit().getDetectorElement();
int strip = fit.getRawTrackerHit().getIdentifierFieldValue("strip");
int layer = fit.getRawTrackerHit().getIdentifierFieldValue("layer"); // 1-10; axial layers are odd layers; stereo layers are even
int module = fit.getRawTrackerHit().getIdentifierFieldValue("module"); // 0-1; module number is top or bottom
@@ -138,14 +138,18 @@
aida.histogram1D(sensorName + "_amplitude").fill(fittedAmp);
aida.histogram1D(sensorName + "_chiprob").fill(fit.getShapeFitParameters().getChiProb());
- double noise = HPSSVTCalibrationConstants.getNoise(sensor, strip);
- double pedestal = HPSSVTCalibrationConstants.getPedestal(sensor, strip);
- double tp = HPSSVTCalibrationConstants.getTShaping(sensor, strip);
-
+ //===> double noise = HPSSVTCalibrationConstants.getNoise(sensor, strip);
+ //===> double pedestal = HPSSVTCalibrationConstants.getPedestal(sensor, strip);
+ //===> double tp = HPSSVTCalibrationConstants.getTShaping(sensor, strip);
+ double tp = sensor.getShapeFitParameters(strip)[HpsSiSensor.TP_INDEX];
+
t0a[module][layer - 1].fill(fit.getT0(), fit.getAmp());
- if (fit.getAmp() > 4 * noise) {
+ //===> if (fit.getAmp() > 4 * noise) {
+ if (fit.getAmp() > 4 * sensor.getNoise(strip, 0)) {
for (int i = 0; i < fit.getRawTrackerHit().getADCValues().length; i++) {
- shape[module][layer - 1].fill((i * HPSSVTConstants.SAMPLING_INTERVAL - fit.getT0()) / tp, (fit.getRawTrackerHit().getADCValues()[i] - pedestal) / fit.getAmp());
+ //====> shape[module][layer - 1].fill((i * HPSSVTConstants.SAMPLING_INTERVAL - fit.getT0()) / tp, (fit.getRawTrackerHit().getADCValues()[i] - pedestal) / fit.getAmp());
+ shape[module][layer - 1].fill((i * HPSSVTConstants.SAMPLING_INTERVAL - fit.getT0()) / tp,
+ (fit.getRawTrackerHit().getADCValues()[i] - sensor.getPedestal(strip, i)) / fit.getAmp());
// shape.fill((i * HPSSVTConstants.SAMPLE_INTERVAL - hrth.getT0()) / tp, (hrth.getRawTrackerHit().getADCValues()[i] - pedestal) / hrth.getAmp());
}
}
SVNspam 0.1