Changeset 18278 for branches/MarsWobble/mjoptim

Timestamp:

08/18/15 10:09:13 (9 years ago)

Author:

ftemme

Message:

Merging trunk into MarsWobble branch

File:

• branches/MarsWobble/mjoptim/MJOptimizeCuts.cc (modified) (3 diffs)

branches/MarsWobble/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);