Print

---

Author: [log in to unmask]
Date: Tue Jan 20 06:45:50 2015
New Revision: 1958

Log:
fix cluster test position check to include face of the ecal

Modified:
    java/trunk/ecal-recon/src/test/java/org/hps/recon/ecal/cluster/ClustererTest.java

Modified: java/trunk/ecal-recon/src/test/java/org/hps/recon/ecal/cluster/ClustererTest.java
 =============================================================================
--- java/trunk/ecal-recon/src/test/java/org/hps/recon/ecal/cluster/ClustererTest.java	(original)
+++ java/trunk/ecal-recon/src/test/java/org/hps/recon/ecal/cluster/ClustererTest.java	Tue Jan 20 06:45:50 2015
@@ -39,7 +39,7 @@
  */
 public class ClustererTest extends TestCase {
     
-    static int nEvents = 1000;
+    static int nEvents = 100;
     static final String fileLocation = "http://www.lcsim.org/test/hps-java/MockDataReconTest.slcio";
     File inputFile;
     File testOutputDir;
@@ -372,11 +372,11 @@
             positionXH1D.fill(Math.abs(cluster.getPosition()[0]));
             positionYH1D.fill(Math.abs(cluster.getPosition()[1]));
             positionZH1D.fill(Math.abs(cluster.getPosition()[2]));
-            shapeParam1H1D.fill(cluster.getShape()[0]);
-            shapeParam2H1D.fill(cluster.getShape()[1]);
-            shapeParam3H1D.fill(cluster.getShape()[2]);
-            iphiC1D.fill(Math.toDegrees(cluster.getIPhi()));
-            ithetaC1D.fill(Math.toDegrees(cluster.getITheta()));                                
+            //shapeParam1H1D.fill(cluster.getShape()[0]);
+            //shapeParam2H1D.fill(cluster.getShape()[1]);
+            //shapeParam3H1D.fill(cluster.getShape()[2]);
+            //iphiC1D.fill(Math.toDegrees(cluster.getIPhi()));
+            //ithetaC1D.fill(Math.toDegrees(cluster.getITheta()));                                
             clusterPositionC2D.fill(cluster.getPosition()[0], cluster.getPosition()[1]);
             
             //Map<MCParticle, List<SimCalorimeterHit>> particleHitMap = ClusterUtilities.createParticleHitMap(cluster);
@@ -427,7 +427,7 @@
                 double[] position = cluster.getPosition();
                 assertTrue("Position X is invalid.", Math.abs(position[0]) < 400. && position[0] != 0.);
                 assertTrue("Position Y is invalid.", Math.abs(position[1]) > 25. && Math.abs(position[1]) < 90.);
-                assertTrue("Position Z is invalid.", position[2] > 1460. && position[2] < 1480.);
+                assertTrue("Position Z is invalid.", position[2] > 1385. && position[2] < 1480.);
             }
         }              
     }