Print

---

Author: [log in to unmask]
Date: Wed Mar 25 12:29:15 2015
New Revision: 2542

Log:
lack of ecal hits is not necessarily an error and setLogLevel in steering file doesn not affect this log message, so disabling this noise

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
    java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/EvioDAQParser.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 12:29:15 2015
@@ -47,7 +47,7 @@
     private static final String rawCollectionName = "EcalReadoutHits";
     private static final String extraDataRelationsName = "EcalReadoutExtraDataRelations";
 
-    private String histoNameFormat = "Ecal/Pedestals/Mode7/ped%3d";
+    private String histoNameFormat = "Ecal/Pedestals/Mode7/ped%03d";
 
     private static final int minimumStats = 1000;
     private static final DecimalFormat dbNumberFormat=new DecimalFormat("#.####");
@@ -74,12 +74,17 @@
     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.");
@@ -135,10 +140,6 @@
             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 12:29:15 2015
@@ -249,7 +249,7 @@
                 }
             }
         } else {
-            getLogger().severe("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.");
             }

Modified: java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/EvioDAQParser.java
 =============================================================================
--- java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/EvioDAQParser.java	(original)
+++ java/trunk/ecal-recon/src/main/java/org/hps/recon/ecal/daqconfig/EvioDAQParser.java	Wed Mar 25 12:29:15 2015
@@ -179,16 +179,16 @@
      * TAG TRIGGER VALUES
      */
     public void parseConfigMap() {
-        fadcNSA = Integer.valueOf(getConfig("FADC250_NSA", 0));
-        fadcNSB = Integer.valueOf(getConfig("FADC250_NSB", 0));
-        fadcNPEAK = Integer.valueOf(getConfig("FADC250_NPEAK", 0));
-        fadcMODE = Integer.valueOf(getConfig("FADC250_MODE", 0));
-        fadcWIDTH = Integer.valueOf(getConfig("FADC250_W_WIDTH", 0));
+        fadcNSA    = Integer.valueOf(getConfig("FADC250_NSA", 0));
+        fadcNSB    = Integer.valueOf(getConfig("FADC250_NSB", 0));
+        fadcNPEAK  = Integer.valueOf(getConfig("FADC250_NPEAK", 0));
+        fadcMODE   = Integer.valueOf(getConfig("FADC250_MODE", 0));
+        fadcWIDTH  = Integer.valueOf(getConfig("FADC250_W_WIDTH", 0));
         fadcOFFSET = Integer.valueOf(getConfig("FADC250_W_OFFSET", 0));
         
         gtpMinSeedEnergy = Integer.valueOf(getConfig("GTP_CLUSTER_PULSE_THRESHOLD", 0));
-        gtpWindowBefore = Integer.valueOf(getConfig("GTP_CLUSTER_PULSE_COIN", 0));
-        gtpWindowAfter = Integer.valueOf(getConfig("GTP_CLUSTER_PULSE_COIN", 1));
+        gtpWindowBefore  = Integer.valueOf(getConfig("GTP_CLUSTER_PULSE_COIN", 0));
+        gtpWindowAfter   = Integer.valueOf(getConfig("GTP_CLUSTER_PULSE_COIN", 1));
         
         for(int ii = 0; ii < 2; ii++) {
             singlesNhitsEn[ii]         = getBoolConfigSSP(ii,  "SINGLES_NMIN",          1);