Author: [log in to unmask]
Date: Thu Aug 20 13:14:59 2015
New Revision: 3383
Log:
setting parameter defaults to the values in steering files for 2015 data, so can be removed from steering files
Modified:
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverter.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverterDriver.java
Modified: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverter.java
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverter.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverter.java Thu Aug 20 13:14:59 2015
@@ -44,12 +44,12 @@
/**
* If true, time walk correction is performed.
*/
- private boolean useTimeWalkCorrection = false;
+ private boolean useTimeWalkCorrection = true;
/**
* If true, running pedestal is used.
*/
- private boolean useRunningPedestal = false;
+ private boolean useRunningPedestal = true;
/**
* If true, use a single gain factor for all channels.
@@ -68,7 +68,7 @@
*
* If false, it is the currently used convention: E(GeV) = GAIN * ADC
*/
- private boolean use2014Gain = true;
+ private boolean use2014Gain = false;
/**
* If true, use the DAQ configuration from EVIO to set EcalRawConverter parameters.
@@ -87,7 +87,7 @@
* Whether to use pulse fitting (EcalPulseFitter) to extract pulse energy time.
* Only applicable to Mode-1 data.
*/
- private boolean useFit = false;
+ private boolean useFit = true;
/**
* The pulse fitter class.
@@ -138,7 +138,7 @@
* Perform Mode-7 algorithm, else Mode-3.
* Only applicable to Mode-1 data.
*/
- private boolean mode7 = false;
+ private boolean mode7 = true;
private EcalConditions ecalConditions = null;
Modified: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverterDriver.java
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverterDriver.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverterDriver.java Thu Aug 20 13:14:59 2015
@@ -52,7 +52,7 @@
private final String ecalReadoutName = "EcalHits";
/*
- * Output relation between ecalCollectionName and Mode-7 pedestal for that hit
+ * Output relation between ecalCollectionName and Mode-7 pedestals
*/
private static final String extraDataRelationsName = "EcalReadoutExtraDataRelations";
@@ -107,7 +107,7 @@
*
* This is poorly named.
*/
- private boolean emulateFirmware = false;
+ private boolean emulateFirmware = true;
public EcalRawConverterDriver() {
converter = new EcalRawConverter();
@@ -440,7 +440,7 @@
}
final int SYSTEM_TRIGGER = 0;
- final int SYSTEM_TRACKER = 1;
+// final int SYSTEM_TRACKER = 1;
final int SYSTEM_ECAL = 2;
double timeOffset = 0.0;
|