Author: [log in to unmask]
Date: Wed Apr 1 14:34:14 2015
New Revision: 2652
Log:
First set of changes for normalizing ECAL names. HPSJAVA-478
Added:
java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/EcalMCStudies.java
- copied, changed from r2606, java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/ECalMCStudies.java
java/trunk/analysis/src/main/java/org/hps/analysis/ecal/EcalCellIDPrintDriver.java
- copied, changed from r2606, java/trunk/analysis/src/main/java/org/hps/analysis/ecal/ECalCellIDPrintDriver.java
java/trunk/analysis/src/main/java/org/hps/analysis/examples/EcalScoringMatchDriver.java
- copied, changed from r2606, java/trunk/analysis/src/main/java/org/hps/analysis/examples/ECalScoringMatchDriver.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRunningPedestalDriver.java
- copied, changed from r2606, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/ECalRunningPedestalDriver.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalUtils.java
- copied, changed from r2606, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/ECalUtils.java
java/trunk/evio/src/main/java/org/hps/evio/EcalEvioReader.java
- copied, changed from r2650, java/trunk/evio/src/main/java/org/hps/evio/ECalEvioReader.java
java/trunk/evio/src/main/java/org/hps/evio/EcalHitWriter.java
- copied, changed from r2650, java/trunk/evio/src/main/java/org/hps/evio/ECalHitWriter.java
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalBasicMonitoring.lcsim
- copied unchanged from r2606, java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalBasicMonitoring.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalLedCommissioning.lcsim
- copied unchanged from r2606, java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalLedCommissioning.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoring.lcsim
- copied unchanged from r2606, java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalMonitoring.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalTriggerMonitoring.lcsim
- copied unchanged from r2606, java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalTriggerMonitoring.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalTriggerWindowMonitoring.lcsim
- copied unchanged from r2606, java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalTriggerWindowMonitoring.lcsim
java/trunk/users/src/main/java/org/hps/users/baltzell/EcalRunningPedestalDriver.java
- copied, changed from r2606, java/trunk/users/src/main/java/org/hps/users/baltzell/ECalRunningPedestalDriver.java
java/trunk/users/src/main/java/org/hps/users/phansson/EcalHitMapPlots.java
- copied, changed from r2606, java/trunk/users/src/main/java/org/hps/users/phansson/ECalHitMapPlots.java
Removed:
java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/ECalMCStudies.java
java/trunk/analysis/src/main/java/org/hps/analysis/ecal/ECalCellIDPrintDriver.java
java/trunk/analysis/src/main/java/org/hps/analysis/examples/ECalScoringMatchDriver.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/ECalRunningPedestalDriver.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/ECalUtils.java
java/trunk/evio/src/main/java/org/hps/evio/ECalEvioReader.java
java/trunk/evio/src/main/java/org/hps/evio/ECalHitWriter.java
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalBasicMonitoring.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalLedCommissioning.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalMonitoring.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalTriggerMonitoring.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalTriggerWindowMonitoring.lcsim
java/trunk/users/src/main/java/org/hps/users/baltzell/ECalRunningPedestalDriver.java
java/trunk/users/src/main/java/org/hps/users/phansson/ECalHitMapPlots.java
Modified:
java/trunk/analysis/src/main/java/org/hps/analysis/ecal/EcalClusterPlots.java
java/trunk/analysis/src/main/java/org/hps/analysis/ecal/EcalHitPlots.java
java/trunk/analysis/src/main/java/org/hps/analysis/ecal/HPSEcalTriggerPlotsDriver.java
java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/FADCEcalReadoutDriver.java
java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/FADCPrimaryTriggerDriver.java
java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/FADCTriggerDriver.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalEdepToTriggerConverterDriver.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverter.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/LegacyClusterer.java
java/trunk/evio/src/main/java/org/hps/evio/LCSimTestRunEventBuilder.java
java/trunk/evio/src/main/java/org/hps/evio/TestRunReconToEvio.java
java/trunk/evio/src/main/java/org/hps/evio/TestRunTriggeredReconToEvio.java
java/trunk/evio/src/main/java/org/hps/evio/TestRunTriggeredReconToLcio.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalClusterPlots.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalEventDisplay.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalEventDisplayWithRawWaveform.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalHitPlots.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalLedSequenceMonitor.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalWindowPlotsXY.java
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalLedSequenceMonitor.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalPedestalMonitor.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2014ECalRecon.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2014ECalRecon_Pass1.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2015ECalRecon.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/baltzell/EcalPedestalMonitor.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/baltzell/EcalPedestals.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/baltzell/EngineeringRun2014ECalRecon_Pass1_FirmwareEmulator.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/baltzell/EngineeringRun2014ECalRecon_RunPed.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/celentan/LedAnalysisFromEvio.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/ECalScoring.lcsim
java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/print_ids.lcsim
java/trunk/users/src/main/java/org/hps/users/baltzell/EcalRawConverter_RunPed.java
java/trunk/users/src/main/java/org/hps/users/celentan/DummyDriverRaw.java
java/trunk/users/src/main/java/org/hps/users/celentan/EcalChannelsAmplitude.java
java/trunk/users/src/main/java/org/hps/users/celentan/RawPedestalComputator.java
java/trunk/users/src/main/java/org/hps/users/gcharles/FADCSignalAnalysis.java
java/trunk/users/src/main/java/org/hps/users/holly/EcalClustererCosmics.java
java/trunk/users/src/main/java/org/hps/users/holly/HPSEcalClusterIC.java
java/trunk/users/src/main/java/org/hps/users/luca/FADCVariableTriggerFEEDriver.java
java/trunk/users/src/main/java/org/hps/users/luca/myTriggerDriver.java
java/trunk/users/src/main/java/org/hps/users/ngraf/NearestNeighborClusterDriver.java
java/trunk/users/src/main/java/org/hps/users/phansson/TrigRateAna.java
java/trunk/users/src/main/java/org/hps/users/phansson/dataMCPlots.java
java/trunk/users/src/main/java/org/hps/users/phansson/ecalPlots.java
Copied: java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/EcalMCStudies.java (from r2606, java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/ECalMCStudies.java)
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/ECalMCStudies.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/dataquality/EcalMCStudies.java Wed Apr 1 14:34:14 2015
@@ -10,6 +10,6 @@
*
* @author mgraham
*/
-public class ECalMCStudies {
+public class EcalMCStudies {
}
Copied: java/trunk/analysis/src/main/java/org/hps/analysis/ecal/EcalCellIDPrintDriver.java (from r2606, java/trunk/analysis/src/main/java/org/hps/analysis/ecal/ECalCellIDPrintDriver.java)
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/ecal/ECalCellIDPrintDriver.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/ecal/EcalCellIDPrintDriver.java Wed Apr 1 14:34:14 2015
@@ -17,7 +17,7 @@
* @author Sho Uemura <[log in to unmask]>
* @version $Id: ECalCellIDPrintDriver.java,v 1.1 2012/05/01 15:06:38 meeg Exp $
*/
-public class ECalCellIDPrintDriver extends Driver {
+public class EcalCellIDPrintDriver extends Driver {
Subdetector ecal;
IDDecoder dec;
@@ -26,7 +26,7 @@
String outputFileName;
PrintWriter outputStream = null;
- public ECalCellIDPrintDriver() {
+ public EcalCellIDPrintDriver() {
}
public void setEcalCollectionName(String ecalCollectionName) {
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/ecal/EcalClusterPlots.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/ecal/EcalClusterPlots.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/ecal/EcalClusterPlots.java Wed Apr 1 14:34:14 2015
@@ -7,7 +7,7 @@
import java.util.List;
import org.apache.commons.math.stat.StatUtils;
-import org.hps.recon.ecal.ECalUtils;
+import org.hps.recon.ecal.EcalUtils;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.Cluster;
import org.lcsim.event.EventHeader;
@@ -29,7 +29,7 @@
IHistogram1D clusterTimeSigma;
IHistogram2D edgePlot;
int eventn = 0;
- double maxE = 5000 * ECalUtils.MeV;
+ double maxE = 5000 * EcalUtils.MeV;
boolean logScale = false;
public void setInputCollection(String inputCollection) {
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/ecal/EcalHitPlots.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/ecal/EcalHitPlots.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/ecal/EcalHitPlots.java Wed Apr 1 14:34:14 2015
@@ -7,7 +7,7 @@
import java.util.List;
-import org.hps.recon.ecal.ECalUtils;
+import org.hps.recon.ecal.EcalUtils;
import org.hps.recon.ecal.triggerbank.AbstractIntData;
import org.hps.recon.ecal.triggerbank.SSPData;
import org.hps.recon.ecal.triggerbank.TestRunTriggerData;
@@ -34,7 +34,7 @@
// IHistogram2D topX, botX, topY, botY;
IHistogram2D edgePlot;
int eventn = 0;
- double maxE = 5000 * ECalUtils.MeV;
+ double maxE = 5000 * EcalUtils.MeV;
boolean logScale = false;
public void setInputCollection(String inputCollection) {
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/ecal/HPSEcalTriggerPlotsDriver.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/ecal/HPSEcalTriggerPlotsDriver.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/ecal/HPSEcalTriggerPlotsDriver.java Wed Apr 1 14:34:14 2015
@@ -1,14 +1,14 @@
package org.hps.analysis.ecal;
-import static org.hps.recon.ecal.ECalUtils.maxVolt;
-import static org.hps.recon.ecal.ECalUtils.nBit;
+import static org.hps.recon.ecal.EcalUtils.maxVolt;
+import static org.hps.recon.ecal.EcalUtils.nBit;
import hep.aida.IHistogram2D;
import java.util.ArrayList;
import java.util.List;
import org.hps.readout.ecal.TriggerDriver;
-import org.hps.recon.ecal.ECalUtils;
+import org.hps.recon.ecal.EcalUtils;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.Cluster;
import org.lcsim.event.EventHeader;
@@ -102,7 +102,7 @@
// Loop through the energy plots and fill them if the hit
// is over the current energy threshold/
for(int e = 0; e < energyCut.length; e++) {
- if(energy > energyCut[e] * ECalUtils.MeV) {
+ if(energy > energyCut[e] * EcalUtils.MeV) {
hitXYPlot[e].fill(ix - 0.5 * Math.signum(ix), iy);
}
}
@@ -151,6 +151,6 @@
private double pulseAmplitude(double time) {
if (time <= 0.0) { return 0.0; }
- return ECalUtils.readoutGain * ((time * time / (2 * tp * tp * tp)) * Math.exp(-time / tp)) * ((Math.pow(2, nBit) - 1) / maxVolt);
+ return EcalUtils.readoutGain * ((time * time / (2 * tp * tp * tp)) * Math.exp(-time / tp)) * ((Math.pow(2, nBit) - 1) / maxVolt);
}
}
Copied: java/trunk/analysis/src/main/java/org/hps/analysis/examples/EcalScoringMatchDriver.java (from r2606, java/trunk/analysis/src/main/java/org/hps/analysis/examples/ECalScoringMatchDriver.java)
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/examples/ECalScoringMatchDriver.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/examples/EcalScoringMatchDriver.java Wed Apr 1 14:34:14 2015
@@ -18,7 +18,7 @@
* @author Sho Uemura <[log in to unmask]>
* @version $Id: $
*/
-public class ECalScoringMatchDriver extends Driver {
+public class EcalScoringMatchDriver extends Driver {
private AIDA aida = AIDA.defaultInstance();
// IHistogram1D hitCorEner = aida.histogram1D("CorEnergy", 1000, 0.0, 10);
Modified: java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/FADCEcalReadoutDriver.java
=============================================================================
--- java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/FADCEcalReadoutDriver.java (original)
+++ java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/FADCEcalReadoutDriver.java Wed Apr 1 14:34:14 2015
@@ -1,11 +1,11 @@
package org.hps.readout.ecal;
-import static org.hps.recon.ecal.ECalUtils.ecalReadoutPeriod;
-import static org.hps.recon.ecal.ECalUtils.fallTime;
-import static org.hps.recon.ecal.ECalUtils.maxVolt;
-import static org.hps.recon.ecal.ECalUtils.nBit;
-import static org.hps.recon.ecal.ECalUtils.readoutGain;
-import static org.hps.recon.ecal.ECalUtils.riseTime;
+import static org.hps.recon.ecal.EcalUtils.ecalReadoutPeriod;
+import static org.hps.recon.ecal.EcalUtils.fallTime;
+import static org.hps.recon.ecal.EcalUtils.maxVolt;
+import static org.hps.recon.ecal.EcalUtils.nBit;
+import static org.hps.recon.ecal.EcalUtils.readoutGain;
+import static org.hps.recon.ecal.EcalUtils.riseTime;
import java.util.ArrayList;
import java.util.Comparator;
@@ -19,7 +19,7 @@
import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.conditions.ecal.EcalChannelConstants;
import org.hps.conditions.ecal.EcalConditions;
-import org.hps.recon.ecal.ECalUtils;
+import org.hps.recon.ecal.EcalUtils;
import org.hps.util.RandomGaussian;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
@@ -455,11 +455,11 @@
//add preamp noise and photoelectron Poisson noise in quadrature
double noise;
if (use2014Gain) {
- noise = Math.sqrt(Math.pow(channelData.getCalibration().getNoise() * channelData.getGain().getGain() * ECalUtils.gainFactor * ECalUtils.ecalReadoutPeriod, 2)
- + hit.getRawEnergy() / (ECalUtils.lightYield * ECalUtils.quantumEff * ECalUtils.surfRatio));
+ noise = Math.sqrt(Math.pow(channelData.getCalibration().getNoise() * channelData.getGain().getGain() * EcalUtils.gainFactor * EcalUtils.ecalReadoutPeriod, 2)
+ + hit.getRawEnergy() / (EcalUtils.lightYield * EcalUtils.quantumEff * EcalUtils.surfRatio));
} else {
- noise = Math.sqrt(Math.pow(channelData.getCalibration().getNoise() * channelData.getGain().getGain() * ECalUtils.MeV, 2)
- + hit.getRawEnergy() * ECalUtils.MeV / pePerMeV);
+ noise = Math.sqrt(Math.pow(channelData.getCalibration().getNoise() * channelData.getGain().getGain() * EcalUtils.MeV, 2)
+ + hit.getRawEnergy() * EcalUtils.MeV / pePerMeV);
}
energyAmplitude += RandomGaussian.getGaussian(0, noise);
}
@@ -522,9 +522,9 @@
//normalization constant from cal gain (MeV/integral bit) to amplitude gain (amplitude bit/GeV)
double gain;
if (fixedGain > 0) {
- gain = readoutPeriod / (fixedGain * ECalUtils.MeV * ((Math.pow(2, nBit) - 1) / maxVolt));
+ gain = readoutPeriod / (fixedGain * EcalUtils.MeV * ((Math.pow(2, nBit) - 1) / maxVolt));
} else {
- gain = readoutPeriod / (channelData.getGain().getGain() * ECalUtils.MeV * ((Math.pow(2, nBit) - 1) / maxVolt));
+ gain = readoutPeriod / (channelData.getGain().getGain() * EcalUtils.MeV * ((Math.pow(2, nBit) - 1) / maxVolt));
}
return gain * pulseAmplitude(time, pulseShape, tp);
Modified: java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/FADCPrimaryTriggerDriver.java
=============================================================================
--- java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/FADCPrimaryTriggerDriver.java (original)
+++ java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/FADCPrimaryTriggerDriver.java Wed Apr 1 14:34:14 2015
@@ -8,7 +8,7 @@
import java.util.List;
import java.util.Queue;
-import org.hps.recon.ecal.ECalUtils;
+import org.hps.recon.ecal.EcalUtils;
import org.hps.recon.ecal.triggerbank.TriggerModule;
import org.lcsim.event.Cluster;
import org.lcsim.event.EventHeader;
@@ -288,7 +288,7 @@
* @param clusterEnergyHigh - The parameter value.
*/
public void setClusterEnergyHigh(double clusterEnergyHigh) {
- triggerModule.setCutValue(TriggerModule.CLUSTER_TOTAL_ENERGY_HIGH, clusterEnergyHigh * ECalUtils.GeV);
+ triggerModule.setCutValue(TriggerModule.CLUSTER_TOTAL_ENERGY_HIGH, clusterEnergyHigh * EcalUtils.GeV);
}
/**
@@ -298,7 +298,7 @@
* @param clusterEnergyLow - The parameter value.
*/
public void setClusterEnergyLow(double clusterEnergyLow) {
- triggerModule.setCutValue(TriggerModule.CLUSTER_TOTAL_ENERGY_LOW, clusterEnergyLow * ECalUtils.GeV);
+ triggerModule.setCutValue(TriggerModule.CLUSTER_TOTAL_ENERGY_LOW, clusterEnergyLow * EcalUtils.GeV);
}
/**
@@ -318,7 +318,7 @@
* @param energyDifferenceHigh - The parameter value.
*/
public void setEnergyDifferenceHigh(double energyDifferenceHigh) {
- triggerModule.setCutValue(TriggerModule.PAIR_ENERGY_DIFFERENCE_HIGH, energyDifferenceHigh * ECalUtils.GeV);
+ triggerModule.setCutValue(TriggerModule.PAIR_ENERGY_DIFFERENCE_HIGH, energyDifferenceHigh * EcalUtils.GeV);
}
/**
@@ -337,7 +337,7 @@
* @param energySumHigh - The parameter value.
*/
public void setEnergySumHigh(double energySumHigh) {
- triggerModule.setCutValue(TriggerModule.PAIR_ENERGY_SUM_HIGH, energySumHigh * ECalUtils.GeV);
+ triggerModule.setCutValue(TriggerModule.PAIR_ENERGY_SUM_HIGH, energySumHigh * EcalUtils.GeV);
}
/**
@@ -347,7 +347,7 @@
* @param energySumHigh - The parameter value.
*/
public void setEnergySumLow(double energySumLow) {
- triggerModule.setCutValue(TriggerModule.PAIR_ENERGY_SUM_LOW, energySumLow * ECalUtils.GeV);
+ triggerModule.setCutValue(TriggerModule.PAIR_ENERGY_SUM_LOW, energySumLow * EcalUtils.GeV);
}
/**
@@ -376,7 +376,7 @@
* @param seedEnergyHigh - The parameter value.
*/
public void setSeedEnergyHigh(double seedEnergyHigh) {
- triggerModule.setCutValue(TriggerModule.CLUSTER_SEED_ENERGY_HIGH, seedEnergyHigh * ECalUtils.GeV);
+ triggerModule.setCutValue(TriggerModule.CLUSTER_SEED_ENERGY_HIGH, seedEnergyHigh * EcalUtils.GeV);
}
/**
@@ -386,7 +386,7 @@
* @param seedEnergyLow - The parameter value.
*/
public void setSeedEnergyLow(double seedEnergyLow) {
- triggerModule.setCutValue(TriggerModule.CLUSTER_SEED_ENERGY_LOW, seedEnergyLow * ECalUtils.GeV);
+ triggerModule.setCutValue(TriggerModule.CLUSTER_SEED_ENERGY_LOW, seedEnergyLow * EcalUtils.GeV);
}
/**
Modified: java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/FADCTriggerDriver.java
=============================================================================
--- java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/FADCTriggerDriver.java (original)
+++ java/trunk/ecal-readout-sim/src/main/java/org/hps/readout/ecal/FADCTriggerDriver.java Wed Apr 1 14:34:14 2015
@@ -11,7 +11,7 @@
import java.util.List;
import java.util.Queue;
-import org.hps.recon.ecal.ECalUtils;
+import org.hps.recon.ecal.EcalUtils;
import org.lcsim.event.Cluster;
import org.lcsim.event.EventHeader;
import org.lcsim.geometry.Detector;
@@ -32,10 +32,10 @@
protected double beamEnergy = -1; //by default, get beam energy from detector name
private int minHitCount = 1;
private boolean useDefaultCuts = true;
- private double clusterEnergyHigh = 2.2 * ECalUtils.GeV;
- private double clusterEnergyLow = .1 * ECalUtils.GeV;
- private double energySumThreshold = 2.2 * ECalUtils.GeV;
- private double energyDifferenceThreshold = 2.2 * ECalUtils.GeV;
+ private double clusterEnergyHigh = 2.2 * EcalUtils.GeV;
+ private double clusterEnergyLow = .1 * EcalUtils.GeV;
+ private double energySumThreshold = 2.2 * EcalUtils.GeV;
+ private double energyDifferenceThreshold = 2.2 * EcalUtils.GeV;
private double maxCoplanarityAngle = 90; // degrees
// private double energyDistanceDistance = 250; // mm
// private double energyDistanceThreshold = 0.8 / 2.2;
@@ -91,23 +91,23 @@
if (beamEnergy == 1.1) {
System.out.println(this.getClass().getSimpleName() + ": Setting trigger for 1.1 GeV beam");
maxCoplanarityAngle = 90;
- clusterEnergyHigh = .7 * ECalUtils.GeV;
- clusterEnergyLow = .1 * ECalUtils.GeV;
- energySumThreshold = 0.8 * ECalUtils.GeV;
+ clusterEnergyHigh = .7 * EcalUtils.GeV;
+ clusterEnergyLow = .1 * EcalUtils.GeV;
+ energySumThreshold = 0.8 * EcalUtils.GeV;
energyDifferenceThreshold = beamEnergy;
} else if (beamEnergy == 2.2) {
System.out.println(this.getClass().getSimpleName() + ": Setting trigger for 2.2 GeV beam");
maxCoplanarityAngle = 35;
- clusterEnergyHigh = 1.5 * ECalUtils.GeV;
- clusterEnergyLow = .1 * ECalUtils.GeV;
- energySumThreshold = 1.9 * ECalUtils.GeV;
+ clusterEnergyHigh = 1.5 * EcalUtils.GeV;
+ clusterEnergyLow = .1 * EcalUtils.GeV;
+ energySumThreshold = 1.9 * EcalUtils.GeV;
energyDifferenceThreshold = beamEnergy;
} else if (beamEnergy == 6.6) {
System.out.println(this.getClass().getSimpleName() + ": Setting trigger for 6.6 GeV beam");
maxCoplanarityAngle = 60;
- clusterEnergyHigh = 5.0 * ECalUtils.GeV;
- clusterEnergyLow = .1 * ECalUtils.GeV;
- energySumThreshold = 5.5 * ECalUtils.GeV;
+ clusterEnergyHigh = 5.0 * EcalUtils.GeV;
+ clusterEnergyLow = .1 * EcalUtils.GeV;
+ energySumThreshold = 5.5 * EcalUtils.GeV;
energyDifferenceThreshold = beamEnergy;
}
}
@@ -176,7 +176,7 @@
* @param clusterEnergyHigh
*/
public void setClusterEnergyHigh(double clusterEnergyHigh) {
- this.clusterEnergyHigh = clusterEnergyHigh * ECalUtils.GeV;
+ this.clusterEnergyHigh = clusterEnergyHigh * EcalUtils.GeV;
}
/**
@@ -185,7 +185,7 @@
* @param clusterEnergyLow
*/
public void setClusterEnergyLow(double clusterEnergyLow) {
- this.clusterEnergyLow = clusterEnergyLow * ECalUtils.GeV;
+ this.clusterEnergyLow = clusterEnergyLow * EcalUtils.GeV;
}
/**
@@ -194,7 +194,7 @@
* @param energySumThreshold
*/
public void setEnergySumThreshold(double energySumThreshold) {
- this.energySumThreshold = energySumThreshold * ECalUtils.GeV;
+ this.energySumThreshold = energySumThreshold * EcalUtils.GeV;
}
/**
@@ -204,7 +204,7 @@
* @param energyDifferenceThreshold
*/
public void setEnergyDifferenceThreshold(double energyDifferenceThreshold) {
- this.energyDifferenceThreshold = energyDifferenceThreshold * ECalUtils.GeV;
+ this.energyDifferenceThreshold = energyDifferenceThreshold * EcalUtils.GeV;
}
/**
@@ -352,8 +352,8 @@
if (outputStream != null) {
outputStream.printf("Event %d: cluster pair (energy %f in quadrant %d (%s), energy %f in quadrant %d (%s))\n",
ClockSingleton.getClock(),
- clusterPair[0].getEnergy(), ECalUtils.getQuadrant(clusterPair[0]), clusterPair[0].getCalorimeterHits().get(0).getPositionVec().toString(),
- clusterPair[1].getEnergy(), ECalUtils.getQuadrant(clusterPair[1]), clusterPair[1].getCalorimeterHits().get(0).getPositionVec().toString());
+ clusterPair[0].getEnergy(), EcalUtils.getQuadrant(clusterPair[0]), clusterPair[0].getCalorimeterHits().get(0).getPositionVec().toString(),
+ clusterPair[1].getEnergy(), EcalUtils.getQuadrant(clusterPair[1]), clusterPair[1].getCalorimeterHits().get(0).getPositionVec().toString());
}
allPairs++;
@@ -568,8 +568,8 @@
* @return true if opposite quadrants, false otherwise
*/
protected boolean oppositeQuadrantsCut(Cluster[] clusterPair) {
- int quad1 = ECalUtils.getQuadrant(clusterPair[0]);
- int quad2 = ECalUtils.getQuadrant(clusterPair[1]);
+ int quad1 = EcalUtils.getQuadrant(clusterPair[0]);
+ int quad2 = EcalUtils.getQuadrant(clusterPair[1]);
//if clusters are in the same quadrant, they're not opposite quadrants
if (quad1 == quad2) {
Modified: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalEdepToTriggerConverterDriver.java
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalEdepToTriggerConverterDriver.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalEdepToTriggerConverterDriver.java Wed Apr 1 14:34:14 2015
@@ -173,7 +173,7 @@
// double integral = hit.getRawEnergy()/ECalUtils.GeV * gainScale;
double gain = _gain > 0 ? _gain : channelData.getGain().getGain();
- double integral = amplitude * gain * pulseIntegral * gainScale * ECalUtils.MeV / ECalUtils.GeV;
+ double integral = amplitude * gain * pulseIntegral * gainScale * EcalUtils.MeV / EcalUtils.GeV;
// double thresholdCrossingTime = 0 - hit.getTime();
// while (true) {
@@ -207,13 +207,13 @@
if (addNoise) {
//add preamp noise and photoelectron Poisson noise in quadrature
- double noise = Math.sqrt(Math.pow(channelData.getCalibration().getNoise() * channelData.getGain().getGain() * ECalUtils.MeV, 2) + hit.getRawEnergy() * ECalUtils.MeV / pePerMeV);
+ double noise = Math.sqrt(Math.pow(channelData.getCalibration().getNoise() * channelData.getGain().getGain() * EcalUtils.MeV, 2) + hit.getRawEnergy() * EcalUtils.MeV / pePerMeV);
energyAmplitude += RandomGaussian.getGaussian(0, noise);
}
double gain = _gain > 0 ? _gain : channelData.getGain().getGain();
// System.out.format("amplitude: %f %f %f %f\n", hit.getRawEnergy(), energyAmplitude, gain, (energyAmplitude / ECalUtils.MeV) / (gain * pulseIntegral));
- return (energyAmplitude / ECalUtils.MeV) / (gain * pulseIntegral);
+ return (energyAmplitude / EcalUtils.MeV) / (gain * pulseIntegral);
}
private double pulseAmplitude(double time) {
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 Wed Apr 1 14:34:14 2015
@@ -488,9 +488,9 @@
int amplitude;
double pedestal = getPulsePedestal(null, id, windowSamples, (int) hit.getTime() / nsPerSample);
if (constantGain) {
- amplitude = (int) Math.round((hit.getRawEnergy() / ECalUtils.MeV) / gain + pedestal);
+ amplitude = (int) Math.round((hit.getRawEnergy() / EcalUtils.MeV) / gain + pedestal);
} else {
- amplitude = (int) Math.round((hit.getRawEnergy() / ECalUtils.MeV) / channelData.getGain().getGain() + pedestal);
+ amplitude = (int) Math.round((hit.getRawEnergy() / EcalUtils.MeV) / channelData.getGain().getGain() + pedestal);
}
RawCalorimeterHit h = new BaseRawCalorimeterHit(id, amplitude, time);
return h;
@@ -506,18 +506,18 @@
if(useDAQConfig) {
//float gain = ConfigurationManager.getInstance().getFADCConfig().getGain(ecalConditions.getChannelCollection().findGeometric(cellID));
- return config.getGain(cellID) * adcSum * ECalUtils.MeV;
+ return config.getGain(cellID) * adcSum * EcalUtils.MeV;
} else if(use2014Gain) {
if (constantGain) {
- return adcSum * ECalUtils.gainFactor * ECalUtils.ecalReadoutPeriod;
+ return adcSum * EcalUtils.gainFactor * EcalUtils.ecalReadoutPeriod;
} else {
- return channelData.getGain().getGain() * adcSum * ECalUtils.gainFactor * ECalUtils.ecalReadoutPeriod; // should not be used for the moment (2014/02)
+ return channelData.getGain().getGain() * adcSum * EcalUtils.gainFactor * EcalUtils.ecalReadoutPeriod; // should not be used for the moment (2014/02)
}
} else {
if(constantGain) {
- return gain * adcSum * ECalUtils.MeV;
+ return gain * adcSum * EcalUtils.MeV;
} else {
- return channelData.getGain().getGain() * adcSum * ECalUtils.MeV; //gain is defined as MeV/integrated ADC
+ return channelData.getGain().getGain() * adcSum * EcalUtils.MeV; //gain is defined as MeV/integrated ADC
}
}
}
Copied: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRunningPedestalDriver.java (from r2606, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/ECalRunningPedestalDriver.java)
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/ECalRunningPedestalDriver.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRunningPedestalDriver.java Wed Apr 1 14:34:14 2015
@@ -28,7 +28,7 @@
* @version $Id: ECalRunningPedestalDriver.java,v 1.0 2015/02/10 00:00:00
* @author <[log in to unmask]>
*/
-public class ECalRunningPedestalDriver extends Driver {
+public class EcalRunningPedestalDriver extends Driver {
// limit array lengths:
private final int limitLookbackEvents = 1000;
@@ -63,7 +63,7 @@
private boolean debug = false;
private EcalConditions ecalConditions = null;
- public ECalRunningPedestalDriver() {
+ public EcalRunningPedestalDriver() {
}
@Override
Copied: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalUtils.java (from r2606, java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/ECalUtils.java)
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/ECalUtils.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalUtils.java Wed Apr 1 14:34:14 2015
@@ -8,7 +8,7 @@
* @author Sho Uemura <[log in to unmask]>
* @version $Id: ECalUtils.java,v 1.1 2013/02/25 22:39:24 meeg Exp $
*/
-public class ECalUtils {
+public class EcalUtils {
public static final double GeV = 1.0;
public static final double MeV = 0.001;
Modified: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/LegacyClusterer.java
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/LegacyClusterer.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/LegacyClusterer.java Wed Apr 1 14:34:14 2015
@@ -5,7 +5,7 @@
import java.util.Map;
import java.util.Set;
-import org.hps.recon.ecal.ECalUtils;
+import org.hps.recon.ecal.EcalUtils;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.Cluster;
import org.lcsim.event.EventHeader;
Copied: java/trunk/evio/src/main/java/org/hps/evio/EcalEvioReader.java (from r2650, java/trunk/evio/src/main/java/org/hps/evio/ECalEvioReader.java)
=============================================================================
--- java/trunk/evio/src/main/java/org/hps/evio/ECalEvioReader.java (original)
+++ java/trunk/evio/src/main/java/org/hps/evio/EcalEvioReader.java Wed Apr 1 14:34:14 2015
@@ -39,7 +39,7 @@
* @author Sho Uemura <[log in to unmask]>
* @version $Id: ECalEvioReader.java,v 1.23 2013/04/18 20:59:16 meeg Exp $
*/
-public class ECalEvioReader extends EvioReader {
+public class EcalEvioReader extends EvioReader {
// Names of subdetectors.
private int bankTag = 0;
@@ -68,12 +68,12 @@
private final Map<List<Integer>, Integer> genericHitCount = new HashMap<List<Integer>, Integer>();
- private static final Logger logger = LogUtil.create(ECalEvioReader.class);
+ private static final Logger logger = LogUtil.create(EcalEvioReader.class);
static {
logger.setLevel(Level.INFO);
}
- public ECalEvioReader(int topBankTag, int botBankTag) {
+ public EcalEvioReader(int topBankTag, int botBankTag) {
this.topBankTag = topBankTag;
this.botBankTag = botBankTag;
hitCollectionName = "EcalReadoutHits";
Copied: java/trunk/evio/src/main/java/org/hps/evio/EcalHitWriter.java (from r2650, java/trunk/evio/src/main/java/org/hps/evio/ECalHitWriter.java)
=============================================================================
--- java/trunk/evio/src/main/java/org/hps/evio/ECalHitWriter.java (original)
+++ java/trunk/evio/src/main/java/org/hps/evio/EcalHitWriter.java Wed Apr 1 14:34:14 2015
@@ -32,7 +32,7 @@
* @author Sho Uemura <[log in to unmask]>
* @version $Id: ECalHitWriter.java,v 1.6 2013/04/18 20:59:16 meeg Exp $
*/
-public class ECalHitWriter implements HitWriter {
+public class EcalHitWriter implements HitWriter {
private String hitCollectionName = "EcalReadoutHits";
private int mode = EventConstants.ECAL_PULSE_INTEGRAL_MODE;
@@ -45,7 +45,7 @@
private int verbosity = 1;
- public ECalHitWriter() {
+ public EcalHitWriter() {
}
/**
Modified: java/trunk/evio/src/main/java/org/hps/evio/LCSimTestRunEventBuilder.java
=============================================================================
--- java/trunk/evio/src/main/java/org/hps/evio/LCSimTestRunEventBuilder.java (original)
+++ java/trunk/evio/src/main/java/org/hps/evio/LCSimTestRunEventBuilder.java Wed Apr 1 14:34:14 2015
@@ -28,7 +28,7 @@
*/
public class LCSimTestRunEventBuilder implements LCSimEventBuilder, ConditionsListener {
- protected ECalEvioReader ecalReader = null;
+ protected EcalEvioReader ecalReader = null;
protected AbstractSvtEvioReader svtReader = null;
protected long time = 0; //most recent event time (ns), taken from prestart and end events, and trigger banks (if any)
protected int sspCrateBankTag = 0x1; //bank ID of the crate containing the SSP
@@ -37,7 +37,7 @@
protected List<IntBankDefinition> intBanks = null;
public LCSimTestRunEventBuilder() {
- ecalReader = new ECalEvioReader(0x1, 0x2);
+ ecalReader = new EcalEvioReader(0x1, 0x2);
svtReader = new TestRunSvtEvioReader();
intBanks = new ArrayList<IntBankDefinition>();
intBanks.add(new IntBankDefinition(TestRunTriggerData.class, new int[]{sspCrateBankTag, sspBankTag}));
Modified: java/trunk/evio/src/main/java/org/hps/evio/TestRunReconToEvio.java
=============================================================================
--- java/trunk/evio/src/main/java/org/hps/evio/TestRunReconToEvio.java (original)
+++ java/trunk/evio/src/main/java/org/hps/evio/TestRunReconToEvio.java Wed Apr 1 14:34:14 2015
@@ -26,7 +26,7 @@
String evioOutputFile = "TestRunData.evio";
EventBuilder builder = null;
private int eventsWritten = 0;
- ECalHitWriter ecalWriter = null;
+ EcalHitWriter ecalWriter = null;
SVTHitWriter svtWriter = null;
Detector detector = null;
@@ -58,7 +58,7 @@
throw new RuntimeException(e);
}
- ecalWriter = new ECalHitWriter();
+ ecalWriter = new EcalHitWriter();
ecalWriter.setDetector(detector);
ecalWriter.setHitCollectionName(rawCalorimeterHitCollectionName);
Modified: java/trunk/evio/src/main/java/org/hps/evio/TestRunTriggeredReconToEvio.java
=============================================================================
--- java/trunk/evio/src/main/java/org/hps/evio/TestRunTriggeredReconToEvio.java (original)
+++ java/trunk/evio/src/main/java/org/hps/evio/TestRunTriggeredReconToEvio.java Wed Apr 1 14:34:14 2015
@@ -33,7 +33,7 @@
private Queue<QueuedEtEvent> builderQueue = null;
private int eventsWritten = 0;
private int eventNum = 0;
- private ECalHitWriter ecalWriter = null;
+ private EcalHitWriter ecalWriter = null;
private SVTHitWriter svtWriter = null;
private TriggerDataWriter triggerWriter = null;
private List<HitWriter> writers = null;
@@ -106,7 +106,7 @@
writers = new ArrayList<HitWriter>();
- ecalWriter = new ECalHitWriter();
+ ecalWriter = new EcalHitWriter();
// if(detector == null) System.out.println("Detector == null");
// else System.out.println("Detector != null");
//ecalWriter.setDetector(detector);
Modified: java/trunk/evio/src/main/java/org/hps/evio/TestRunTriggeredReconToLcio.java
=============================================================================
--- java/trunk/evio/src/main/java/org/hps/evio/TestRunTriggeredReconToLcio.java (original)
+++ java/trunk/evio/src/main/java/org/hps/evio/TestRunTriggeredReconToLcio.java Wed Apr 1 14:34:14 2015
@@ -40,7 +40,7 @@
private int triggerSpacing = 250;
private boolean rejectBackground = false;
// HPSEcalConditions ecalIDConverter = null;
- ECalHitWriter ecalWriter = null;
+ EcalHitWriter ecalWriter = null;
SVTHitWriter svtWriter = null;
TriggerDataWriter triggerWriter = null;
List<HitWriter> writers = null;
@@ -152,7 +152,7 @@
writers = new ArrayList<HitWriter>();
if (writeEcalData) {
- ecalWriter = new ECalHitWriter();
+ ecalWriter = new EcalHitWriter();
ecalWriter.setMode(ecalMode);
ecalWriter.setHitCollectionName(rawCalorimeterHitCollectionName);
writers.add(ecalWriter);
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalClusterPlots.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalClusterPlots.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalClusterPlots.java Wed Apr 1 14:34:14 2015
@@ -9,7 +9,7 @@
import java.util.List;
import org.apache.commons.math.stat.StatUtils;
-import org.hps.recon.ecal.ECalUtils;
+import org.hps.recon.ecal.EcalUtils;
import org.hps.recon.ecal.triggerbank.TriggerModule;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.Cluster;
@@ -53,7 +53,7 @@
private boolean hide = false;
private boolean logScale = false;
private AIDA aida = AIDA.defaultInstance();
- private double maxE = 5000 * ECalUtils.MeV;
+ private double maxE = 5000 * EcalUtils.MeV;
private IPlotter[] plotter = new IPlotter[4];
private String clusterCollectionName = "EcalClusters";
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalEventDisplay.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalEventDisplay.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalEventDisplay.java Wed Apr 1 14:34:14 2015
@@ -19,7 +19,7 @@
import org.hps.monitoring.ecal.eventdisplay.ui.Viewer;
import org.hps.monitoring.ecal.eventdisplay.util.CrystalEvent;
import org.hps.monitoring.ecal.eventdisplay.util.CrystalListener;
-import org.hps.recon.ecal.ECalUtils;
+import org.hps.recon.ecal.EcalUtils;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.Cluster;
import org.lcsim.event.EventHeader;
@@ -71,8 +71,8 @@
private long lastEventTime = 0; // Tracks the time at which the last event occurred.
private int eventRefreshRate = 1; // The number of seconds before an update occurs.
private boolean resetOnUpdate = true; // Clears the event display on each update.
- private double minEch = 10 * ECalUtils.MeV; // The energy scale minimum.
- private double maxEch = 3500 * ECalUtils.MeV; // The energy scale maximum.
+ private double minEch = 10 * EcalUtils.MeV; // The energy scale minimum.
+ private double maxEch = 3500 * EcalUtils.MeV; // The energy scale maximum.
private int[] windowRaw = new int[NUM_CHANNELS]; // The number of samples in a waveform for each channel.
private boolean[] isFirstRaw = new boolean[NUM_CHANNELS]; // Whether a waveform plot was initiated for each channel.
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalEventDisplayWithRawWaveform.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalEventDisplayWithRawWaveform.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalEventDisplayWithRawWaveform.java Wed Apr 1 14:34:14 2015
@@ -20,7 +20,7 @@
import org.hps.monitoring.ecal.eventdisplay.util.CrystalEvent;
import org.hps.monitoring.ecal.eventdisplay.util.CrystalListener;
import org.hps.monitoring.ecal.plots.EcalMonitoringUtilities;
-import org.hps.recon.ecal.ECalUtils;
+import org.hps.recon.ecal.EcalUtils;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.RawTrackerHit;
import org.lcsim.event.Cluster;
@@ -74,8 +74,8 @@
private long lastEventTime = 0; // Tracks the time at which the last event occurred.
private int eventRefreshRate = 1; // The number of seconds before an update occurs.
private boolean resetOnUpdate = true; // Clears the event display on each update.
- private double minEch = 10 * ECalUtils.MeV; // The energy scale minimum.
- private double maxEch = 3500 * ECalUtils.MeV; // The energy scale maximum.
+ private double minEch = 10 * EcalUtils.MeV; // The energy scale minimum.
+ private double maxEch = 3500 * EcalUtils.MeV; // The energy scale maximum.
private int[] windowRaw = new int[NUM_CHANNELS]; // The number of samples in a waveform for each channel.
private boolean[] isFirstRaw = new boolean[NUM_CHANNELS]; // Whether a waveform plot was initiated for each channel.
@@ -435,18 +435,18 @@
// Initialize the waveform plot.
channelRawWaveform.set(id,aida.histogram1D(event.getDetectorName()
+ " : " + inputCollectionRaw + " : Raw Waveform : " + ix + " "
- + iy + ": " + id, windowRaw[id], -0.5 * ECalUtils.ecalReadoutPeriod,
- (-0.5 + windowRaw[id]) * ECalUtils.ecalReadoutPeriod));
+ + iy + ": " + id, windowRaw[id], -0.5 * EcalUtils.ecalReadoutPeriod,
+ (-0.5 + windowRaw[id]) * EcalUtils.ecalReadoutPeriod));
}
// If the plot should be updated, do so.
if(update) {
channelRawWaveform.get(id).reset();
for (int jj = 0; jj < windowRaw[id]; jj++) {
- channelRawWaveform.get(id).fill(jj * ECalUtils.ecalReadoutPeriod,
- hit.getADCValues()[jj] * ECalUtils.adcResolution * 1000);
+ channelRawWaveform.get(id).fill(jj * EcalUtils.ecalReadoutPeriod,
+ hit.getADCValues()[jj] * EcalUtils.adcResolution * 1000);
}
- double[] result = ECalUtils.computeAmplitude(hit.getADCValues(), windowRaw[id], pedSamples);
+ double[] result = EcalUtils.computeAmplitude(hit.getADCValues(), windowRaw[id], pedSamples);
channelRawWaveform.get(id).setTitle("Ampl: " + String.format("%.2f", result[0])
+ " mV , ped : " + String.format("%.2f", result[1]) + " "
+ String.format("%.2f", result[2]) + " ADC counts");
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalHitPlots.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalHitPlots.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalHitPlots.java Wed Apr 1 14:34:14 2015
@@ -8,7 +8,7 @@
import java.util.List;
-import org.hps.recon.ecal.ECalUtils;
+import org.hps.recon.ecal.EcalUtils;
import org.hps.recon.ecal.triggerbank.SSPData;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
@@ -53,7 +53,7 @@
int eventn = 0;
- double maxE = 5000 * ECalUtils.MeV;
+ double maxE = 5000 * EcalUtils.MeV;
boolean logScale = false;
boolean hide = false;
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalLedSequenceMonitor.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalLedSequenceMonitor.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalLedSequenceMonitor.java Wed Apr 1 14:34:14 2015
@@ -61,7 +61,7 @@
import org.hps.conditions.ecal.EcalCalibration;
import org.hps.conditions.ecal.EcalConditions;
import org.hps.conditions.ecal.EcalChannelConstants;
-import org.hps.recon.ecal.ECalUtils;
+import org.hps.recon.ecal.EcalUtils;
import org.hps.monitoring.ecal.plots.EcalMonitoringUtilities;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
@@ -648,7 +648,7 @@
*/
public double getRawADCSum(double energy,long cellID){
EcalChannelConstants channelData = ecalConditions.getChannelConstants(ecalConditions.getChannelCollection().findGeometric(cellID));
- double RawSum=energy / ECalUtils.GeV;
+ double RawSum=energy / EcalUtils.GeV;
double gain=channelData.getGain().getGain();
double ret=RawSum/gain;
// System.out.println("A:C "+RawSum+" "+ret);
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalWindowPlotsXY.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalWindowPlotsXY.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/ecal/plots/EcalWindowPlotsXY.java Wed Apr 1 14:34:14 2015
@@ -19,7 +19,7 @@
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
-import org.hps.recon.ecal.ECalUtils;
+import org.hps.recon.ecal.EcalUtils;
public class EcalWindowPlotsXY extends Driver implements ActionListener {
@@ -145,7 +145,7 @@
}
windowPlot.reset();
for (int i = 0; i < window; i++) {
- windowPlot.fill(i, hit.getADCValues()[i]*ECalUtils.adcResolution);
+ windowPlot.fill(i, hit.getADCValues()[i]*EcalUtils.adcResolution);
}
}
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalLedSequenceMonitor.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalLedSequenceMonitor.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalLedSequenceMonitor.lcsim Wed Apr 1 14:34:14 2015
@@ -17,7 +17,7 @@
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>100000</eventInterval>
</driver>
- <driver name="EcalRunningPedestal" type="org.hps.recon.ecal.ECalRunningPedestalDriver">
+ <driver name="EcalRunningPedestal" type="org.hps.recon.ecal.EcalRunningPedestalDriver">
<minLookbackEvents>10</minLookbackEvents>
<maxLookbackEvents>50</maxLookbackEvents>
</driver>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalPedestalMonitor.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalPedestalMonitor.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalPedestalMonitor.lcsim Wed Apr 1 14:34:14 2015
@@ -9,7 +9,7 @@
<drivers>
<driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
</driver>
- <driver name="EcalRunningPedestal" type="org.hps.recon.ecal.ECalRunningPedestalDriver">
+ <driver name="EcalRunningPedestal" type="org.hps.recon.ecal.EcalRunningPedestalDriver">
<minLookbackEvents>10</minLookbackEvents>
<maxLookbackEvents>50</maxLookbackEvents>
</driver>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2014ECalRecon.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2014ECalRecon.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2014ECalRecon.lcsim Wed Apr 1 14:34:14 2015
@@ -28,7 +28,7 @@
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1</eventInterval>
</driver>
- <driver name="EcalRunningPedestal" type="org.hps.recon.ecal.ECalRunningPedestalDriver">
+ <driver name="EcalRunningPedestal" type="org.hps.recon.ecal.EcalRunningPedestalDriver">
<minLookbackEvents>10</minLookbackEvents>
<maxLookbackEvents>50</maxLookbackEvents>
</driver>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2014ECalRecon_Pass1.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2014ECalRecon_Pass1.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2014ECalRecon_Pass1.lcsim Wed Apr 1 14:34:14 2015
@@ -28,7 +28,7 @@
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1</eventInterval>
</driver>
- <driver name="EcalRunningPedestal" type="org.hps.recon.ecal.ECalRunningPedestalDriver">
+ <driver name="EcalRunningPedestal" type="org.hps.recon.ecal.EcalRunningPedestalDriver">
<minLookbackEvents>10</minLookbackEvents>
<maxLookbackEvents>50</maxLookbackEvents>
</driver>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2015ECalRecon.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2015ECalRecon.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2015ECalRecon.lcsim Wed Apr 1 14:34:14 2015
@@ -28,7 +28,7 @@
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1</eventInterval>
</driver>
- <driver name="EcalRunningPedestal" type="org.hps.recon.ecal.ECalRunningPedestalDriver">
+ <driver name="EcalRunningPedestal" type="org.hps.recon.ecal.EcalRunningPedestalDriver">
<logLevel>CONFIG</logLevel>
<minLookbackEvents>10</minLookbackEvents>
<maxLookbackEvents>50</maxLookbackEvents>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/baltzell/EcalPedestalMonitor.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/baltzell/EcalPedestalMonitor.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/baltzell/EcalPedestalMonitor.lcsim Wed Apr 1 14:34:14 2015
@@ -9,7 +9,7 @@
<drivers>
<driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
</driver>
- <driver name="EcalRunningPedestal" type="org.hps.recon.ecal.ECalRunningPedestalDriver">
+ <driver name="EcalRunningPedestal" type="org.hps.recon.ecal.EcalRunningPedestalDriver">
<minLookbackEvents>10</minLookbackEvents>
<maxLookbackEvents>50</maxLookbackEvents>
</driver>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/baltzell/EcalPedestals.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/baltzell/EcalPedestals.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/baltzell/EcalPedestals.lcsim Wed Apr 1 14:34:14 2015
@@ -9,7 +9,7 @@
<drivers>
<driver name="EcalPedestalCalculator" type="org.hps.recon.ecal.EcalPedestalCalculator">
</driver>
- <driver name="EcalRunningPedestal" type="org.hps.recon.ecal.ECalRunningPedestalDriver">
+ <driver name="EcalRunningPedestal" type="org.hps.recon.ecal.EcalRunningPedestalDriver">
<minLookbackEvents>10</minLookbackEvents>
<maxLookbackEvents>50</maxLookbackEvents>
</driver>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/baltzell/EngineeringRun2014ECalRecon_Pass1_FirmwareEmulator.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/baltzell/EngineeringRun2014ECalRecon_Pass1_FirmwareEmulator.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/baltzell/EngineeringRun2014ECalRecon_Pass1_FirmwareEmulator.lcsim Wed Apr 1 14:34:14 2015
@@ -28,7 +28,7 @@
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1</eventInterval>
</driver>
- <driver name="EcalRunningPedestal" type="org.hps.recon.ecal.ECalRunningPedestalDriver">
+ <driver name="EcalRunningPedestal" type="org.hps.recon.ecal.EcalRunningPedestalDriver">
<minLookbackEvents>10</minLookbackEvents>
<maxLookbackEvents>50</maxLookbackEvents>
</driver>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/baltzell/EngineeringRun2014ECalRecon_RunPed.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/baltzell/EngineeringRun2014ECalRecon_RunPed.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/baltzell/EngineeringRun2014ECalRecon_RunPed.lcsim Wed Apr 1 14:34:14 2015
@@ -31,7 +31,7 @@
<eventInterval>1</eventInterval>
</driver>
- <driver name="EcalRunningPedestal" type="org.hps.users.baltzell.ECalRunningPedestalDriver">
+ <driver name="EcalRunningPedestal" type="org.hps.users.baltzell.EcalRunningPedestalDriver">
<minLookbackEvents>10</minLookbackEvents>
<maxLookbackEvents>50</maxLookbackEvents>
<maxLookbackTime>-1</maxLookbackTime>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/celentan/LedAnalysisFromEvio.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/celentan/LedAnalysisFromEvio.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/celentan/LedAnalysisFromEvio.lcsim Wed Apr 1 14:34:14 2015
@@ -16,7 +16,7 @@
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>10000</eventInterval>
</driver>
- <driver name="EcalRunningPedestal" type="org.hps.recon.ecal.ECalRunningPedestalDriver">
+ <driver name="EcalRunningPedestal" type="org.hps.recon.ecal.EcalRunningPedestalDriver">
<minLookbackEvents>10</minLookbackEvents>
<maxLookbackEvents>50</maxLookbackEvents>
</driver>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/ECalScoring.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/ECalScoring.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/ECalScoring.lcsim Wed Apr 1 14:34:14 2015
@@ -17,8 +17,7 @@
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1</eventInterval>
</driver>
- <driver name="ECalScoringMatch" type="org.hps.analysis.examples.ECalScoringMatchDriver"/>
-
+ <driver name="ECalScoringMatch" type="org.hps.analysis.examples.EcalScoringMatchDriver"/>
<driver name="AidaSaveDriver" type="org.lcsim.job.AidaSaveDriver">
<outputFileName>${outputFile}</outputFileName>
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/print_ids.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/print_ids.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/meeg/print_ids.lcsim Wed Apr 1 14:34:14 2015
@@ -9,7 +9,7 @@
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1</eventInterval>
</driver>
- <driver name="EcalIDPrint" type="org.hps.analysis.ecal.ECalCellIDPrintDriver" />
+ <driver name="EcalIDPrint" type="org.hps.analysis.ecal.EcalCellIDPrintDriver" />
<driver name="SVTDataIDPrint" type="org.hps.monitoring.drivers.svt.SVTCellIDPrintDriver" />
<driver name="SVTIDPrint" type="org.hps.monitoring.drivers.svt.SVTCellIDPrintDriver">
<rawTrackerHitCollectionName>SVTRawTrackerHits</rawTrackerHitCollectionName>
Modified: java/trunk/users/src/main/java/org/hps/users/baltzell/EcalRawConverter_RunPed.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/baltzell/EcalRawConverter_RunPed.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/baltzell/EcalRawConverter_RunPed.java Wed Apr 1 14:34:14 2015
@@ -7,7 +7,7 @@
import org.hps.conditions.ecal.EcalChannelConstants;
import org.hps.conditions.ecal.EcalConditions;
import org.hps.recon.ecal.CalorimeterHitUtilities;
-import org.hps.recon.ecal.ECalUtils;
+import org.hps.recon.ecal.EcalUtils;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
import org.lcsim.event.GenericObject;
@@ -131,9 +131,9 @@
EcalChannelConstants channelData = findChannel(id);
int amplitude;
if (constantGain) {
- amplitude = (int) Math.round((hit.getRawEnergy() / ECalUtils.MeV) / gain + window * channelData.getCalibration().getPedestal());
+ amplitude = (int) Math.round((hit.getRawEnergy() / EcalUtils.MeV) / gain + window * channelData.getCalibration().getPedestal());
} else {
- amplitude = (int) Math.round((hit.getRawEnergy() / ECalUtils.MeV) / channelData.getGain().getGain() + window * channelData.getCalibration().getPedestal());
+ amplitude = (int) Math.round((hit.getRawEnergy() / EcalUtils.MeV) / channelData.getGain().getGain() + window * channelData.getCalibration().getPedestal());
}
RawCalorimeterHit h = new BaseRawCalorimeterHit(id, amplitude, time);
return h;
@@ -149,15 +149,15 @@
if (use2014Gain) {
if (constantGain) {
- return adcSum * ECalUtils.gainFactor * ECalUtils.ecalReadoutPeriod;
+ return adcSum * EcalUtils.gainFactor * EcalUtils.ecalReadoutPeriod;
} else {
- return channelData.getGain().getGain() * adcSum * ECalUtils.gainFactor * ECalUtils.ecalReadoutPeriod; // should not be used for the moment (2014/02)
+ return channelData.getGain().getGain() * adcSum * EcalUtils.gainFactor * EcalUtils.ecalReadoutPeriod; // should not be used for the moment (2014/02)
}
} else {
if (constantGain) {
- return gain * adcSum * ECalUtils.MeV;
+ return gain * adcSum * EcalUtils.MeV;
} else {
- return channelData.getGain().getGain() * adcSum * ECalUtils.MeV; //gain is defined as MeV/integrated ADC
+ return channelData.getGain().getGain() * adcSum * EcalUtils.MeV; //gain is defined as MeV/integrated ADC
}
}
}
Copied: java/trunk/users/src/main/java/org/hps/users/baltzell/EcalRunningPedestalDriver.java (from r2606, java/trunk/users/src/main/java/org/hps/users/baltzell/ECalRunningPedestalDriver.java)
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/baltzell/ECalRunningPedestalDriver.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/baltzell/EcalRunningPedestalDriver.java Wed Apr 1 14:34:14 2015
@@ -23,7 +23,7 @@
* @version $Id: ECalRunningPedestalDriver.java,v 1.0 2015/02/06 00:00:00
* @author <[log in to unmask]>
*/
-public class ECalRunningPedestalDriver extends Driver {
+public class EcalRunningPedestalDriver extends Driver {
// limit array lengths:
private final int limitLookbackEvents = 1000;
@@ -57,7 +57,7 @@
private boolean debug = false;
private EcalConditions ecalConditions = null;
- public ECalRunningPedestalDriver() {
+ public EcalRunningPedestalDriver() {
}
@Override
Modified: java/trunk/users/src/main/java/org/hps/users/celentan/DummyDriverRaw.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/celentan/DummyDriverRaw.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/celentan/DummyDriverRaw.java Wed Apr 1 14:34:14 2015
@@ -6,7 +6,7 @@
import org.lcsim.geometry.Detector;
import org.lcsim.util.Driver;
import org.lcsim.util.aida.AIDA;
-import org.hps.recon.ecal.ECalUtils;
+import org.hps.recon.ecal.EcalUtils;
import org.hps.recon.ecal.triggerbank.AbstractIntData;
import org.hps.recon.ecal.triggerbank.SSPData;
import org.lcsim.event.CalorimeterHit;
Modified: java/trunk/users/src/main/java/org/hps/users/celentan/EcalChannelsAmplitude.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/celentan/EcalChannelsAmplitude.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/celentan/EcalChannelsAmplitude.java Wed Apr 1 14:34:14 2015
@@ -6,7 +6,7 @@
import java.util.List;
import org.hps.monitoring.ecal.plots.EcalMonitoringUtilities;
-import org.hps.recon.ecal.ECalUtils;
+import org.hps.recon.ecal.EcalUtils;
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
import org.lcsim.geometry.Detector;
@@ -119,9 +119,9 @@
if (isFirstRaw[ii]) { // at the very first hit we read for this channel, we need to read the window length and save it
isFirstRaw[ii] = false;
windowRaw[ii] = hit.getADCValues().length;
- channelRawWaveform.set(ii, aida.histogram1D(detector.getDetectorName() + " : " + inputCollectionRaw + " : Raw Waveform : " + (column) + " " + (row) + ": " + ii, windowRaw[ii], -0.5 * ECalUtils.ecalReadoutPeriod, (-0.5 + windowRaw[ii]) * ECalUtils.ecalReadoutPeriod));
+ channelRawWaveform.set(ii, aida.histogram1D(detector.getDetectorName() + " : " + inputCollectionRaw + " : Raw Waveform : " + (column) + " " + (row) + ": " + ii, windowRaw[ii], -0.5 * EcalUtils.ecalReadoutPeriod, (-0.5 + windowRaw[ii]) * EcalUtils.ecalReadoutPeriod));
}
- result = ECalUtils.computeAmplitude(hit.getADCValues(), windowRaw[ii], pedSamples);
+ result = EcalUtils.computeAmplitude(hit.getADCValues(), windowRaw[ii], pedSamples);
channelAmplitudePlot.get(ii).fill(result[0]);
}
}
Modified: java/trunk/users/src/main/java/org/hps/users/celentan/RawPedestalComputator.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/celentan/RawPedestalComputator.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/celentan/RawPedestalComputator.java Wed Apr 1 14:34:14 2015
@@ -9,7 +9,7 @@
import org.hps.conditions.ecal.EcalChannel;
import org.hps.conditions.ecal.EcalChannel.GeometryId;
import org.hps.conditions.ecal.EcalConditions;
-import org.hps.recon.ecal.ECalUtils;
+import org.hps.recon.ecal.EcalUtils;
import org.lcsim.detector.identifier.IIdentifierHelper;
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
@@ -67,7 +67,7 @@
isFirstRaw[ii] = false;
windowRaw[ii] = hit.getADCValues().length;
}
- result = ECalUtils.computeAmplitude(hit.getADCValues(), windowRaw[ii], pedSamples);
+ result = EcalUtils.computeAmplitude(hit.getADCValues(), windowRaw[ii], pedSamples);
pedestal[ii] += result[1];
noise[ii] += result[2];
}
Modified: java/trunk/users/src/main/java/org/hps/users/gcharles/FADCSignalAnalysis.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/gcharles/FADCSignalAnalysis.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/gcharles/FADCSignalAnalysis.java Wed Apr 1 14:34:14 2015
@@ -11,7 +11,7 @@
import org.hps.readout.ecal.FADCEcalReadoutDriver;
import org.hps.readout.ecal.RingBuffer;
-import org.hps.recon.ecal.ECalUtils;
+import org.hps.recon.ecal.EcalUtils;
import org.hps.recon.ecal.EcalRawConverterDriver;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
@@ -114,9 +114,9 @@
// h1d_volt.fill(signalBuffer.getValue(i));
// }
hSignalBuffer.fill(signalBuffer.getValue(i));
- int temp = Math.min((int) (Math.round(signalBuffer.getValue(i) * (Math.pow(2, ECalUtils.nBit) - 1) / ECalUtils.maxVolt)), (int) Math.pow(2, ECalUtils.nBit));
+ int temp = Math.min((int) (Math.round(signalBuffer.getValue(i) * (Math.pow(2, EcalUtils.nBit) - 1) / EcalUtils.maxVolt)), (int) Math.pow(2, EcalUtils.nBit));
- sumBuffer_en += temp * ECalUtils.gainFactor * ECalUtils.ecalReadoutPeriod;
+ sumBuffer_en += temp * EcalUtils.gainFactor * EcalUtils.ecalReadoutPeriod;
// if(23<temp) System.out.println(pipeBuffer.getValue(i)-pedestal + " " + signalBuffer.getValue(i) + " " + temp);
Modified: java/trunk/users/src/main/java/org/hps/users/holly/EcalClustererCosmics.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/holly/EcalClustererCosmics.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/holly/EcalClustererCosmics.java Wed Apr 1 14:34:14 2015
@@ -6,7 +6,7 @@
import java.util.Map;
import java.util.Set;
-import org.hps.recon.ecal.ECalUtils;
+import org.hps.recon.ecal.EcalUtils;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.Cluster;
import org.lcsim.event.EventHeader;
@@ -35,9 +35,9 @@
String ecalName = "Ecal";
String clusterCollectionName = "EcalClusters";
// Minimum E for cluster seed.
- double seedEMin = .05 * ECalUtils.GeV;
+ double seedEMin = .05 * EcalUtils.GeV;
// Minimum E to add hit to cluster.
- double addEMin = .03 * ECalUtils.GeV;
+ double addEMin = .03 * EcalUtils.GeV;
// Odd or even number of crystals in X.
boolean oddX;
// Map of crystals to their neighbors.
Modified: java/trunk/users/src/main/java/org/hps/users/holly/HPSEcalClusterIC.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/holly/HPSEcalClusterIC.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/holly/HPSEcalClusterIC.java Wed Apr 1 14:34:14 2015
@@ -8,7 +8,7 @@
import java.util.List;
import org.hps.recon.ecal.CalorimeterHitUtilities;
-import org.hps.recon.ecal.ECalUtils;
+import org.hps.recon.ecal.EcalUtils;
import org.lcsim.detector.IGeometryInfo;
import org.lcsim.detector.solids.Trd;
import org.lcsim.event.CalorimeterHit;
@@ -27,7 +27,7 @@
private ArrayList<CalorimeterHit> sharedHitList = new ArrayList<CalorimeterHit>();
- static final double eCriticalW = 800.0*ECalUtils.MeV/(74+1);
+ static final double eCriticalW = 800.0*EcalUtils.MeV/(74+1);
static final double radLenW = 8.8; //mm
double[] electronPosAtDepth = new double[3];
private boolean needsElectronPosCalculation = true;
Modified: java/trunk/users/src/main/java/org/hps/users/luca/FADCVariableTriggerFEEDriver.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/luca/FADCVariableTriggerFEEDriver.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/luca/FADCVariableTriggerFEEDriver.java Wed Apr 1 14:34:14 2015
@@ -7,7 +7,7 @@
import org.hps.readout.ecal.FADCTriggerDriver;
import org.hps.readout.ecal.TriggerDriver;
-import org.hps.recon.ecal.ECalUtils;
+import org.hps.recon.ecal.EcalUtils;
import org.lcsim.event.Cluster;
import org.lcsim.event.EventHeader;
/**
@@ -28,11 +28,11 @@
private int minHitCount = 1; // Minimum required cluster hit count threshold. (Hits)
private double seedEnergyHigh = Double.MAX_VALUE; // Maximum allowed cluster seed energy. (GeV)
private double seedEnergyLow = Double.MIN_VALUE; // Minimum required cluster seed energy. (GeV)
- private double clusterEnergyHigh = 1.5 * ECalUtils.GeV; // Maximum allowed cluster total energy. (GeV)
- private double clusterEnergyLow = .1 * ECalUtils.GeV; // Minimum required cluster total energy. (GeV)
- private double energySumHigh = 1.9 * ECalUtils.GeV; // Maximum allowed pair energy sum. (GeV)
- private double energySumLow = 0.0 * ECalUtils.GeV; // Minimum required pair energy sum. (GeV)
- private double energyDifferenceHigh = 2.2 * ECalUtils.GeV; // Maximum allowed pair energy difference. (GeV)
+ private double clusterEnergyHigh = 1.5 * EcalUtils.GeV; // Maximum allowed cluster total energy. (GeV)
+ private double clusterEnergyLow = .1 * EcalUtils.GeV; // Minimum required cluster total energy. (GeV)
+ private double energySumHigh = 1.9 * EcalUtils.GeV; // Maximum allowed pair energy sum. (GeV)
+ private double energySumLow = 0.0 * EcalUtils.GeV; // Minimum required pair energy sum. (GeV)
+ private double energyDifferenceHigh = 2.2 * EcalUtils.GeV; // Maximum allowed pair energy difference. (GeV)
private double energySlopeLow = 1.1; // Minimum required pair energy slope value.
private double coplanarityHigh = 35; // Maximum allowed pair coplanarity deviation. (Degrees)
@@ -172,7 +172,7 @@
* @param clusterEnergyHigh - The parameter value.
*/
public void setClusterEnergyHigh(double clusterEnergyHigh) {
- this.clusterEnergyHigh = clusterEnergyHigh * ECalUtils.GeV;
+ this.clusterEnergyHigh = clusterEnergyHigh * EcalUtils.GeV;
}
/**
@@ -183,7 +183,7 @@
* @param clusterEnergyLow - The parameter value.
*/
public void setClusterEnergyLow(double clusterEnergyLow) {
- this.clusterEnergyLow = clusterEnergyLow * ECalUtils.GeV;
+ this.clusterEnergyLow = clusterEnergyLow * EcalUtils.GeV;
}
/**
@@ -205,7 +205,7 @@
* @param energyDifferenceHigh - The parameter value.
*/
public void setEnergyDifferenceHigh(double energyDifferenceHigh) {
- this.energyDifferenceHigh = energyDifferenceHigh * ECalUtils.GeV;
+ this.energyDifferenceHigh = energyDifferenceHigh * EcalUtils.GeV;
}
/**
@@ -226,7 +226,7 @@
* @param energySumHigh - The parameter value.
*/
public void setEnergySumHigh(double energySumHigh) {
- this.energySumHigh = energySumHigh * ECalUtils.GeV;
+ this.energySumHigh = energySumHigh * EcalUtils.GeV;
}
/**
@@ -237,7 +237,7 @@
* @param energySumHigh - The parameter value.
*/
public void setEnergySumLow(double energySumLow) {
- this.energySumLow = energySumLow * ECalUtils.GeV;
+ this.energySumLow = energySumLow * EcalUtils.GeV;
}
/**
@@ -280,7 +280,7 @@
* @param seedEnergyHigh - The parameter value.
*/
public void setSeedEnergyHigh(double seedEnergyHigh) {
- this.seedEnergyHigh = seedEnergyHigh * ECalUtils.GeV;
+ this.seedEnergyHigh = seedEnergyHigh * EcalUtils.GeV;
}
/**
@@ -291,7 +291,7 @@
* @param seedEnergyLow - The parameter value.
*/
public void setSeedEnergyLow(double seedEnergyLow) {
- this.seedEnergyLow = seedEnergyLow * ECalUtils.GeV;
+ this.seedEnergyLow = seedEnergyLow * EcalUtils.GeV;
}
/**
Modified: java/trunk/users/src/main/java/org/hps/users/luca/myTriggerDriver.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/luca/myTriggerDriver.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/luca/myTriggerDriver.java Wed Apr 1 14:34:14 2015
@@ -21,7 +21,7 @@
import org.hps.readout.ecal.ClockSingleton;
import org.hps.readout.ecal.TriggerDriver;
-import org.hps.recon.ecal.ECalUtils;
+import org.hps.recon.ecal.EcalUtils;
import org.lcsim.event.Cluster;
import org.lcsim.event.EventHeader;
import org.lcsim.geometry.Detector;
@@ -42,10 +42,10 @@
protected double beamEnergy = -1; //by default, get beam energy from detector name
private int minHitCount = 1;
private boolean useDefaultCuts = true;
- private double clusterEnergyHigh = 2.2 * ECalUtils.GeV;
- private double clusterEnergyLow = .1 * ECalUtils.GeV;
- private double energySumThreshold = 2.2 * ECalUtils.GeV;
- private double energyDifferenceThreshold = 2.2 * ECalUtils.GeV;
+ private double clusterEnergyHigh = 2.2 * EcalUtils.GeV;
+ private double clusterEnergyLow = .1 * EcalUtils.GeV;
+ private double energySumThreshold = 2.2 * EcalUtils.GeV;
+ private double energyDifferenceThreshold = 2.2 * EcalUtils.GeV;
private double maxCoplanarityAngle = 90; // degrees
// private double energyDistanceDistance = 250; // mm
// private double energyDistanceThreshold = 0.8 / 2.2;
@@ -101,23 +101,23 @@
if (beamEnergy == 1.1) {
System.out.println(this.getClass().getSimpleName() + ": Setting trigger for 1.1 GeV beam");
maxCoplanarityAngle = 90;
- clusterEnergyHigh = .7 * ECalUtils.GeV;
- clusterEnergyLow = .1 * ECalUtils.GeV;
- energySumThreshold = 0.8 * ECalUtils.GeV;
+ clusterEnergyHigh = .7 * EcalUtils.GeV;
+ clusterEnergyLow = .1 * EcalUtils.GeV;
+ energySumThreshold = 0.8 * EcalUtils.GeV;
energyDifferenceThreshold = beamEnergy;
} else if (beamEnergy == 2.2) {
System.out.println(this.getClass().getSimpleName() + ": Setting trigger for 2.2 GeV beam");
maxCoplanarityAngle = 35;
- clusterEnergyHigh = 1.5 * ECalUtils.GeV;
- clusterEnergyLow = .1 * ECalUtils.GeV;
- energySumThreshold = 1.9 * ECalUtils.GeV;
+ clusterEnergyHigh = 1.5 * EcalUtils.GeV;
+ clusterEnergyLow = .1 * EcalUtils.GeV;
+ energySumThreshold = 1.9 * EcalUtils.GeV;
energyDifferenceThreshold = beamEnergy;
} else if (beamEnergy == 6.6) {
System.out.println(this.getClass().getSimpleName() + ": Setting trigger for 6.6 GeV beam");
maxCoplanarityAngle = 60;
- clusterEnergyHigh = 5.0 * ECalUtils.GeV;
- clusterEnergyLow = .1 * ECalUtils.GeV;
- energySumThreshold = 5.5 * ECalUtils.GeV;
+ clusterEnergyHigh = 5.0 * EcalUtils.GeV;
+ clusterEnergyLow = .1 * EcalUtils.GeV;
+ energySumThreshold = 5.5 * EcalUtils.GeV;
energyDifferenceThreshold = beamEnergy;
}
}
@@ -186,7 +186,7 @@
* @param clusterEnergyHigh
*/
public void setClusterEnergyHigh(double clusterEnergyHigh) {
- this.clusterEnergyHigh = clusterEnergyHigh * ECalUtils.GeV;
+ this.clusterEnergyHigh = clusterEnergyHigh * EcalUtils.GeV;
}
/**
@@ -195,7 +195,7 @@
* @param clusterEnergyLow
*/
public void setClusterEnergyLow(double clusterEnergyLow) {
- this.clusterEnergyLow = clusterEnergyLow * ECalUtils.GeV;
+ this.clusterEnergyLow = clusterEnergyLow * EcalUtils.GeV;
}
/**
@@ -204,7 +204,7 @@
* @param energySumThreshold
*/
public void setEnergySumThreshold(double energySumThreshold) {
- this.energySumThreshold = energySumThreshold * ECalUtils.GeV;
+ this.energySumThreshold = energySumThreshold * EcalUtils.GeV;
}
/**
@@ -214,7 +214,7 @@
* @param energyDifferenceThreshold
*/
public void setEnergyDifferenceThreshold(double energyDifferenceThreshold) {
- this.energyDifferenceThreshold = energyDifferenceThreshold * ECalUtils.GeV;
+ this.energyDifferenceThreshold = energyDifferenceThreshold * EcalUtils.GeV;
}
/**
@@ -362,8 +362,8 @@
if (outputStream != null) {
outputStream.printf("Event %d: cluster pair (energy %f in quadrant %d (%s), energy %f in quadrant %d (%s))\n",
ClockSingleton.getClock(),
- clusterPair[0].getEnergy(), ECalUtils.getQuadrant(clusterPair[0]), clusterPair[0].getCalorimeterHits().get(0).getPositionVec().toString(),
- clusterPair[1].getEnergy(), ECalUtils.getQuadrant(clusterPair[1]), clusterPair[1].getCalorimeterHits().get(0).getPositionVec().toString());
+ clusterPair[0].getEnergy(), EcalUtils.getQuadrant(clusterPair[0]), clusterPair[0].getCalorimeterHits().get(0).getPositionVec().toString(),
+ clusterPair[1].getEnergy(), EcalUtils.getQuadrant(clusterPair[1]), clusterPair[1].getCalorimeterHits().get(0).getPositionVec().toString());
}
allPairs++;
@@ -578,8 +578,8 @@
* @return true if opposite quadrants, false otherwise
*/
protected boolean oppositeQuadrantsCut(Cluster[] clusterPair) {
- int quad1 = ECalUtils.getQuadrant(clusterPair[0]);
- int quad2 = ECalUtils.getQuadrant(clusterPair[1]);
+ int quad1 = EcalUtils.getQuadrant(clusterPair[0]);
+ int quad2 = EcalUtils.getQuadrant(clusterPair[1]);
//if clusters are in the same quadrant, they're not opposite quadrants
if (quad1 == quad2) {
Modified: java/trunk/users/src/main/java/org/hps/users/ngraf/NearestNeighborClusterDriver.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/ngraf/NearestNeighborClusterDriver.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/ngraf/NearestNeighborClusterDriver.java Wed Apr 1 14:34:14 2015
@@ -5,7 +5,7 @@
import java.util.List;
import java.util.Map;
-import org.hps.recon.ecal.ECalUtils;
+import org.hps.recon.ecal.EcalUtils;
import org.lcsim.event.CalorimeterHit;
import org.lcsim.event.EventHeader;
import org.lcsim.geometry.Detector;
@@ -23,9 +23,9 @@
public class NearestNeighborClusterDriver extends Driver
{
// Minimum E for cluster seed.
- double seedEMin = .00 * ECalUtils.GeV;
+ double seedEMin = .00 * EcalUtils.GeV;
// Minimum E to add hit to cluster.
- double addEMin = .00 * ECalUtils.GeV;
+ double addEMin = .00 * EcalUtils.GeV;
// Map of crystals to their neighbors.
HPSEcal3.NeighborMap _neighborMap = null;
String ecalCollectionName;
Copied: java/trunk/users/src/main/java/org/hps/users/phansson/EcalHitMapPlots.java (from r2606, java/trunk/users/src/main/java/org/hps/users/phansson/ECalHitMapPlots.java)
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/ECalHitMapPlots.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/EcalHitMapPlots.java Wed Apr 1 14:34:14 2015
@@ -21,7 +21,7 @@
*
* @author phansson
*/
-public class ECalHitMapPlots {
+public class EcalHitMapPlots {
private AIDA aida = AIDA.defaultInstance();
private IAnalysisFactory af = aida.analysisFactory();
@@ -31,11 +31,11 @@
private boolean hide = false;
- public ECalHitMapPlots() {
-
- }
-
- public ECalHitMapPlots(boolean h) {
+ public EcalHitMapPlots() {
+
+ }
+
+ public EcalHitMapPlots(boolean h) {
this.hide = h;
//System.out.println("Constructor ECalHitMapPlots");
Modified: java/trunk/users/src/main/java/org/hps/users/phansson/TrigRateAna.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/TrigRateAna.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/TrigRateAna.java Wed Apr 1 14:34:14 2015
@@ -53,7 +53,7 @@
double _C_ep = 1;
- ECalHitMapPlots util = new ECalHitMapPlots();
+ EcalHitMapPlots util = new EcalHitMapPlots();
List<Count> _countList = new ArrayList<Count>();
Modified: java/trunk/users/src/main/java/org/hps/users/phansson/dataMCPlots.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/dataMCPlots.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/dataMCPlots.java Wed Apr 1 14:34:14 2015
@@ -82,7 +82,7 @@
IAnalysisFactory af = IAnalysisFactory.create();
- ECalHitMapPlots ecalhtplots = new ECalHitMapPlots();
+ EcalHitMapPlots ecalhtplots = new EcalHitMapPlots();
@@ -228,7 +228,7 @@
ITree tree_mc = af.createTreeFactory().create(path+ file_mc);
ITree tree_bkg = af.createTreeFactory().create(path+ file_bkg);
- ECalHitMapPlots ecalhtplots = new ECalHitMapPlots();
+ EcalHitMapPlots ecalhtplots = new EcalHitMapPlots();
//String name = "dataMC_clusterE_tophalf_norm";
Modified: java/trunk/users/src/main/java/org/hps/users/phansson/ecalPlots.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/ecalPlots.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/ecalPlots.java Wed Apr 1 14:34:14 2015
@@ -61,7 +61,7 @@
IAnalysisFactory af = IAnalysisFactory.create();
- ECalHitMapPlots ecalhtplots = new ECalHitMapPlots();
+ EcalHitMapPlots ecalhtplots = new EcalHitMapPlots();
