Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 6036)
+++ trunk/MagicSoft/Mars/Changelog	(revision 6037)
@@ -20,4 +20,14 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2005/01/27 Daniel Mazin and Markus Gaug
+
+   * mpointing/MInterpolatePointingPos.[h,cc]
+     new class to interpolate pointing positions, adapted from a class 
+     by Marcos Lopez 
+
+   * mjobs/MJCalibrateSignal.[h,cc]
+     enabled the calibration of data with interlaced calibration events     
+
+
  2005/01/27 Thomas Bretz
 
Index: trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc	(revision 6036)
+++ trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc	(revision 6037)
@@ -269,8 +269,4 @@
     MHCalibrationRelTimeCam     hrelcam;
 
-    hchacam.SetLoGain(kTRUE);
-    hchacam.SetOscillations(kFALSE);
-    hrelcam.SetOscillations(kFALSE);
-
     interlacedcont.Add(&hchacam);
     interlacedcont.Add(&hbndcam);
@@ -305,6 +301,4 @@
     if (!ReadCalibration(calibcont, badpix, extractor1, extractor2, geom))
         return kFALSE;
-
-    badpix.Print();
 
     *fLog << all;
@@ -383,5 +377,4 @@
 
     MInterpolatePointingPos pextr;
-//    pextr.SetDebug();  // take it out
     pextr.AddFiles(&iter);
     
@@ -404,5 +397,4 @@
     MFTriggerPattern ftp;
     ftp.RequireCalibration();
-    //    ftp.RequireCalibration(kTRUE);
     //    ftp.DenyCalibration();
     //    ftp.DenyPedestal();
@@ -539,8 +531,8 @@
     MHCamEvent evt1(2, "PedRmsFLG",   "Pedestal RMS from Lo Gain;;\\sigma_{p} [fadc/sl]");
     MHCamEvent evt2(0, "Extra'd",     "Extracted Signal;;S [fadc/sl]");
-    MHCamEvent evt3(4, "PedPhot",     "Calibrated Pedestal;;P [\\gamma]");
+    //    MHCamEvent evt3(4, "PedPhot",     "Calibrated Pedestal;;P [\\gamma]");
     MHCamEvent evt4(5, "PedRMS",      "Calibrated Pedestal RMS;;\\sigma_{p} [\\gamma]");
     MHCamEvent evt5(0, "Interp'd",    "Interpolated Signal;;S [\\gamma]");
-    MHCamEvent evt6(2, "Unsuitable",  "Unsuitable event ratio;;%");
+    MHCamEvent evt6(2, "Unsuitable",  "Fraction of unsuitable events per Pixel;;[1]");
     MHCamEvent evt7(0, "Times",       "Arrival Time;;T [slice]");
     //    MHCamEvent evt8(0, "HiLoConv",    "Ratio Hi-Lo Gain Signal;;Ratio [1]");
@@ -550,5 +542,5 @@
     evt1.EnableVariance();
     evt2.EnableVariance();
-    evt3.EnableVariance();
+    // evt3.EnableVariance();
     evt4.EnableVariance();
     evt5.EnableVariance();
@@ -560,11 +552,9 @@
     MFillH fill1(&evt1, "MPedestalFromExtractor", "FillPedRmsFLG");
     MFillH fill2(&evt2, "MExtractedSignalCam",    "FillExtracted");
-    MFillH fill3(&evt3, "MPedPhotFundamental",    "FillPedPhot");
+    // MFillH fill3(&evt3, "MPedPhotFundamental",    "FillPedPhot");
     MFillH fill4(&evt4, "MPedPhotFromExtractor",  "FillPedRMS");
     MFillH fill5(&evt5, "MCerPhotEvt",            "FillInterpolated");
     MFillH fill6(&evt6, "MBadPixelsCam",          "FillUnsuitable");
     MFillH fill7(&evt7, "MArrivalTime",           "FillTimes");
-    //    MFillH fill8(&evt8, "MCalibrationHiLoCam",    "FillRatio");
-    //    MFillH fill9(&evt9, "MCalibrationHiLoCam",    "FillDiff");
 
     // The second rule is for the case reading raw-files!
@@ -673,5 +663,5 @@
     tlist2.AddToList(&treat);
     tlist2.AddToList(&fill6);
-    tlist2.AddToList(&fill3);
+    //    tlist2.AddToList(&fill3);
     tlist2.AddToList(&fill4);
     tlist2.AddToList(&fill5);
@@ -679,15 +669,11 @@
         tlist2.AddToList(&fill7);
 
-    if (fIsHiLoCalibration)
-      {
-	//	tlist2.AddToList(&fill8);
-	//	tlist2.AddToList(&fill9);
-      }
     // Setup List for Drive-tree
-    MPointingPosCalc pcalc;
+    //    MPointingPosCalc pcalc;
 
     // Now setup main tasklist
     tlist.AddToList(IsDataCheck() ? (MTask*)&rawread : (MTask*)&readreal);
-    tlist2.AddToList(&pextr);
+    if (!IsDataCheck())
+      tlist2.AddToList(&pextr);
     tlist.AddToList(&tlist2, IsDataCheck()?"All":"Events");
 
Index: trunk/MagicSoft/Mars/mpointing/Makefile
===================================================================
--- trunk/MagicSoft/Mars/mpointing/Makefile	(revision 6036)
+++ trunk/MagicSoft/Mars/mpointing/Makefile	(revision 6037)
@@ -20,9 +20,10 @@
 #
 INCLUDES = -I. -I../mbase -I../mraw -I../mreport -I../mmc \
-           -I../mastro -I../mgeom
+           -I../mastro -I../mgeom -I../mfileio
 
 SRCFILES = MPointing.cc \
 	   MPointingPos.cc \
 	   MPointingPosCalc.cc \
+	   MInterpolatePointingPos.cc \
            MSrcPosCam.cc \
            MSrcPosCalc.cc \
Index: trunk/MagicSoft/Mars/mpointing/PointingLinkDef.h
===================================================================
--- trunk/MagicSoft/Mars/mpointing/PointingLinkDef.h	(revision 6036)
+++ trunk/MagicSoft/Mars/mpointing/PointingLinkDef.h	(revision 6037)
@@ -9,4 +9,5 @@
 #pragma link C++ class MPointingPos+;
 #pragma link C++ class MPointingPosCalc+;
+#pragma link C++ class MInterpolatePointingPos+;
 
 #pragma link C++ class MSrcPosCam+;