Author: [log in to unmask]
Date: Wed Sep 21 17:41:22 2016
New Revision: 4491
Log:
moved time dependent ecal gains to cluster package
Added:
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/TimeDependentEcalGains.java
- copied, changed from r4490, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/TimeDependentEcalGains.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/TimeDependentEcalGains2016.java
- copied, changed from r4490, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/TimeDependentEcalGains2016.java
Removed:
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/TimeDependentEcalGains.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/TimeDependentEcalGains2016.java
Modified:
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalTimeCorrectionDriver.java
Modified: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalTimeCorrectionDriver.java
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalTimeCorrectionDriver.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalTimeCorrectionDriver.java Wed Sep 21 17:41:22 2016
@@ -21,6 +21,7 @@
public class EcalTimeCorrectionDriver extends Driver {
private String inputHitsCollectionName = "EcalCalHits";
+
private String outputHitsCollectionName = "TimeCorrEcalHits";
/**
@@ -47,12 +48,20 @@
}
/**
- * Set the output {@link org.lcsim.event.CalorimeterHit} collection name,
+ * Set the input {@link org.lcsim.event.CalorimeterHit} collection name,
*
* @param ecalCollectionName The <code>CalorimeterHit</code> collection name.
*/
public void setInputHitsCollectionName(String inputHitsCollectionName) {
this.inputHitsCollectionName = inputHitsCollectionName;
+ }
+ /**
+ * Set the output {@link org.lcsim.event.CalorimeterHit} collection name,
+ *
+ * @param ecalCollectionName The <code>CalorimeterHit</code> collection name.
+ */
+ public void setOutputHitsCollectionName(String name){
+ this.outputHitsCollectionName = name;
}
// Time walk default parameters for mode 3. Not studied since 2014 run.
Copied: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/TimeDependentEcalGains.java (from r4490, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/TimeDependentEcalGains.java)
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/TimeDependentEcalGains.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/TimeDependentEcalGains.java Wed Sep 21 17:41:22 2016
@@ -1,4 +1,4 @@
-package org.hps.recon.ecal;
+package org.hps.recon.ecal.cluster;
import org.lcsim.event.EventHeader;
import org.lcsim.event.base.BaseCluster;
@@ -10,7 +10,7 @@
*
*/
public abstract class TimeDependentEcalGains extends Driver{
- String ecalClusterCollectionName = "EcalClustersCorr";
+ private String ecalClusterCollectionName = "EcalClustersCorr";
public void setEcalClusterCollectionName(String name){
this.ecalClusterCollectionName = name;
}
Copied: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/TimeDependentEcalGains2016.java (from r4490, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/TimeDependentEcalGains2016.java)
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/TimeDependentEcalGains2016.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/TimeDependentEcalGains2016.java Wed Sep 21 17:41:22 2016
@@ -1,4 +1,4 @@
-package org.hps.recon.ecal;
+package org.hps.recon.ecal.cluster;
public class TimeDependentEcalGains2016 extends TimeDependentEcalGains {
private long[] rangeStarts = new long[]{
@@ -46,7 +46,7 @@
protected double getGain(long timeStamp) {
for(int i = 0; i<rangeStarts.length; i++){
if(timeStamp > rangeStarts[i] && timeStamp<rangeEnds[i]){
-
+
//this is from fitting the fee peak position as a function of time.
double fittedFeePeak = A[i]-B[i]*Math.exp(-(timeStamp-rangeStarts[i])/C[i]);
return beamEnergy2016/fittedFeePeak;
|