LISTSERV 16.5 - LCD-CVS Archives

- - - -

+ +

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

EcalEdepToTriggerConverterDriver.java 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- EcalEdepToTriggerConverterDriver.java	25 Feb 2013 22:39:24 -0000	1.1
+++ EcalEdepToTriggerConverterDriver.java	31 Oct 2013 00:11:02 -0000	1.2
@@ -5,6 +5,7 @@

 import org.lcsim.event.CalorimeterHit;
 import org.lcsim.event.EventHeader;
 import org.lcsim.geometry.Detector;

+import org.lcsim.hps.util.RandomGaussian;

 import org.lcsim.util.Driver;
 
 /**

@@ -27,6 +28,8 @@

     private double pulseIntegral = tp * Math.E / readoutPeriod;
     private double gainScale = 1.0; //gain miscalibration factor
     private double _gain = -1.0; //constant gain, activated if >0

+    private boolean addNoise = false;
+    private double pePerMeV = 2.0; //photoelectrons per MeV, used to calculate noise

 
     public EcalEdepToTriggerConverterDriver() {
     }

@@ -35,6 +38,10 @@

         this.tp = tp;
     }

+    public void setAddNoise(boolean addNoise) {
+        this.addNoise = addNoise;
+    }
+

     public void setReadoutCollection(String readoutCollection) {
         this.readoutCollection = readoutCollection;
     }

@@ -86,13 +93,16 @@

                 if (applyBadCrystalMap && isBadCrystal(hit)) {
                     continue;
                 }

-                CalorimeterHit triggerHit = makeTriggerHit(hit);

+                double amplitude = hitAmplitude(hit);
+                CalorimeterHit triggerHit = makeTriggerHit(hit, amplitude);

                 if (triggerHit != null) {
                     triggerHits.add(triggerHit);

+//                    System.out.format("trigger hit: %f %f\n", amplitude, triggerHit.getRawEnergy());

-                CalorimeterHit readoutHit = makeReadoutHit(hit);

+                CalorimeterHit readoutHit = makeReadoutHit(hit, amplitude);

                 if (readoutHit != null) {
                     readoutHits.add(readoutHit);

+//                    System.out.format("readout hit: %f %f\n", amplitude, readoutHit.getRawEnergy());

                 }
             }
         }

@@ -101,8 +111,7 @@

         event.put(readoutCollection, readoutHits, CalorimeterHit.class, flags, ecalReadoutName);
     }

-    public CalorimeterHit makeTriggerHit(CalorimeterHit hit) {
-        double amplitude = hitAmplitude(hit);

+    public CalorimeterHit makeTriggerHit(CalorimeterHit hit, double amplitude) {

 
 //        double time = readoutPeriod * (Math.random() - 1);
         double time = 0 - hit.getTime();

@@ -126,7 +135,7 @@

             }
         }

-//        System.out.format("%f %f %f\n", readoutIntegral, amplitude, triggerIntegral);

+//        System.out.format("trigger: %f %f\n", amplitude, triggerIntegral);

 
         int truncatedIntegral = (int) Math.floor(triggerIntegral / truncateScale);
         if (truncatedIntegral > 0) {

@@ -135,12 +144,14 @@

         return null;
     }

-    public CalorimeterHit makeReadoutHit(CalorimeterHit hit) {
-        double amplitude = hitAmplitude(hit);

+    public CalorimeterHit makeReadoutHit(CalorimeterHit hit, double amplitude) {

         if (amplitude < readoutThreshold) {
             return null;
         }

-        double integral = hit.getRawEnergy()/ECalUtils.GeV * gainScale;

+
+//        double integral = hit.getRawEnergy()/ECalUtils.GeV * gainScale;
+        double gain = _gain > 0 ? _gain : EcalConditions.physicalToGain(hit.getCellID());
+        double integral = amplitude * gain * pulseIntegral * gainScale * ECalUtils.MeV / ECalUtils.GeV;

 
 //        double thresholdCrossingTime = 0 - hit.getTime();
 //        while (true) {

@@ -162,13 +173,22 @@

 ////        double integral = readoutIntegral * HPSEcalConditions.physicalToGain(id);
 //        System.out.format("dumb: %f, full: %f\n",hit.getRawEnergy() * 1000.0,readoutIntegral * HPSEcalConditions.physicalToGain(id));

+//        System.out.format("readout: %f %f\n", amplitude, integral);

         CalorimeterHit h = new HPSCalorimeterHit(integral, hit.getTime(), hit.getCellID(), 0);
         return h;
     }
 
     private double hitAmplitude(CalorimeterHit hit) {

+        double energyAmplitude = hit.getRawEnergy();
+        if (addNoise) {
+            //add preamp noise and photoelectron Poisson noise in quadrature
+            double noise = Math.sqrt(Math.pow(EcalConditions.physicalToNoise(hit.getCellID()) * EcalConditions.physicalToGain(hit.getCellID()) * ECalUtils.MeV, 2) + hit.getRawEnergy() * ECalUtils.MeV / pePerMeV);
+            energyAmplitude += RandomGaussian.getGaussian(0, noise);
+        }
+

         double gain = _gain > 0 ? _gain : EcalConditions.physicalToGain(hit.getCellID());

-        return (hit.getRawEnergy() /ECalUtils.MeV) / (gain * pulseIntegral);

+//        System.out.format("amplitude: %f %f %f %f\n", hit.getRawEnergy(), energyAmplitude, gain, (energyAmplitude / ECalUtils.MeV) / (gain * pulseIntegral));
+        return (energyAmplitude / ECalUtils.MeV) / (gain * pulseIntegral);

     }
 
     private double pulseAmplitude(double time) {

+ gainWriter.print(" " + hit.getIdentifierFieldValue("ix") + " " + hit.getIdentifierFieldValue("iy") + " " + hit.getRawEnergy() * 1000.0 + " " + EcalConditions.physicalToGain(hit.getCellID()));

Commit in `hps-java/src/main` on MAIN
`resources/org/lcsim/hps/steering/users/meeg/EcalGainDriverSim.lcsim`	+12	-8	1.2 -> 1.3
`/EcalGainDriver.lcsim`	+12	-13	1.3 -> 1.4
`java/org/lcsim/hps/recon/ecal/EcalEdepToTriggerConverterDriver.java`	+29	-9	1.1 -> 1.2
`java/org/lcsim/hps/readout/ecal/FADCEcalReadoutDriver.java`	+2	-2	1.3 -> 1.4
`java/org/lcsim/hps/users/phansson/ECalGainDriver.java`	+5	-5	1.15 -> 1.16
	+60	-37