Author: [log in to unmask]
Date: Wed Mar 25 13:08:26 2015
New Revision: 2544
Log:
reverting accidental commit
Modified:
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalPedestalCalculator.java
java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/ClusterDriver.java
Modified: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalPedestalCalculator.java
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalPedestalCalculator.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/EcalPedestalCalculator.java Wed Mar 25 13:08:26 2015
@@ -47,7 +47,7 @@
private static final String rawCollectionName = "EcalReadoutHits";
private static final String extraDataRelationsName = "EcalReadoutExtraDataRelations";
- private String histoNameFormat = "Ecal/Pedestals/Mode7/ped%03d";
+ private String histoNameFormat = "Ecal/Pedestals/Mode7/ped%3d";
private static final int minimumStats = 1000;
private static final DecimalFormat dbNumberFormat=new DecimalFormat("#.####");
@@ -74,17 +74,12 @@
public EcalPedestalCalculator() {
}
- private String getHistoName(EcalChannel cc) {
- return String.format(histoNameFormat,cc.getChannelId());
- }
-
@Override
protected void startOfData() {
}
@Override
public void endOfData() {
-
Console cc = System.console();
if (cc == null) {
System.err.println("No console.");
@@ -140,6 +135,10 @@
aida.histogram1D(getHistoName(cc),181,19.5,200.5);
}
+ }
+
+ private String getHistoName(EcalChannel cc) {
+ return String.format(histoNameFormat,cc.getChannelId());
}
private void uploadToDB() {
Modified: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/ClusterDriver.java
=============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/ClusterDriver.java (original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/cluster/ClusterDriver.java Wed Mar 25 13:08:26 2015
@@ -249,7 +249,7 @@
}
}
} else {
- //getLogger().info("The input hit collection " + this.inputHitCollectionName + " is missing from the event.");
+ getLogger().info("The input hit collection " + this.inputHitCollectionName + " is missing from the event.");
if (this.raiseErrorNoHitCollection) {
throw new RuntimeException("The expected input hit collection is missing from the event.");
}
|