4 modified files
lcsim/src/org/lcsim/digisim
diff -u -r1.1 -r1.2
--- Crosstalk.java 27 Jun 2005 21:34:31 -0000 1.1
+++ Crosstalk.java 5 Jul 2005 06:53:50 -0000 1.2
@@ -10,7 +10,7 @@
* A modifier for simulation of crosstalk in calorimeter cells
*
* @author Guilherme Lima
- * @version $Id: Crosstalk.java,v 1.1 2005/06/27 21:34:31 lima Exp $
+ * @version $Id: Crosstalk.java,v 1.2 2005/07/05 06:53:50 lima Exp $
*/
class Crosstalk extends AbstractCalHitModifier {
@@ -29,11 +29,6 @@
// decode parameters
_fracNom = params.get(0);
_fracSigma = params.get(1);
-// _timeNom = params.get(2);
-// _timeSigma = params.get(3);
-// _meanNumNoisyCells = params.get(4);
-// _system = params.get(5).intValue();
-// _barend = params.get(6).intValue();
// @todo we need to load here the number of cells per layer,
// for quick determination of neighbors
@@ -55,7 +50,10 @@
_segm = _digitizer.getCellSelector().getSegmentation();
assert _segm!=null : "No segmentation available?!";
- if( !_segm.supportsNeighbours() ) return;
+ if( !_segm.supportsNeighbours() ) {
+ System.out.println("Crosstalk: Current implementation does not support neighbors. _segm="+_segm);
+ return;
+ }
// save input map to be used as reference
Map<Long,TempCalHit> origMap = new HashMap<Long,TempCalHit>();
@@ -199,6 +197,4 @@
private static Crosstalk _me = new Crosstalk();
/** Geometry-aware class to find neighbours */
private SegmentationImpl _segm;
-// /** cellID encoder */
-// private IDEncoder _encoder;
}
lcsim/src/org/lcsim/digisim
diff -u -r1.8 -r1.9
--- DigiSimDriver.java 28 Jun 2005 21:56:09 -0000 1.8
+++ DigiSimDriver.java 5 Jul 2005 06:53:50 -0000 1.9
@@ -13,7 +13,7 @@
* both parameters and events from the framework.
*
* @author Guilherme Lima
- * @version $Id: DigiSimDriver.java,v 1.8 2005/06/28 21:56:09 lima Exp $
+ * @version $Id: DigiSimDriver.java,v 1.9 2005/07/05 06:53:50 lima Exp $
*/
public class DigiSimDriver extends Driver {
@@ -40,7 +40,7 @@
// open released config file from lcsim.jar
ConfigReader file = new ConfigReader(DigiSimDriver.class.getResourceAsStream(_name+".steer"));
// use local config file
-// ConfigReader file = new ConfigReader(_name+".steer");
+// ConfigReader file = new ConfigReader(_name+".steer");
// read config file
Map<String,Vector<String>> sections = file.digiSimParse();
lcsim/src/org/lcsim/digisim
diff -u -r1.5 -r1.6
--- Digitizer.java 28 Jun 2005 21:55:37 -0000 1.5
+++ Digitizer.java 5 Jul 2005 06:53:50 -0000 1.6
@@ -23,7 +23,7 @@
* simulation process for a specific subdetector.
*
* @author Guilherme Lima
- * @version $Id: Digitizer.java,v 1.5 2005/06/28 21:55:37 lima Exp $
+ * @version $Id: Digitizer.java,v 1.6 2005/07/05 06:53:50 lima Exp $
*/
class Digitizer {
@@ -372,6 +372,8 @@
++_nEvt;
double lntolog10 = 1/Math.log(10);
+// _selector.checkHitPositions();
+
String detName = evt.getDetectorName();
// _det = null;
lcsim/src/org/lcsim/digisim
diff -u -r1.5 -r1.6
--- SDJan03.steer 27 Jun 2005 21:40:11 -0000 1.5
+++ SDJan03.steer 5 Jul 2005 06:53:50 -0000 1.6
@@ -115,7 +115,7 @@
OutputCollection HcalBarrRawHits
Raw2SimLinksCollection HcalBarrRaw2sim
-ModifierNames HBidentity HBlightYield HBcrosstalk HBlightCollEff SiPMQuEffic HBExpoNoise HBGaussNoise HBdiscrim HBSiPMSaturat HBGain
+ModifierNames HBlightYield HBcrosstalk HBlightCollEff SiPMQuEffic HBExpoNoise HBGaussNoise HBdiscrim HBGain
# Parameters:
# modifierName Type gainNom gainSig thresh thrSig
@@ -124,8 +124,9 @@
# Crosstalk mean sigma
HBcrosstalk Crosstalk 0.07 0.01
-HBlightCollEff SmearedGain 0.0111 0.0029
-SiPMQuEffic SmearedGain 0.15 0
+# Smeared gain parameters: gain gainSigma
+HBlightCollEff SmearedGain 0.0111 0.0029
+SiPMQuEffic SmearedGain 0.15 0
### Noise generators
# GaussNoise parameters: sys be Ecut TimeNom TSig Mean Sigma
@@ -136,7 +137,7 @@
# SiPM gain=601 with saturation at about 2200 incident photons
# SiPMSaturation parameters: gainNom linMax
-HBSiPMSaturat SiPMSaturation 601 2200
+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
@@ -146,11 +147,12 @@
HBDeadCell DeadCell 3 0 12 34 56
# Discrimination threshold sigma
-HBdiscrim AbsValueDiscrimination 8 1
+HBdiscrim AbsValueDiscrimination 8 1
+#HBdiscrim GainDiscrimination 1 0 8 1
-# Gain adjustment
-HBidentity SmearedGain 1 0
-HBGain SmearedGain 1000 0
+# Gain adjustments (temporary, kludge modifiers)
+HBidentity SmearedGain 1 0
+HBGain SmearedGain 60.06 0
.end -------------------------------------------------
############################################################
CVSspam 0.2.8
