java/branches/hps_java_trunk_HPSJAVA-255/ecal-recon/src/main/java/org/hps/recon/ecal

EcalRawConverterDriver.java 1113 -> 1114

--- java/branches/hps_java_trunk_HPSJAVA-255/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverterDriver.java	2014-09-30 16:25:14 UTC (rev 1113)
+++ java/branches/hps_java_trunk_HPSJAVA-255/ecal-recon/src/main/java/org/hps/recon/ecal/EcalRawConverterDriver.java	2014-09-30 19:49:00 UTC (rev 1114)
@@ -3,16 +3,13 @@

 import java.util.ArrayList;
 import java.util.List;

-import org.hps.conditions.ConditionsDriver;

 import org.hps.conditions.TableConstants;

-import org.hps.conditions.ecal.EcalChannel.EcalChannelCollection;

 import org.hps.conditions.ecal.EcalChannel.GeometryId;
 import org.hps.conditions.ecal.EcalChannelConstants;
 import org.hps.conditions.ecal.EcalConditions;
 import org.hps.conditions.ecal.EcalConditionsUtil;
 import org.lcsim.conditions.ConditionsManager;
 import org.lcsim.detector.identifier.IIdentifier;

-import org.lcsim.detector.identifier.IIdentifierHelper;

 import org.lcsim.detector.identifier.Identifier;
 import org.hps.conditions.ecal.EcalChannel.EcalChannelCollection;
 import org.lcsim.detector.identifier.IIdentifierHelper;

@@ -32,13 +29,14 @@

  */
 public class EcalRawConverterDriver extends Driver {

-	// To import database conditions
-    static EcalConditions ecalConditions = null;
-    static IIdentifierHelper helper = null;
-    static EcalChannelCollection channels = null; 
-

+    // To import database conditions
+    private static EcalConditions ecalConditions = null;
+    private static IIdentifierHelper helper = null;
+    private static EcalChannelCollection channels = null;
+    EcalConditionsUtil util = null;
+

     Detector detector = null;

     EcalRawConverter converter = null;
     String rawCollectionName = "EcalReadoutHits";
     String ecalReadoutName = "EcalHits";

@@ -53,7 +51,7 @@

     private boolean useTruthTime = false;
 
     public EcalRawConverterDriver() {

-    	converter = new EcalRawConverter();

+        converter = new EcalRawConverter();

     }
 
     public void setUse2014Gain(boolean use2014Gain) {

@@ -113,43 +111,46 @@

 
     @Override
     public void detectorChanged(Detector detector) {

-    	
-    	converter.setDetector(detector);
-    	
-    	// set the detector for the converter

+
+        converter.setDetector(detector);
+
+        // set the detector for the converter

         this.detector = detector;

         // ECAL combined conditions object.
         ecalConditions = ConditionsManager.defaultInstance()
                 .getCachedConditions(EcalConditions.class, TableConstants.ECAL_CONDITIONS).getCachedData();

         // List of channels.
         channels = ecalConditions.getChannelCollection();

         // ID helper.
         helper = detector.getSubdetector("Ecal").getDetectorElement().getIdentifierHelper();

+
+        util = new EcalConditionsUtil();
+

         System.out.println("You are now using the database conditions for EcalRawConverterDriver.");
     }

     /**
      * @return false if the channel is a good one, true if it is a bad one
      * @param CalorimeterHit
      */

-    public static boolean isBadCrystal(CalorimeterHit hit) {

+    public static boolean isBadCrystal(CalorimeterHit hit) {

         // Get the channel data.
         EcalChannelConstants channelData = findChannel(hit.getCellID());

         return channelData.isBadChannel();
     }

     /**
      * @return false if the ADC is a good one, true if it is a bad one
      * @param CalorimeterHit
      */

-    public boolean isBadFADC(CalorimeterHit hit) {

+    public boolean isBadFADC(CalorimeterHit hit) {

         return (getCrate(hit.getCellID()) == 1 && getSlot(hit.getCellID()) == 3);
     }

     private static double getTimestamp(int system, EventHeader event) { //FIXME: copied from org.hps.readout.ecal.ReadoutTimestamp
         if (event.hasCollection(GenericObject.class, "ReadoutTimestamps")) {
             List<GenericObject> timestamps = event.get(GenericObject.class, "ReadoutTimestamps");

@@ -181,7 +182,6 @@

             timeOffset += ((t0ECal + 250.0) % 500.0) - 250.0;
         }

         int flags = 0;
         flags += 1 << LCIOConstants.RCHBIT_TIME; //store hit time
         flags += 1 << LCIOConstants.RCHBIT_LONG; //store hit position; this flag has no effect for RawCalorimeterHits

@@ -195,10 +195,10 @@

 
                 for (RawTrackerHit hit : hits) {
                     CalorimeterHit newHit = converter.HitDtoA(hit);

                     // Get the channel data.
                     EcalChannelConstants channelData = findChannel(newHit.getCellID());

                     if (applyBadCrystalMap && channelData.isBadChannel()) {
                         continue;
                     }

@@ -219,7 +219,7 @@

                         System.out.format("old hit energy %d\n", hit.getAmplitude());
                     }
                     CalorimeterHit newHit = converter.HitDtoA(hit, integralWindow, timeOffset);

                     if (newHit.getRawEnergy() > threshold) {
                         if (applyBadCrystalMap && isBadCrystal(newHit)) {
                             continue;

@@ -256,52 +256,49 @@

             }
         }
     }

-    
-    
-    /**

+
+    /**

      * Convert physical ID to gain value.

+     *

      * @param cellID (long)
      * @return channel constants (EcalChannelConstants)
      */
     private static EcalChannelConstants findChannel(long cellID) {
         // Make an ID object from raw hit ID.
         IIdentifier id = new Identifier(cellID);

         // Get physical field values.
         int system = helper.getValue(id, "system");
         int x = helper.getValue(id, "ix");
         int y = helper.getValue(id, "iy");

         // Create an ID to search for in channel collection.

-        GeometryId geometryId = new GeometryId(helper, new int[] { system, x, y });
-

+        GeometryId geometryId = new GeometryId(helper, new int[]{system, x, y});
+

         // Get the channel data.

-        return ecalConditions.getChannelConstants(channels.findChannel(geometryId));

+        return ecalConditions.getChannelConstants(channels.findChannel(geometryId));

     /**
      * Return crate number from cellID

+     *

      * @param cellID (long)
      * @return Crate number (int)
      */
     private int getCrate(long cellID) {

-        
-        EcalConditionsUtil util = new EcalConditionsUtil();
-

         // Find the ECAL channel and return the crate number.
         return util.getCrate(helper, cellID);
     }

     /**
      * Return slot number from cellID

+     *

      * @param cellID (long)
      * @return Slot number (int)
      */
     private int getSlot(long cellID) {

-        EcalConditionsUtil util = new EcalConditionsUtil();
-

         // Find the ECAL channel and return the crate number.

-        return util.getSlot(helper, cellID);

+        return util.getSlot(helper, cellID);

java/branches/hps_java_trunk_HPSJAVA-255/ecal-recon/src/main/java/org/hps/recon/ecal

HPSEcalCluster.java 1113 -> 1114

--- java/branches/hps_java_trunk_HPSJAVA-255/ecal-recon/src/main/java/org/hps/recon/ecal/HPSEcalCluster.java	2014-09-30 16:25:14 UTC (rev 1113)
+++ java/branches/hps_java_trunk_HPSJAVA-255/ecal-recon/src/main/java/org/hps/recon/ecal/HPSEcalCluster.java	2014-09-30 19:49:00 UTC (rev 1114)
@@ -6,17 +6,11 @@

 
 import java.util.List;

-import org.hps.conditions.TableConstants;
-import org.hps.conditions.ecal.EcalConditions;
-import org.hps.conditions.ecal.EcalChannel.EcalChannelCollection;
-import org.lcsim.conditions.ConditionsManager;

 import org.lcsim.detector.IGeometryInfo;

-import org.lcsim.detector.identifier.IIdentifierHelper;

 import org.lcsim.detector.solids.Trd;
 import org.lcsim.event.CalorimeterHit;
 import org.lcsim.event.Cluster;
 import org.lcsim.event.base.BaseCluster;

-import org.lcsim.geometry.Detector;

 
 /**
  * Cluster with position defined by seed hit (for 1-bit trigger)

@@ -25,50 +19,42 @@

  * @version $Id: HPSEcalCluster.java,v 1.11 2013/02/25 22:39:24 meeg Exp $
  */
 public class HPSEcalCluster extends BaseCluster {

-	
-    Detector detector = null;    
-    static EcalConditions ecalConditions = null;
-    static IIdentifierHelper helper = null;
-    static EcalChannelCollection channels = null;

 
     private CalorimeterHit seedHit = null;
     private long cellID;

-    
-    static final double eCriticalW = 800.0*ECalUtils.MeV/(74+1);

+
+    static final double eCriticalW = 800.0 * ECalUtils.MeV / (74 + 1);

     static final double radLenW = 8.8; //mm
     double[] electronPosAtDepth = new double[3];
     private boolean needsElectronPosCalculation = true;
     double[] photonPosAtDepth = new double[3];
     private boolean needsPhotonPosCalculation = true;

-    /** 
-     * After the declaration, yourHPSEcalCluster.setDetector(detector) must be called

+    /**

      * @param cellID (long)
      */
     public HPSEcalCluster() {

-    }    
-    
-    /** 
-     * After the declaration, yourHPSEcalCluster.setDetector(detector) must be called

+    }
+
+    /**
+     *

      * @param cellID (long)
      */
     public HPSEcalCluster(Long cellID) {
         this.cellID = cellID;
     }

-    /** 
-     * Before using this method yourHPSEcalCluster.setDetector(detector) must be called

+    /**
+     *

      * @param CalorimeterHit

-     */

+     */

     public void setSeedHit(CalorimeterHit seedHit) {
         this.seedHit = seedHit;

-        ((HPSCalorimeterHit) seedHit).setDetector(detector);

         this.cellID = seedHit.getCellID();
     }
 
     /**

-     * 
-     * @param

+     *

      * @return CalorimeterHit
      */
     public CalorimeterHit getSeedHit() {

@@ -83,18 +69,13 @@

         }
         return seedHit;
     }

-    
-    /** 
-     * Must be set when an object HPSEcalCluster is created.
-     * @param detector (long)
-     */
-    public void setDetector(Detector detector) {
-        this.detector = detector;
-    }
-

/**

-     * Find highest-energy hit in a cluster. For clusters made by GTPEcalClusterer, HPSEcalCluster.getSeedHit(cluster) should be equivalent to cluster.getSeedHit().
-     * Since this method doesn't require that the cluster be an HPSEcalCluster, it will work on clusters read from LCIO.

+     * Find highest-energy hit in a cluster. For clusters made by
+     * GTPEcalClusterer, HPSEcalCluster.getSeedHit(cluster) should be equivalent
+     * to cluster.getSeedHit(). Since this method doesn't require that the
+     * cluster be an HPSEcalCluster, it will work on clusters read from LCIO.
+     *

      * @param cluster
      * @return CalorimeterHit
      */

@@ -107,7 +88,7 @@

         }
         return seedHit;
     }

 //    public double[] getPosition() {
 //        return getSeedHit().getPosition();
 //    }

@@ -117,45 +98,40 @@

         //Electron by default!?
         return this.getPositionAtShowerMax(true);
     }

     public double[] getPositionAtShowerMax(boolean isElectron) {

-        if( isElectron) {
-            if(needsElectronPosCalculation) {

+        if (isElectron) {
+            if (needsElectronPosCalculation) {

                 this.calcPositionAtShowerMax(true);
             }
             return this.electronPosAtDepth;

-        }
-        else {
-            if(needsPhotonPosCalculation) {

+        } else {
+            if (needsPhotonPosCalculation) {

                 this.calcPositionAtShowerMax(false);
             }
             return this.photonPosAtDepth;

-        }

+        }

     public void calcPositionAtShowerMax(boolean isElectron) {
         double E = this.getEnergy();

-        double y = E/eCriticalW;

+        double y = E / eCriticalW;

         double Cj = isElectron ? -0.5 : 0.5;
         double tmax = Math.log(y) + Cj; //Maximum of dE/dt profile in units of rad. len.

-        double dmax = tmax*radLenW; //mm
-        if(isElectron) {
-            electronPosAtDepth =  calculatePositionAtDepth(dmax);

+        double dmax = tmax * radLenW; //mm
+        if (isElectron) {
+            electronPosAtDepth = calculatePositionAtDepth(dmax);

         } else {

-            photonPosAtDepth =  calculatePositionAtDepth(dmax);

+            photonPosAtDepth = calculatePositionAtDepth(dmax);

-    
-    
-    
-    public double[] calculatePositionAtDepth(double dmax) 
-    {

+
+    public double[] calculatePositionAtDepth(double dmax) {

         return this.calculatePositionAtDepth(this.getCalorimeterHits(), dmax);

-    }    
-    
-    public double[] calculatePositionAtDepth(List<CalorimeterHit> hits, double dmax)
-    {

+    }
+
+    public double[] calculatePositionAtDepth(List<CalorimeterHit> hits, double dmax) {

         //copy from package org.lcsim.recon.cluster.util.TensorClusterPropertyCalculator;
 
         double positionErrorLocal[] = new double[6];

@@ -164,17 +140,16 @@

         double positionLocal[] = new double[3];
         double ithetaLocal;
         double iphiLocal;

-        
-

         double[] mm_NE = new double[3];
         double[] mm_CE = new double[3];
         double[][] mm_PA = new double[3][3];

-        for(int i=0;i<3;++i)
-        {

+        for (int i = 0; i < 3; ++i) {

             mm_NE[i] = 0.;
             mm_CE[i] = 0.;

-            for(int j=0;j<3;++j)
-            {mm_PA[i][j]= 0.;}

+            for (int j = 0; j < 3; ++j) {
+                mm_PA[i][j] = 0.;
+            }

         }
         double Etot = 0.0;
         double Exx = 0.0;

@@ -197,8 +172,7 @@

         double M = 0.0;
         double Det = 0.0;
         int nhits = hits.size();

-        for(int i=0;i<hits.size();i++)
-        {

+        for (int i = 0; i < hits.size(); i++) {

             CalorimeterHit hit = hits.get(i);
             //	CalorimeterIDDecoder decoder = hit.getDecoder();
             //	decoder.setID(hit.getCellID());

@@ -209,52 +183,50 @@

             //double[] pos = hit.getPosition();
             //Find position at shower max
             IGeometryInfo geom = hit.getDetectorElement().getGeometry();

-            double[] pos = geom.transformLocalToGlobal(VecOp.add(geom.transformGlobalToLocal(geom.getPosition()),(Hep3Vector)new BasicHep3Vector(0,0,dmax-1*((Trd)geom.getLogicalVolume().getSolid()).getZHalfLength()))).v();
-

+            double[] pos = geom.transformLocalToGlobal(VecOp.add(geom.transformGlobalToLocal(geom.getPosition()), (Hep3Vector) new BasicHep3Vector(0, 0, dmax - 1 * ((Trd) geom.getLogicalVolume().getSolid()).getZHalfLength()))).v();
+

 //            System.out.println("global pos " + global_pos.toString());
 //            System.out.println("local pos " + local_pos.toString());
 //            System.out.println("local pos tmax " + local_pos_tmax.toString());
 //            System.out.println("global pos tmax " + global_pos_tmax.toString());
 //            
             //pos = global_pos_tmax.v();

             double E = hit.getCorrectedEnergy();
             Etot += E;

-            CEx += E*pos[0];
-            CEy += E*pos[1];
-            CEz += E*pos[2];
-            Exx += E*(pos[1]*pos[1] + pos[2]*pos[2]);
-            Eyy += E*(pos[0]*pos[0] + pos[2]*pos[2]);
-            Ezz += E*(pos[1]*pos[1] + pos[0]*pos[0]);
-            Exy -= E*pos[0]*pos[1];
-            Eyz -= E*pos[1]*pos[2];
-            Exz -= E*pos[0]*pos[2];

+            CEx += E * pos[0];
+            CEy += E * pos[1];
+            CEz += E * pos[2];
+            Exx += E * (pos[1] * pos[1] + pos[2] * pos[2]);
+            Eyy += E * (pos[0] * pos[0] + pos[2] * pos[2]);
+            Ezz += E * (pos[1] * pos[1] + pos[0] * pos[0]);
+            Exy -= E * pos[0] * pos[1];
+            Eyz -= E * pos[1] * pos[2];
+            Exz -= E * pos[0] * pos[2];

-        CEx = CEx/Etot;
-        CEy = CEy/Etot;
-        CEz = CEz/Etot;
-        double CErSq = CEx*CEx + CEy*CEy + CEz*CEz;

+        CEx = CEx / Etot;
+        CEy = CEy / Etot;
+        CEz = CEz / Etot;
+        double CErSq = CEx * CEx + CEy * CEy + CEz * CEz;

         CEr = Math.sqrt(CErSq);
         // now go to center of energy coords.

-        if (nhits > 3 )
-        {
-            Exx = Exx - Etot*(CErSq - CEx*CEx);
-            Eyy = Eyy - Etot*(CErSq - CEy*CEy);
-            Ezz = Ezz - Etot*(CErSq - CEz*CEz);
-            Exy = Exy + Etot*CEx*CEy;
-            Eyz = Eyz + Etot*CEy*CEz;
-            Exz = Exz + Etot*CEz*CEx;

+        if (nhits > 3) {
+            Exx = Exx - Etot * (CErSq - CEx * CEx);
+            Eyy = Eyy - Etot * (CErSq - CEy * CEy);
+            Ezz = Ezz - Etot * (CErSq - CEz * CEz);
+            Exy = Exy + Etot * CEx * CEy;
+            Eyz = Eyz + Etot * CEy * CEz;
+            Exz = Exz + Etot * CEz * CEx;

 
             //
             Tr = Exx + Eyy + Ezz;

-            double Dxx = Eyy*Ezz - Eyz*Eyz;
-            double Dyy = Ezz*Exx - Exz*Exz;
-            double Dzz = Exx*Eyy - Exy*Exy;

+            double Dxx = Eyy * Ezz - Eyz * Eyz;
+            double Dyy = Ezz * Exx - Exz * Exz;
+            double Dzz = Exx * Eyy - Exy * Exy;

             M = Dxx + Dyy + Dzz;

-            double Dxy = Exy*Ezz - Exz*Eyz;
-            double Dxz = Exy*Eyz - Exz*Eyy;
-            Det = Exx*Dxx - Exy*Dxy + Exz*Dxz;
-            double xt = Tr*Tr - 3*M;

+            double Dxy = Exy * Ezz - Exz * Eyz;
+            double Dxz = Exy * Eyz - Exz * Eyy;
+            Det = Exx * Dxx - Exy * Dxy + Exz * Dxz;
+            double xt = Tr * Tr - 3 * M;

             double sqrtxt = Math.sqrt(xt);
             // eqn to solve for eigenvalues is x**3 - x**2*Tr + x*M - Det = 0
             // crosses y axis at -Det and inflection points are

@@ -262,180 +234,165 @@

             double mE1 = 0.;
             double mE2 = 0.;
             double mE3 = 0.;

-            double a = (3*M - Tr*Tr)/3.;
-            double b = (-2*Tr*Tr*Tr + 9*Tr*M -27*Det)/27.;
-            double test = b*b/4. + a*a*a/27.;
-            if(test >= 0.01)
-            {

+            double a = (3 * M - Tr * Tr) / 3.;
+            double b = (-2 * Tr * Tr * Tr + 9 * Tr * M - 27 * Det) / 27.;
+            double test = b * b / 4. + a * a * a / 27.;
+            if (test >= 0.01) {

                 //System.out.println("AbstractCluster: Only 1 real root!!!");
                 //System.out.println("  nhits = " + nhits + "\n");
                 //System.out.println(" a,b,test = " + a + " " + b + " " + test + "\n");

-            }
-            else
-            {

+            } else {

                 double temp;

-                if(test >= 0.)temp = 1.;
-                else temp = Math.sqrt(b*b*27./(-a*a*a*4.));
-                if(b > 0.)temp = -temp;

+                if (test >= 0.) {
+                    temp = 1.;
+                } else {
+                    temp = Math.sqrt(b * b * 27. / (-a * a * a * 4.));
+                }
+                if (b > 0.) {
+                    temp = -temp;
+                }

                 double phi = Math.acos(temp);

-                double temp1 = 2.*Math.sqrt(-a/3.);
-                mE1 = Tr/3. + 2.*Math.sqrt(-a/3.)*Math.cos(phi/3.);
-                mE2 = Tr/3. + 2.*Math.sqrt(-a/3.)*Math.cos(phi/3. + 2.*Math.PI/3.);
-                mE3 = Tr/3. + 2.*Math.sqrt(-a/3.)*Math.cos(phi/3. + 4.*Math.PI/3.);

+                double temp1 = 2. * Math.sqrt(-a / 3.);
+                mE1 = Tr / 3. + 2. * Math.sqrt(-a / 3.) * Math.cos(phi / 3.);
+                mE2 = Tr / 3. + 2. * Math.sqrt(-a / 3.) * Math.cos(phi / 3. + 2. * Math.PI / 3.);
+                mE3 = Tr / 3. + 2. * Math.sqrt(-a / 3.) * Math.cos(phi / 3. + 4. * Math.PI / 3.);

-            if(mE1 < mE2)
-            {
-                if(mE1 < mE3)
-                {

+            if (mE1 < mE2) {
+                if (mE1 < mE3) {

                     E1 = mE1;

-                    if(mE2 < mE3)
-                    {

+                    if (mE2 < mE3) {

                         E2 = mE2;
                         E3 = mE3;

-                    }
-                    else
-                    {

+                    } else {

                         E2 = mE3;
                         E3 = mE2;
                     }

-                }
-                else
-                {

+                } else {

-            }
-            else
-            {
-                if(mE2 < mE3)
-                {

+            } else {
+                if (mE2 < mE3) {

                     E1 = mE2;

-                    if(mE1 < mE3)
-                    {

+                    if (mE1 < mE3) {

                         E2 = mE1;
                         E3 = mE3;

-                    }
-                    else
-                    {

+                    } else {

                         E2 = mE3;
                         E3 = mE1;
                     }

-                }
-                else
-                {

+                } else {

-            NE1 = E1/Etot;
-            NE2 = E2/Etot;
-            NE3 = E3/Etot;

+            NE1 = E1 / Etot;
+            NE2 = E2 / Etot;
+            NE3 = E3 / Etot;

             double[] EV = new double[3];
             EV[0] = E1;
             EV[1] = E2;
             EV[2] = E3;
             // Now calculate principal axes

-	    // For eigenvalue EV, the axis is (nx, ny, nz) where:
-	    //    (Exx - EV)nx + (Exy)ny + (Exz)nz = 0
-	    //    (Eyx)nx + (Eyy - EV)ny + (Eyz)nz = 0
-	    //    (Ezx)nx + (Ezy)ny + (Ezz - EV)nz = 0
-	    // Setting nx = 1, we have:
-	    //    (Exx - EV) + (Exy)ny + (Exz)nz = 0
-	    //    (Eyx) + (Eyy - EV)ny + (Eyz)nz = 0
-	    //    (Ezx) + (Ezy)ny + (Ezz - EV)nz = 0
-	    // and so
-	    //    (Exy)ny = EV - Exx - (Exz)nz  =>  ny = (EV - Exx - Exz*nz)/Exy
-	    // What if Exy = 0? Then provided Eyz is non-zero we can write:
-	    //    (Ezx) + (Ezy)ny + (Ezz - EV)nz = 0
-	    //    ny = (Exz - (Ezz-EV)*nz)/Eyz
-	    // What if Exy = 0 and Eyz = 0 but (Eyy - EV) is non-zero?
-	    //    (Eyy - EV)ny + (Eyz)nz = 0
-	    //    ny = -(Eyz*nz)/(Eyy-EV)

+            // For eigenvalue EV, the axis is (nx, ny, nz) where:
+            //    (Exx - EV)nx + (Exy)ny + (Exz)nz = 0
+            //    (Eyx)nx + (Eyy - EV)ny + (Eyz)nz = 0
+            //    (Ezx)nx + (Ezy)ny + (Ezz - EV)nz = 0
+            // Setting nx = 1, we have:
+            //    (Exx - EV) + (Exy)ny + (Exz)nz = 0
+            //    (Eyx) + (Eyy - EV)ny + (Eyz)nz = 0
+            //    (Ezx) + (Ezy)ny + (Ezz - EV)nz = 0
+            // and so
+            //    (Exy)ny = EV - Exx - (Exz)nz  =>  ny = (EV - Exx - Exz*nz)/Exy
+            // What if Exy = 0? Then provided Eyz is non-zero we can write:
+            //    (Ezx) + (Ezy)ny + (Ezz - EV)nz = 0
+            //    ny = (Exz - (Ezz-EV)*nz)/Eyz
+            // What if Exy = 0 and Eyz = 0 but (Eyy - EV) is non-zero?
+            //    (Eyy - EV)ny + (Eyz)nz = 0
+            //    ny = -(Eyz*nz)/(Eyy-EV)

-	    // In the pathological case where Exz = Eyz = Ezz = 0:
-	    //    (Exx - EV)nx + (Exy)ny = 0  =>  ny/nx = -(Exx-EV)/Exy
-	    //    (Eyx)nx + (Eyy - EV)ny = 0  =>  ny/nx = -Eyx/(Eyy-EV)
-	    //    (EV)nz = 0
-	    // so
-	    //     -ny/nx = (EV-Exx)/Exy = Eyx/(EV-Eyy)
-	    // But watch out for order! Recalculate eigenvalues for this pathological case.
-	    //     (EV-Exx)(EV-Eyy) = Eyx*Exy
-	    //     EV^2 - EV(Exx+Eyy) + Exx*Eyy - Eyx*Exy = 0
-	    // 
-	    // In another pathological case, Exz = Exy = 0:
-	    //    (Exx - EV)nx = 0
-	    //    (Eyy - EV)ny + (Eyz)nz = 0 => ny/nz = -(Eyz)/(Eyy-EV)
-	    //    (Ezy)ny + (Ezz - EV)nz = 0 => ny/nz = -(Ezz-EV)/(Ezy)
-	    // so we cannot set nx = 1. Instead, write:
-	    //    -ny/nz = (Eyz)/(Eyy-EV) = (Ezz-EV)/(Ezy)
-	    // Then
-	    //    (Eyz)(Ezy) = (Eyy-EV)(Ezz-EV)
-	    //    (Eyz)^2 = (Eyy)(Ezz) - (Eyy)(EV) - (Ezz)(EV) + (EV)^2
-	    //    EV^2 - EV(Eyy+Ezz) + Eyy*Ezz - Eyz*Eyz = 0
-
-	    // Handle pathological case
-	    if (Exz == 0.0 && Eyz == 0.0) {
-		// Recompute eigenvectors.
-		EV[0] = 0.5*(Exx+Eyy) + 0.5*Math.sqrt((Exx+Eyy)*(Exx+Eyy) + 4.0*Exy*Exy);
-		EV[1] = 0.5*(Exx+Eyy) - 0.5*Math.sqrt((Exx+Eyy)*(Exx+Eyy) + 4.0*Exy*Exy);
-		EV[2] = 0.0;
-		for( int i = 0 ; i < 2 ; i++ ) {
-		    double nx_over_ny = Exy / (Exx-EV[i]);
-		    double nx_unnormalized = nx_over_ny;
-		    double ny_unnormalized = 1.0;
-		    double norm = Math.sqrt(nx_unnormalized*nx_unnormalized + ny_unnormalized*ny_unnormalized);
-		    mm_PA[i][0] = ny_unnormalized/norm;
-		    mm_PA[i][1] = nx_unnormalized/norm;
-		    mm_PA[i][2] = 0.0;
-		}
-		// ... and now set third eigenvector to the z direction:
-		mm_PA[2][0] = 0.0;
-		mm_PA[2][1] = 0.0;
-		mm_PA[2][2] = 1.0;
-	    } else if (Exz == 0.0 && Exy == 0.0) {
-		// Another pathological case
-		EV[0] = 0.5*(Eyy+Ezz) + 0.5*Math.sqrt((Eyy+Ezz)*(Eyy+Ezz) + 4.0*Eyz*Eyz);
-		EV[1] = 0.5*(Eyy+Ezz) - 0.5*Math.sqrt((Eyy+Ezz)*(Eyy+Ezz) + 4.0*Eyz*Eyz);
-		EV[2] = 0.0;
-		for( int i = 0 ; i < 2 ; i++ ) {
-		    double ny_over_nz = Eyz / (Eyy-EV[i]);
-		    double ny_unnormalized = ny_over_nz;
-		    double nz_unnormalized = 1.0;
-		    double norm = Math.sqrt(ny_unnormalized*ny_unnormalized + nz_unnormalized*nz_unnormalized);
-		    mm_PA[i][0] = nz_unnormalized/norm;
-		    mm_PA[i][1] = ny_unnormalized/norm;
-		    mm_PA[i][2] = 0.0;
-		}
-		mm_PA[2][0] = 0.0;
-		mm_PA[2][1] = 0.0;
-		mm_PA[2][2] = 1.0;
-	    } else {
-		for( int i = 0 ; i < 3 ; i++ )
-		    {
-			double[] C = new double[3];
-			C[0] = 1.0;
-			C[2] = (Exy*Exy + (Eyy - EV[i])*(EV[i] - Exx))/
-			    ((Eyy - EV[i])*Exz - Eyz*Exy);
-			C[1] = (EV[i] - Exx - Exz*C[2])/Exy;
-			if (Exy == 0.0) {
-			    // Recompute
-			    if (Eyz != 0.0) {
-				// ny = (Exz - (Ezz-EV)*nz)/Eyz
-				C[1] = (Exz - (Ezz-EV[i])*C[2])/Eyz;
-			    } else {
-				// ny = -(Eyz*nz)/(Eyy-EV)
-				C[1] = -(Eyz*C[2])/(Eyy-EV[i]);
-			    }
-			}
-			double norm = Math.sqrt(C[0]*C[0] + C[1]*C[1] + C[2]*C[2]);
-			mm_PA[i][0] = C[0]/norm;
-			mm_PA[i][1] = C[1]/norm;
-			mm_PA[i][2] = C[2]/norm;
-		    }
-	    }

+            // In the pathological case where Exz = Eyz = Ezz = 0:
+            //    (Exx - EV)nx + (Exy)ny = 0  =>  ny/nx = -(Exx-EV)/Exy
+            //    (Eyx)nx + (Eyy - EV)ny = 0  =>  ny/nx = -Eyx/(Eyy-EV)
+            //    (EV)nz = 0
+            // so
+            //     -ny/nx = (EV-Exx)/Exy = Eyx/(EV-Eyy)
+            // But watch out for order! Recalculate eigenvalues for this pathological case.
+            //     (EV-Exx)(EV-Eyy) = Eyx*Exy
+            //     EV^2 - EV(Exx+Eyy) + Exx*Eyy - Eyx*Exy = 0
+            // 
+            // In another pathological case, Exz = Exy = 0:
+            //    (Exx - EV)nx = 0
+            //    (Eyy - EV)ny + (Eyz)nz = 0 => ny/nz = -(Eyz)/(Eyy-EV)
+            //    (Ezy)ny + (Ezz - EV)nz = 0 => ny/nz = -(Ezz-EV)/(Ezy)
+            // so we cannot set nx = 1. Instead, write:
+            //    -ny/nz = (Eyz)/(Eyy-EV) = (Ezz-EV)/(Ezy)
+            // Then
+            //    (Eyz)(Ezy) = (Eyy-EV)(Ezz-EV)
+            //    (Eyz)^2 = (Eyy)(Ezz) - (Eyy)(EV) - (Ezz)(EV) + (EV)^2
+            //    EV^2 - EV(Eyy+Ezz) + Eyy*Ezz - Eyz*Eyz = 0
+            // Handle pathological case
+            if (Exz == 0.0 && Eyz == 0.0) {
+                // Recompute eigenvectors.
+                EV[0] = 0.5 * (Exx + Eyy) + 0.5 * Math.sqrt((Exx + Eyy) * (Exx + Eyy) + 4.0 * Exy * Exy);
+                EV[1] = 0.5 * (Exx + Eyy) - 0.5 * Math.sqrt((Exx + Eyy) * (Exx + Eyy) + 4.0 * Exy * Exy);
+                EV[2] = 0.0;
+                for (int i = 0; i < 2; i++) {
+                    double nx_over_ny = Exy / (Exx - EV[i]);
+                    double nx_unnormalized = nx_over_ny;
+                    double ny_unnormalized = 1.0;
+                    double norm = Math.sqrt(nx_unnormalized * nx_unnormalized + ny_unnormalized * ny_unnormalized);
+                    mm_PA[i][0] = ny_unnormalized / norm;
+                    mm_PA[i][1] = nx_unnormalized / norm;
+                    mm_PA[i][2] = 0.0;
+                }
+                // ... and now set third eigenvector to the z direction:
+                mm_PA[2][0] = 0.0;
+                mm_PA[2][1] = 0.0;
+                mm_PA[2][2] = 1.0;
+            } else if (Exz == 0.0 && Exy == 0.0) {
+                // Another pathological case
+                EV[0] = 0.5 * (Eyy + Ezz) + 0.5 * Math.sqrt((Eyy + Ezz) * (Eyy + Ezz) + 4.0 * Eyz * Eyz);
+                EV[1] = 0.5 * (Eyy + Ezz) - 0.5 * Math.sqrt((Eyy + Ezz) * (Eyy + Ezz) + 4.0 * Eyz * Eyz);
+                EV[2] = 0.0;
+                for (int i = 0; i < 2; i++) {
+                    double ny_over_nz = Eyz / (Eyy - EV[i]);
+                    double ny_unnormalized = ny_over_nz;
+                    double nz_unnormalized = 1.0;
+                    double norm = Math.sqrt(ny_unnormalized * ny_unnormalized + nz_unnormalized * nz_unnormalized);
+                    mm_PA[i][0] = nz_unnormalized / norm;
+                    mm_PA[i][1] = ny_unnormalized / norm;
+                    mm_PA[i][2] = 0.0;
+                }
+                mm_PA[2][0] = 0.0;
+                mm_PA[2][1] = 0.0;
+                mm_PA[2][2] = 1.0;
+            } else {
+                for (int i = 0; i < 3; i++) {
+                    double[] C = new double[3];
+                    C[0] = 1.0;
+                    C[2] = (Exy * Exy + (Eyy - EV[i]) * (EV[i] - Exx))
+                            / ((Eyy - EV[i]) * Exz - Eyz * Exy);
+                    C[1] = (EV[i] - Exx - Exz * C[2]) / Exy;
+                    if (Exy == 0.0) {
+                        // Recompute
+                        if (Eyz != 0.0) {
+                            // ny = (Exz - (Ezz-EV)*nz)/Eyz
+                            C[1] = (Exz - (Ezz - EV[i]) * C[2]) / Eyz;
+                        } else {
+                            // ny = -(Eyz*nz)/(Eyy-EV)
+                            C[1] = -(Eyz * C[2]) / (Eyy - EV[i]);
+                        }
+                    }
+                    double norm = Math.sqrt(C[0] * C[0] + C[1] * C[1] + C[2] * C[2]);
+                    mm_PA[i][0] = C[0] / norm;
+                    mm_PA[i][1] = C[1] / norm;
+                    mm_PA[i][2] = C[2] / norm;
+                }
+            }

         }
         mm_NE[0] = NE1;
         mm_NE[1] = NE2;

@@ -443,40 +400,34 @@

         mm_CE[0] = CEx;
         mm_CE[1] = CEy;
         mm_CE[2] = CEz;

-        for(int i=0;i<6;i++)
-        {

+        for (int i = 0; i < 6; i++) {

             positionErrorLocal[i] = 0.;
             directionErrorLocal[i] = 0.;
             shapeParametersLocal[i] = 0.;
         }

-        for(int i=0;i<3;i++)
-        {

+        for (int i = 0; i < 3; i++) {

             positionLocal[i] = mm_CE[i];
             shapeParametersLocal[i] = mm_NE[i];
         }

-        if(nhits > 3)
-        {
-            double dr = Math.sqrt(  (position[0]+mm_PA[0][0])*(position[0]+mm_PA[0][0]) +
-                    (position[1]+mm_PA[0][1])*(position[1]+mm_PA[0][1]) +
-                    (position[2]+mm_PA[0][2])*(position[2]+mm_PA[0][2]) ) -
-                    Math.sqrt(	(position[0])*(position[0]) +
-                    (position[1])*(position[1]) +
-                    (position[2])*(position[2]) ) ;

+        if (nhits > 3) {
+            double dr = Math.sqrt((position[0] + mm_PA[0][0]) * (position[0] + mm_PA[0][0])
+                    + (position[1] + mm_PA[0][1]) * (position[1] + mm_PA[0][1])
+                    + (position[2] + mm_PA[0][2]) * (position[2] + mm_PA[0][2]))
+                    - Math.sqrt((position[0]) * (position[0])
+                            + (position[1]) * (position[1])
+                            + (position[2]) * (position[2]));

             double sign = 1.;

-            if(dr < 0.)sign = -1.;
-            itheta = Math.acos(sign*mm_PA[0][2]);
-            iphi = Math.atan2(sign*mm_PA[0][1],sign*mm_PA[0][0]);
-        }
-        else
-        {

+            if (dr < 0.) {
+                sign = -1.;
+            }
+            itheta = Math.acos(sign * mm_PA[0][2]);
+            iphi = Math.atan2(sign * mm_PA[0][1], sign * mm_PA[0][0]);
+        } else {

             itheta = 999.;
             iphi = 999.;
         }

         return positionLocal;
     }

-    
-    
-    
-

Commit in `java/branches/hps_java_trunk_HPSJAVA-255` on MAIN
`conditions/src/main/java/org/hps/conditions/ConditionsDriver.java`	+17	-10	1113 -> 1114
`ecal-readout-sim/src/main/java/org/hps/readout/ecal/SimpleEcalReadoutDriver.java`	+12	-19	1113 -> 1114
`/TimeEvolutionEcalReadoutDriver.java`		-19	1113 -> 1114
`ecal-recon/src/main/java/org/hps/recon/ecal/CTPEcalClusterer.java`		-2	1113 -> 1114
`/EcalClusterer.java`		-1	1113 -> 1114
`/EcalConverterDriver.java`		-1	1113 -> 1114
`/EcalEdepToTriggerConverterDriver.java`	+11	-19	1113 -> 1114
`/EcalRawConverter.java`	+1	-6	1113 -> 1114
`/EcalRawConverterDriver.java`	+41	-44	1113 -> 1114
`/EcalReadoutToTriggerConverterDriver.java`		-1	1113 -> 1114
`/EcalTriggerFilterDriver.java`	+29	-51	1113 -> 1114
`/GTPEcalClusterer.java`		-1	1113 -> 1114
`/HPSCalorimeterHit.java`	+34	-70	1113 -> 1114
`/HPSEcalCluster.java`	+213	-262	1113 -> 1114
`evio/src/main/java/org/hps/evio/ECalEvioReader.java`	+40	-44	1113 -> 1114
`/TestRunEvioToLcio.java`	+4	-2	1113 -> 1114
`/TestRunTriggeredReconToEvio.java`		-2	1113 -> 1114
`/TestRunTriggeredReconToLcio.java`	+1	-3	1113 -> 1114
`steering-files/src/main/resources/org/hps/steering/recon/TestRunOfflineRecon.lcsim`	+6		1113 -> 1114
	+409	-557