6 modified files
lcsim/src/org/lcsim/digisim
diff -u -r1.6 -r1.7
--- ConfigReader.java 23 Aug 2005 23:54:22 -0000 1.6
+++ ConfigReader.java 20 Jan 2006 23:36:38 -0000 1.7
@@ -15,7 +15,7 @@
* interpret the Marlin steering file.
*
* @author Guilherme Lima
- * @version $Id: ConfigReader.java,v 1.6 2005/08/23 23:54:22 lima Exp $
+ * @version $Id: ConfigReader.java,v 1.7 2006/01/20 23:36:38 lima Exp $
*/
class ConfigReader {
@@ -39,7 +39,7 @@
FileReader input = new FileReader(new File(filename));
reader = new BufferedReader(input);
delimiter = " ";
- System.out.println("Using local configuration file: "+filename);
+// System.out.println("Using local configuration file: "+filename);
}
catch(FileNotFoundException e) {
assert false : "File not found: "+ filename;
lcsim/src/org/lcsim/digisim
diff -u -r1.4 -r1.5
--- ExponentialNoise.java 18 Jan 2006 00:25:50 -0000 1.4
+++ ExponentialNoise.java 20 Jan 2006 23:36:38 -0000 1.5
@@ -5,8 +5,8 @@
import org.apache.commons.math.distribution.DistributionFactory;
import org.apache.commons.math.distribution.ExponentialDistribution;
import org.apache.commons.math.MathException;
-import org.lcsim.util.aida.AIDA;
-import hep.aida.ICloud1D;
+// import org.lcsim.util.aida.AIDA;
+// import hep.aida.ICloud1D;
/**
* Noise parametrization based on an exponential distribution. This
@@ -15,7 +15,7 @@
* exponential distribution.
*
* @author Guilherme Lima
- * @version $Id: ExponentialNoise.java,v 1.4 2006/01/18 00:25:50 lima Exp $
+ * @version $Id: ExponentialNoise.java,v 1.5 2006/01/20 23:36:38 lima Exp $
*/
class ExponentialNoise extends RandomNoise {
@@ -36,9 +36,9 @@
// create distribution
_expo = DistributionFactory.newInstance().createExponentialDistribution(_beta);
- // debug histo
- _cloudAll = _aida.cloud1D("allExpo");
- _cloudAbove = _aida.cloud1D("noiseOnlyExpo");
+ // debug histos
+// _cloudAll = _aida.cloud1D("allExpo");
+// _cloudAbove = _aida.cloud1D("noiseOnlyExpo");
}
/** Probability to get noise above the threshold */
@@ -59,7 +59,7 @@
try {
double flat = _random.nextDouble();
double expo = _expo.inverseCumulativeProbability( flat );
- _cloudAll.fill(expo);
+// _cloudAll.fill(expo);
return expo;
}
catch(MathException x) {
@@ -89,7 +89,7 @@
assert false : "MathException caught: " + x;
}
- _cloudAbove.fill(noise);
+// _cloudAbove.fill(noise);
return noise;
}
@@ -129,7 +129,7 @@
/** Global instance, used only for registration */
private static ExponentialNoise _me = new ExponentialNoise();
- private AIDA _aida = AIDA.defaultInstance();
- private ICloud1D _cloudAll = null;
- private ICloud1D _cloudAbove = null;
+// private AIDA _aida = AIDA.defaultInstance();
+// private ICloud1D _cloudAll = null;
+// private ICloud1D _cloudAbove = null;
}
lcsim/src/org/lcsim/digisim
diff -u -r1.5 -r1.6
--- FunctionModifier.java 27 Jun 2005 21:39:07 -0000 1.5
+++ FunctionModifier.java 20 Jan 2006 23:36:38 -0000 1.6
@@ -10,7 +10,7 @@
* the implementation of real function-based modifiers.
*
* @author Guilherme Lima
- * @version $Id: FunctionModifier.java,v 1.5 2005/06/27 21:39:07 lima Exp $
+ * @version $Id: FunctionModifier.java,v 1.6 2006/01/20 23:36:38 lima Exp $
*/
abstract class FunctionModifier extends AbstractCalHitModifier {
@@ -38,7 +38,8 @@
public void processHits(Map<Long,TempCalHit> hitmap) {
if(_debug>0) {
- System.out.println(" name="+_name+", debug="+_debug);
+ System.out.println("processing modifier name="+_name
+ +", debug="+_debug);
}
double tmpEnergy, tmpTime;
lcsim/src/org/lcsim/digisim
diff -u -r1.4 -r1.5
--- GaussianNoise.java 18 Jan 2006 00:25:50 -0000 1.4
+++ GaussianNoise.java 20 Jan 2006 23:36:38 -0000 1.5
@@ -5,8 +5,8 @@
import org.apache.commons.math.distribution.DistributionFactory;
import org.apache.commons.math.distribution.NormalDistribution;
import org.apache.commons.math.MathException;
-import org.lcsim.util.aida.AIDA;
-import hep.aida.ICloud1D;
+// import org.lcsim.util.aida.AIDA;
+// import hep.aida.ICloud1D;
/**
* Noise parametrization based on a gaussian distribution. This class
@@ -14,7 +14,7 @@
* Hence the next two parameters are the gaussian mean and width.
*
* @author Guilherme Lima
- * @version $Id: GaussianNoise.java,v 1.4 2006/01/18 00:25:50 lima Exp $
+ * @version $Id: GaussianNoise.java,v 1.5 2006/01/20 23:36:38 lima Exp $
*/
class GaussianNoise extends RandomNoise {
@@ -41,8 +41,8 @@
_gauss = DistributionFactory.newInstance().createNormalDistribution(_mean,_sigma);
// debug histo
- _cloudAll = _aida.cloud1D("allGaussian");
- _cloudAbove = _aida.cloud1D("noiseOnlyGaussian");
+// _cloudAll = _aida.cloud1D("allGaussian");
+// _cloudAbove = _aida.cloud1D("noiseOnlyGaussian");
}
//*** Defining modifier interface ***
@@ -71,7 +71,7 @@
try {
double flat = _random.nextDouble();
double gauss = _gauss.inverseCumulativeProbability( flat );
- _cloudAll.fill(gauss);
+// _cloudAll.fill(gauss);
return gauss;
}
catch(MathException x) {
@@ -108,7 +108,7 @@
catch(MathException e) {
System.out.println("MathException caught: "+e);
}
- _cloudAbove.fill(noise);
+// _cloudAbove.fill(noise);
return noise;
}
@@ -175,7 +175,7 @@
/** Global instance, used only for registration */
private static GaussianNoise _me = new GaussianNoise();
- private AIDA _aida = AIDA.defaultInstance();
- private ICloud1D _cloudAll = null;
- private ICloud1D _cloudAbove = null;
+// private AIDA _aida = AIDA.defaultInstance();
+// private ICloud1D _cloudAll = null;
+// private ICloud1D _cloudAbove = null;
}
lcsim/src/org/lcsim/digisim
diff -u -r1.1 -r1.2
--- SmearedTiming.java 27 Jun 2005 21:34:32 -0000 1.1
+++ SmearedTiming.java 20 Jan 2006 23:36:38 -0000 1.2
@@ -9,7 +9,7 @@
* A modifier for basic gain transformations
*
* @author Guilherme Lima
- * @version $Id: SmearedTiming.java,v 1.1 2005/06/27 21:34:32 lima Exp $
+ * @version $Id: SmearedTiming.java,v 1.2 2006/01/20 23:36:38 lima Exp $
*/
class SmearedTiming extends AbstractCalHitModifier {
@@ -71,8 +71,8 @@
/** Smeared linear transformations on time */
public double transformTime(final TempCalHit hit) {
// assign roles to the parameters
- final double smearNominal = _par.get(2);
- final double smearWidth = _par.get(3);
+ final double smearNominal = _par.get(0);
+ final double smearWidth = _par.get(1);
double smear = smearNominal;
if(smearWidth>0.0) {
lcsim/src/org/lcsim/digisim
diff -u -r1.1 -r1.2
--- identity.steer 27 Jul 2005 00:00:37 -0000 1.1
+++ identity.steer 20 Jan 2006 23:36:38 -0000 1.2
@@ -63,10 +63,11 @@
OutputCollection EcalBarrRawHits
Raw2SimLinksCollection EcalBarrRaw2sim
-ModifierNames EMBDigiIdentity
+ModifierNames EMBEneDigi EMBTimeDigi
-# modifierName Type Parameters (floats)
-EMBDigiIdentity SmearedGain 100000000 0
+# modifierName Type Parameters (floats)
+EMBEneDigi SmearedGain 100000000 0
+EMBTimeDigi SmearedTiming 1000000 0
.end -------------------------------------------------
############################################################
@@ -81,10 +82,11 @@
OutputCollection EcalEndcapRawHits
Raw2SimLinksCollection EcalEndcapRaw2sim
-ModifierNames EMECDigiIdentity
+ModifierNames EMECEneDigi EMECTimeDigi
-# modifierName Type Parameters (floats)
-EMECDigiIdentity SmearedGain 100000000 0
+# modifierName Type Parameters (floats)
+EMECEneDigi SmearedGain 100000000 0
+EMECTimeDigi SmearedTiming 1000000 0
.end -------------------------------------------------
############################################################
@@ -99,10 +101,11 @@
OutputCollection HcalBarrRawHits
Raw2SimLinksCollection HcalBarrRaw2sim
-ModifierNames HBDigiIdentity
+ModifierNames HBEneDigi HBTimeDigi
# modifierName Type Parameters (floats)
-HBDigiIdentity SmearedGain 100000000 0
+HBEneDigi SmearedGain 100000000 0
+HBTimeDigi SmearedTiming 1000000 0
.end -------------------------------------------------
############################################################
@@ -117,9 +120,10 @@
OutputCollection HcalEndcapRawHits
Raw2SimLinksCollection HcalEndcapRaw2sim
-ModifierNames HECDigiIdentity
+ModifierNames HECEneDigi HECTimeDigi
-# modifierName Type Parameters (floats)
-HECDigiIdentity SmearedGain 100000000 0
+# modifierName Type Parameters (floats)
+HECEneDigi SmearedGain 100000000 0
+HECTimeDigi SmearedTiming 1000000 0
.end -------------------------------------------------
CVSspam 0.2.8
