Merge branch 'master' of https://github.com/JeffersonLab/clas12-offli…

…ne-software
JeffersonLab · Dec 15, 2017 · cf34a6b · cf34a6b
2 parents bf69db2 + 03d4866
commit cf34a6b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/reconstruction/cvt/pom.xml b/reconstruction/cvt/pom.xml
@@ -47,4 +47,4 @@
         <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
 
-</project>
+</project>
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 {