java/trunk/hps-java/src/main/java/org/lcsim/hps/readout/ecal

--- java/trunk/hps-java/src/main/java/org/lcsim/hps/readout/ecal/FADCEcalReadoutDriver.java	2014-03-18 01:06:55 UTC (rev 308)
+++ java/trunk/hps-java/src/main/java/org/lcsim/hps/readout/ecal/FADCEcalReadoutDriver.java	2014-03-18 01:08:09 UTC (rev 309)
@@ -51,7 +51,7 @@

     //length of readout pipeline (in readout cycles)
     private int pipelineLength = 2000;
     //switch between two pulse shape functions

-    private boolean useCRRCShape = false;

+    private boolean useCRRCShape = true;

     //shaper time constant in ns; negative values generate square pulses of the given width (for test run sim)
     private double tp = 14.0;
     //delay (number of readout periods) between start of summing window and output of hit to clusterer

@@ -413,7 +413,7 @@

             if (addNoise) {
                 //add preamp noise and photoelectron Poisson noise in quadrature
                 double noise;

-                if (useCRRCShape) {

+                if (!useCRRCShape) {

                     noise = Math.sqrt(Math.pow(EcalConditions.physicalToNoise(hit.getCellID()) * EcalConditions.physicalToGain(hit.getCellID()) * ECalUtils.gainFactor * ECalUtils.ecalReadoutPeriod, 2) + hit.getRawEnergy() * ECalUtils.MeV / pePerMeV);
                 } else {
                     noise = Math.sqrt(Math.pow(EcalConditions.physicalToNoise(hit.getCellID()) * EcalConditions.physicalToGain(hit.getCellID()) * ECalUtils.MeV, 2) + hit.getRawEnergy() * ECalUtils.MeV / pePerMeV);

@@ -494,12 +494,12 @@

                 corrGain = 1.0 / EcalConditions.physicalToGain(cellID);
             }
 

-            double norm = ((riseTime + fallTime) / 2) * Math.sqrt(2 * Math.PI) / Req; //to ensure the total integral is equal to 1/R, R is necessary for homogeneity

+            double norm = ((riseTime + fallTime) / 2) * Math.sqrt(2 * Math.PI); //to ensure the total integral is equal to 1: = 33.8

 
             if (time < 3 * riseTime) {

-                return corrGain * lightYield * quantumEff * surfRatio * gainAPD * gainPreAmpl * elemCharge * funcGaus(time - 3 * riseTime, riseTime) / norm;

+                return corrGain * readoutGain * funcGaus(time - 3 * riseTime, riseTime) / norm;

             } else {

-                return corrGain * lightYield * quantumEff * surfRatio * gainAPD * gainPreAmpl * elemCharge * funcGaus(time - 3 * riseTime, fallTime) / norm;

+                return corrGain * readoutGain * funcGaus(time - 3 * riseTime, fallTime) / norm;

             }
         }
     }

java/trunk/hps-java/src/main/java/org/lcsim/hps/readout/ecal

--- java/trunk/hps-java/src/main/java/org/lcsim/hps/readout/ecal/FADCTriggerDriver.java	2014-03-18 01:06:55 UTC (rev 308)
+++ java/trunk/hps-java/src/main/java/org/lcsim/hps/readout/ecal/FADCTriggerDriver.java	2014-03-18 01:08:09 UTC (rev 309)
@@ -52,6 +52,7 @@

     IHistogram2D clusterEnergy2DAll, clusterSumDiff2DAll, energyDistance2DAll, clusterAngles2DAll, clusterCoplanarity2DAll;
     IHistogram2D clusterEnergy2D, clusterSumDiff2D, energyDistance2D, clusterAngles2D, clusterCoplanarity2D;
     IHistogram1D triggerBits1D, triggerTimes1D;

+    int truthPeriod = 250;

     private boolean useQuadrants = false;
     protected String clusterCollectionName = "EcalClusters";
 

@@ -105,12 +106,21 @@

     }
 
     protected double getBeamEnergyFromDetector(Detector detector) {

-        if (detector.getName().contains("1pt1")) return 1.1;
-        else if (detector.getName().contains("2pt2")) return 2.2;
-        else if (detector.getName().contains("6pt6")) return 6.6;
-        else return -1.0;

+        if (detector.getName().contains("1pt1")) {
+            return 1.1;
+        } else if (detector.getName().contains("2pt2")) {
+            return 2.2;
+        } else if (detector.getName().contains("6pt6")) {
+            return 6.6;
+        } else {
+            return -1.0;
+        }

     }

-    

+
+    public void setTruthPeriod(int truthPeriod) {
+        this.truthPeriod = truthPeriod;
+    }
+

     @Override
     public void detectorChanged(Detector detector) {
         setBeamEnergy(this.getBeamEnergyFromDetector(detector));

@@ -128,7 +138,7 @@

         clusterAngles2D = aida.histogram2D("Passed other cuts: cluster angle (less energetic vs. more energetic)", 100, -180.0, 180.0, 100, -180.0, 180.0);
 
         triggerBits1D = aida.histogram1D(detector.getDetectorName() + " : " + clusterCollectionName + " : trigger bits", 17, -1.5, 15.5);

-        triggerTimes1D = aida.histogram1D(detector.getDetectorName() + " : " + clusterCollectionName + " : trigger times", 500, -0.5, 499.5);

+        triggerTimes1D = aida.histogram1D(detector.getDetectorName() + " : " + clusterCollectionName + " : trigger times", truthPeriod, -0.5, truthPeriod - 0.5);

     }
 
     @Override

@@ -284,7 +294,7 @@

         }
         if (trigger) {
             triggerBits1D.fill(-1);

-            triggerTimes1D.fill(ClockSingleton.getClock() % 500);

+            triggerTimes1D.fill(ClockSingleton.getClock() % truthPeriod);

         }
         return trigger;
     }

java/trunk/hps-java/src/main/java/org/lcsim/hps/recon/ecal

--- java/trunk/hps-java/src/main/java/org/lcsim/hps/recon/ecal/ECalUtils.java	2014-03-18 01:06:55 UTC (rev 308)
+++ java/trunk/hps-java/src/main/java/org/lcsim/hps/recon/ecal/ECalUtils.java	2014-03-18 01:08:09 UTC (rev 309)
@@ -23,7 +23,9 @@

     public static final int nBit = 12;  //number of bits used by the fADC to code a value
     public static final double maxVolt = 2.0;   //maximum volt intput of the fADC
     public static final double Req = 1.0 / 27.5; // equivalent resistance of the amplification chain

-    public static final double gainFactor = 2.0 / ((Math.pow(2, nBit) - 1) * Req * lightYield * quantumEff * surfRatio * gainAPD * gainPreAmpl * elemCharge);

+    public static final double adcResolution = 2.0 / (Math.pow(2, nBit) - 1); //volts per ADC count
+    public static final double readoutGain = Req * lightYield * quantumEff * surfRatio * gainAPD * gainPreAmpl * elemCharge;// = 15.0545 volt-seconds/GeV
+    public static final double gainFactor = adcResolution / readoutGain;

     public static final double ecalReadoutPeriod = 4.0; // readout period in ns, it is hardcoded in the public declaration of EcalReadoutDriver. 
 
     /**