Changeset 18282 for branches/MarsGapdTimeJitter/mjoptim

Timestamp:

08/18/15 10:28:44 (9 years ago)

Author:

Jens Buss

Message:

merged Trunk into Branch

Location:

branches/MarsGapdTimeJitter

Files:

• . (modified) (1 prop)
• mjoptim/MJOptimizeCuts.cc (modified) (3 diffs)

branches/MarsGapdTimeJitter/mjoptim/MJOptimizeCuts.cc

@@ -95 +95 @@
 
 // Parameter container
-#include "MGeomCamMagic.h"
+#include "MGeomCamFACT.h"
 #include "MParameters.h"
 #include "MFilterList.h"
@@ -150 +150 @@
     MParList parlist;
 
-    MGeomCamMagic geom; // For GetConvMm2Deg
+    MGeomCamFACT geom; // For GetConvMm2Deg
     parlist.AddToList(&geom);
 
@@ -274 +274 @@
     MParList parlist;
 
-    MGeomCamMagic geom; // For GetConvMm2Deg
+    MGeomCamFACT geom; // For GetConvMm2Deg
     parlist.AddToList(&geom);