Commit in hps-java/src/main on MAIN
java/org/lcsim/hps/recon/ecal/HPSFADCTriggerDriver.java+73-671.13 -> 1.14
                             /HPSTriggerDriver.java+25-241.21 -> 1.22
resources/org/lcsim/hps/steering/HPS2014ReadoutToLcio.lcsim+12-51.1 -> 1.2
resources/org/lcsim/hps/calib/proposal2014/calibECal/default.gain+442-4421.1 -> 1.2
                                                    /fadc02.ped-1921.1 removed
                                                    /ecal02.ped-1931.1 removed
                                                    /ecal01.ped-2091.1 removed
                                                    /fadc01.ped-2081.1 removed
+552-1340
4 removed + 4 modified, total 8 files
clean up ECal calibrations in proposal2014, add debug plots to pair trigger

hps-java/src/main/java/org/lcsim/hps/recon/ecal
HPSFADCTriggerDriver.java 1.13 -> 1.14
diff -u -r1.13 -r1.14
--- HPSFADCTriggerDriver.java	8 Dec 2012 01:12:17 -0000	1.13
+++ HPSFADCTriggerDriver.java	11 Dec 2012 00:04:29 -0000	1.14
@@ -1,13 +1,16 @@
 package org.lcsim.hps.recon.ecal;
 
+import hep.aida.IHistogram2D;
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
 import org.lcsim.event.Cluster;
 import org.lcsim.event.EventHeader;
+import org.lcsim.geometry.Detector;
 import org.lcsim.hps.evio.TriggerData;
 import org.lcsim.hps.util.ClockSingleton;
+import org.lcsim.util.aida.AIDA;
 
 /**
  * Reads clusters and makes trigger decision using opposite quadrant criterion.
@@ -15,7 +18,7 @@
  *
  * @author Omar Moreno <[log in to unmask]>
  * @author Sho Uemura <[log in to unmask]>
- * @version $Id: HPSFADCTriggerDriver.java,v 1.13 2012/12/08 01:12:17 meeg Exp $
+ * @version $Id: HPSFADCTriggerDriver.java,v 1.14 2012/12/11 00:04:29 meeg Exp $
  */
 public class HPSFADCTriggerDriver extends HPSTriggerDriver {
 
@@ -23,11 +26,14 @@
     List<HPSEcalCluster[]> clusterPairs;
     int nTriggers;
     int totalEvents;
-    private double clusterEnergyHigh = 1.85 * HPSECalUtils.GeV; // GeV
-    private double clusterEnergyLow = .1 * HPSECalUtils.GeV;    // GeV
-    private double energySumThreshold = 2.2 * HPSECalUtils.GeV;  // GeV
-    private double energyDifferenceThreshold = 1.5 * HPSECalUtils.GeV; // GeV
+    private double beamEnergy = 2.2 * HPSECalUtils.GeV;
+    private double clusterEnergyHigh = 1.85 / 2.2;
+    private double clusterEnergyLow = .1 / 2.2;
+    private double energySumThreshold = 1.0;
+    private double energyDifferenceThreshold = 1.5 / 2.2;
     private double maxCoplanarityAngle = 35; // degrees
+    private double energyDistanceScale = 0.0032 / 2.2; // mm^-1
+    private double energyDistanceThreshold = 0.8 / 2.2;
     int allPairs;
     int oppositeQuadrantCount;
     int clusterEnergyCount;
@@ -35,12 +41,24 @@
     int energyDifferenceCount;
     int energyDistanceCount;
     int coplanarityCount;
-    int deadtimelessTriggerCount;
+    AIDA aida = AIDA.defaultInstance();
+    IHistogram2D clusterEnergy2D, energyDistance2D, clusterAngle2D;
 
     public HPSFADCTriggerDriver() {
         clusterPairs = new LinkedList<HPSEcalCluster[]>();
     }
 
+    public void setBeamEnergy(double beamEnergy) {
+        this.beamEnergy = beamEnergy;
+    }
+
+    @Override
+    public void detectorChanged(Detector detector) {
+        clusterEnergy2D = aida.histogram2D(detector.getDetectorName() + " : " + clusterCollectionName + " : energy difference vs. sum", 100, 0.0, 2 * beamEnergy, 100, 0.0, beamEnergy);
+        energyDistance2D = aida.histogram2D(detector.getDetectorName() + " : " + clusterCollectionName + " : distance vs. energy (less energetic cluster)", 100, 0.0, beamEnergy, 100, 0.0, 400.0);
+        clusterAngle2D = aida.histogram2D(detector.getDetectorName() + " : " + clusterCollectionName + " : cluster angle uncoplanarity vs. more energetic cluster angle", 100, -180.0, 180.0, 100, -180.0, 180.0);
+    }
+
     @Override
     public void startOfData() {
         super.startOfData();
@@ -52,7 +70,6 @@
         energyDifferenceCount = 0;
         energyDistanceCount = 0;
         coplanarityCount = 0;
-        deadtimelessTriggerCount = 0;
     }
 
     @Override
@@ -89,7 +106,7 @@
             oppositeQuadrantCount++;
 
 
-            // Require the componets of a cluster pair to have an energy in
+            // Require the components of a cluster pair to have an energy in
             // the range of 100 MeV to 1.85 GeV
             if (!clusterECut(clusterPair)) {
                 if (outputStream != null) {
@@ -99,6 +116,16 @@
             }
             clusterEnergyCount++;
 
+            if (energyDistanceCut(clusterPair) && coplanarityCut(clusterPair)) {
+                clusterEnergy2D.fill(clusterPair[0].getEnergy() + clusterPair[1].getEnergy(), clusterPair[0].getEnergy() - clusterPair[1].getEnergy());
+            }
+            if (energySum(clusterPair) && energyDifference(clusterPair) && coplanarityCut(clusterPair)) {
+                energyDistance2D.fill(clusterPair[1].getEnergy(), getClusterDistance(clusterPair[1]));
+            }
+            if (energySum(clusterPair) && energyDifference(clusterPair) && energyDistanceCut(clusterPair)) {
+                clusterAngle2D.fill(getClusterAngle(clusterPair[0]), ((360.0 + getClusterAngle(clusterPair[0]) - getClusterAngle(clusterPair[1])) % 360.0) - 180.0);
+            }
+
             // Require the sum of the energies of the components of the
             // cluster pair to be less than the
             // (Beam Energy)*(Sampling Fraction) ( 2 GeV for the Test Run )
@@ -147,9 +174,6 @@
             }
             trigger = true;
         }
-        if (trigger) {
-            deadtimelessTriggerCount++;
-        }
         return trigger;
     }
 
@@ -164,7 +188,6 @@
             outputStream.printf("Energy difference: %d\n", energyDifferenceCount);
             outputStream.printf("Energy-distance cut: %d\n", energyDistanceCount);
             outputStream.printf("Coplanarity: %d\n", coplanarityCount);
-            outputStream.printf("Trigger count without dead time: %d\n", deadtimelessTriggerCount);
             outputStream.printf("Trigger count: %d\n", numTriggers);
             outputStream.close();
         }
@@ -176,7 +199,6 @@
         System.out.printf("Energy difference: %d\n", energyDifferenceCount);
         System.out.printf("Energy-distance cut: %d\n", energyDistanceCount);
         System.out.printf("Coplanarity: %d\n", coplanarityCount);
-        System.out.printf("Trigger count without dead time: %d\n", deadtimelessTriggerCount);
         System.out.printf("Trigger count: %d\n", numTriggers);
         super.endOfData();
     }
@@ -187,7 +209,7 @@
      * @param ecalClusters : List of ECal clusters
      * @return true if there are any cluster pairs
      */
-    public boolean getClusterPairs(List<HPSEcalCluster> ecalClusters) {
+    private boolean getClusterPairs(List<HPSEcalCluster> ecalClusters) {
         // Create a list which will hold all neighboring cluster to the cluster
         // of interest
         List< HPSEcalCluster> ecalClusterNeighbors = new LinkedList< HPSEcalCluster>();
@@ -204,8 +226,13 @@
             // any which lie in opposing quadrants to the cluster of interest.
             // If so, add them to the list of cluster pairs
             for (HPSEcalCluster ecalClusterNeighbor : ecalClusterNeighbors) {
-                HPSEcalCluster[] clusterPair = {ecalCluster, ecalClusterNeighbor};
-                clusterPairs.add(clusterPair);
+                if (ecalCluster.getEnergy() > ecalClusterNeighbor.getEnergy()) {
+                    HPSEcalCluster[] clusterPair = {ecalCluster, ecalClusterNeighbor};
+                    clusterPairs.add(clusterPair);
+                } else {
+                    HPSEcalCluster[] clusterPair = {ecalClusterNeighbor, ecalCluster};
+                    clusterPairs.add(clusterPair);
+                }
             }
         }
 
@@ -219,7 +246,7 @@
      * @param clusterPair : pair of clusters
      * @return true if opposite quadrants, false otherwise
      */
-    public boolean oppositeQuadrantsCut(HPSEcalCluster[] clusterPair) {
+    private boolean oppositeQuadrantsCut(HPSEcalCluster[] clusterPair) {
         int quad1 = HPSECalUtils.getQuadrant(clusterPair[0]);
         int quad2 = HPSECalUtils.getQuadrant(clusterPair[1]);
 
@@ -239,11 +266,11 @@
      * @param clusterPair : pair of clusters
      * @return true if a pair is found, false otherwise
      */
-    public boolean clusterECut(HPSEcalCluster[] clusterPair) {
-        return (clusterPair[0].getEnergy() < clusterEnergyHigh
-                && clusterPair[1].getEnergy() < clusterEnergyHigh
-                && clusterPair[0].getEnergy() > clusterEnergyLow
-                && clusterPair[1].getEnergy() > clusterEnergyLow);
+    private boolean clusterECut(HPSEcalCluster[] clusterPair) {
+        return (clusterPair[0].getEnergy() < beamEnergy * clusterEnergyHigh
+                && clusterPair[1].getEnergy() < beamEnergy * clusterEnergyHigh
+                && clusterPair[0].getEnergy() > beamEnergy * clusterEnergyLow
+                && clusterPair[1].getEnergy() > beamEnergy * clusterEnergyLow);
     }
 
     /**
@@ -253,10 +280,9 @@
      * @param clusterPair : pair of clusters
      * @return true if a pair is found, false otherwise
      */
-    public boolean energySum(Cluster[] clusterPair) {
-        double clusterESum = clusterPair[0].getEnergy()
-                + clusterPair[1].getEnergy();
-        return (clusterESum < energySumThreshold);
+    private boolean energySum(Cluster[] clusterPair) {
+        double clusterESum = clusterPair[0].getEnergy() + clusterPair[1].getEnergy();
+        return (clusterESum < beamEnergy * energySumThreshold);
     }
 
     /**
@@ -266,11 +292,10 @@
      * @param clusterPair : pair of clusters
      * @return true if pair is found, false otherwise
      */
-    public boolean energyDifference(HPSEcalCluster[] clusterPair) {
-        double clusterEDifference = Math.abs(clusterPair[0].getEnergy()
-                - clusterPair[1].getEnergy());
+    private boolean energyDifference(HPSEcalCluster[] clusterPair) {
+        double clusterEDifference = clusterPair[0].getEnergy() - clusterPair[1].getEnergy();
 
-        return (clusterEDifference < energyDifferenceThreshold);
+        return (clusterEDifference < beamEnergy * energyDifferenceThreshold);
     }
 
     /**
@@ -280,30 +305,14 @@
      * @param clusterPair : pair of clusters
      * @return true if pair is found, false otherwise
      */
-    public boolean energyDistanceCut(HPSEcalCluster[] clusterPair) {
-        HPSEcalCluster lowEnergyCluster;
-
-        // Obtain the lowest energy cluster
-        if (clusterPair[0].getEnergy() < clusterPair[1].getEnergy()) {
-            lowEnergyCluster = clusterPair[0];
-        } else {
-            lowEnergyCluster = clusterPair[1];
-        }
+    private boolean energyDistanceCut(HPSEcalCluster[] clusterPair) {
+        HPSEcalCluster lowEnergyCluster = clusterPair[1];
 
-        double lowEClusterPosition[] = lowEnergyCluster.getSeedHit().getPosition();
         // Calculate its position
-        double lowEClusterDistance = Math.sqrt(Math.pow(lowEClusterPosition[0], 2)
-                + Math.pow(lowEClusterPosition[1], 2));
+        double lowEClusterDistance = getClusterDistance(clusterPair[1]);
+        double clusterDistvsE = lowEnergyCluster.getEnergy() + lowEClusterDistance * beamEnergy * energyDistanceScale;
 
-        double clusterDistvsE = lowEnergyCluster.getEnergy() + lowEClusterDistance * (0.0032 * HPSECalUtils.GeV);
-
-        if (clusterDistvsE > .8 * HPSECalUtils.GeV /*
-                 * GeV
-                 */) {
-            return true;
-        }
-
-        return false;
+        return (clusterDistvsE > beamEnergy * energyDistanceThreshold);
     }
 
     /**
@@ -312,25 +321,22 @@
      * @param clusterPair : pair of clusters
      * @return true if pair is found, false otherwise
      */
-    public boolean coplanarityCut(HPSEcalCluster[] clusterPair) {
-        double cluster1Position[] = clusterPair[0].getSeedHit().getPosition();
-        double cluster2Position[] = clusterPair[1].getSeedHit().getPosition();
-        // Find the distance of both clusters from the origin
-        double cluster1Dist = Math.sqrt(Math.pow(cluster1Position[0], 2)
-                + Math.pow(cluster1Position[1], 2));
-        double cluster2Dist = Math.sqrt(Math.pow(cluster2Position[0], 2)
-                + Math.pow(cluster2Position[1], 2));
-
-        // Calculate the dot product between the distance vectors of
-        // each cluster in the cluster pair
-        double clusterDot = cluster1Position[0] * cluster2Position[0]
-                + cluster1Position[1] * cluster2Position[1];
+    private boolean coplanarityCut(HPSEcalCluster[] clusterPair) {
+        double cluster1Angle = getClusterAngle(clusterPair[0]);
+        double cluster2Angle = getClusterAngle(clusterPair[1]);
 
         // Find the angle between clusters in the pair
-        double cosphi = clusterDot / (cluster1Dist * cluster2Dist);
-        double phi = Math.toDegrees(Math.acos(cosphi));
+        double phi = (360.0 + cluster1Angle - cluster2Angle) % 360.0;
+        return (Math.abs(phi - 180.0) < maxCoplanarityAngle);
+    }
+
+    private double getClusterAngle(HPSEcalCluster cluster) {
+        double position[] = cluster.getSeedHit().getPosition();
+        return Math.toDegrees(Math.atan2(position[0], position[1]));
+    }
 
-        return ((180 - phi) < maxCoplanarityAngle);
+    private double getClusterDistance(HPSEcalCluster cluster) {
+        return Math.hypot(cluster.getSeedHit().getPosition()[0], cluster.getSeedHit().getPosition()[1]);
     }
 
     /**

hps-java/src/main/java/org/lcsim/hps/recon/ecal
HPSTriggerDriver.java 1.21 -> 1.22
diff -u -r1.21 -r1.22
--- HPSTriggerDriver.java	2 Oct 2012 01:56:08 -0000	1.21
+++ HPSTriggerDriver.java	11 Dec 2012 00:04:30 -0000	1.22
@@ -24,9 +24,10 @@
  * Applies SVT trigger latency and sends trigger signal to SVT
  *
  * @author Sho Uemura <[log in to unmask]>
- * @version $Id: HPSTriggerDriver.java,v 1.21 2012/10/02 01:56:08 phansson Exp $
+ * @version $Id: HPSTriggerDriver.java,v 1.22 2012/12/11 00:04:30 meeg Exp $
  */
 public abstract class HPSTriggerDriver extends Driver {
+
     private boolean _DEBUG = false;
     protected String clusterCollectionName = "EcalClusters";
     private String outputFileName = null;
@@ -86,7 +87,9 @@
                 throw new RuntimeException("Invalid outputFilePath!");
             }
         } else {
-            if(_DEBUG) outputStream = new PrintWriter(System.out, true);
+            if (_DEBUG) {
+                outputStream = new PrintWriter(System.out, true);
+            }
         }
 
         if (lcioFile != null) {
@@ -108,30 +111,28 @@
         triggerBit = false; //reset trigger
         //System.out.println(this.getClass().getCanonicalName() + " - process");
 
-        if (triggerDecision(event)) {
-            if (ClockSingleton.getClock() - lastTrigger > deadTime) {
-                triggerBit = true;
-                lastTrigger = ClockSingleton.getClock();
-                numTriggers++;
-                if(_DEBUG) System.out.printf(this.getClass().getSimpleName() + ": Trigger on event %d\n", event.getEventNumber());
-                if (outputStream != null) {
-                    outputStream.printf("Trigger on event %d\n", event.getEventNumber());
-                }
+        if (ClockSingleton.getClock() - lastTrigger > deadTime && triggerDecision(event)) {
+            triggerBit = true;
+            lastTrigger = ClockSingleton.getClock();
+            numTriggers++;
+            if (_DEBUG) {
+                System.out.printf(this.getClass().getSimpleName() + ": Trigger on event %d\n", event.getEventNumber());
+            }
+            if (outputStream != null) {
+                outputStream.printf("Trigger on event %d\n", event.getEventNumber());
+            }
 
-                // If an ECal trigger signal has been sent store the trigger
-                // time offset by the trigger latencies
-                svtTriggerTimeStamp.add(ClockSingleton.getTime() + svtTriggerLatency);
-                ecalTriggerTimestamps.add(ClockSingleton.getTime() + ecalTriggerLatency);
-                triggerTriggerTimestamps.add(ClockSingleton.getTime() + triggerTriggerLatency);
-                if(_DEBUG) System.out.println(this.getClass().getSimpleName() + ": Trigger added on event " + event.getEventNumber());
+            // If an ECal trigger signal has been sent store the trigger
+            // time offset by the trigger latencies
+            svtTriggerTimeStamp.add(ClockSingleton.getTime() + svtTriggerLatency);
+            ecalTriggerTimestamps.add(ClockSingleton.getTime() + ecalTriggerLatency);
+            triggerTriggerTimestamps.add(ClockSingleton.getTime() + triggerTriggerLatency);
+            if (_DEBUG) {
+                System.out.println(this.getClass().getSimpleName() + ": Trigger added on event " + event.getEventNumber());
+            }
 
-                if (outputStream != null) {
-                    outputStream.printf("trigger sent to ET event builder on event %d\n", event.getEventNumber());
-                }
-            } else {
-                if (outputStream != null) {
-                    outputStream.printf("Event %d rejected by dead time\n", event.getEventNumber());
-                }
+            if (outputStream != null) {
+                outputStream.printf("trigger sent to ET event builder on event %d\n", event.getEventNumber());
             }
             makeTriggerData(event, "TriggerStatus");
             if (lcioWriter != null) {

hps-java/src/main/resources/org/lcsim/hps/steering
HPS2014ReadoutToLcio.lcsim 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- HPS2014ReadoutToLcio.lcsim	21 Nov 2012 00:04:10 -0000	1.1
+++ HPS2014ReadoutToLcio.lcsim	11 Dec 2012 00:04:30 -0000	1.2
@@ -1,7 +1,7 @@
 <!-- 
   Execute full trigger+readout simulation and write the results as an LCIO file.
   @author Sho Uemura <[log in to unmask]>
-  @version $Id: HPS2014ReadoutToLcio.lcsim,v 1.1 2012/11/21 00:04:10 meeg Exp $
+  @version $Id: HPS2014ReadoutToLcio.lcsim,v 1.2 2012/12/11 00:04:30 meeg Exp $
 -->
 <lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" 
        xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
@@ -21,6 +21,8 @@
         <driver name="DataProcessing"/>
         <driver name="TestRunReconToLcio"/>
 
+		<driver name="AidaSaveDriver"/>
+
         <driver name="ClockDriver"/>
         <driver name="CleanupDriver"/>
     </execute> 
@@ -33,7 +35,7 @@
 <!--            <runNumber>1351</runNumber>    -->
         </driver>
         <driver name="TestRunReconToLcio" type="org.lcsim.hps.evio.TestRunTriggeredReconToLcio">
-            <outputFile>${outputFile}</outputFile>
+            <outputFile>${outputFile}.slcio</outputFile>
         </driver>
 			
         <driver name="EcalReadout" type="org.lcsim.hps.recon.ecal.HPSEcalFADCReadoutDriver">
@@ -46,21 +48,21 @@
             <readoutThreshold>50</readoutThreshold>
             <constantTriggerWindow>true</constantTriggerWindow>
             <scaleFactor>1</scaleFactor>
-            <fixedGain>0.15</fixedGain>
+<!--            <fixedGain>0.15</fixedGain>-->
 <!--            <debug>true</debug>-->
         </driver>
 
         <driver name="EcalConverter" type="org.lcsim.hps.recon.ecal.HPSEcalRawConverterDriver">
             <rawCollectionName>EcalRawHits</rawCollectionName>
             <ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
-            <gain>0.15</gain>
+<!--            <gain>0.15</gain>-->
             <applyBadCrystalMap>false</applyBadCrystalMap>
 <!--            <debug>true</debug>-->
         </driver>	
 
         <driver name="EcalClusterer" type="org.lcsim.hps.recon.ecal.HPSEcalCTPClusterer">
             <ecalName>Ecal</ecalName>
-            <clusterWindow>32.0</clusterWindow>
+            <clusterWindow>8.0</clusterWindow>
             <ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
         </driver>
 
@@ -88,6 +90,11 @@
             <numberOfSamplesToReadOut>6</numberOfSamplesToReadOut>
         </driver>
 
+		<driver name="AidaSaveDriver"
+                type="org.lcsim.job.AidaSaveDriver">
+			<outputFileName>${outputFile}_triggerPlots</outputFileName>
+		</driver>
+
         <driver name="ClockDriver" type="org.lcsim.hps.util.ClockDriver"/>
         <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
             <collectionNames>TrackerHits</collectionNames>

hps-java/src/main/resources/org/lcsim/hps/calib/proposal2014/calibECal
default.gain 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- default.gain	1 Nov 2012 00:18:04 -0000	1.1
+++ default.gain	11 Dec 2012 00:04:30 -0000	1.2
@@ -1,443 +1,443 @@
 #x	y	gain
--23	1	0.133127
--23	2	0.115780
--23	3	0.134208
--23	4	0.155521
--23	5	0.133770
--22	1	0.157064
--22	2	0.130944
--22	3	0.140505
--22	4	0.166728
--22	5	0.133770
--21	1	0.179666
--21	2	0.196879
--21	3	0.212828
--21	4	0.212381
--21	5	0.212381
--20	1	0.204436
--20	2	0.214580
--20	3	0.208637
--20	4	0.212381
--20	5	0.212381
--19	1	0.207319
--19	2	0.193910
--19	3	0.199045
--19	4	0.214641
--19	5	0.214641
--18	1	0.204768
--18	2	0.219602
--18	3	0.213419
--18	4	0.214641
--18	5	0.214641
--17	1	0.238475
--17	2	0.251577
--17	3	0.265810
--17	4	0.261040
--17	5	0.261040
--16	1	0.236384
--16	2	0.269346
--16	3	0.230097
--16	4	0.261040
--16	5	0.261040
--15	1	0.188842
--15	2	0.220022
--15	3	0.240980
--15	4	0.222194
--15	5	0.222194
--14	1	0.213146
--14	2	0.210830
--14	3	0.213309
--14	4	0.222194
--14	5	0.222194
--13	1	0.228191
--13	2	0.190975
--13	3	0.240622
--13	4	0.222540
--13	5	0.222540
--12	1	0.192332
--12	2	0.193673
--12	3	0.224156
--12	4	0.222540
--12	5	0.222540
--11	1	0.224342
--11	2	0.216855
--11	3	0.195149
--11	4	0.252977
--11	5	0.252977
--10	2	0.182041
--10	3	0.238880
--10	4	0.252977
--10	5	0.252977
--9	2	0.270465
--9	3	0.297437
--9	4	0.305047
--9	5	0.305047
--8	2	0.255389
--8	3	0.198861
--8	4	0.305047
--8	5	0.305047
--7	2	0.348669
--7	3	0.296798
--7	4	0.296798
--7	5	0.305047
--6	2	0.296456
--6	3	0.503613
--6	4	0.296798
--6	5	0.296389
--5	2	0.500000
--5	3	0.503613
--5	4	0.296798
--5	5	0.296389
--4	2	0.500000
--4	3	0.503613
--4	4	0.296798
--4	5	0.296389
--3	2	0.503613
--3	3	0.503613
--3	4	0.296798
--3	5	0.296389
--2	2	0.296798
--2	3	0.296798
--2	4	0.296798
--2	5	0.296389
--1	1	0.296389
--1	2	0.296389
--1	3	0.296389
--1	4	0.296389
--1	5	0.296389
-1	1	0.150000
-1	2	0.150000
-1	3	0.150000
-1	4	0.150000
-1	5	0.150000
-2	1	0.107838
-2	2	0.107838
-2	3	0.107838
-2	4	0.107838
-2	5	0.107838
-3	1	0.217046
-3	2	0.077198
-3	3	0.107838
-3	4	0.107838
-3	5	0.107838
-4	1	0.245245
-4	2	0.322816
-4	3	0.274674
-4	4	0.274674
-4	5	0.274674
-5	1	0.247034
-5	2	0.212981
-5	3	0.215274
-5	4	0.274674
-5	5	0.274674
-6	1	0.275734
-6	2	0.233450
-6	3	0.259134
-6	4	0.150107
-6	5	0.150107
-7	1	0.221557
-7	2	0.165603
-7	3	0.283345
-7	4	0.150107
-7	5	0.150107
-8	1	0.106743
-8	2	0.343513
-8	3	0.315545
-8	4	0.135420
-8	5	0.135420
-9	1	0.121220
-9	2	0.052949
-9	3	0.127313
-9	4	0.135420
-9	5	0.135420
-10	1	0.185800
-10	2	0.182771
-10	3	0.195378
-10	4	0.047782
-10	5	0.047782
-11	1	0.192539
-11	2	0.186530
-11	3	0.286829
-11	4	0.047782
-11	5	0.047782
-12	1	0.181305
-12	2	0.178378
-12	3	0.224414
-12	4	0.173552
-12	5	0.173552
-13	1	0.206043
-13	2	0.223798
-13	3	0.193820
-13	4	0.173552
-13	5	0.173552
-14	1	0.374444
-14	2	0.317276
-14	3	0.374444
-14	4	0.374444
-14	5	0.374444
-15	1	0.374444
-15	2	0.374444
-15	3	0.374444
-15	4	0.374444
-15	5	0.374444
-16	1	0.141703
-16	2	0.185444
-16	3	0.215518
-16	4	0.194642
-16	5	0.194642
-17	1	0.164737
-17	2	0.197575
-17	3	0.176788
-17	4	0.194642
-17	5	0.194642
-18	1	0.165079
-18	2	0.171949
-18	3	0.191686
-18	4	0.182929
-18	5	0.182929
-19	1	0.164299
-19	2	0.162000
-19	3	0.177600
-19	4	0.182929
-19	5	0.182929
-20	1	0.208651
-20	2	0.208651
-20	3	0.208651
-20	4	0.208651
-20	5	0.208651
-21	1	0.208651
-21	2	0.208651
-21	3	0.208651
-21	4	0.208651
-21	5	0.208651
-22	1	0.114746
-22	2	0.098501
-22	3	0.120690
-22	4	0.103435
-22	5	0.103435
-23	1	0.107483
-23	2	0.109401
-23	3	0.114415
-23	4	0.099082
-23	5	0.103435
--23	-1	0.371500
--23	-2	0.371500
--23	-3	0.371500
--23	-4	0.371500
--23	-5	0.371500
--22	-1	0.277608
--22	-2	0.371500
--22	-3	0.371500
--22	-4	0.371500
--22	-5	0.371500
--21	-1	0.238962
--21	-2	0.213457
--21	-3	0.189900
--21	-4	0.253691
--21	-5	0.253691
--20	-1	0.286850
--20	-2	0.253691
--20	-3	0.253691
--20	-4	0.253691
--20	-5	0.253691
--19	-1	0.293288
--19	-2	0.219453
--19	-3	0.294973
--19	-4	0.294973
--19	-5	0.294973
--18	-1	0.325383
--18	-2	0.291775
--18	-3	0.221447
--18	-4	0.294973
--18	-5	0.294973
--17	-1	0.231910
--17	-2	0.229097
--17	-3	0.239466
--17	-4	0.254280
--17	-5	0.254280
--16	-1	0.259626
--16	-2	0.224484
--16	-3	0.244679
--16	-4	0.254280
--16	-5	0.254280
--15	-1	0.343298
--15	-2	0.267686
--15	-3	0.301283
--15	-4	0.351962
--15	-5	0.351962
--14	-1	0.327551
--14	-2	0.369376
--14	-3	0.295718
--14	-4	0.351962
--14	-5	0.351962
--13	-1	0.282527
--13	-2	0.242217
--13	-3	0.252755
--13	-4	0.275657
--13	-5	0.275657
--12	-1	0.254222
--12	-2	0.243366
--12	-3	0.231663
--12	-4	0.275657
--12	-5	0.275657
--11	-1	0.231021
--11	-2	0.220742
--11	-3	0.248353
--11	-4	0.236100
--11	-5	0.236100
--10	-2	0.195309
--10	-3	0.245860
--10	-4	0.236100
--10	-5	0.236100
--9	-2	0.177194
--9	-3	0.074520
--9	-4	0.198624
--9	-5	0.198624
--8	-2	0.091487
--8	-3	0.198624
--8	-4	0.198624
--8	-5	0.198624
--7	-2	0.189489
--7	-3	0.347573
--7	-4	0.347573
--7	-5	0.198624
--6	-2	0.341213
--6	-3	0.579484
--6	-4	0.347573
--6	-5	0.503696
--5	-2	0.489084
--5	-3	0.579484
--5	-4	0.347573
--5	-5	0.503696
--4	-2	0.374082
--4	-3	0.579484
--4	-4	0.347573
--4	-5	0.503696
--3	-2	0.579484
--3	-3	0.579484
--3	-4	0.347573
--3	-5	0.503696
--2	-2	0.347573
--2	-3	0.347573
--2	-4	0.347573
--2	-5	0.503696
--1	-1	0.503696
--1	-2	0.503696
--1	-3	0.503696
--1	-4	0.503696
--1	-5	0.503696
-1	-1	0.415687
-1	-2	0.380094
-1	-3	0.380094
-1	-4	0.380094
-1	-5	0.380094
-2	-1	0.248947
-2	-2	0.131393
-2	-3	0.176029
-2	-4	0.176029
-2	-5	0.176029
-3	-1	0.176029
-3	-2	0.176029
-3	-3	0.176029
-3	-4	0.176029
-3	-5	0.176029
-4	-1	0.115522
-4	-2	0.091284
-4	-3	0.141196
-4	-4	0.141196
-4	-5	0.141196
-5	-1	0.173591
-5	-2	0.141196
-5	-3	0.158859
-5	-4	0.141196
-5	-5	0.141196
-6	-1	0.150000
-6	-2	0.150000
-6	-3	0.150000
-6	-4	0.150000
-6	-5	0.150000
-7	-1	0.150000
-7	-2	0.150000
-7	-3	0.150000
-7	-4	0.150000
-7	-5	0.150000
-8	-1	0.318585
-8	-2	0.318585
-8	-3	0.546386
-8	-4	0.318585
-8	-5	0.318585
-9	-1	0.264988
-9	-2	0.362635
-9	-3	0.268807
-9	-4	0.318585
-9	-5	0.318585
-10	-1	0.091724
-10	-2	0.069005
-10	-3	0.069005
-10	-4	0.069005
-10	-5	0.069005
-11	-1	0.090529
-11	-2	0.029101
-11	-3	0.143969
-11	-4	0.069005
-11	-5	0.069005
-12	-1	0.285501
-12	-2	0.190797
-12	-3	0.201697
-12	-4	0.242563
-12	-5	0.242563
-13	-1	0.267369
-13	-2	0.180459
-13	-3	0.188169
-13	-4	0.242563
-13	-5	0.242563
-14	-1	0.528823
-14	-2	0.428856
-14	-3	0.428856
-14	-4	0.428856
-14	-5	0.428856
-15	-1	0.428856
-15	-2	0.428856
-15	-3	0.428856
-15	-4	0.428856
-15	-5	0.428856
-16	-1	0.202071
-16	-2	0.157954
-16	-3	0.204363
-16	-4	0.186077
-16	-5	0.186077
-17	-1	0.168442
-17	-2	0.189531
-17	-3	0.176195
-17	-4	0.186077
-17	-5	0.186077
-18	-1	0.150000
-18	-2	0.150000
-18	-3	0.150000
-18	-4	0.150000
-18	-5	0.150000
-19	-1	0.150000
-19	-2	0.150000
-19	-3	0.150000
-19	-4	0.150000
-19	-5	0.150000
-20	-1	0.128094
-20	-2	0.137154
-20	-3	0.109164
-20	-4	0.107923
-20	-5	0.107923
-21	-1	0.092048
-21	-2	0.096009
-21	-3	0.107923
-21	-4	0.107923
-21	-5	0.107923
-22	-1	0.150000
-22	-2	0.150000
-22	-3	0.150000
-22	-4	0.150000
-22	-5	0.150000
-23	-1	0.150000
-23	-2	0.150000
-23	-3	0.150000
-23	-4	0.150000
-23	-5	0.150000
+-23	1	0.15
+-23	2	0.15
+-23	3	0.15
+-23	4	0.15
+-23	5	0.15
+-22	1	0.15
+-22	2	0.15
+-22	3	0.15
+-22	4	0.15
+-22	5	0.15
+-21	1	0.15
+-21	2	0.15
+-21	3	0.15
+-21	4	0.15
+-21	5	0.15
+-20	1	0.15
+-20	2	0.15
+-20	3	0.15
+-20	4	0.15
+-20	5	0.15
+-19	1	0.15
+-19	2	0.15
+-19	3	0.15
+-19	4	0.15
+-19	5	0.15
+-18	1	0.15
+-18	2	0.15
+-18	3	0.15
+-18	4	0.15
+-18	5	0.15
+-17	1	0.15
+-17	2	0.15
+-17	3	0.15
+-17	4	0.15
+-17	5	0.15
+-16	1	0.15
+-16	2	0.15
+-16	3	0.15
+-16	4	0.15
+-16	5	0.15
+-15	1	0.15
+-15	2	0.15
+-15	3	0.15
+-15	4	0.15
+-15	5	0.15
+-14	1	0.15
+-14	2	0.15
+-14	3	0.15
+-14	4	0.15
+-14	5	0.15
+-13	1	0.15
+-13	2	0.15
+-13	3	0.15
+-13	4	0.15
+-13	5	0.15
+-12	1	0.15
+-12	2	0.15
+-12	3	0.15
+-12	4	0.15
+-12	5	0.15
+-11	1	0.15
+-11	2	0.15
+-11	3	0.15
+-11	4	0.15
+-11	5	0.15
+-10	2	0.15
+-10	3	0.15
+-10	4	0.15
+-10	5	0.15
+-9	2	0.15
+-9	3	0.15
+-9	4	0.15
+-9	5	0.15
+-8	2	0.15
+-8	3	0.15
+-8	4	0.15
+-8	5	0.15
+-7	2	0.15
+-7	3	0.15
+-7	4	0.15
+-7	5	0.15
+-6	2	0.15
+-6	3	0.15
+-6	4	0.15
+-6	5	0.15
+-5	2	0.15
+-5	3	0.15
+-5	4	0.15
+-5	5	0.15
+-4	2	0.15
+-4	3	0.15
+-4	4	0.15
+-4	5	0.15
+-3	2	0.15
+-3	3	0.15
+-3	4	0.15
+-3	5	0.15
+-2	2	0.15
+-2	3	0.15
+-2	4	0.15
+-2	5	0.15
+-1	1	0.15
+-1	2	0.15
+-1	3	0.15
+-1	4	0.15
+-1	5	0.15
+1	1	0.15
+1	2	0.15
+1	3	0.15
+1	4	0.15
+1	5	0.15
+2	1	0.15
+2	2	0.15
+2	3	0.15
+2	4	0.15
+2	5	0.15
+3	1	0.15
+3	2	0.15
+3	3	0.15
+3	4	0.15
+3	5	0.15
+4	1	0.15
+4	2	0.15
+4	3	0.15
+4	4	0.15
+4	5	0.15
+5	1	0.15
+5	2	0.15
+5	3	0.15
+5	4	0.15
+5	5	0.15
+6	1	0.15
+6	2	0.15
+6	3	0.15
+6	4	0.15
+6	5	0.15
+7	1	0.15
+7	2	0.15
+7	3	0.15
+7	4	0.15
+7	5	0.15
+8	1	0.15
+8	2	0.15
+8	3	0.15
+8	4	0.15
+8	5	0.15
+9	1	0.15
+9	2	0.15
+9	3	0.15
+9	4	0.15
+9	5	0.15
+10	1	0.15
+10	2	0.15
+10	3	0.15
+10	4	0.15
+10	5	0.15
+11	1	0.15
+11	2	0.15
+11	3	0.15
+11	4	0.15
+11	5	0.15
+12	1	0.15
+12	2	0.15
+12	3	0.15
+12	4	0.15
+12	5	0.15
+13	1	0.15
+13	2	0.15
+13	3	0.15
+13	4	0.15
+13	5	0.15
+14	1	0.15
+14	2	0.15
+14	3	0.15
+14	4	0.15
+14	5	0.15
+15	1	0.15
+15	2	0.15
+15	3	0.15
+15	4	0.15
+15	5	0.15
+16	1	0.15
+16	2	0.15
+16	3	0.15
+16	4	0.15
+16	5	0.15
+17	1	0.15
+17	2	0.15
+17	3	0.15
+17	4	0.15
+17	5	0.15
+18	1	0.15
+18	2	0.15
+18	3	0.15
+18	4	0.15
+18	5	0.15
+19	1	0.15
+19	2	0.15
+19	3	0.15
+19	4	0.15
+19	5	0.15
+20	1	0.15
+20	2	0.15
+20	3	0.15
+20	4	0.15
+20	5	0.15
+21	1	0.15
+21	2	0.15
+21	3	0.15
+21	4	0.15
+21	5	0.15
+22	1	0.15
+22	2	0.15
+22	3	0.15
+22	4	0.15
+22	5	0.15
+23	1	0.15
+23	2	0.15
+23	3	0.15
+23	4	0.15
+23	5	0.15
+-23	-1	0.15
+-23	-2	0.15
+-23	-3	0.15
+-23	-4	0.15
+-23	-5	0.15
+-22	-1	0.15
+-22	-2	0.15
+-22	-3	0.15
+-22	-4	0.15
+-22	-5	0.15
+-21	-1	0.15
+-21	-2	0.15
+-21	-3	0.15
+-21	-4	0.15
+-21	-5	0.15
+-20	-1	0.15
+-20	-2	0.15
+-20	-3	0.15
+-20	-4	0.15
+-20	-5	0.15
+-19	-1	0.15
+-19	-2	0.15
+-19	-3	0.15
+-19	-4	0.15
+-19	-5	0.15
+-18	-1	0.15
+-18	-2	0.15
+-18	-3	0.15
+-18	-4	0.15
+-18	-5	0.15
+-17	-1	0.15
+-17	-2	0.15
+-17	-3	0.15
+-17	-4	0.15
+-17	-5	0.15
+-16	-1	0.15
+-16	-2	0.15
+-16	-3	0.15
+-16	-4	0.15
+-16	-5	0.15
+-15	-1	0.15
+-15	-2	0.15
+-15	-3	0.15
+-15	-4	0.15
+-15	-5	0.15
+-14	-1	0.15
+-14	-2	0.15
+-14	-3	0.15
+-14	-4	0.15
+-14	-5	0.15
+-13	-1	0.15
+-13	-2	0.15
+-13	-3	0.15
+-13	-4	0.15
+-13	-5	0.15
+-12	-1	0.15
+-12	-2	0.15
+-12	-3	0.15
+-12	-4	0.15
+-12	-5	0.15
+-11	-1	0.15
+-11	-2	0.15
+-11	-3	0.15
+-11	-4	0.15
+-11	-5	0.15
+-10	-2	0.15
+-10	-3	0.15
+-10	-4	0.15
+-10	-5	0.15
+-9	-2	0.15
+-9	-3	0.15
+-9	-4	0.15
+-9	-5	0.15
+-8	-2	0.15
+-8	-3	0.15
+-8	-4	0.15
+-8	-5	0.15
+-7	-2	0.15
+-7	-3	0.15
+-7	-4	0.15
+-7	-5	0.15
+-6	-2	0.15
+-6	-3	0.15
+-6	-4	0.15
+-6	-5	0.15
+-5	-2	0.15
+-5	-3	0.15
+-5	-4	0.15
+-5	-5	0.15
+-4	-2	0.15
+-4	-3	0.15
+-4	-4	0.15
+-4	-5	0.15
+-3	-2	0.15
+-3	-3	0.15
+-3	-4	0.15
+-3	-5	0.15
+-2	-2	0.15
+-2	-3	0.15
+-2	-4	0.15
+-2	-5	0.15
+-1	-1	0.15
+-1	-2	0.15
+-1	-3	0.15
+-1	-4	0.15
+-1	-5	0.15
+1	-1	0.15
+1	-2	0.15
+1	-3	0.15
+1	-4	0.15
+1	-5	0.15
+2	-1	0.15
+2	-2	0.15
+2	-3	0.15
+2	-4	0.15
+2	-5	0.15
+3	-1	0.15
+3	-2	0.15
+3	-3	0.15
+3	-4	0.15
+3	-5	0.15
+4	-1	0.15
+4	-2	0.15
+4	-3	0.15
+4	-4	0.15
+4	-5	0.15
+5	-1	0.15
+5	-2	0.15
+5	-3	0.15
+5	-4	0.15
+5	-5	0.15
+6	-1	0.15
+6	-2	0.15
+6	-3	0.15
+6	-4	0.15
+6	-5	0.15
+7	-1	0.15
+7	-2	0.15
+7	-3	0.15
+7	-4	0.15
+7	-5	0.15
+8	-1	0.15
+8	-2	0.15
+8	-3	0.15
+8	-4	0.15
+8	-5	0.15
+9	-1	0.15
+9	-2	0.15
+9	-3	0.15
+9	-4	0.15
+9	-5	0.15
+10	-1	0.15
+10	-2	0.15
+10	-3	0.15
+10	-4	0.15
+10	-5	0.15
+11	-1	0.15
+11	-2	0.15
+11	-3	0.15
+11	-4	0.15
+11	-5	0.15
+12	-1	0.15
+12	-2	0.15
+12	-3	0.15
+12	-4	0.15
+12	-5	0.15
+13	-1	0.15
+13	-2	0.15
+13	-3	0.15
+13	-4	0.15
+13	-5	0.15
+14	-1	0.15
+14	-2	0.15
+14	-3	0.15
+14	-4	0.15
+14	-5	0.15
+15	-1	0.15
+15	-2	0.15
+15	-3	0.15
+15	-4	0.15
+15	-5	0.15
+16	-1	0.15
+16	-2	0.15
+16	-3	0.15
+16	-4	0.15
+16	-5	0.15
+17	-1	0.15
+17	-2	0.15
+17	-3	0.15
+17	-4	0.15
+17	-5	0.15
+18	-1	0.15
+18	-2	0.15
+18	-3	0.15
+18	-4	0.15
+18	-5	0.15
+19	-1	0.15
+19	-2	0.15
+19	-3	0.15
+19	-4	0.15
+19	-5	0.15
+20	-1	0.15
+20	-2	0.15
+20	-3	0.15
+20	-4	0.15
+20	-5	0.15
+21	-1	0.15
+21	-2	0.15
+21	-3	0.15
+21	-4	0.15
+21	-5	0.15
+22	-1	0.15
+22	-2	0.15
+22	-3	0.15
+22	-4	0.15
+22	-5	0.15
+23	-1	0.15
+23	-2	0.15
+23	-3	0.15
+23	-4	0.15
+23	-5	0.15

hps-java/src/main/resources/org/lcsim/hps/calib/proposal2014/calibECal
fadc02.ped removed after 1.1
diff -N fadc02.ped
--- fadc02.ped	1 Nov 2012 00:18:04 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,192 +0,0 @@
- 5  0    69  1.173
- 5  1    53  1.149
- 5  2    72  1.113
- 5  3    99  1.152
- 5  4   104  1.175
- 5  5    88  1.112
- 5  6    86  1.190
- 5  7   116  1.125
- 5  8    99  1.222
- 5  9   102  1.218
- 5 10    72  1.189
- 5 11   113  1.159
- 5 12   100  1.117
- 5 13    77  1.060
- 5 14    89  1.063
- 5 15   166  1.234
- 6  0    68  1.116
- 6  1    87  1.142
- 6  2    94  1.203
- 6  3    83  1.044
- 6  4   122  1.212
- 6  5    91  1.216
- 6  6    63  1.223
- 6  7    63  1.255
- 6  8    94  1.233
- 6  9   138  1.236
- 6 10    91  1.265
- 6 11   107  1.239
- 6 12    67  1.123
- 6 13   128  1.201
- 6 14    80  1.021
- 6 15   100  1.057
- 7  0   151  7.369
- 7  1    84 13.269
- 7  2    83 10.519
- 7  3   103  7.571
- 7  4   112  7.478
- 7  5   124 16.000
- 7  6   107  9.570
- 7  7    88 10.393
- 7  8   126  6.903
- 7  9   110  5.988
- 7 10    89  1.220
- 7 11    85  1.156
- 7 12    94  1.155
- 7 13   110  1.108
- 7 14   100  0.970
- 7 15   120  1.012
- 8  0   115  4.564
- 8  1   126  4.546
- 8  2    93  4.412
- 8  3   100  4.566
- 8  4   108  4.577
- 8  5    86  9.030
- 8  6   122  8.905
- 8  7   135  5.641
- 8  8    87  6.200
- 8  9   152 11.851
- 8 10   111  5.888
- 8 11    80  4.826
- 8 12   105  4.623
- 8 13    93  9.689
- 8 14    82  4.664
- 8 15    95  4.271
- 9  0    84  4.473
- 9  1   110  4.559
- 9  2   118  4.440
- 9  3   123  6.788
- 9  4   178  4.718
- 9  5   183  4.684
- 9  6   138  4.552
- 9  7   152  4.512
- 9  8   102  9.983
- 9  9   134  4.558
- 9 10   120  4.551
- 9 11   132  4.277
- 9 12   130  4.373
- 9 13   133  5.099
- 9 14   157  4.411
- 9 15   122  4.460
-10  0   118 11.067
-10  1   147  5.341
-10  2   123  4.645
-10  3    81  4.555
-10  4    68  4.843
-10  5   162  5.978
-10  6   112  4.818
-10  7   111  6.061
-10  8   129  5.430
-10  9   123  7.296
-10 10   106 14.046
-10 11    99  5.061
-10 12   149  5.405
-10 13   127  5.207
-10 14   107  5.823
-10 15   117  9.128
-13  0   124  7.289
-13  1   135  4.673
-13  2    91  4.722
-13  3   131  4.847
-13  4    87  5.325
-13  5   114  4.611
-13  6    93  4.716
-13  7    93  4.676
-13  8   134  4.422
-13  9   103  8.114
-13 10    78  5.227
-13 11   125  4.614
-13 12   108  4.671
-13 13   103  4.806
-13 14   103  6.902
-13 15   106  1.163
-14  0   112  4.651
-14  1   114  4.433
-14  2   148 11.841
-14  3   111  4.747
-14  4    96  4.469
-14  5   114  4.429
-14  6   101  4.331
-14  7   113  7.532
-14  8   110  4.568
-14  9   120  4.441
-14 10    88  4.381
-14 11    94  4.273
-14 12   135  7.767
-14 13   103  4.409
-14 14   132  4.434
-14 15   122  4.923
-15  0   109  4.463
-15  1   132  4.198
-15  2   127  5.861
-15  3   146  4.565
-15  4   132  4.677
-15  5   103 13.438
-15  6   119  5.045
-15  7   113  5.857
-15  8   107  4.596
-15  9   120 13.832
-15 10    81  4.380
-15 11   137  5.146
-15 12   123  4.418
-15 13   135  4.482
-15 14   145  7.178
-15 15   157  4.863
-16  0   121  1.179
-16  1    63  1.169
-16  2    61  1.210
-16  3    88  1.067
-16  4    68  1.340
-16  5    64  1.221
-16  6    79  1.180
-16  7   103  1.142
-16  8   102  1.266
-16  9    84  1.152
-16 10    47  1.241
-16 11    89  1.091
-16 12    61  1.115
-16 13    81  1.044
-16 14    66  1.058
-16 15    98  1.086
-17  0    82  1.159
-17  1    79  1.189
-17  2    47  1.210
-17  3    86  1.131
-17  4    96  1.275
-17  5    84  1.218
-17  6    88  1.208
-17  7    87  1.231
-17  8    92  1.229
-17  9   109  1.305
-17 10    91  1.146
-17 11    44  1.212
-17 12   109  1.167
-17 13    77  1.096
-17 14   104  1.096
-17 15    93  1.091
-18  0   112  1.203
-18  1    81  1.278
-18  2   109  1.229
-18  3   128  6.583
-18  4    93  1.600
-18  5    94  1.248
-18  6    88  1.536
-18  7   123  1.254
-18  8   124  1.204
-18  9    92  1.301
-18 10    78  1.175
-18 11   113  1.159
-18 12    94  1.129
-18 13    95  1.004
-18 14    98  1.096
-18 15   139  1.650

hps-java/src/main/resources/org/lcsim/hps/calib/proposal2014/calibECal
ecal02.ped removed after 1.1
diff -N ecal02.ped
--- ecal02.ped	1 Nov 2012 00:18:04 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,193 +0,0 @@
-#run 779
-5	0	0.000000	0.000000
-5	1	80.529774	5.183932
-5	2	99.033355	4.577570
-5	3	125.653285	4.577083
-5	4	0.000000	0.000000
-5	5	0.000000	0.000000
-5	6	112.120611	5.209091
-5	7	141.858603	4.590507
-5	8	125.509536	4.489494
-5	9	128.886992	4.530635
-5	10	0.000000	0.000000
-5	11	140.961064	3.870921
-5	12	127.263041	1.340183
-5	13	103.767348	1.149825
-5	14	116.094770	4.323570
-5	15	115.994836	4.286831
-6	0	94.140870	1.230945
-6	1	113.761020	1.209416
-6	2	120.761767	1.155833
-6	3	83.825159	1.140665
-6	4	122.960976	1.236118
-6	5	91.608108	1.253636
-6	6	63.473237	1.261579
-6	7	63.715118	1.330205
-6	8	120.249615	1.391363
-6	9	163.668095	1.379636
-6	10	118.482619	1.391895
-6	11	133.338805	1.300871
-6	12	93.035069	1.187017
-6	13	154.219073	1.397834
-6	14	106.780532	1.121237
-6	15	127.145858	1.241024
-7	0	177.259020	4.299900
-7	1	109.067853	4.461004
-7	2	108.095188	4.408252
-7	3	128.900439	4.481608
-7	4	137.591606	4.385399
-7	5	149.700044	4.932701
-7	6	132.472248	4.225537
-7	7	113.937179	4.680026
-7	8	151.837398	4.568031
-7	9	135.341727	3.797203
-7	10	114.828653	5.002666
-7	11	111.454406	4.401806
-7	12	120.406131	4.299772
-7	13	135.814788	4.345661
-7	14	125.841024	4.520295
-7	15	145.541925	4.504027
-8	0	115.386333	4.556965
-8	1	126.310723	4.507746
-8	2	93.363481	4.450744
-8	3	100.732916	4.592013
-8	4	109.029620	4.615043
-8	5	85.907185	5.189784
-8	6	122.628301	4.727416
-8	7	135.220633	4.442587
-8	8	87.693606	4.974180
-8	9	151.061723	4.459036
-8	10	111.488904	4.329126
-8	11	80.190793	4.696709
-8	12	106.023511	4.529711
-8	13	93.008086	4.459666
-8	14	82.122149	4.467751
-8	15	95.897737	4.282606
-9	0	84.273786	4.558636
-9	1	110.529949	4.550227
-9	2	119.650780	4.431388
-9	3	124.057855	5.618816
-9	4	178.439662	4.469162
-9	5	183.355812	4.441631
-9	6	138.079917	4.492002
-9	7	152.833487	4.438793
-9	8	101.884663	5.327445
-9	9	133.846715	4.614630
-9	10	120.420303	4.573332
-9	11	132.845001	4.319173
-9	12	130.800330	4.404270
-9	13	133.703955	5.034839
-9	14	157.276906	4.399652
-9	15	122.117601	4.436709
-10	0	117.497517	4.771015
-10	1	146.550121	5.386350
-10	2	123.830850	4.674474
-10	3	82.408328	4.650409
-10	4	68.708020	4.811942
-10	5	162.149066	4.608059
-10	6	112.478247	4.806810
-10	7	111.266447	4.564499
-10	8	129.500923	5.414661
-10	9	123.370556	6.726442
-10	10	105.524786	5.479346
-10	11	99.955834	4.738537
-10	12	150.250209	4.734827
-10	13	127.529818	5.218872
-10	14	107.675654	5.624528
-10	15	117.549154	5.324775
-13	0	123.873654	4.933038
-13	1	135.355460	4.666577
-13	2	90.018853	4.680243
-13	3	131.391299	4.810872
-13	4	87.356867	5.382661
-13	5	114.173764	4.495687
-13	6	93.284838	4.691916
-13	7	93.567568	4.657526
-13	8	133.832960	4.353028
-13	9	102.834212	5.670480
-13	10	78.220127	4.512189
-13	11	125.387431	4.636600
-13	12	107.572116	4.703694
-13	13	103.696704	4.860173
-13	14	103.472907	6.783198
-13	15	115.995122	4.563603
-14	0	112.406504	4.617921
-14	1	113.676862	4.371800
-14	2	147.506043	5.193580
-14	3	111.030477	4.479394
-14	4	96.277192	4.478274
-14	5	114.148715	4.330008
-14	6	101.008921	4.379705
-14	7	112.291321	5.523875
-14	8	110.126192	4.467112
-14	9	119.800637	4.443557
-14	10	88.235838	4.333686
-14	11	93.379587	4.394233
-14	12	135.395408	4.987177
-14	13	102.868556	4.480980
-14	14	132.337706	4.401341
-14	15	122.361327	4.105926
-15	0	108.610833	4.688491
-15	1	131.682553	4.158603
-15	2	126.523050	4.268569
-15	3	146.410701	4.134815
-15	4	132.099407	4.821326
-15	5	101.597407	4.567937
-15	6	119.482531	4.259433
-15	7	112.536322	4.456808
-15	8	106.457877	4.642189
-15	9	118.738541	4.581698
-15	10	80.793935	4.414593
-15	11	137.133026	4.463713
-15	12	123.224149	4.451414
-15	13	135.160426	4.199423
-15	14	145.140321	4.272157
-15	15	157.265238	4.444332
-16	0	147.422588	4.502546
-16	1	88.786135	4.449609
-16	2	87.432762	4.627670
-16	3	113.719402	4.647743
-16	4	93.290464	1.233811
-16	5	90.291145	1.225869
-16	6	104.703142	1.300452
-16	7	129.753241	1.263720
-16	8	128.358844	4.656485
-16	9	109.957108	4.707433
-16	10	73.366733	4.896968
-16	11	115.475808	4.833335
-16	12	87.495166	4.583176
-16	13	107.688794	4.833941
-16	14	92.225357	6.669771
-16	15	0.000000	0.000000
-17	0	0.000000	0.000000
-17	1	0.000000	0.000000
-17	2	0.000000	0.000000
-17	3	111.414239	4.692240
-17	4	122.358888	4.839637
-17	5	120.549462	3.199484
-17	6	124.817073	3.312250
-17	7	113.477060	8.342126
-17	8	118.353702	1.366433
-17	9	144.241090	3.212091
-17	10	127.183454	3.291891
-17	11	79.903757	3.254422
-17	12	135.736783	8.718844
-17	13	103.362008	7.076536
-17	14	130.626434	6.906205
-17	15	119.591606	6.391432
-18	0	137.334893	4.609294
-18	1	108.122193	4.580594
-18	2	134.941310	4.672689
-18	3	0.000000	0.000000
-18	4	127.951022	3.399826
-18	5	120.759767	4.704572
-18	6	114.574006	4.678216
-18	7	149.596484	4.416967
-18	8	159.683740	3.187260
-18	9	0.000000	0.000000
-18	10	104.778928	4.638093
-18	11	138.539310	4.615002
-18	12	119.921446	5.234115
-18	13	121.152472	4.813464
-18	14	124.434366	4.848701
-18	15	122.967743	4.492902

hps-java/src/main/resources/org/lcsim/hps/calib/proposal2014/calibECal
ecal01.ped removed after 1.1
diff -N ecal01.ped
--- ecal01.ped	1 Nov 2012 00:18:04 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,209 +0,0 @@
-#run 779
-4	0	96.887387	4.949092
-4	1	113.858339	4.779299
-4	2	103.011602	4.756676
-4	3	68.905977	4.666130
-4	4	94.676225	4.851552
-4	5	99.840035	4.609953
-4	6	119.780290	5.223849
-4	7	135.439640	4.759890
-4	8	99.438893	4.681595
-4	9	110.188794	4.471728
-4	10	120.289145	4.491933
-4	11	109.420303	5.012085
-4	12	113.199539	4.559967
-4	13	123.814348	4.429527
-4	14	112.445616	4.747810
-4	15	108.937332	4.984805
-5	0	123.890112	4.828843
-5	1	112.396924	5.063473
-5	2	114.069128	4.869058
-5	3	108.107317	4.778417
-5	4	121.657284	4.886534
-5	5	118.665392	4.793670
-5	6	117.021358	5.026494
-5	7	118.184926	4.808853
-5	8	68.271171	4.818924
-5	9	95.225137	4.697389
-5	10	136.132410	3.203719
-5	11	120.110833	5.074365
-5	12	114.815579	4.894374
-5	13	108.458405	4.813733
-5	14	97.631685	4.616990
-5	15	129.088244	4.494352
-6	0	157.044386	5.130489
-6	1	105.501384	5.013985
-6	2	95.660976	5.329157
-6	3	93.824214	5.979423
-6	4	106.563920	5.015256
-6	5	104.338629	5.230630
-6	6	64.145441	5.160360
-6	7	114.505801	5.089854
-6	8	101.228697	5.223735
-6	9	125.635816	4.973178
-6	10	120.063129	4.859077
-6	11	152.191387	5.263188
-6	12	129.477280	4.870595
-6	13	112.911206	6.263300
-6	14	103.979147	5.496555
-6	15	96.437508	5.043576
-7	0	141.902395	4.515382
-7	1	124.083366	4.418762
-7	2	114.748693	4.621192
-7	3	64.213623	4.353565
-7	4	162.543837	4.477160
-7	5	146.364425	5.842361
-7	6	136.619205	4.395851
-7	7	151.861107	4.581681
-7	8	124.890793	4.525688
-7	9	138.735772	4.627528
-7	10	135.972709	7.203090
-7	11	126.503362	5.999500
-7	12	113.264294	4.862836
-7	13	143.743331	4.998951
-7	14	119.593562	4.834090
-7	15	144.606548	5.739149
-8	0	99.888969	4.713650
-8	1	118.603208	4.593727
-8	2	153.175610	5.212320
-8	3	147.654296	4.685222
-8	4	103.196484	4.770467
-8	5	113.902922	4.472153
-8	6	74.606614	4.138166
-8	7	111.227510	4.770055
-8	8	103.842364	4.553071
-8	9	113.860514	4.587887
-8	10	68.013931	4.643936
-8	11	129.957108	4.310525
-8	12	122.327554	4.574878
-8	13	90.822654	2.814189
-8	14	92.497407	4.515797
-8	15	127.167084	4.526985
-9	0	130.682048	4.625446
-9	1	110.902461	4.088281
-9	2	119.659877	3.941682
-9	3	113.995232	4.681093
-9	4	114.068996	4.445419
-9	5	110.098484	4.544936
-9	6	63.975720	4.228323
-9	7	165.411800	4.595603
-9	8	134.889079	4.592007
-9	9	92.571567	4.533380
-9	10	108.874181	4.559655
-9	11	105.056427	4.624676
-9	12	123.378752	4.618042
-9	13	118.646188	4.625051
-9	14	107.585058	4.605711
-9	15	95.363239	4.435322
-10	0	84.443529	5.837976
-10	1	84.704702	5.279514
-10	2	115.882048	5.169440
-10	3	94.493913	5.173143
-10	4	104.346078	5.385278
-10	5	121.623621	5.272183
-10	6	110.880268	5.214579
-10	7	121.830411	4.993507
-10	8	139.333531	5.055774
-10	9	109.132608	5.503074
-10	10	154.789189	4.820020
-10	11	109.922588	4.606646
-10	12	79.130015	4.585916
-10	13	144.663305	4.536925
-10	14	90.575939	4.633202
-10	15	149.403626	5.139878
-13	0	123.463239	4.699374
-13	1	113.202285	4.642272
-13	2	110.553768	5.570861
-13	3	110.991738	6.410431
-13	4	109.545309	4.894048
-13	5	89.842145	4.764938
-13	6	146.954428	4.695556
-13	7	99.759130	4.751175
-13	8	128.125709	5.714118
-13	9	101.989233	4.832853
-13	10	106.601296	4.721393
-13	11	92.770842	4.749222
-13	12	112.148715	4.732788
-13	13	103.091035	4.996874
-13	14	103.107932	4.766658
-13	15	123.056471	4.402225
-14	0	136.643924	4.727412
-14	1	134.324478	4.628125
-14	2	144.749681	4.668888
-14	3	80.544012	4.427966
-14	4	126.052164	4.727429
-14	5	129.697517	4.681844
-14	6	130.354801	4.533350
-14	7	159.556845	4.582064
-14	8	118.229620	4.652368
-14	9	155.526368	4.602780
-14	10	131.699121	4.528275
-14	11	106.299604	4.557641
-14	12	142.321710	4.597581
-14	13	93.785673	4.539404
-14	14	100.124412	4.553651
-14	15	156.368425	4.583002
-15	0	115.168183	4.958387
-15	1	113.848033	7.070709
-15	2	154.360514	4.455227
-15	3	94.208152	4.710566
-15	4	120.691189	4.783449
-15	5	144.728675	4.757249
-15	6	124.683059	4.640313
-15	7	108.568754	4.672078
-15	8	96.390925	4.675274
-15	9	162.625093	4.657860
-15	10	133.398770	4.624505
-15	11	114.095188	4.568802
-15	12	110.362140	4.444265
-15	13	127.391233	4.586274
-15	14	96.235289	4.222421
-15	15	148.562668	4.616163
-16	0	126.662008	5.505865
-16	1	107.964579	5.168331
-16	2	144.463437	4.977265
-16	3	113.266293	4.998483
-16	4	132.387783	5.720807
-16	5	128.374072	6.413551
-16	6	139.636937	5.144893
-16	7	109.882070	4.912319
-16	8	115.208350	4.656678
-16	9	141.833619	6.092844
-16	10	138.476181	5.023447
-16	11	133.591826	5.185107
-16	12	119.469369	5.075001
-16	13	115.928082	5.118661
-16	14	149.800088	5.547417
-16	15	121.388200	5.026296
-17	0	119.794814	4.899612
-17	1	104.684465	5.072849
-17	2	0.000000	0.000000
-17	3	92.236058	10.821286
-17	4	113.402109	11.010827
-17	5	137.933223	10.523690
-17	6	105.679235	10.725159
-17	7	115.219754	11.812031
-17	8	123.954603	10.252431
-17	9	139.999714	10.162541
-17	10	124.207537	10.886374
-17	11	120.766820	10.448765
-17	12	132.763085	4.950845
-17	13	119.546561	4.822599
-17	14	112.779301	4.584185
-17	15	122.996814	4.507994
-18	0	117.683476	12.317849
-18	1	136.248759	10.256967
-18	2	145.760185	10.521442
-18	3	101.284751	10.548288
-18	4	96.422940	10.863300
-18	5	0.000000	0.000000
-18	6	89.492903	11.827612
-18	7	86.652824	10.890979
-18	8	95.060031	10.623966
-18	9	120.817381	9.925038
-18	10	108.515205	5.036245
-18	11	99.872160	4.936370
-18	12	129.498110	4.869272
-18	13	145.102022	4.672442
-18	14	101.370248	4.784008
-18	15	143.666403	5.113236

hps-java/src/main/resources/org/lcsim/hps/calib/proposal2014/calibECal
fadc01.ped removed after 1.1
diff -N fadc01.ped
--- fadc01.ped	1 Nov 2012 00:18:04 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,208 +0,0 @@
- 4  0    96  4.847
- 4  1   113  4.677
- 4  2   103  4.589
- 4  3    68  4.539
- 4  4    94  4.606
- 4  5   100  4.451
- 4  6   119  5.096
- 4  7   135  4.632
- 4  8    99  4.578
- 4  9   109  5.112
- 4 10   120  4.681
- 4 11   108  4.968
- 4 12   112  4.539
- 4 13   123  4.422
- 4 14   112  4.708
- 4 15   109  9.048
- 5  0   123  4.815
- 5  1   112  4.898
- 5  2   113  4.654
- 5  3   108  4.590
- 5  4   121  4.758
- 5  5   118  4.725
- 5  6   117  8.193
- 5  7   118  4.653
- 5  8    68  4.727
- 5  9    95  4.553
- 5 10   136  3.208
- 5 11   120 11.768
- 5 12   115  5.135
- 5 13   108  4.652
- 5 14    97  4.392
- 5 15   184  1.441
- 6  0   156  5.013
- 6  1   106  4.919
- 6  2    95  5.061
- 6  3    93  5.517
- 6  4   107  4.823
- 6  5   104  4.941
- 6  6    64  4.940
- 6  7   114  7.076
- 6  8   101  5.358
- 6  9   125  4.798
- 6 10   119  4.665
- 6 11   152  4.986
- 6 12   129  4.810
- 6 13   112 11.593
- 6 14   104  5.134
- 6 15    96  4.682
- 7  0   142  4.507
- 7  1   125  8.294
- 7  2   115  7.674
- 7  3    64  4.370
- 7  4   162  4.454
- 7  5   146  6.342
- 7  6   137  6.155
- 7  7   152  5.757
- 7  8   125  4.528
- 7  9   139  4.555
- 7 10   135  7.200
- 7 11   126  5.581
- 7 12   113  4.723
- 7 13   143  4.738
- 7 14   120  4.753
- 7 15   145  9.729
- 8  0    99  4.517
- 8  1   118  4.518
- 8  2   153  5.126
- 8  3   148  4.693
- 8  4   103  4.691
- 8  5   114  4.449
- 8  6    74  4.221
- 8  7   110  4.742
- 8  8   103  4.490
- 8  9   113  4.528
- 8 10    68 11.579
- 8 11   130  4.272
- 8 12   122  4.537
- 8 13    90  5.637
- 8 14    92  8.909
- 8 15   127  4.577
- 9  0   130  4.682
- 9  1   110  4.018
- 9  2   119  3.980
- 9  3   114  6.446
- 9  4   114  4.546
- 9  5   110  5.240
- 9  6    63  4.229
- 9  7   165  4.569
- 9  8   134  7.217
- 9  9    92  4.958
- 9 10   109 10.711
- 9 11   105  4.644
- 9 12   122  4.609
- 9 13   118  4.561
- 9 14   107  4.841
- 9 15    96  4.435
-10  0    84  5.452
-10  1    85  5.134
-10  2   116  6.942
-10  3    94  5.063
-10  4   104  5.253
-10  5   121  5.726
-10  6   110  5.114
-10  7   121  8.034
-10  8   139  5.357
-10  9   109  5.341
-10 10   154  4.665
-10 11   109  4.577
-10 12    78  4.603
-10 13   144  4.570
-10 14    89  4.569
-10 15   166  1.510
-13  0   124  4.660
-13  1   113  4.641
-13  2   110  5.383
-13  3   110  6.101
-13  4   109  8.384
-13  5    89  4.746
-13  6   147  4.637
-13  7   100  4.753
-13  8   128  5.591
-13  9   102  5.267
-13 10   106  4.624
-13 11    92  4.669
-13 12   112  4.709
-13 13   103  4.964
-13 14   103  6.764
-13 15   123  4.344
-14  0   137  4.716
-14  1   135  4.604
-14  2   144  4.623
-14  3    80  4.422
-14  4   126  4.647
-14  5   130  4.729
-14  6   130  4.507
-14  7   160 11.291
-14  8   118  5.720
-14  9   155  4.579
-14 10   131  4.486
-14 11   106  4.574
-14 12   143  7.722
-14 13    93  4.471
-14 14    99  4.501
-14 15   155  4.567
-15  0   115  4.842
-15  1   114  9.819
-15  2   155  6.899
-15  3    94  6.053
-15  4   120  4.568
-15  5   147 13.872
-15  6   125 13.905
-15  7   108  5.561
-15  8    97  4.676
-15  9   165 19.590
-15 10   133  5.336
-15 11   114  4.741
-15 12   111  4.440
-15 13   128  8.927
-15 14    96  5.363
-15 15   148  4.707
-16  0   126  5.556
-16  1   108  5.058
-16  2   144  4.905
-16  3   113  5.050
-16  4   133  8.231
-16  5   128  6.381
-16  6   139  4.884
-16  7   109  4.875
-16  8   114  4.593
-16  9   142 10.174
-16 10   138  4.937
-16 11   133  8.471
-16 12   119  4.916
-16 13   115  4.994
-16 14   150  8.259
-16 15   120  4.850
-17  0   120  4.740
-17  1   105  4.959
-17  2   132 11.274
-17  3    92 10.674
-17  4   113 10.750
-17  5   137 10.491
-17  6   105 10.736
-17  7   114 10.748
-17  8   124 10.006
-17  9   139 10.062
-17 10   123 10.658
-17 11   120 10.576
-17 12   132  4.713
-17 13   119  4.679
-17 14   112  4.407
-17 15   123  4.457
-18  0   117 10.500
-18  1   136 10.279
-18  2   145 10.373
-18  3   101 10.505
-18  4    96 10.547
-18  5   138 10.450
-18  6    89 12.060
-18  7    86 10.576
-18  8    94 10.074
-18  9   120  9.706
-18 10   109 24.978
-18 11   100  4.784
-18 12   129  5.644
-18 13   144  4.520
-18 14   101  4.629
-18 15   143  5.041
CVSspam 0.2.12


Use REPLY-ALL to reply to list

To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1