1 added + 11 modified, total 12 files
LCDetectors/detectors/cdcaug05/digisim
diff -u -r1.1 -r1.2
--- digisim.steer 17 Aug 2005 20:14:17 -0000 1.1
+++ digisim.steer 21 Jan 2006 14:10:01 -0000 1.2
@@ -1,6 +1,6 @@
############################################
#
-# Example steering file for Marlin
+# Example DigiSim steering file for Marlin
#
############################################
@@ -63,10 +63,17 @@
OutputCollection EcalBarrRawHits
Raw2SimLinksCollection EcalBarrRaw2sim
-ModifierNames EMBDigiIdentity
+ModifierNames EMBEnergyCut EMBTimeCut EMBEneDigi EMBTimeDigi
# modifierName Type Parameters (floats)
-EMBDigiIdentity SmearedGain 100000000 0
+
+# MIP is 92 keV, MIP/4 cut at 23e-6 GeV
+EMBEnergyCut GainDiscrimination 1 0 23e-6 0
+EMBTimeCut TimeDiscrimination 100 0
+
+# Digitization: multiply by large numbers to minimize round-off errors
+EMBEneDigi SmearedGain 100000000 0
+EMBTimeDigi SmearedTiming 1000000 0
.end -------------------------------------------------
############################################################
@@ -81,10 +88,16 @@
OutputCollection EcalEndcapRawHits
Raw2SimLinksCollection EcalEndcapRaw2sim
-ModifierNames EMECDigiIdentity
+ModifierNames EMECEnergyCut EMECTimeCut EMECEneDigi EMECTimeDigi
# modifierName Type Parameters (floats)
-EMECDigiIdentity SmearedGain 100000000 0
+# MIP is 92 keV, MIP/4 cut at 23e-6 GeV
+EMECEnergyCut GainDiscrimination 1 0 23e-6 0
+EMECTimeCut TimeDiscrimination 100 0
+
+# Digitization: multiply by large numbers to minimize round-off errors
+EMECEneDigi SmearedGain 100000000 0
+EMECTimeDigi SmearedTiming 1000000 0
.end -------------------------------------------------
############################################################
@@ -95,48 +108,18 @@
ProcessorType DigiSimProcessor
-InputCollection HcalBarrHits
-OutputCollection HcalBarrRawHits
+InputCollection HcalBarrHits
+OutputCollection HcalBarrRawHits
Raw2SimLinksCollection HcalBarrRaw2sim
-ModifierNames HBlightYield HBcrosstalk HBlightCollEff HBPDQuEffic HBExpoNoise HBGaussNoise HBdiscrim HBGain
+ModifierNames HBEnergyCut HBTimeCut HBEneDigi HBTimeDigi
-# Parameters:
-# modifierName Type gainNom gainSig thresh thrSig
-HBlightYield GainDiscrimination 10000000 0 1 0
-
-# Crosstalk mean sigma
-HBcrosstalk Crosstalk 0.020 0.005
-
-# Smeared gain parameters: gain gainSigma thresh thrSig
-HBlightCollEff GainDiscrimination 0.0111 0.0029 1 0
-HBPDQuEffic GainDiscrimination 0.15 0 1 0
-
-### Noise generators
-# GaussNoise parameters: sys be Ecut TimeNom TSig Mean Sigma
-# Note: sigma<0 means that threshold acts on absolute value only
-HBGaussNoise GaussianNoise 3 0 2.5 100 100 0.0 -0.58
-# ExponentialNoise parameters: sys be Ecut TimeNom TSig Mean
-HBExpoNoise ExponentialNoise 3 0 2.5 100 100 0.23
-
-# SiPM gain=601 with saturation at about 2200 incident photons
-# SiPMSaturation parameters: gainNom linMax
-HBSiPMSaturat SiPMSaturation 1 2200
-
-# Hot cell parameters: AmplNom Sig TimeNom Sig sys be lay the phi
-HBHotCell HotCell 252525 0 101010 0 3 0 12 123 345
-HBDeadCellTest HotCell 252525 0 101010 0 3 0 12 34 56
-
-# Hot cell parameters: sys be lay the phi
-HBDeadCell DeadCell 3 0 12 34 56
-
-# Discrimination threshold sigma
-HBdiscrim AbsValueDiscrimination 4 0.25
-#HBdiscrim GainDiscrimination 1 0 4 0.25
-
-# Gain adjustments (temporary, kludge modifiers)
-HBGain SmearedGain 6006. 0
-HBIdentity SmearedGain 1 0
+# modifierName Type Parameters (floats)
+# MIP is 820 keV, MIP/4 cut at 205e-6 GeV
+HBEnergyCut GainDiscrimination 1 0 205e-6 0
+HBTimeCut TimeDiscrimination 100 0
+HBEneDigi SmearedGain 100000000 0
+HBTimeDigi SmearedTiming 1000000 0
.end -------------------------------------------------
############################################################
@@ -151,10 +134,15 @@
OutputCollection HcalEndcapRawHits
Raw2SimLinksCollection HcalEndcapRaw2sim
-ModifierNames HECDigiIdentity
+ModifierNames HECEnergyCut HECTimeCut HECEneDigi HECTimeDigi
-# Parameters:
-# modifierName Type gainNom gainSig
-HECDigiIdentity SmearedGain 100000000 0
+# modifierName Type Parameters (floats)
+# MIP is 820 keV, MIP/4 cut at 205e-6 GeV
+HECEnergyCut GainDiscrimination 1 0 205e-6 0
+HECTimeCut TimeDiscrimination 100 0
+
+# Digitization: multiply by large numbers to minimize round-off errors
+HECEneDigi SmearedGain 100000000 0
+HECTimeDigi SmearedTiming 1000000 0
.end -------------------------------------------------
LCDetectors/detectors/cdcaug05_ecal150/digisim
diff -u -r1.1 -r1.2
--- digisim.steer 17 Aug 2005 20:14:17 -0000 1.1
+++ digisim.steer 21 Jan 2006 14:10:02 -0000 1.2
@@ -1,6 +1,6 @@
############################################
#
-# Example steering file for Marlin
+# Example DigiSim steering file for Marlin
#
############################################
@@ -63,10 +63,17 @@
OutputCollection EcalBarrRawHits
Raw2SimLinksCollection EcalBarrRaw2sim
-ModifierNames EMBDigiIdentity
+ModifierNames EMBEnergyCut EMBTimeCut EMBEneDigi EMBTimeDigi
# modifierName Type Parameters (floats)
-EMBDigiIdentity SmearedGain 100000000 0
+
+# MIP is 92 keV, MIP/4 cut at 23e-6 GeV
+EMBEnergyCut GainDiscrimination 1 0 23e-6 0
+EMBTimeCut TimeDiscrimination 100 0
+
+# Digitization: multiply by large numbers to minimize round-off errors
+EMBEneDigi SmearedGain 100000000 0
+EMBTimeDigi SmearedTiming 1000000 0
.end -------------------------------------------------
############################################################
@@ -81,10 +88,16 @@
OutputCollection EcalEndcapRawHits
Raw2SimLinksCollection EcalEndcapRaw2sim
-ModifierNames EMECDigiIdentity
+ModifierNames EMECEnergyCut EMECTimeCut EMECEneDigi EMECTimeDigi
# modifierName Type Parameters (floats)
-EMECDigiIdentity SmearedGain 100000000 0
+# MIP is 92 keV, MIP/4 cut at 23e-6 GeV
+EMECEnergyCut GainDiscrimination 1 0 23e-6 0
+EMECTimeCut TimeDiscrimination 100 0
+
+# Digitization: multiply by large numbers to minimize round-off errors
+EMECEneDigi SmearedGain 100000000 0
+EMECTimeDigi SmearedTiming 1000000 0
.end -------------------------------------------------
############################################################
@@ -95,48 +108,18 @@
ProcessorType DigiSimProcessor
-InputCollection HcalBarrHits
-OutputCollection HcalBarrRawHits
+InputCollection HcalBarrHits
+OutputCollection HcalBarrRawHits
Raw2SimLinksCollection HcalBarrRaw2sim
-ModifierNames HBlightYield HBcrosstalk HBlightCollEff HBPDQuEffic HBExpoNoise HBGaussNoise HBdiscrim HBGain
+ModifierNames HBEnergyCut HBTimeCut HBEneDigi HBTimeDigi
-# Parameters:
-# modifierName Type gainNom gainSig thresh thrSig
-HBlightYield GainDiscrimination 10000000 0 1 0
-
-# Crosstalk mean sigma
-HBcrosstalk Crosstalk 0.020 0.005
-
-# Smeared gain parameters: gain gainSigma thresh thrSig
-HBlightCollEff GainDiscrimination 0.0111 0.0029 1 0
-HBPDQuEffic GainDiscrimination 0.15 0 1 0
-
-### Noise generators
-# GaussNoise parameters: sys be Ecut TimeNom TSig Mean Sigma
-# Note: sigma<0 means that threshold acts on absolute value only
-HBGaussNoise GaussianNoise 3 0 2.5 100 100 0.0 -0.58
-# ExponentialNoise parameters: sys be Ecut TimeNom TSig Mean
-HBExpoNoise ExponentialNoise 3 0 2.5 100 100 0.23
-
-# SiPM gain=601 with saturation at about 2200 incident photons
-# SiPMSaturation parameters: gainNom linMax
-HBSiPMSaturat SiPMSaturation 1 2200
-
-# Hot cell parameters: AmplNom Sig TimeNom Sig sys be lay the phi
-HBHotCell HotCell 252525 0 101010 0 3 0 12 123 345
-HBDeadCellTest HotCell 252525 0 101010 0 3 0 12 34 56
-
-# Hot cell parameters: sys be lay the phi
-HBDeadCell DeadCell 3 0 12 34 56
-
-# Discrimination threshold sigma
-HBdiscrim AbsValueDiscrimination 4 0.25
-#HBdiscrim GainDiscrimination 1 0 4 0.25
-
-# Gain adjustments (temporary, kludge modifiers)
-HBGain SmearedGain 6006. 0
-HBIdentity SmearedGain 1 0
+# modifierName Type Parameters (floats)
+# MIP is 820 keV, MIP/4 cut at 205e-6 GeV
+HBEnergyCut GainDiscrimination 1 0 205e-6 0
+HBTimeCut TimeDiscrimination 100 0
+HBEneDigi SmearedGain 100000000 0
+HBTimeDigi SmearedTiming 1000000 0
.end -------------------------------------------------
############################################################
@@ -151,10 +134,15 @@
OutputCollection HcalEndcapRawHits
Raw2SimLinksCollection HcalEndcapRaw2sim
-ModifierNames HECDigiIdentity
+ModifierNames HECEnergyCut HECTimeCut HECEneDigi HECTimeDigi
-# Parameters:
-# modifierName Type gainNom gainSig
-HECDigiIdentity SmearedGain 100000000 0
+# modifierName Type Parameters (floats)
+# MIP is 820 keV, MIP/4 cut at 205e-6 GeV
+HECEnergyCut GainDiscrimination 1 0 205e-6 0
+HECTimeCut TimeDiscrimination 100 0
+
+# Digitization: multiply by large numbers to minimize round-off errors
+HECEneDigi SmearedGain 100000000 0
+HECTimeDigi SmearedTiming 1000000 0
.end -------------------------------------------------
LCDetectors/detectors/cdcaug05_np/digisim
diff -u -r1.1 -r1.2
--- digisim.steer 17 Aug 2005 20:14:18 -0000 1.1
+++ digisim.steer 21 Jan 2006 14:10:02 -0000 1.2
@@ -1,6 +1,6 @@
############################################
#
-# Example steering file for Marlin
+# Example DigiSim steering file for Marlin
#
############################################
@@ -63,10 +63,17 @@
OutputCollection EcalBarrRawHits
Raw2SimLinksCollection EcalBarrRaw2sim
-ModifierNames EMBDigiIdentity
+ModifierNames EMBEnergyCut EMBTimeCut EMBEneDigi EMBTimeDigi
# modifierName Type Parameters (floats)
-EMBDigiIdentity SmearedGain 100000000 0
+
+# MIP is 92 keV, MIP/4 cut at 23e-6 GeV
+EMBEnergyCut GainDiscrimination 1 0 23e-6 0
+EMBTimeCut TimeDiscrimination 100 0
+
+# Digitization: multiply by large numbers to minimize round-off errors
+EMBEneDigi SmearedGain 100000000 0
+EMBTimeDigi SmearedTiming 1000000 0
.end -------------------------------------------------
############################################################
@@ -81,10 +88,16 @@
OutputCollection EcalEndcapRawHits
Raw2SimLinksCollection EcalEndcapRaw2sim
-ModifierNames EMECDigiIdentity
+ModifierNames EMECEnergyCut EMECTimeCut EMECEneDigi EMECTimeDigi
# modifierName Type Parameters (floats)
-EMECDigiIdentity SmearedGain 100000000 0
+# MIP is 92 keV, MIP/4 cut at 23e-6 GeV
+EMECEnergyCut GainDiscrimination 1 0 23e-6 0
+EMECTimeCut TimeDiscrimination 100 0
+
+# Digitization: multiply by large numbers to minimize round-off errors
+EMECEneDigi SmearedGain 100000000 0
+EMECTimeDigi SmearedTiming 1000000 0
.end -------------------------------------------------
############################################################
@@ -95,48 +108,18 @@
ProcessorType DigiSimProcessor
-InputCollection HcalBarrHits
-OutputCollection HcalBarrRawHits
+InputCollection HcalBarrHits
+OutputCollection HcalBarrRawHits
Raw2SimLinksCollection HcalBarrRaw2sim
-ModifierNames HBlightYield HBcrosstalk HBlightCollEff HBPDQuEffic HBExpoNoise HBGaussNoise HBdiscrim HBGain
+ModifierNames HBEnergyCut HBTimeCut HBEneDigi HBTimeDigi
-# Parameters:
-# modifierName Type gainNom gainSig thresh thrSig
-HBlightYield GainDiscrimination 10000000 0 1 0
-
-# Crosstalk mean sigma
-HBcrosstalk Crosstalk 0.020 0.005
-
-# Smeared gain parameters: gain gainSigma thresh thrSig
-HBlightCollEff GainDiscrimination 0.0111 0.0029 1 0
-HBPDQuEffic GainDiscrimination 0.15 0 1 0
-
-### Noise generators
-# GaussNoise parameters: sys be Ecut TimeNom TSig Mean Sigma
-# Note: sigma<0 means that threshold acts on absolute value only
-HBGaussNoise GaussianNoise 3 0 2.5 100 100 0.0 -0.58
-# ExponentialNoise parameters: sys be Ecut TimeNom TSig Mean
-HBExpoNoise ExponentialNoise 3 0 2.5 100 100 0.23
-
-# SiPM gain=601 with saturation at about 2200 incident photons
-# SiPMSaturation parameters: gainNom linMax
-HBSiPMSaturat SiPMSaturation 1 2200
-
-# Hot cell parameters: AmplNom Sig TimeNom Sig sys be lay the phi
-HBHotCell HotCell 252525 0 101010 0 3 0 12 123 345
-HBDeadCellTest HotCell 252525 0 101010 0 3 0 12 34 56
-
-# Hot cell parameters: sys be lay the phi
-HBDeadCell DeadCell 3 0 12 34 56
-
-# Discrimination threshold sigma
-HBdiscrim AbsValueDiscrimination 4 0.25
-#HBdiscrim GainDiscrimination 1 0 4 0.25
-
-# Gain adjustments (temporary, kludge modifiers)
-HBGain SmearedGain 6006. 0
-HBIdentity SmearedGain 1 0
+# modifierName Type Parameters (floats)
+# MIP is 820 keV, MIP/4 cut at 205e-6 GeV
+HBEnergyCut GainDiscrimination 1 0 205e-6 0
+HBTimeCut TimeDiscrimination 100 0
+HBEneDigi SmearedGain 100000000 0
+HBTimeDigi SmearedTiming 1000000 0
.end -------------------------------------------------
############################################################
@@ -151,10 +134,15 @@
OutputCollection HcalEndcapRawHits
Raw2SimLinksCollection HcalEndcapRaw2sim
-ModifierNames HECDigiIdentity
+ModifierNames HECEnergyCut HECTimeCut HECEneDigi HECTimeDigi
-# Parameters:
-# modifierName Type gainNom gainSig
-HECDigiIdentity SmearedGain 100000000 0
+# modifierName Type Parameters (floats)
+# MIP is 820 keV, MIP/4 cut at 205e-6 GeV
+HECEnergyCut GainDiscrimination 1 0 205e-6 0
+HECTimeCut TimeDiscrimination 100 0
+
+# Digitization: multiply by large numbers to minimize round-off errors
+HECEneDigi SmearedGain 100000000 0
+HECTimeDigi SmearedTiming 1000000 0
.end -------------------------------------------------
LCDetectors/detectors/cdcaug05_rpchcal/digisim
diff -u -r1.1 -r1.2
--- digisim.steer 17 Aug 2005 20:14:18 -0000 1.1
+++ digisim.steer 21 Jan 2006 14:10:02 -0000 1.2
@@ -1,6 +1,6 @@
############################################
#
-# Example steering file for Marlin
+# Example DigiSim steering file for Marlin
#
############################################
@@ -63,10 +63,17 @@
OutputCollection EcalBarrRawHits
Raw2SimLinksCollection EcalBarrRaw2sim
-ModifierNames EMBDigiIdentity
+ModifierNames EMBEnergyCut EMBTimeCut EMBEneDigi EMBTimeDigi
-# modifierName Type Parameters (floats)
-EMBDigiIdentity SmearedGain 100000000 0
+# modifierName Type Parameters (floats)
+
+# MIP is 92 keV, MIP/4 cut at 23e-6 GeV
+EMBEnergyCut GainDiscrimination 1 0 23e-6 0
+EMBTimeCut TimeDiscrimination 100 0
+
+# Digitization: multiply by large numbers to minimize round-off errors
+EMBEneDigi SmearedGain 100000000 0
+EMBTimeDigi SmearedTiming 1000000 0
.end -------------------------------------------------
############################################################
@@ -81,10 +88,16 @@
OutputCollection EcalEndcapRawHits
Raw2SimLinksCollection EcalEndcapRaw2sim
-ModifierNames EMECDigiIdentity
+ModifierNames EMECEnergyCut EMECTimeCut EMECEneDigi EMECTimeDigi
-# modifierName Type Parameters (floats)
-EMECDigiIdentity SmearedGain 100000000 0
+# modifierName Type Parameters (floats)
+# MIP is 92 keV, MIP/4 cut at 23e-6 GeV
+EMECEnergyCut GainDiscrimination 1 0 23e-6 0
+EMECTimeCut TimeDiscrimination 100 0
+
+# Digitization: multiply by large numbers to minimize round-off errors
+EMECEneDigi SmearedGain 100000000 0
+EMECTimeDigi SmearedTiming 1000000 0
.end -------------------------------------------------
############################################################
@@ -99,10 +112,12 @@
OutputCollection HcalBarrRawHits
Raw2SimLinksCollection HcalBarrRaw2sim
-ModifierNames HBDigiIdentity
+ModifierNames HBTimeCut HBEneDigi HBTimeDigi
-# modifierName Type Parameters (floats)
-HBDigiIdentity SmearedGain 100000000 0
+# modifierName Type Parameters (floats)
+HBTimeCut TimeDiscrimination 100 0
+HBEneDigi SmearedGain 100000000 0
+HBTimeDigi SmearedTiming 1000000 0
.end -------------------------------------------------
############################################################
@@ -117,9 +132,13 @@
OutputCollection HcalEndcapRawHits
Raw2SimLinksCollection HcalEndcapRaw2sim
-ModifierNames HECDigiIdentity
+ModifierNames HECTimeCut HECEneDigi HECTimeDigi
+
+# modifierName Type Parameters (floats)
+HECTimeCut TimeDiscrimination 100 0
-# modifierName Type Parameters (floats)
-HECDigiIdentity SmearedGain 100000000 0
+# Digitization: multiply by large numbers to minimize round-off errors
+HECEneDigi SmearedGain 100000000 0
+HECTimeDigi SmearedTiming 1000000 0
.end -------------------------------------------------
LCDetectors/detectors/sid00/digisim
diff -u -r1.1 -r1.2
--- digisim.steer 22 Sep 2005 19:10:27 -0000 1.1
+++ digisim.steer 21 Jan 2006 14:10:02 -0000 1.2
@@ -1,6 +1,6 @@
############################################
#
-# Example steering file for Marlin
+# Example DigiSim steering file for Marlin
#
############################################
@@ -63,10 +63,17 @@
OutputCollection EcalBarrRawHits
Raw2SimLinksCollection EcalBarrRaw2sim
-ModifierNames EMBDigiIdentity
+ModifierNames EMBEnergyCut EMBTimeCut EMBEneDigi EMBTimeDigi
-# modifierName Type Parameters (floats)
-EMBDigiIdentity SmearedGain 100000000 0
+# modifierName Type Parameters (floats)
+
+# MIP is 92 keV, MIP/4 cut at 23e-6 GeV
+EMBEnergyCut GainDiscrimination 1 0 23e-6 0
+EMBTimeCut TimeDiscrimination 100 0
+
+# Digitization: multiply by large numbers to minimize round-off errors
+EMBEneDigi SmearedGain 100000000 0
+EMBTimeDigi SmearedTiming 1000000 0
.end -------------------------------------------------
############################################################
@@ -81,10 +88,16 @@
OutputCollection EcalEndcapRawHits
Raw2SimLinksCollection EcalEndcapRaw2sim
-ModifierNames EMECDigiIdentity
+ModifierNames EMECEnergyCut EMECTimeCut EMECEneDigi EMECTimeDigi
-# modifierName Type Parameters (floats)
-EMECDigiIdentity SmearedGain 100000000 0
+# modifierName Type Parameters (floats)
+# MIP is 92 keV, MIP/4 cut at 23e-6 GeV
+EMECEnergyCut GainDiscrimination 1 0 23e-6 0
+EMECTimeCut TimeDiscrimination 100 0
+
+# Digitization: multiply by large numbers to minimize round-off errors
+EMECEneDigi SmearedGain 100000000 0
+EMECTimeDigi SmearedTiming 1000000 0
.end -------------------------------------------------
############################################################
@@ -99,10 +112,12 @@
OutputCollection HcalBarrRawHits
Raw2SimLinksCollection HcalBarrRaw2sim
-ModifierNames HBDigiIdentity
+ModifierNames HBTimeCut HBEneDigi HBTimeDigi
-# modifierName Type Parameters (floats)
-HBDigiIdentity SmearedGain 100000000 0
+# modifierName Type Parameters (floats)
+HBTimeCut TimeDiscrimination 100 0
+HBEneDigi SmearedGain 100000000 0
+HBTimeDigi SmearedTiming 1000000 0
.end -------------------------------------------------
############################################################
@@ -117,9 +132,13 @@
OutputCollection HcalEndcapRawHits
Raw2SimLinksCollection HcalEndcapRaw2sim
-ModifierNames HECDigiIdentity
+ModifierNames HECTimeCut HECEneDigi HECTimeDigi
+
+# modifierName Type Parameters (floats)
+HECTimeCut TimeDiscrimination 100 0
-# modifierName Type Parameters (floats)
-HECDigiIdentity SmearedGain 100000000 0
+# Digitization: multiply by large numbers to minimize round-off errors
+HECEneDigi SmearedGain 100000000 0
+HECTimeDigi SmearedTiming 1000000 0
.end -------------------------------------------------
LCDetectors/detectors/sidaug05/digisim
diff -u -r1.1 -r1.2
--- digisim.steer 17 Aug 2005 20:14:19 -0000 1.1
+++ digisim.steer 21 Jan 2006 14:10:03 -0000 1.2
@@ -1,6 +1,6 @@
############################################
#
-# Example steering file for Marlin
+# Example DigiSim steering file for Marlin
#
############################################
@@ -63,10 +63,17 @@
OutputCollection EcalBarrRawHits
Raw2SimLinksCollection EcalBarrRaw2sim
-ModifierNames EMBDigiIdentity
+ModifierNames EMBEnergyCut EMBTimeCut EMBEneDigi EMBTimeDigi
-# modifierName Type Parameters (floats)
-EMBDigiIdentity SmearedGain 100000000 0
+# modifierName Type Parameters (floats)
+
+# MIP is 92 keV, MIP/4 cut at 23e-6 GeV
+EMBEnergyCut GainDiscrimination 1 0 23e-6 0
+EMBTimeCut TimeDiscrimination 100 0
+
+# Digitization: multiply by large numbers to minimize round-off errors
+EMBEneDigi SmearedGain 100000000 0
+EMBTimeDigi SmearedTiming 1000000 0
.end -------------------------------------------------
############################################################
@@ -81,10 +88,16 @@
OutputCollection EcalEndcapRawHits
Raw2SimLinksCollection EcalEndcapRaw2sim
-ModifierNames EMECDigiIdentity
+ModifierNames EMECEnergyCut EMECTimeCut EMECEneDigi EMECTimeDigi
-# modifierName Type Parameters (floats)
-EMECDigiIdentity SmearedGain 100000000 0
+# modifierName Type Parameters (floats)
+# MIP is 92 keV, MIP/4 cut at 23e-6 GeV
+EMECEnergyCut GainDiscrimination 1 0 23e-6 0
+EMECTimeCut TimeDiscrimination 100 0
+
+# Digitization: multiply by large numbers to minimize round-off errors
+EMECEneDigi SmearedGain 100000000 0
+EMECTimeDigi SmearedTiming 1000000 0
.end -------------------------------------------------
############################################################
@@ -99,10 +112,12 @@
OutputCollection HcalBarrRawHits
Raw2SimLinksCollection HcalBarrRaw2sim
-ModifierNames HBDigiIdentity
+ModifierNames HBTimeCut HBEneDigi HBTimeDigi
-# modifierName Type Parameters (floats)
-HBDigiIdentity SmearedGain 100000000 0
+# modifierName Type Parameters (floats)
+HBTimeCut TimeDiscrimination 100 0
+HBEneDigi SmearedGain 100000000 0
+HBTimeDigi SmearedTiming 1000000 0
.end -------------------------------------------------
############################################################
@@ -117,9 +132,13 @@
OutputCollection HcalEndcapRawHits
Raw2SimLinksCollection HcalEndcapRaw2sim
-ModifierNames HECDigiIdentity
+ModifierNames HECTimeCut HECEneDigi HECTimeDigi
+
+# modifierName Type Parameters (floats)
+HECTimeCut TimeDiscrimination 100 0
-# modifierName Type Parameters (floats)
-HECDigiIdentity SmearedGain 100000000 0
+# Digitization: multiply by large numbers to minimize round-off errors
+HECEneDigi SmearedGain 100000000 0
+HECTimeDigi SmearedTiming 1000000 0
.end -------------------------------------------------
LCDetectors/detectors/sidaug05_20mr/digisim
diff -u -r1.1 -r1.2
--- digisim.steer 17 Aug 2005 20:14:19 -0000 1.1
+++ digisim.steer 21 Jan 2006 14:10:03 -0000 1.2
@@ -1,6 +1,6 @@
############################################
#
-# Example steering file for Marlin
+# Example DigiSim steering file for Marlin
#
############################################
@@ -63,10 +63,17 @@
OutputCollection EcalBarrRawHits
Raw2SimLinksCollection EcalBarrRaw2sim
-ModifierNames EMBDigiIdentity
+ModifierNames EMBEnergyCut EMBTimeCut EMBEneDigi EMBTimeDigi
-# modifierName Type Parameters (floats)
-EMBDigiIdentity SmearedGain 100000000 0
+# modifierName Type Parameters (floats)
+
+# MIP is 92 keV, MIP/4 cut at 23e-6 GeV
+EMBEnergyCut GainDiscrimination 1 0 23e-6 0
+EMBTimeCut TimeDiscrimination 100 0
+
+# Digitization: multiply by large numbers to minimize round-off errors
+EMBEneDigi SmearedGain 100000000 0
+EMBTimeDigi SmearedTiming 1000000 0
.end -------------------------------------------------
############################################################
@@ -81,10 +88,16 @@
OutputCollection EcalEndcapRawHits
Raw2SimLinksCollection EcalEndcapRaw2sim
-ModifierNames EMECDigiIdentity
+ModifierNames EMECEnergyCut EMECTimeCut EMECEneDigi EMECTimeDigi
-# modifierName Type Parameters (floats)
-EMECDigiIdentity SmearedGain 100000000 0
+# modifierName Type Parameters (floats)
+# MIP is 92 keV, MIP/4 cut at 23e-6 GeV
+EMECEnergyCut GainDiscrimination 1 0 23e-6 0
+EMECTimeCut TimeDiscrimination 100 0
+
+# Digitization: multiply by large numbers to minimize round-off errors
+EMECEneDigi SmearedGain 100000000 0
+EMECTimeDigi SmearedTiming 1000000 0
.end -------------------------------------------------
############################################################
@@ -99,10 +112,12 @@
OutputCollection HcalBarrRawHits
Raw2SimLinksCollection HcalBarrRaw2sim
-ModifierNames HBDigiIdentity
+ModifierNames HBTimeCut HBEneDigi HBTimeDigi
-# modifierName Type Parameters (floats)
-HBDigiIdentity SmearedGain 100000000 0
+# modifierName Type Parameters (floats)
+HBTimeCut TimeDiscrimination 100 0
+HBEneDigi SmearedGain 100000000 0
+HBTimeDigi SmearedTiming 1000000 0
.end -------------------------------------------------
############################################################
@@ -117,9 +132,13 @@
OutputCollection HcalEndcapRawHits
Raw2SimLinksCollection HcalEndcapRaw2sim
-ModifierNames HECDigiIdentity
+ModifierNames HECTimeCut HECEneDigi HECTimeDigi
+
+# modifierName Type Parameters (floats)
+HECTimeCut TimeDiscrimination 100 0
-# modifierName Type Parameters (floats)
-HECDigiIdentity SmearedGain 100000000 0
+# Digitization: multiply by large numbers to minimize round-off errors
+HECEneDigi SmearedGain 100000000 0
+HECTimeDigi SmearedTiming 1000000 0
.end -------------------------------------------------
LCDetectors/detectors/sidaug05_4tesla/digisim
diff -u -r1.1 -r1.2
--- digisim.steer 17 Aug 2005 20:14:19 -0000 1.1
+++ digisim.steer 21 Jan 2006 14:10:03 -0000 1.2
@@ -1,6 +1,6 @@
############################################
#
-# Example steering file for Marlin
+# Example DigiSim steering file for Marlin
#
############################################
@@ -63,10 +63,17 @@
OutputCollection EcalBarrRawHits
Raw2SimLinksCollection EcalBarrRaw2sim
-ModifierNames EMBDigiIdentity
+ModifierNames EMBEnergyCut EMBTimeCut EMBEneDigi EMBTimeDigi
-# modifierName Type Parameters (floats)
-EMBDigiIdentity SmearedGain 100000000 0
+# modifierName Type Parameters (floats)
+
+# MIP is 92 keV, MIP/4 cut at 23e-6 GeV
+EMBEnergyCut GainDiscrimination 1 0 23e-6 0
+EMBTimeCut TimeDiscrimination 100 0
+
+# Digitization: multiply by large numbers to minimize round-off errors
+EMBEneDigi SmearedGain 100000000 0
+EMBTimeDigi SmearedTiming 1000000 0
.end -------------------------------------------------
############################################################
@@ -81,10 +88,16 @@
OutputCollection EcalEndcapRawHits
Raw2SimLinksCollection EcalEndcapRaw2sim
-ModifierNames EMECDigiIdentity
+ModifierNames EMECEnergyCut EMECTimeCut EMECEneDigi EMECTimeDigi
-# modifierName Type Parameters (floats)
-EMECDigiIdentity SmearedGain 100000000 0
+# modifierName Type Parameters (floats)
+# MIP is 92 keV, MIP/4 cut at 23e-6 GeV
+EMECEnergyCut GainDiscrimination 1 0 23e-6 0
+EMECTimeCut TimeDiscrimination 100 0
+
+# Digitization: multiply by large numbers to minimize round-off errors
+EMECEneDigi SmearedGain 100000000 0
+EMECTimeDigi SmearedTiming 1000000 0
.end -------------------------------------------------
############################################################
@@ -99,10 +112,12 @@
OutputCollection HcalBarrRawHits
Raw2SimLinksCollection HcalBarrRaw2sim
-ModifierNames HBDigiIdentity
+ModifierNames HBTimeCut HBEneDigi HBTimeDigi
-# modifierName Type Parameters (floats)
-HBDigiIdentity SmearedGain 100000000 0
+# modifierName Type Parameters (floats)
+HBTimeCut TimeDiscrimination 100 0
+HBEneDigi SmearedGain 100000000 0
+HBTimeDigi SmearedTiming 1000000 0
.end -------------------------------------------------
############################################################
@@ -117,9 +132,13 @@
OutputCollection HcalEndcapRawHits
Raw2SimLinksCollection HcalEndcapRaw2sim
-ModifierNames HECDigiIdentity
+ModifierNames HECTimeCut HECEneDigi HECTimeDigi
+
+# modifierName Type Parameters (floats)
+HECTimeCut TimeDiscrimination 100 0
-# modifierName Type Parameters (floats)
-HECDigiIdentity SmearedGain 100000000 0
+# Digitization: multiply by large numbers to minimize round-off errors
+HECEneDigi SmearedGain 100000000 0
+HECTimeDigi SmearedTiming 1000000 0
.end -------------------------------------------------
LCDetectors/detectors/sidaug05_np/digisim
diff -u -r1.1 -r1.2
--- digisim.steer 17 Aug 2005 20:14:19 -0000 1.1
+++ digisim.steer 21 Jan 2006 14:10:03 -0000 1.2
@@ -1,6 +1,6 @@
############################################
#
-# Example steering file for Marlin
+# Example DigiSim steering file for Marlin
#
############################################
@@ -63,10 +63,17 @@
OutputCollection EcalBarrRawHits
Raw2SimLinksCollection EcalBarrRaw2sim
-ModifierNames EMBDigiIdentity
+ModifierNames EMBEnergyCut EMBTimeCut EMBEneDigi EMBTimeDigi
-# modifierName Type Parameters (floats)
-EMBDigiIdentity SmearedGain 100000000 0
+# modifierName Type Parameters (floats)
+
+# MIP is 92 keV, MIP/4 cut at 23e-6 GeV
+EMBEnergyCut GainDiscrimination 1 0 23e-6 0
+EMBTimeCut TimeDiscrimination 100 0
+
+# Digitization: multiply by large numbers to minimize round-off errors
+EMBEneDigi SmearedGain 100000000 0
+EMBTimeDigi SmearedTiming 1000000 0
.end -------------------------------------------------
############################################################
@@ -81,10 +88,16 @@
OutputCollection EcalEndcapRawHits
Raw2SimLinksCollection EcalEndcapRaw2sim
-ModifierNames EMECDigiIdentity
+ModifierNames EMECEnergyCut EMECTimeCut EMECEneDigi EMECTimeDigi
-# modifierName Type Parameters (floats)
-EMECDigiIdentity SmearedGain 100000000 0
+# modifierName Type Parameters (floats)
+# MIP is 92 keV, MIP/4 cut at 23e-6 GeV
+EMECEnergyCut GainDiscrimination 1 0 23e-6 0
+EMECTimeCut TimeDiscrimination 100 0
+
+# Digitization: multiply by large numbers to minimize round-off errors
+EMECEneDigi SmearedGain 100000000 0
+EMECTimeDigi SmearedTiming 1000000 0
.end -------------------------------------------------
############################################################
@@ -99,10 +112,12 @@
OutputCollection HcalBarrRawHits
Raw2SimLinksCollection HcalBarrRaw2sim
-ModifierNames HBDigiIdentity
+ModifierNames HBTimeCut HBEneDigi HBTimeDigi
-# modifierName Type Parameters (floats)
-HBDigiIdentity SmearedGain 100000000 0
+# modifierName Type Parameters (floats)
+HBTimeCut TimeDiscrimination 100 0
+HBEneDigi SmearedGain 100000000 0
+HBTimeDigi SmearedTiming 1000000 0
.end -------------------------------------------------
############################################################
@@ -117,9 +132,13 @@
OutputCollection HcalEndcapRawHits
Raw2SimLinksCollection HcalEndcapRaw2sim
-ModifierNames HECDigiIdentity
+ModifierNames HECTimeCut HECEneDigi HECTimeDigi
+
+# modifierName Type Parameters (floats)
+HECTimeCut TimeDiscrimination 100 0
-# modifierName Type Parameters (floats)
-HECDigiIdentity SmearedGain 100000000 0
+# Digitization: multiply by large numbers to minimize round-off errors
+HECEneDigi SmearedGain 100000000 0
+HECTimeDigi SmearedTiming 1000000 0
.end -------------------------------------------------
LCDetectors/detectors/sidaug05_polyhedra/digisim
diff -N digisim.steer
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ digisim.steer 21 Jan 2006 14:10:04 -0000 1.1
@@ -0,0 +1,144 @@
+############################################
+#
+# Example DigiSim steering file for Marlin
+#
+############################################
+
+.begin Global ---------------------------------------
+
+# specify one ore more input files (in one ore more lines)
+
+LCIOInputFiles inputfile
+#LCIOInputFiles ../simjob.slcio ../simjob.slcio
+
+# the active processors that are called in the given order
+ActiveProcessors CalHitMapProcessor
+ActiveProcessors EcalBarrDigitizer
+ActiveProcessors EcalEndcapDigitizer
+ActiveProcessors HcalBarrDigitizer
+ActiveProcessors HcalEndcapDigitizer
+ActiveProcessors OutputProcessor
+
+# limit the number of processed records (run+evt):
+MaxRecordNumber 501
+.end Global -----------------------------------------------
+###########################################################
+
+#define the processor parameters after '.begin ProcessorName' :
+
+# the default output processor
+.begin OutputProcessor
+
+# mandatory processor type (the name of the class)
+ProcessorType LCIOOutputProcessor
+
+# the outputfile
+LCIOOutputFile marlin.slcio
+
+# lcio write mode, new overwrites existing files
+# append appends to existing files
+# if nothing specified create new file only if it doesn't exist
+LCIOWriteMode WRITE_NEW
+#LCIOWriteMode WRITE_APPEND
+
+.end -------------------------------------------------
+############################################################
+# Utility processor. It fills hit maps for use by other processors,
+# so they don't need to fill the same maps themselves
+
+.begin CalHitMapProcessor
+
+ProcessorType CalHitMapProcessor
+
+.end -------------------------------------------------
+############################################################
+# Cal digitizer processor. Instantiates one or more calorimeter hit
+# "modifiers", which together represent the full digitization process.
+
+.begin EcalBarrDigitizer
+
+ProcessorType DigiSimProcessor
+
+InputCollection EcalBarrHits
+OutputCollection EcalBarrRawHits
+Raw2SimLinksCollection EcalBarrRaw2sim
+
+ModifierNames EMBEnergyCut EMBTimeCut EMBEneDigi EMBTimeDigi
+
+# modifierName Type Parameters (floats)
+
+# MIP is 92 keV, MIP/4 cut at 23e-6 GeV
+EMBEnergyCut GainDiscrimination 1 0 23e-6 0
+EMBTimeCut TimeDiscrimination 100 0
+
+# Digitization: multiply by large numbers to minimize round-off errors
+EMBEneDigi SmearedGain 100000000 0
+EMBTimeDigi SmearedTiming 1000000 0
+
+.end -------------------------------------------------
+############################################################
+# Cal digitizer processor. Instantiates one or more calorimeter hit
+# "modifiers", which together represent the full digitization process.
+
+.begin EcalEndcapDigitizer
+
+ProcessorType DigiSimProcessor
+
+InputCollection EcalEndcapHits
+OutputCollection EcalEndcapRawHits
+Raw2SimLinksCollection EcalEndcapRaw2sim
+
+ModifierNames EMECEnergyCut EMECTimeCut EMECEneDigi EMECTimeDigi
+
+# modifierName Type Parameters (floats)
+# MIP is 92 keV, MIP/4 cut at 23e-6 GeV
+EMECEnergyCut GainDiscrimination 1 0 23e-6 0
+EMECTimeCut TimeDiscrimination 100 0
+
+# Digitization: multiply by large numbers to minimize round-off errors
+EMECEneDigi SmearedGain 100000000 0
+EMECTimeDigi SmearedTiming 1000000 0
+
+.end -------------------------------------------------
+############################################################
+# Cal digitizer processor. Instantiates one or more calorimeter hit
+# "modifiers", which together represent the full digitization process.
+
+.begin HcalBarrDigitizer
+
+ProcessorType DigiSimProcessor
+
+InputCollection HcalBarrHits
+OutputCollection HcalBarrRawHits
+Raw2SimLinksCollection HcalBarrRaw2sim
+
+ModifierNames HBTimeCut HBEneDigi HBTimeDigi
+
+# modifierName Type Parameters (floats)
+HBTimeCut TimeDiscrimination 100 0
+HBEneDigi SmearedGain 100000000 0
+HBTimeDigi SmearedTiming 1000000 0
+
+.end -------------------------------------------------
+############################################################
+# Cal digitizer processor. Instantiates one or more calorimeter hit
+# "modifiers", which together represent the full digitization process.
+
+.begin HcalEndcapDigitizer
+
+ProcessorType DigiSimProcessor
+
+InputCollection HcalEndcapHits
+OutputCollection HcalEndcapRawHits
+Raw2SimLinksCollection HcalEndcapRaw2sim
+
+ModifierNames HECTimeCut HECEneDigi HECTimeDigi
+
+# modifierName Type Parameters (floats)
+HECTimeCut TimeDiscrimination 100 0
+
+# Digitization: multiply by large numbers to minimize round-off errors
+HECEneDigi SmearedGain 100000000 0
+HECTimeDigi SmearedTiming 1000000 0
+
+.end -------------------------------------------------
LCDetectors/detectors/sidaug05_scinthcal/digisim
diff -u -r1.1 -r1.2
--- digisim.steer 17 Aug 2005 20:14:19 -0000 1.1
+++ digisim.steer 21 Jan 2006 14:10:04 -0000 1.2
@@ -1,6 +1,6 @@
############################################
#
-# Example steering file for Marlin
+# Example DigiSim steering file for Marlin
#
############################################
@@ -63,10 +63,17 @@
OutputCollection EcalBarrRawHits
Raw2SimLinksCollection EcalBarrRaw2sim
-ModifierNames EMBDigiIdentity
+ModifierNames EMBEnergyCut EMBTimeCut EMBEneDigi EMBTimeDigi
# modifierName Type Parameters (floats)
-EMBDigiIdentity SmearedGain 100000000 0
+
+# MIP is 92 keV, MIP/4 cut at 23e-6 GeV
+EMBEnergyCut GainDiscrimination 1 0 23e-6 0
+EMBTimeCut TimeDiscrimination 100 0
+
+# Digitization: multiply by large numbers to minimize round-off errors
+EMBEneDigi SmearedGain 100000000 0
+EMBTimeDigi SmearedTiming 1000000 0
.end -------------------------------------------------
############################################################
@@ -81,10 +88,16 @@
OutputCollection EcalEndcapRawHits
Raw2SimLinksCollection EcalEndcapRaw2sim
-ModifierNames EMECDigiIdentity
+ModifierNames EMECEnergyCut EMECTimeCut EMECEneDigi EMECTimeDigi
# modifierName Type Parameters (floats)
-EMECDigiIdentity SmearedGain 100000000 0
+# MIP is 92 keV, MIP/4 cut at 23e-6 GeV
+EMECEnergyCut GainDiscrimination 1 0 23e-6 0
+EMECTimeCut TimeDiscrimination 100 0
+
+# Digitization: multiply by large numbers to minimize round-off errors
+EMECEneDigi SmearedGain 100000000 0
+EMECTimeDigi SmearedTiming 1000000 0
.end -------------------------------------------------
############################################################
@@ -95,48 +108,18 @@
ProcessorType DigiSimProcessor
-InputCollection HcalBarrHits
-OutputCollection HcalBarrRawHits
+InputCollection HcalBarrHits
+OutputCollection HcalBarrRawHits
Raw2SimLinksCollection HcalBarrRaw2sim
-ModifierNames HBlightYield HBcrosstalk HBlightCollEff HBPDQuEffic HBExpoNoise HBGaussNoise HBdiscrim HBGain
+ModifierNames HBEnergyCut HBTimeCut HBEneDigi HBTimeDigi
-# Parameters:
-# modifierName Type gainNom gainSig thresh thrSig
-HBlightYield GainDiscrimination 10000000 0 1 0
-
-# Crosstalk mean sigma
-HBcrosstalk Crosstalk 0.020 0.005
-
-# Smeared gain parameters: gain gainSigma thresh thrSig
-HBlightCollEff GainDiscrimination 0.0111 0.0029 1 0
-HBPDQuEffic GainDiscrimination 0.15 0 1 0
-
-### Noise generators
-# GaussNoise parameters: sys be Ecut TimeNom TSig Mean Sigma
-# Note: sigma<0 means that threshold acts on absolute value only
-HBGaussNoise GaussianNoise 3 0 2.5 100 100 0.0 -0.58
-# ExponentialNoise parameters: sys be Ecut TimeNom TSig Mean
-HBExpoNoise ExponentialNoise 3 0 2.5 100 100 0.23
-
-# SiPM gain=601 with saturation at about 2200 incident photons
-# SiPMSaturation parameters: gainNom linMax
-HBSiPMSaturat SiPMSaturation 1 2200
-
-# Hot cell parameters: AmplNom Sig TimeNom Sig sys be lay the phi
-HBHotCell HotCell 252525 0 101010 0 3 0 12 123 345
-HBDeadCellTest HotCell 252525 0 101010 0 3 0 12 34 56
-
-# Hot cell parameters: sys be lay the phi
-HBDeadCell DeadCell 3 0 12 34 56
-
-# Discrimination threshold sigma
-HBdiscrim AbsValueDiscrimination 4 0.25
-#HBdiscrim GainDiscrimination 1 0 4 0.25
-
-# Gain adjustments (temporary, kludge modifiers)
-HBGain SmearedGain 6006. 0
-HBIdentity SmearedGain 1 0
+# modifierName Type Parameters (floats)
+# MIP is 820 keV, MIP/4 cut at 205e-6 GeV
+HBEnergyCut GainDiscrimination 1 0 205e-6 0
+HBTimeCut TimeDiscrimination 100 0
+HBEneDigi SmearedGain 100000000 0
+HBTimeDigi SmearedTiming 1000000 0
.end -------------------------------------------------
############################################################
@@ -151,10 +134,15 @@
OutputCollection HcalEndcapRawHits
Raw2SimLinksCollection HcalEndcapRaw2sim
-ModifierNames HECDigiIdentity
+ModifierNames HECEnergyCut HECTimeCut HECEneDigi HECTimeDigi
-# Parameters:
-# modifierName Type gainNom gainSig
-HECDigiIdentity SmearedGain 100000000 0
+# modifierName Type Parameters (floats)
+# MIP is 820 keV, MIP/4 cut at 205e-6 GeV
+HECEnergyCut GainDiscrimination 1 0 205e-6 0
+HECTimeCut TimeDiscrimination 100 0
+
+# Digitization: multiply by large numbers to minimize round-off errors
+HECEneDigi SmearedGain 100000000 0
+HECTimeDigi SmearedTiming 1000000 0
.end -------------------------------------------------
LCDetectors/detectors/sidaug05_tcmt/digisim
diff -u -r1.2 -r1.3
--- digisim.steer 13 Dec 2005 19:13:37 -0000 1.2
+++ digisim.steer 21 Jan 2006 14:10:04 -0000 1.3
@@ -1,6 +1,6 @@
############################################
#
-# Example steering file for Marlin
+# Example DigiSim steering file for Marlin
#
############################################
@@ -63,10 +63,17 @@
OutputCollection EcalBarrRawHits
Raw2SimLinksCollection EcalBarrRaw2sim
-ModifierNames EMBDigiIdentity
+ModifierNames EMBEnergyCut EMBTimeCut EMBEneDigi EMBTimeDigi
# modifierName Type Parameters (floats)
-EMBDigiIdentity SmearedGain 100000000 0
+
+# MIP is 92 keV, MIP/4 cut at 23e-6 GeV
+EMBEnergyCut GainDiscrimination 1 0 23e-6 0
+EMBTimeCut TimeDiscrimination 100 0
+
+# Digitization: multiply by large numbers to minimize round-off errors
+EMBEneDigi SmearedGain 100000000 0
+EMBTimeDigi SmearedTiming 1000000 0
.end -------------------------------------------------
############################################################
@@ -81,10 +88,16 @@
OutputCollection EcalEndcapRawHits
Raw2SimLinksCollection EcalEndcapRaw2sim
-ModifierNames EMECDigiIdentity
+ModifierNames EMECEnergyCut EMECTimeCut EMECEneDigi EMECTimeDigi
# modifierName Type Parameters (floats)
-EMECDigiIdentity SmearedGain 100000000 0
+# MIP is 92 keV, MIP/4 cut at 23e-6 GeV
+EMECEnergyCut GainDiscrimination 1 0 23e-6 0
+EMECTimeCut TimeDiscrimination 100 0
+
+# Digitization: multiply by large numbers to minimize round-off errors
+EMECEneDigi SmearedGain 100000000 0
+EMECTimeDigi SmearedTiming 1000000 0
.end -------------------------------------------------
############################################################
@@ -95,48 +108,18 @@
ProcessorType DigiSimProcessor
-InputCollection HcalBarrHits
-OutputCollection HcalBarrRawHits
+InputCollection HcalBarrHits
+OutputCollection HcalBarrRawHits
Raw2SimLinksCollection HcalBarrRaw2sim
-ModifierNames HBlightYield HBcrosstalk HBlightCollEff HBPDQuEffic HBExpoNoise HBGaussNoise HBdiscrim HBGain
+ModifierNames HBEnergyCut HBTimeCut HBEneDigi HBTimeDigi
-# Parameters:
-# modifierName Type gainNom gainSig thresh thrSig
-HBlightYield GainDiscrimination 10000000 0 1 0
-
-# Crosstalk mean sigma
-HBcrosstalk Crosstalk 0.020 0.005
-
-# Smeared gain parameters: gain gainSigma thresh thrSig
-HBlightCollEff GainDiscrimination 0.0111 0.0029 1 0
-HBPDQuEffic GainDiscrimination 0.15 0 1 0
-
-### Noise generators
-# GaussNoise parameters: sys be Ecut TimeNom TSig Mean Sigma
-# Note: sigma<0 means that threshold acts on absolute value only
-HBGaussNoise GaussianNoise 3 0 2.5 100 100 0.0 -0.58
-# ExponentialNoise parameters: sys be Ecut TimeNom TSig Mean
-HBExpoNoise ExponentialNoise 3 0 2.5 100 100 0.23
-
-# SiPM gain=601 with saturation at about 2200 incident photons
-# SiPMSaturation parameters: gainNom linMax
-HBSiPMSaturat SiPMSaturation 1 2200
-
-# Hot cell parameters: AmplNom Sig TimeNom Sig sys be lay the phi
-HBHotCell HotCell 252525 0 101010 0 3 0 12 123 345
-HBDeadCellTest HotCell 252525 0 101010 0 3 0 12 34 56
-
-# Hot cell parameters: sys be lay the phi
-HBDeadCell DeadCell 3 0 12 34 56
-
-# Discrimination threshold sigma
-HBdiscrim AbsValueDiscrimination 4 0.25
-#HBdiscrim GainDiscrimination 1 0 4 0.25
-
-# Gain adjustments (temporary, kludge modifiers)
-HBGain SmearedGain 6006. 0
-HBIdentity SmearedGain 1 0
+# modifierName Type Parameters (floats)
+# MIP is 820 keV, MIP/4 cut at 205e-6 GeV
+HBEnergyCut GainDiscrimination 1 0 205e-6 0
+HBTimeCut TimeDiscrimination 100 0
+HBEneDigi SmearedGain 100000000 0
+HBTimeDigi SmearedTiming 1000000 0
.end -------------------------------------------------
############################################################
@@ -151,10 +134,15 @@
OutputCollection HcalEndcapRawHits
Raw2SimLinksCollection HcalEndcapRaw2sim
-ModifierNames HECDigiIdentity
+ModifierNames HECEnergyCut HECTimeCut HECEneDigi HECTimeDigi
-# Parameters:
-# modifierName Type gainNom gainSig
-HECDigiIdentity SmearedGain 100000000 0
+# modifierName Type Parameters (floats)
+# MIP is 820 keV, MIP/4 cut at 205e-6 GeV
+HECEnergyCut GainDiscrimination 1 0 205e-6 0
+HECTimeCut TimeDiscrimination 100 0
+
+# Digitization: multiply by large numbers to minimize round-off errors
+HECEneDigi SmearedGain 100000000 0
+HECTimeDigi SmearedTiming 1000000 0
.end -------------------------------------------------
CVSspam 0.2.8
