Changeset 6048

Timestamp:

01/27/05 14:52:56 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mjobs/MJCalibrateSignal.cc (modified) (4 diffs)
• mpointing/MInterpolatePointingPos.cc (deleted)
• mpointing/MInterpolatePointingPos.h (deleted)
• mpointing/MPointingPosInterpolate.cc (added)
• mpointing/MPointingPosInterpolate.h (added)
• mpointing/Makefile (modified) (1 diff)
• mpointing/PointingLinkDef.h (modified) (1 diff)

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -89 +89 @@
 #include "MMcPedestalCopy.h"
 #include "MPointingPosCalc.h"
-#include "MInterpolatePointingPos.h"
+#include "MPointingPosInterpolate.h"
 #include "MPedCalcFromLoGain.h"
 #include "MExtractor.h"
@@ -386 +386 @@
         readreal.AddFiles(iter);
 
-    MInterpolatePointingPos pextr;
+    MPointingPosInterpolate pextr;
     pextr.AddFiles(&iter);
     
@@ -690 +690 @@
 
     // Setup List for Drive-tree
-    //    MPointingPosCalc pcalc;
+    MPointingPosCalc pcalc;
 
     // Now setup main tasklist
@@ -698 +698 @@
     tlist.AddToList(&tlist2, IsRootData() ? "Events" : "All");
 
-    //
-    // !!! Replaced by MInterpolatePointingPos !!!
-    //
-    //    if (IsRootData())
-    //        tlist.AddToList(&pcalc, "Drive");
-
+    if (IsMC())
+      tlist.AddToList(&pcalc, "Drive");
 
     tlist.AddToList(&write);

trunk/MagicSoft/Mars/mpointing/Makefile

@@ -25 +25 @@
            MPointingPos.cc \
            MPointingPosCalc.cc \
-           MInterpolatePointingPos.cc \
+           MPointingPosInterpolate.cc \
            MSrcPosCam.cc \
            MSrcPosCalc.cc \

trunk/MagicSoft/Mars/mpointing/PointingLinkDef.h

@@ -9 +9 @@
 #pragma link C++ class MPointingPos+;
 #pragma link C++ class MPointingPosCalc+;
-#pragma link C++ class MInterpolatePointingPos+;
+#pragma link C++ class MPointingPosInterpolate+;
 
 #pragma link C++ class MSrcPosCam+;