Author: [log in to unmask]
Date: Thu Mar 19 17:13:15 2015
New Revision: 2497
Log:
revert change to FADCEcalReadoutDriver, add checks to TestRunTriggeredReconToLcio so it doesn't crash on ECal-only data, set NSA/NSB correctly in Holly's ECal readout sim test
Modified:
java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/FADCEcalReadoutDriver.java
java/trunk/evio/src/main/java/org/hps/evio/TestRunTriggeredReconToLcio.java
java/trunk/steering-files/src/main/resources/org/hps/steering/users/holly/ECalSimReadout.lcsim
Modified: java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/FADCEcalReadoutDriver.java
=============================================================================
--- java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/FADCEcalReadoutDriver.java (original)
+++ java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/FADCEcalReadoutDriver.java Thu Mar 19 17:13:15 2015
@@ -516,7 +516,7 @@
if (fixedGain > 0) {
gain = readoutPeriod / (fixedGain * ECalUtils.MeV * ((Math.pow(2, nBit) - 1) / maxVolt));
} else {
- gain = 1. / (channelData.getGain().getGain() * ECalUtils.MeV);
+ gain = readoutPeriod / (channelData.getGain().getGain() * ECalUtils.MeV * ((Math.pow(2, nBit) - 1) / maxVolt));
}
return gain * pulseAmplitude(time, pulseShape, tp);
Modified: java/trunk/evio/src/main/java/org/hps/evio/TestRunTriggeredReconToLcio.java
=============================================================================
--- java/trunk/evio/src/main/java/org/hps/evio/TestRunTriggeredReconToLcio.java (original)
+++ java/trunk/evio/src/main/java/org/hps/evio/TestRunTriggeredReconToLcio.java Thu Mar 19 17:13:15 2015
@@ -161,7 +161,9 @@
if (event.hasCollection(SimCalorimeterHit.class, ecalCollectionName) && !event.get(SimCalorimeterHit.class, ecalCollectionName).isEmpty()) {
mcParticles = event.getMCParticles();
ecalHits = event.get(SimCalorimeterHit.class, ecalCollectionName);
- trackerHits = event.get(SimTrackerHit.class, trackerCollectionName);
+ if (event.hasCollection(SimTrackerHit.class, trackerCollectionName)) {
+ trackerHits = event.get(SimTrackerHit.class, trackerCollectionName);
+ }
if (event.hasCollection(SimTrackerHit.class, ecalScoringPlaneHitsCollectionName)) {
ecalScoringPlaneHits = event.get(SimTrackerHit.class, ecalScoringPlaneHitsCollectionName);
}
@@ -170,7 +172,9 @@
if (event.hasCollection(MCParticle.class)) {
triggerMCParticles = event.getMCParticles();
triggerECalHits = event.get(SimCalorimeterHit.class, ecalCollectionName);
- triggerTrackerHits = event.get(SimTrackerHit.class, trackerCollectionName);
+ if (event.hasCollection(SimTrackerHit.class, trackerCollectionName)) {
+ triggerTrackerHits = event.get(SimTrackerHit.class, trackerCollectionName);
+ }
if (event.hasCollection(SimTrackerHit.class, ecalScoringPlaneHitsCollectionName)) {
triggerECalScoringPlaneHits = event.get(SimTrackerHit.class, ecalScoringPlaneHitsCollectionName);
}
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/holly/ECalSimReadout.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/holly/ECalSimReadout.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/holly/ECalSimReadout.lcsim Thu Mar 19 17:13:15 2015
@@ -12,7 +12,7 @@
<execute>
<driver name="EventMarkerDriver"/>
<driver name="ConditionsDriver"/>
- <driver name="TestRunReconToLcio"/>
+ <!--<driver name="TestRunReconToLcio"/>-->
<driver name="EcalReadout"/>
<driver name="EcalConverter"/>
<driver name="ReconClusterer"/>
@@ -29,23 +29,26 @@
<freeze>true</freeze>
<detectorName>HPS-ECalCommissioning-v3-fieldmap</detectorName>
</driver>
- <driver name="TestRunReconToLcio" type="org.hps.evio.TestRunTriggeredReconToLcio">
+<!-- <driver name="TestRunReconToLcio" type="org.hps.evio.TestRunTriggeredReconToLcio">
<outputFile>${outputFile}.slcio</outputFile>
<rejectBackground>true</rejectBackground>
- </driver>
+ </driver>-->
<driver name="EcalReadout" type="org.hps.readout.ecal.FADCEcalReadoutDriver">
<coincidenceWindow>1</coincidenceWindow>
<ecalName>Ecal</ecalName>
<ecalCollectionName>EcalHits</ecalCollectionName>
<ecalRawCollectionName>EcalRawHits</ecalRawCollectionName>
<addNoise>true</addNoise>
- <use2014Gain>true</use2014Gain>
+ <use2014Gain>false</use2014Gain>
+ <numSamplesAfter>25</numSamplesAfter>
+ <numSamplesBefore>5</numSamplesBefore>
+ <!--<debug>true</debug>-->
</driver>
<driver name="EcalConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
<rawCollectionName>EcalRawHits</rawCollectionName>
<ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
<applyBadCrystalMap>false</applyBadCrystalMap>
- <use2014Gain>true</use2014Gain>
+ <use2014Gain>false</use2014Gain>
</driver>
<driver name="ReconClusterer" type="org.hps.recon.ecal.cluster.ReconClusterDriver">
<logLevel>WARNING</logLevel>
