Print

Print


Commit in hps-java/src/main/java/org/lcsim/hps on MAIN
recon/ecal/HPSEcalTimeEvolutionReadoutDriver.java+4-21.4 -> 1.5
          /HPSEcalSimpleReadoutDriver.java+4-21.3 -> 1.4
analysis/ecal/HPSEcalPlotsDriver.java+3-21.8 -> 1.9
+11-6
3 modified files
flip X coordinate (until we can run v3pt0 detector)

hps-java/src/main/java/org/lcsim/hps/recon/ecal
HPSEcalTimeEvolutionReadoutDriver.java 1.4 -> 1.5
diff -u -r1.4 -r1.5
--- HPSEcalTimeEvolutionReadoutDriver.java	29 Aug 2011 23:05:37 -0000	1.4
+++ HPSEcalTimeEvolutionReadoutDriver.java	31 Aug 2011 22:18:09 -0000	1.5
@@ -15,7 +15,7 @@
  * Simulates time evolution of preamp output pulse.
  * 
  * @author Sho Uemura <[log in to unmask]>
- * @version $Id: HPSEcalTimeEvolutionReadoutDriver.java,v 1.4 2011/08/29 23:05:37 meeg Exp $
+ * @version $Id: HPSEcalTimeEvolutionReadoutDriver.java,v 1.5 2011/08/31 22:18:09 meeg Exp $
  */
 public class HPSEcalTimeEvolutionReadoutDriver extends HPSEcalReadoutDriver {
 
@@ -55,7 +55,9 @@
             dec.setID(hit.getCellID());
             int ix = dec.getValue("ix");
             int iy = dec.getValue("iy");
-            if (iy == 1 && ix >= -10 && ix <= -2)
+            //temporary hack to disable crystals and flip X coordinate
+            int side = dec.getValue("side");
+            if (iy == 1 && ix * side >= -10 && ix * side <= -2)
                 continue;
 
             RingBuffer eDepBuffer = eDepMap.get(hit.getCellID());

hps-java/src/main/java/org/lcsim/hps/recon/ecal
HPSEcalSimpleReadoutDriver.java 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- HPSEcalSimpleReadoutDriver.java	29 Aug 2011 23:05:37 -0000	1.3
+++ HPSEcalSimpleReadoutDriver.java	31 Aug 2011 22:18:09 -0000	1.4
@@ -13,7 +13,7 @@
  * No time evolution - this just integrates all hits in a cycle.
  * 
  * @author Sho Uemura <[log in to unmask]>
- * @version $Id: HPSEcalSimpleReadoutDriver.java,v 1.3 2011/08/29 23:05:37 meeg Exp $
+ * @version $Id: HPSEcalSimpleReadoutDriver.java,v 1.4 2011/08/31 22:18:09 meeg Exp $
  */
 public class HPSEcalSimpleReadoutDriver extends HPSEcalReadoutDriver {
 
@@ -27,7 +27,9 @@
             dec.setID(cellID);
             int ix = dec.getValue("ix");
             int iy = dec.getValue("iy");
-            if (iy == 1 && ix >= -10 && ix <= -2)
+            //temporary hack to disable crystals and flip X coordinate
+            int side = dec.getValue("side");
+            if (iy == 1 && ix*side >= -10 && ix*side <= -2)
                 continue;
             if (eDepMap.get(cellID) > threshold)
                 hitList.add(new HPSRawCalorimeterHit(eDepMap.get(cellID), dec.getPosition(), 0.0, cellID, hitType));

hps-java/src/main/java/org/lcsim/hps/analysis/ecal
HPSEcalPlotsDriver.java 1.8 -> 1.9
diff -u -r1.8 -r1.9
--- HPSEcalPlotsDriver.java	31 Aug 2011 21:58:54 -0000	1.8
+++ HPSEcalPlotsDriver.java	31 Aug 2011 22:18:09 -0000	1.9
@@ -34,7 +34,7 @@
  * Diagnostic plots for HPS ECal.
  * 
  * @author Jeremy McCormick <[log in to unmask]>
- * @version $Id: HPSEcalPlotsDriver.java,v 1.8 2011/08/31 21:58:54 meeg Exp $
+ * @version $Id: HPSEcalPlotsDriver.java,v 1.9 2011/08/31 22:18:09 meeg Exp $
  */
 public class HPSEcalPlotsDriver extends Driver {
 
@@ -321,7 +321,8 @@
             quadrants[seedHit.getQuadrant() - 1] = true;
         }
 
-        if ((quadrants[0] && quadrants[2]) || (quadrants[1] && quadrants[3])) {
+        //TODO: change the quadrants back for correct X coordinate
+        if ((quadrants[0] && quadrants[3]) || (quadrants[1] && quadrants[2])) {
             trigger = true;
             numTriggers++;
         }
CVSspam 0.2.8