 |
 |
| Commit in hps-java/src/main on MAIN | |||
| java/org/lcsim/hps/recon/ecal/EcalRawConverter.java | +1 | -1 | 1.1 -> 1.2 |
| resources/org/lcsim/hps/steering/readout/TestRunNoPileup.lcsim | +2 | 1.3 -> 1.4 | |
| /HPS2014ReadoutNoPileup.lcsim | +4 | -2 | 1.3 -> 1.4 |
| java/org/lcsim/hps/recon/tracking/SimpleSvtReadout.java | +4 | -3 | 1.17 -> 1.18 |
| +11 | -6 | ||
fix bugs in no-pileup readout
diff -u -r1.1 -r1.2 --- EcalRawConverter.java 25 Feb 2013 22:39:24 -0000 1.1 +++ EcalRawConverter.java 7 Aug 2013 23:37:30 -0000 1.2 @@ -75,7 +75,7 @@
}
public RawCalorimeterHit HitAtoD(CalorimeterHit hit, int window) {
- int time = (int) (hit.getTime() * 16.0);
+ int time = (int) (Math.round(hit.getTime()/4.0) * 64.0);
long id = hit.getCellID();
int amplitude;
if (constantGain) {
diff -u -r1.3 -r1.4 --- TestRunNoPileup.lcsim 1 Mar 2013 23:22:24 -0000 1.3 +++ TestRunNoPileup.lcsim 7 Aug 2013 23:37:30 -0000 1.4 @@ -15,6 +15,7 @@
<driver name="SimpleSVTReadout"/>
<driver name="EcalTrigger"/>
<driver name="ClockDriver"/>
+ <driver name="CleanupDriver"/>
</execute>
<drivers>
<driver name="CalibrationDriver" type="org.lcsim.hps.monitoring.CalibrationDriver">
@@ -49,5 +50,6 @@
<noPileup>true</noPileup>
</driver>
<driver name="ClockDriver" type="org.lcsim.hps.util.ClockDriver"/>
+ <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver"/>
</drivers> </lcsim>
diff -u -r1.3 -r1.4 --- HPS2014ReadoutNoPileup.lcsim 1 Mar 2013 23:22:24 -0000 1.3 +++ HPS2014ReadoutNoPileup.lcsim 7 Aug 2013 23:37:30 -0000 1.4 @@ -1,7 +1,7 @@
<!-- Execute trigger+readout simulation without pileup (event by event) and write the results as an LCIO file. @author Sho Uemura <[log in to unmask]>
- @version $Id: HPS2014ReadoutNoPileup.lcsim,v 1.3 2013/03/01 23:22:24 meeg Exp $
+ @version $Id: HPS2014ReadoutNoPileup.lcsim,v 1.4 2013/08/07 23:37:30 meeg Exp $
-->
<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
@@ -18,6 +18,7 @@
<driver name="SimpleSVTReadout"/>
<driver name="EcalTrigger"/>
<driver name="ClockDriver"/>
+ <driver name="CleanupDriver"/>
</execute>
<drivers>
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
@@ -43,7 +44,7 @@
</driver>
<driver name="EcalTrigger" type="org.lcsim.hps.readout.ecal.FADCTriggerDriver">
<clusterCollectionName>EcalTriggerClusters</clusterCollectionName>
- <outputFileName>${outputFile}.triggers</outputFileName>
+ <outputFileName>${outputFile}.triggers</outputFileName>
<deadTime>0</deadTime>
<lcioFile>${outputFile}.slcio</lcioFile>
</driver>
@@ -52,5 +53,6 @@
<noPileup>true</noPileup>
</driver>
<driver name="ClockDriver" type="org.lcsim.hps.util.ClockDriver"/>
+ <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver"/>
</drivers> </lcsim>
diff -u -r1.17 -r1.18 --- SimpleSvtReadout.java 22 May 2013 18:45:33 -0000 1.17 +++ SimpleSvtReadout.java 7 Aug 2013 23:37:30 -0000 1.18 @@ -31,7 +31,7 @@
/** * * @author Sho Uemura <[log in to unmask]>
- * @version $Id: SimpleSvtReadout.java,v 1.17 2013/05/22 18:45:33 jeremy Exp $
+ * @version $Id: SimpleSvtReadout.java,v 1.18 2013/08/07 23:37:30 meeg Exp $
*/
public class SimpleSvtReadout extends TriggerableDriver {
@@ -45,7 +45,7 @@
private double readoutLatency = 240.0;
private double pileupCutoff = 300.0;
private String readout = "TrackerHits";
- private double timeOffset = 30.0;
+ private double timeOffset = 60.0;
private boolean noPileup = false;
private boolean addNoise = true;
//cut settings
@@ -162,7 +162,8 @@
for (int i = 0; i < 6; i++) {
double time = i * HPSSVTConstants.SAMPLING_INTERVAL - timeOffset;
- signal[i] += amplitude * pulseAmplitude(time, HPSSVTCalibrationConstants.getTShaping(sensor, channel)) + HPSSVTCalibrationConstants.getPedestal(sensor, channel);
+ signal[i] += amplitude * pulseAmplitude(time, HPSSVTCalibrationConstants.getTShaping(sensor, channel)); +// signal[i] += amplitude * pulseAmplitude(time, HPSSVTCalibrationConstants.getTShaping(sensor, channel)) + HPSSVTCalibrationConstants.getPedestal(sensor, channel);
samples[i] = (short) Math.round(signal[i]);
}
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