4 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/DataProcessingModule.java 2014-10-10 05:15:14 UTC (rev 1165)
+++ java/branches/hps-java_HPSJAVA-88/tracking/src/main/java/org/hps/recon/tracking/apv25/DataProcessingModule.java 2014-10-10 05:32:24 UTC (rev 1166)
@@ -4,7 +4,7 @@
import java.util.List;
import java.util.Map;
-import org.hps.conditions.deprecated.SvtUtils;
+//===> import org.hps.conditions.deprecated.SvtUtils;
import org.lcsim.detector.tracker.silicon.SiSensor;
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
@@ -13,9 +13,9 @@
/**
*
* @author Omar Moreno
- * @version $Id: DataProcessingModule.java,v 1.1 2013/03/15 21:05:28 meeg Exp $
*/
-public abstract class DataProcessingModule extends Driver{
+// TODO: Sandbox this class
+public abstract class DataProcessingModule extends Driver {
Map<SiSensor, SvtDataBlocks> sensorToDataBlocks = new HashMap<SiSensor, SvtDataBlocks>();
@@ -35,12 +35,12 @@
protected abstract List<RawTrackerHit> findRawHits();
- @Override
- public void detectorChanged(Detector detector){
+
+ /*public void detectorChanged(Detector detector){
for(SiSensor sensor : SvtUtils.getInstance().getSensors()){
sensorToDataBlocks.put(sensor, new SvtDataBlocks());
}
- }
+ }*/
@Override
public void process(EventHeader event){
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/HPSDataProcessingModule.java 2014-10-10 05:15:14 UTC (rev 1165)
+++ java/branches/hps-java_HPSJAVA-88/tracking/src/main/java/org/hps/recon/tracking/apv25/HPSDataProcessingModule.java 2014-10-10 05:32:24 UTC (rev 1166)
@@ -15,7 +15,7 @@
//--- org.lcsim ---//
import java.util.Set;
-import org.hps.conditions.deprecated.SvtUtils;
+//===> import org.hps.conditions.deprecated.SvtUtils;
import org.hps.readout.svt.SVTData;
import org.lcsim.detector.IReadout;
import org.lcsim.detector.tracker.silicon.SiSensor;
@@ -30,8 +30,8 @@
/**
*
* @author Omar Moreno <[log in to unmask]>
- * @version $Id: HPSDataProcessingModule.java,v 1.3 2013/03/15 21:05:28 meeg Exp $
*/
+// TODO: Sandbox this class
public class HPSDataProcessingModule extends Driver {
// A map relating a sensor to all sample blocks collected from that sensor
@@ -92,10 +92,10 @@
@Override
public void detectorChanged(Detector detector) {
- for (SiSensor sensor : SvtUtils.getInstance().getSensors()) {
+ /*for (SiSensor sensor : SvtUtils.getInstance().getSensors()) {
// Map a sensor to its corresponding samples
sensorToSamplesMap.put(sensor, new HashMap<Integer, List<Double>>());
- }
+ }*/
}
/**
@@ -219,10 +219,11 @@
for (Map.Entry<SiSensor, Map<Integer, List<Double>>> sensor : sensorToSamplesMap.entrySet()) {
// Get the FPGA number
- fpgaNumber = SvtUtils.getInstance().getFPGA(sensor.getKey());
+ /* ===> fpgaNumber = SvtUtils.getInstance().getFPGA(sensor.getKey());
if(fpgaNumber > SVT_TOTAL_FPGAS || fpgaNumber < 0)
throw new RuntimeException("FPGA Number out of range!");
if(debug) System.out.println(this.getClass().getSimpleName() + ": FPGA Number: " + fpgaNumber);
+ ===> */
// Clear the temporary list
svtFpgaData.clear();
@@ -265,10 +266,11 @@
rawHits.add(rawHit);
// Get the hybrid number
- hybridNumber = SvtUtils.getInstance().getHybrid(sensor.getKey());
- if(hybridNumber > TOTAL_HYBRIDS_PER_FPGA || hybridNumber < 0)
+ //===> hybridNumber = SvtUtils.getInstance().getHybrid(sensor.getKey());
+ /* ==> if(hybridNumber > TOTAL_HYBRIDS_PER_FPGA || hybridNumber < 0)
throw new RuntimeException("Hybrid number is out of range!");
//if(debug) System.out.println(this.getClass().getSimpleName() + ": Hybrid Number: " + hybridNumber);
+ ===> */
// Find the APV number. Note that strip numbering is from 639 to 0
apvNumber = (TOTAL_APV25_PER_HYBRID - 1) - (int) Math.floor(samples.getKey()/128);
@@ -284,14 +286,14 @@
//if(debug) System.out.println(this.getClass().getSimpleName() + ": Raw Channel Number: " + rawChannel);
// Create an svtData packet
- SVTData data = new SVTData(hybridNumber, apvNumber, rawChannel, fpgaNumber, adc);
+ /* ===> SVTData data = new SVTData(hybridNumber, apvNumber, rawChannel, fpgaNumber, adc);
svtData.add(data);
svtFpgaData.add(data);
-
+ ===> */
samples.getValue().clear();
}
- HPSSVTDataBuffer.addToBuffer(svtFpgaData, fpgaNumber);
+ //===> HPSSVTDataBuffer.addToBuffer(svtFpgaData, fpgaNumber);
}
if(debug) System.out.println(this.getClass().getName() + ": Total RawTrackerHits before cuts: " + rawHitsNoCuts.size());
if(debug) System.out.println(this.getClass().getName() + ": Total RawTrackerHits: " + rawHits.size());
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/HPSSiSensorReadout.java 2014-10-10 05:15:14 UTC (rev 1165)
+++ java/branches/hps-java_HPSJAVA-88/tracking/src/main/java/org/hps/recon/tracking/apv25/HPSSiSensorReadout.java 2014-10-10 05:32:24 UTC (rev 1166)
@@ -20,7 +20,7 @@
import org.apache.commons.math.distribution.BinomialDistributionImpl;
import org.apache.commons.math.distribution.NormalDistribution;
import org.apache.commons.math.distribution.NormalDistributionImpl;
-import org.hps.conditions.deprecated.SvtUtils;
+//===> import org.hps.conditions.deprecated.SvtUtils;
import org.hps.readout.ecal.ClockSingleton;
//--- hps-java ---//
import org.hps.recon.tracking.apv25.HPSAPV25.APV25Channel.APV25AnalogPipeline;
@@ -43,8 +43,8 @@
* Class used to Readout HPS APV25's
*
* @author Omar Moreno <[log in to unmask]>
- * @version $Id: HPSSiSensorReadout.java,v 1.12 2013/03/15 21:05:28 meeg Exp $
*/
+// TODO: Sandbox this classes
public class HPSSiSensorReadout extends Driver {
//
@@ -142,7 +142,7 @@
super.detectorChanged(detector);
// Instantiate all maps
- for (SiSensor sensor : SvtUtils.getInstance().getSensors()) {
+ /*for (SiSensor sensor : SvtUtils.getInstance().getSensors()) {
sensorToPipelineMap.put(sensor, new HashMap<Integer, APV25AnalogPipeline>());
@@ -158,7 +158,7 @@
sensorToAnalogDataMap.put(sensor, new HashMap<Integer, double[]>());
sensorToDigitalDataMap.put(sensor, new HashMap<Integer, double[]>());
- }
+ }*/
}
/**
@@ -193,10 +193,10 @@
}
// Loop over all sensors
- for (SiSensor sensor : SvtUtils.getInstance().getSensors()) {
+ /*for (SiSensor sensor : SvtUtils.getInstance().getSensors()) {
// Readout the sensors
readoutSensor(sensor);
- }
+ }*/
// If a trigger is received readout the APV25 and digitize all hits
if (HPSAPV25.readoutBit) {
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/SvtReadout.java 2014-10-10 05:15:14 UTC (rev 1165)
+++ java/branches/hps-java_HPSJAVA-88/tracking/src/main/java/org/hps/recon/tracking/apv25/SvtReadout.java 2014-10-10 05:32:24 UTC (rev 1166)
@@ -1,7 +1,6 @@
package org.hps.recon.tracking.apv25;
-//--- java ---//
import static org.hps.conditions.deprecated.HPSSVTConstants.TOTAL_APV25_CHANNELS;
import static org.hps.conditions.deprecated.HPSSVTConstants.TOTAL_NUMBER_OF_SAMPLES;
import static org.hps.conditions.deprecated.HPSSVTConstants.TOTAL_STRIPS_PER_SENSOR;
@@ -16,9 +15,8 @@
import java.util.Set;
import org.hps.conditions.deprecated.HPSSVTConstants;
-import org.hps.conditions.deprecated.SvtUtils;
+//===> import org.hps.conditions.deprecated.SvtUtils;
import org.hps.readout.ecal.ClockSingleton;
-//--- lcsim ---//
import org.lcsim.detector.tracker.silicon.ChargeCarrier;
import org.lcsim.detector.tracker.silicon.SiSensor;
import org.lcsim.event.EventHeader;
@@ -30,14 +28,12 @@
import org.lcsim.recon.tracking.digitization.sisim.SiSensorSim;
import org.lcsim.recon.tracking.digitization.sisim.config.SimTrackerHitReadoutDriver;
import org.lcsim.util.Driver;
-//--- Constants ---//
-//--- hps-java ---//
/**
*
* @author Omar Moreno <[log in to unmask]>
- * @version $Id: SvtReadout.java,v 1.12 2013/04/25 22:11:14 meeg Exp $
*/
+// TODO: Sandbox this class
public class SvtReadout extends Driver {
private Set<SvtHalfModule> halfModules = new HashSet<SvtHalfModule>();
@@ -122,9 +118,9 @@
super.detectorChanged(detector);
// Instantiate all SVT Half modules
- for(SiSensor sensor : SvtUtils.getInstance().getSensors()){
+ /*for(SiSensor sensor : SvtUtils.getInstance().getSensors()){
halfModules.add(new SvtHalfModule(sensor));
- }
+ }*/
// Set the trigger latency
for(SvtHalfModule halfModule : halfModules){
@@ -256,12 +252,12 @@
double charge = pedestalRun ? 0 : electrodeData.getCharge();
if(debug){
- if(charge > 0){
+ /*if(charge > 0){
System.out.println(this.getClass().getSimpleName()
+ ": Sensor: " + SvtUtils.getInstance().getDescription(halfModule.getSensor())
+ ": Injecting charge " + charge + " into channel " + physicalChannel);
sensorToChannel.get(halfModule.getSensor()).add(physicalChannel);
- }
+ }*/
}
// Inject the charge into the APV25 amplifier chain
@@ -295,9 +291,6 @@
if(sensorToChannel.get(halfModule.getSensor()).contains(physicalChannel)){
int channel = physicalChannel - TOTAL_STRIPS_PER_SENSOR
+ halfModule.getAPV25Number(physicalChannel)*TOTAL_APV25_CHANNELS + (TOTAL_APV25_CHANNELS - 1);
- System.out.println("\nPhysical Channel: " + physicalChannel
- + " Sensor: " + SvtUtils.getInstance().getDescription(halfModule.getSensor())
- + apv25[halfModule.getAPV25Number(physicalChannel)].getChannel(channel).getPipeline().toString() + "\n");
}
}
}
SVNspam 0.1
