Print

Print


Commit in lcsim/src/org/lcsim/util/heprep on RefactorBranch
MCParticleConverter.java+4-101.5.2.1 -> 1.5.2.2


lcsim/src/org/lcsim/util/heprep
MCParticleConverter.java 1.5.2.1 -> 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- MCParticleConverter.java	29 Sep 2005 00:47:11 -0000	1.5.2.1
+++ MCParticleConverter.java	29 Sep 2005 01:02:26 -0000	1.5.2.2
@@ -20,7 +20,7 @@
 /**
  *
  * @author tonyj
- * @version $Id: MCParticleConverter.java,v 1.5.2.1 2005/09/29 00:47:11 jeremy Exp $
+ * @version $Id: MCParticleConverter.java,v 1.5.2.2 2005/09/29 01:02:26 jeremy Exp $
  */
 class MCParticleConverter implements HepRepCollectionConverter
 {
@@ -43,14 +43,8 @@
       double ptMinCut = 0.05;
       double rCut = 1.0;
       
-      double field2 = 0;
-      if ( detector.getFieldMap() != null )
-      {
-          field2 = detector.getFieldMap().getField(IP)[2];
-      }
-//      double[] field = detector.getFieldMap().getField(IP);
-//      HelixSwimmer helix = new HelixSwimmer(field[2]);
-      HelixSwimmer helix = new HelixSwimmer(field2);
+      double[] field = detector.getFieldMap().getField(IP);
+      HelixSwimmer helix = new HelixSwimmer(field[2]);      
       
       HepRepType typeX = factory.createHepRepType(typeTree, name);
       typeX.addAttValue("layer",LCSimHepRepConverter.PARTICLES_LAYER);
@@ -98,7 +92,7 @@
                    stop = new BasicHep3Vector();
                }
             }
-            if (charge == 0 || field2 == 0)
+            if (charge == 0 || field[2] == 0)
             {
                HepRepInstance instanceX = factory.createHepRepInstance(charge == 0 ? neutral : charged, charge == 0 ? neutralType : chargedType);
                factory.createHepRepPoint(instanceX,start.x(),start.y(),start.z());
CVSspam 0.2.8