7 modified files
lcsim/src/org/lcsim/digisim
diff -u -r1.1 -r1.2
--- AbsValueDiscrimination.java 27 Jun 2005 21:34:31 -0000 1.1
+++ AbsValueDiscrimination.java 28 Jun 2005 21:56:09 -0000 1.2
@@ -15,7 +15,7 @@
* out positive noise.
*
* @author Guilherme Lima
- * @version $Id: AbsValueDiscrimination.java,v 1.1 2005/06/27 21:34:31 lima Exp $
+ * @version $Id: AbsValueDiscrimination.java,v 1.2 2005/06/28 21:56:09 lima Exp $
*/
class AbsValueDiscrimination extends AbstractCalHitModifier {
@@ -70,11 +70,11 @@
double energy = ihit.getTotalEnergy();
if( isBetweenThresholds( energy ) ) {
- // Tried to erase here, but got problems in C++:
- // Docs say that iterators
- // are not safe to use after the erase, and it is used in ++it...
- // hitmap.erase(it); //
- // Thus, for now, just save the keys to erase the elements later
+ // Tried to erase here, but got problems in C++: Docs say
+ // that iterators are not safe to use after the erase...
+// hitmap.erase(it);
+
+ // Thus, for now, just save the keys to erase the elements later
toBeErased.add( id );
}
}
lcsim/src/org/lcsim/digisim
diff -u -r1.6 -r1.7
--- GainDiscrimination.java 27 Jun 2005 21:37:21 -0000 1.6
+++ GainDiscrimination.java 28 Jun 2005 21:56:09 -0000 1.7
@@ -9,7 +9,7 @@
* A modifier for basic gain + threshold transformations
*
* @author Guilherme Lima
- * @version $Id: GainDiscrimination.java,v 1.6 2005/06/27 21:37:21 lima Exp $
+ * @version $Id: GainDiscrimination.java,v 1.7 2005/06/28 21:56:09 lima Exp $
*/
class GainDiscrimination extends AbstractCalHitModifier {
@@ -77,10 +77,10 @@
energy = ihit.getTotalEnergy();
if( isBelowThreshold( energy ) ) {
- // Tried to erase here, but got problems in C++:
- // Docs say that iterators
- // are not safe to use after the erase, and it is used in ++it...
- // hitmap.erase(it); //
+ // Tried to erase here, but got problems in C++: Docs say
+ // that iterators are not safe to use after the erase...
+// hitmap.erase(it);
+
// Thus, for now, just save the keys to erase the elements later
toBeErased.add( ientry.getKey() );
}
lcsim/src/org/lcsim/digisim
diff -u -r1.2 -r1.3
--- SiPMSaturation.java 27 Jun 2005 21:40:11 -0000 1.2
+++ SiPMSaturation.java 28 Jun 2005 21:56:09 -0000 1.3
@@ -4,11 +4,11 @@
import java.util.Map;
import java.util.Set;
-/**
+/**
* A simple modifier for simulating the SiPM saturation.
*
* @author Guilherme Lima
- * @version $Id: SiPMSaturation.java,v 1.2 2005/06/27 21:40:11 lima Exp $
+ * @version $Id: SiPMSaturation.java,v 1.3 2005/06/28 21:56:09 lima Exp $
*/
class SiPMSaturation extends FunctionModifier {
lcsim/src/org/lcsim/digisim
diff -u -r1.1 -r1.2
--- SmearedGain.java 27 Jun 2005 21:34:32 -0000 1.1
+++ SmearedGain.java 28 Jun 2005 21:56:09 -0000 1.2
@@ -4,12 +4,12 @@
import java.util.Map;
import java.util.Set;
-/**
+/**
* A simple modifier for function-based smeared linear transformations
* on energy.
*
* @author Guilherme Lima
- * @version $Id: SmearedGain.java,v 1.1 2005/06/27 21:34:32 lima Exp $
+ * @version $Id: SmearedGain.java,v 1.2 2005/06/28 21:56:09 lima Exp $
*/
class SmearedGain extends FunctionModifier {
lcsim/src/org/lcsim/digisim
diff -u -r1.4 -r1.5
--- ConfigReader.java 27 Jun 2005 21:47:19 -0000 1.4
+++ ConfigReader.java 28 Jun 2005 21:56:09 -0000 1.5
@@ -15,7 +15,7 @@
* interpret the Marlin steering file.
*
* @author Guilherme Lima
- * @version $Id: ConfigReader.java,v 1.4 2005/06/27 21:47:19 lima Exp $
+ * @version $Id: ConfigReader.java,v 1.5 2005/06/28 21:56:09 lima Exp $
*/
class ConfigReader {
@@ -92,7 +92,7 @@
if(line==null) return false;
- // a good line, clean it up
+ // a good line, clean it up
line = line.trim().replaceAll("\t"," ");
// collapse all spaces
int lastlen;
lcsim/src/org/lcsim/digisim
diff -u -r1.7 -r1.8
--- DigiSimDriver.java 27 Jun 2005 21:51:16 -0000 1.7
+++ DigiSimDriver.java 28 Jun 2005 21:56:09 -0000 1.8
@@ -13,7 +13,7 @@
* both parameters and events from the framework.
*
* @author Guilherme Lima
- * @version $Id: DigiSimDriver.java,v 1.7 2005/06/27 21:51:16 lima Exp $
+ * @version $Id: DigiSimDriver.java,v 1.8 2005/06/28 21:56:09 lima Exp $
*/
public class DigiSimDriver extends Driver {
@@ -110,7 +110,7 @@
}
}
- // *** FIELDS ***
+ // *** FIELDS ***
/** Event number */
private int _nEvt ;
lcsim/src/org/lcsim/digisim
diff -u -r1.4 -r1.5
--- DigiSimMain.java 27 Jun 2005 21:34:32 -0000 1.4
+++ DigiSimMain.java 28 Jun 2005 21:56:10 -0000 1.5
@@ -21,7 +21,7 @@
* The main driver for digitization simulation.
*
* @author Guilherme Lima
- * @version $Id: DigiSimMain.java,v 1.4 2005/06/27 21:34:32 lima Exp $
+ * @version $Id: DigiSimMain.java,v 1.5 2005/06/28 21:56:10 lima Exp $
*/
public class DigiSimMain extends Driver {
@@ -154,7 +154,7 @@
public void setDebug() {
// format: "Digitizer:Modifier"
// _digi.setDebug("EcalEndcapDigitizer:EMECcrosstalk", 1);
-// _digi.setDebug("HcalBarrDigitizer:HBcrosstalk", 1);
+// _digi.setDebug("HcalBarrDigitizer:HBExpoNoise", 1);
}
//***** FIELDS *****
CVSspam 0.2.8