update reconstruction to use new Magfield. Solenoid moved upstream fo…

…r engineering data runs.
JeffersonLab · Dec 15, 2017 · 03d4866 · 03d4866
1 parent a81f0ca
commit 03d4866
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/reconstruction/dc/src/main/java/org/jlab/rec/dc/trajectory/DCSwimmer.java b/reconstruction/dc/src/main/java/org/jlab/rec/dc/trajectory/DCSwimmer.java
@@ -13,6 +13,7 @@
 import cnuphys.rk4.RungeKuttaException;
 import cnuphys.swim.SwimTrajectory;
 import cnuphys.swim.Swimmer;
+import cnuphys.magfield.TorusMap;
 import org.jlab.detector.geant4.v2.DCGeant4Factory;
 
 import org.jlab.rec.dc.Constants;
@@ -553,13 +554,15 @@ public static synchronized void getMagneticFields() {
         //location relative to clasJLib. This will
         //have to be modified as appropriate.
 
-        String clasDictionaryPath = CLASResources.getResourcePath("etc");
+        //String clasDictionaryPath = CLASResources.getResourcePath("etc");
 
-        String torusFileName = clasDictionaryPath + "/data/magfield/clas12-fieldmap-torus.dat";
-        String solenoidFileName = clasDictionaryPath + "/data/magfield/clas12-fieldmap-solenoid.dat";
-
-        MagneticFields.getInstance().initializeMagneticFields();
+        //String torusFileName = clasDictionaryPath + "/data/magfield/clas12-fieldmap-torus.dat";
+        //String solenoidFileName = clasDictionaryPath + "/data/magfield/clas12-fieldmap-solenoid.dat";
 
+        //MagneticFields.getInstance().initializeMagneticFields();
+        String clasDictionaryPath = CLASResources.getResourcePath("etc");
+
+        MagneticFields.getInstance().initializeMagneticFields(clasDictionaryPath, TorusMap.SYMMETRIC);
         /*
         File torusFile = new File(torusFileName);
         try {