Commit in lcsim/src/org/lcsim/digisim on MAIN
identity.steer+1-11.2 -> 1.3
user.steer+37-191.1 -> 1.2
+38-20
2 modified files
GL: Update

lcsim/src/org/lcsim/digisim
identity.steer 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- identity.steer	20 Jan 2006 23:36:38 -0000	1.2
+++ identity.steer	9 Feb 2006 21:47:54 -0000	1.3
@@ -1,6 +1,6 @@
 ############################################
 #
-#  Example steering file for Marlin
+#  Example DigiSim steering file for Marlin
 #
 ############################################
 

lcsim/src/org/lcsim/digisim
user.steer 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- user.steer	14 Jan 2006 00:08:51 -0000	1.1
+++ user.steer	9 Feb 2006 21:47:54 -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,16 +108,19 @@
 
 ProcessorType DigiSimProcessor
 
-InputCollection  HcalBarrHits
-OutputCollection HcalBarrRawHits
+InputCollection        HcalBarrHits
+OutputCollection       HcalBarrRawHits
 Raw2SimLinksCollection HcalBarrRaw2sim
 
-ModifierNames HBlightYield HBcrosstalk HBlightCollEff HBPDQuEffic HBExpoNoise HBGaussNoise HBdiscrim HBGain HBtimeGate
+ModifierNames HBlightYield HBTimeCut HBcrosstalk HBlightCollEff HBPDQuEffic HBExpoNoise HBGaussNoise HBdiscrim HBEneDigi HBTimeDigi
 
 # Parameters:
 # modifierName    Type                gainNom  gainSig  thresh   thrSig
 HBlightYield     GainDiscrimination  10000000        0       1        0
 
+# time gate in nsec
+HBTimeCut        TimeDiscrimination         100       0
+
 # Crosstalk                              mean    sigma
 HBcrosstalk      Crosstalk               0.020     0.005
 
@@ -114,7 +130,7 @@
 
 ### Noise generators
 # GaussNoise parameters:        sys   be    Ecut   TimeNom  TSig   Mean  Sigma
-# Note: sigma<0 means that threshold acts on absolute value only
+# Note: sigma<0 means that threshold acts on absolute values
 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
@@ -134,12 +150,9 @@
 HBdiscrim	AbsValueDiscrimination   	        4     0.25
 #HBdiscrim	GainDiscrimination   	 1     0        4     0.25
 
-# timing threshold
-HBtimeGate      TimeDiscrimination       100   0
-
-# Gain adjustments (temporary, kludge modifiers)
-HBGain          SmearedGain              6006.        0
-HBIdentity      SmearedGain                  1        0
+# Digitization: multiply by large numbers to minimize round-off errors
+HBEneDigi       SmearedGain              6006        0
+HBTimeDigi      SmearedTiming         1000000        0
 
 .end -------------------------------------------------
 ############################################################
@@ -154,10 +167,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