3 modified files
java/branches/hps-java_HPSJAVA-88/tracking/src/main/java/org/hps/recon/tracking/apv25
--- java/branches/hps-java_HPSJAVA-88/tracking/src/main/java/org/hps/recon/tracking/apv25/RearTransitionModule.java 2014-10-06 20:25:09 UTC (rev 1142)
+++ java/branches/hps-java_HPSJAVA-88/tracking/src/main/java/org/hps/recon/tracking/apv25/RearTransitionModule.java 2014-10-06 20:45:24 UTC (rev 1143)
@@ -1,25 +1,22 @@
package org.hps.recon.tracking.apv25;
-//--- java ---//
-//--- Constants ---//
-import static org.hps.conditions.deprecated.HPSSVTConstants.TOTAL_STRIPS_PER_SENSOR;
import java.util.ArrayList;
import java.util.List;
-import org.hps.conditions.deprecated.HPSSVTCalibrationConstants;
+//===> import org.hps.conditions.deprecated.HPSSVTCalibrationConstants;
import org.hps.conditions.deprecated.HPSSVTConstants;
+import static org.hps.conditions.deprecated.HPSSVTConstants.TOTAL_STRIPS_PER_SENSOR;
import org.hps.util.RandomGaussian;
-//--- org.lcsim ---//
+
import org.lcsim.event.EventHeader;
import org.lcsim.util.Driver;
-//--- hps-java ---//
/**
*
* @author Omar Moreno <[log in to unmask]>
- * @version $Id: RearTransitionModule.java,v 1.2 2013/04/25 22:11:14 meeg Exp $
*/
+// TODO: Sandbox this class.
public class RearTransitionModule extends Driver {
String apv25AnalogDataCollectionName = "APV25AnalogData";
@@ -116,15 +113,20 @@
apv25Output[index] *= (HPSSVTConstants.MIP/HPSSVTConstants.MULTIPLEXER_GAIN);
// Digitize the signal
+
+ // FIXME: Update to use the new conditions system at some point.
+ /* ===>
apv25Output[index] *= HPSSVTCalibrationConstants.getGain(analogDatum.getSensor(), physicalChannel);
// Add pedestal and noise
double pedestal = HPSSVTCalibrationConstants.getPedestal(analogDatum.getSensor(), physicalChannel);
double noise = HPSSVTCalibrationConstants.getNoise(analogDatum.getSensor(), physicalChannel);
+
if(!noiseless)
apv25Output[index] += RandomGaussian.getGaussian(pedestal, noise);
else
apv25Output[index] += pedestal;
+ ===> */
}
// Add the digital data to the list
java/branches/hps-java_HPSJAVA-88/tracking/src/main/java/org/hps/recon/tracking/apv25
--- java/branches/hps-java_HPSJAVA-88/tracking/src/main/java/org/hps/recon/tracking/apv25/SvtHalfModule.java 2014-10-06 20:25:09 UTC (rev 1142)
+++ java/branches/hps-java_HPSJAVA-88/tracking/src/main/java/org/hps/recon/tracking/apv25/SvtHalfModule.java 2014-10-06 20:45:24 UTC (rev 1143)
@@ -1,18 +1,16 @@
package org.hps.recon.tracking.apv25;
-//--- constants ---//
import static org.hps.conditions.deprecated.HPSSVTConstants.TOTAL_APV25_PER_HYBRID;
-
-import org.hps.conditions.deprecated.HPSSVTCalibrationConstants;
+//===> import org.hps.conditions.deprecated.HPSSVTCalibrationConstants;
import org.hps.conditions.deprecated.HPSSVTConstants;
-//--- lcsim ---//
+
import org.lcsim.detector.tracker.silicon.SiSensor;
/**
*
* @author Omar Moreno
- * @version $Id: SvtHalfModule.java,v 1.7 2013/04/25 22:11:14 meeg Exp $
*/
+// TODO: Sandbox this class.
public class SvtHalfModule {
private SiSensor sensor;
@@ -30,13 +28,14 @@
int physicalChannel = 639 - (chip*128 + 127 - channel);
// Mark all bad channels which were found during QA
- if(HPSSVTCalibrationConstants.isBadChannel(sensor, physicalChannel)){
+ // FIXME: Update to use the new conditions system at some point.
+ /* ===> if(HPSSVTCalibrationConstants.isBadChannel(sensor, physicalChannel)){
apv25[chip].getChannel(channel).markAsBadChannel();
}
// Set the shaping time
double tp = HPSSVTCalibrationConstants.getTShaping(sensor, physicalChannel);
- apv25[chip].getChannel(channel).setShapingTime(tp);
+ apv25[chip].getChannel(channel).setShapingTime(tp); <=== */
}
}
}
java/branches/hps-java_HPSJAVA-88/tracking/src/main/java/org/hps/recon/tracking/apv25
--- java/branches/hps-java_HPSJAVA-88/tracking/src/main/java/org/hps/recon/tracking/apv25/TestRunDataProcessingModule.java 2014-10-06 20:25:09 UTC (rev 1142)
+++ java/branches/hps-java_HPSJAVA-88/tracking/src/main/java/org/hps/recon/tracking/apv25/TestRunDataProcessingModule.java 2014-10-06 20:45:24 UTC (rev 1143)
@@ -4,7 +4,7 @@
import java.util.List;
import java.util.Map;
-import org.hps.conditions.deprecated.HPSSVTCalibrationConstants;
+//===> import org.hps.conditions.deprecated.HPSSVTCalibrationConstants;
import org.lcsim.detector.IReadout;
import org.lcsim.detector.tracker.silicon.ChargeCarrier;
import org.lcsim.detector.tracker.silicon.SiSensor;
@@ -16,8 +16,8 @@
/**
*
* @author Omar Moreno <[log in to unmask]>
- * @version $Id: TestRunDataProcessingModule.java,v 1.1 2013/03/15 21:05:28 meeg Exp $
*/
+// TODO: Sandbox this class.
public class TestRunDataProcessingModule extends DataProcessingModule {
int nSamplesAboveThreshold = 1; // Number of samples above noise threshold
@@ -71,7 +71,8 @@
for(int channel = 0; channel < 639; channel++){
- if(HPSSVTCalibrationConstants.isBadChannel(sensor.getKey(), channel)) continue;
+ // FIXME: Update to use the new conditions system at some point.
+ //===> if(HPSSVTCalibrationConstants.isBadChannel(sensor.getKey(), channel)) continue;
short[] samples = blocks.getSamples(channel);
@@ -104,8 +105,11 @@
/**
*
*/
+ // FIXME: Update to use the new conditions system at some point.
private boolean samplesAboveThreshold(SiSensor sensor, int channel, short[] samples){
- // Number of samples above threshold
+
+ /* ===>
+ // Number of samples above threshold
int nSamplesAboveThreshold = 0;
// Get the pedestal and noise for this channel
@@ -121,6 +125,7 @@
// If the prerequisite number of samples are above threshold return true
if(nSamplesAboveThreshold >= this.nSamplesAboveThreshold ) return true;
+ ===> */
return false;
}
SVNspam 0.1