From 03d4866135f16b56bdc1b721ab68b15e6fa989de Mon Sep 17 00:00:00 2001 From: Veronique Ziegler Date: Fri, 15 Dec 2017 16:53:17 -0500 Subject: [PATCH] update reconstruction to use new Magfield. Solenoid moved upstream for engineering data runs. --- .../java/org/jlab/rec/dc/trajectory/DCSwimmer.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 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 index 9f77e29d8e..951e85a171 100644 --- 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 {