Index: trunk/MagicSoft/Mars/mpointing/MSrcPosCorrect.cc
===================================================================
--- trunk/MagicSoft/Mars/mpointing/MSrcPosCorrect.cc	(revision 7143)
+++ trunk/MagicSoft/Mars/mpointing/MSrcPosCorrect.cc	(revision 7143)
@@ -0,0 +1,144 @@
+/* ======================================================================== *\
+!
+! *
+! * This file is part of MARS, the MAGIC Analysis and Reconstruction
+! * Software. It is distributed to you in the hope that it can be a useful
+! * and timesaving tool in analysing Data of imaging Cerenkov telescopes.
+! * It is distributed WITHOUT ANY WARRANTY.
+! *
+! * Permission to use, copy, modify and distribute this software and its
+! * documentation for any purpose is hereby granted without fee,
+! * provided that the above copyright notice appear in all copies and
+! * that both that copyright notice and this permission notice appear
+! * in supporting documentation. It is provided "as is" without express
+! * or implied warranty.
+! *
+!
+!
+!   Author(s): Thomas Bretz 6/2005 <mailto:tbretz@astro.uni-wuerzburg.de>
+!
+!   Copyright: MAGIC Software Development, 2000-2005
+!
+!
+\* ======================================================================== */
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// MSrcPosCorrect
+//
+// For more details see Process()
+//
+//////////////////////////////////////////////////////////////////////////////
+#include "MSrcPosCorrect.h"
+
+#include <TVector2.h>
+
+#include "MParList.h"
+
+#include "MLog.h"
+#include "MLogManip.h"
+
+#include "MSrcPosCam.h"
+#include "MRawRunHeader.h"
+
+ClassImp(MSrcPosCorrect);
+
+using namespace std;
+
+// --------------------------------------------------------------------------
+//
+MSrcPosCorrect::MSrcPosCorrect(const char *name, const char *title)
+    : fSrcPosCam(NULL), fSrcPosAnti(NULL)
+{
+    fName  = name  ? name  : "MSrcPosCorrect";
+    fTitle = title ? title : "Calculates the source position in the camera";
+}
+
+// --------------------------------------------------------------------------
+//
+// Search and if necessary create MSrcPosCam in the parameter list. Search
+// MSourcePos. If not found, do nothing else, and skip the task. If MSrcPosCam
+// did not exist before and has been created here, it will contain as source
+// position the camera center (0,0).
+// In the case that MSourcePos is found, go ahead in searching the rest of
+// necessary containers. The source position will be calculated for each
+// event in Process.
+//
+Int_t MSrcPosCorrect::PreProcess(MParList *pList)
+{
+    fSrcPosCam = (MSrcPosCam*)pList->FindObject("MSrcPosCam");
+    if (!fSrcPosCam)
+    {
+        *fLog << err << "MSrcPosCam not found... aborting." << endl;
+        return kFALSE;
+    }
+
+    fSrcPosAnti = (MSrcPosCam*)pList->FindObject("MSrcPosAnti", "MSrcPosCam");
+
+    return kTRUE;
+}
+
+// --------------------------------------------------------------------------
+//
+// Checking for file type. If the file type is Monte Carlo the
+// source position is arbitrarily determined from the MC headers.
+//
+Bool_t MSrcPosCorrect::ReInit(MParList *plist)
+{
+    MRawRunHeader *run = (MRawRunHeader*)plist->FindObject("MRawRunHeader");
+    if (!run)
+    {
+        *fLog << err << "MRawRunHeader not found... aborting." << endl;
+        return kFALSE;
+    }
+
+    fRunType   = run->GetRunType();
+    fRunNumber = run->GetRunNumber();
+
+    return kTRUE;
+}
+
+// --------------------------------------------------------------------------
+//
+// Performs source position correction in the camera.
+// Due to missfocussing a shift of
+//    dx=0.048deg and dy=0.032deg
+//  or
+//    dx=14.24mm and dy=9.495mm
+// is added between run 53832 (excl) and 56161 (excl)
+// See also: Runbook
+//
+// 2005-05-23 03:33:51:
+// We start again to make tests on AMC with Roque lamp and PinDiode Tests.
+// At park position, we do a Laser initial isation and a Laser adjustment.
+// We discovered that the procedure we used yester day for Roque Lamp
+// light source was producing a very non-uniform light
+// We did some studies to produce an uniformly illuminated li ght from the
+// Roque Lamp Then we moved the telescope to the Roque Lamp position a nd
+// did a Laser adjust for  the Roque position.  We put the telescope to
+// the same shaftencoder values as were used in August to adjust the
+// mirrors
+// ( 29691 for SE-Az and SE-Zd1 1301 and SE-Zd2 9912 ( someti mes
+// oscillating to 9913 ) ) When we looked at the image of the spot on the
+// camer a, we saw a clear offset from the centre. Then we calculated this
+// offset and put the correct numbers in the AMC code. Then we redid the
+// laser adjustment and fou nd the spot to be nicely centred.  Our
+// calculations showed that the offset was 0 .048 deg in X direction and
+// 0.032 deg in Y direction.
+// Good night
+//
+Int_t MSrcPosCorrect::Process()
+{
+    if (fRunType==MRawRunHeader::kRTMonteCarlo)
+        return kTRUE;
+
+    if (fRunNumber<56161 && fRunNumber>53832)
+    {
+        static const TVector2 dxy(-14.24, -9.495);
+        fSrcPosCam->Add(dxy);
+        if (fSrcPosAnti)
+            fSrcPosAnti->Add(dxy);
+    }
+
+    return kTRUE;
+}
Index: trunk/MagicSoft/Mars/mpointing/MSrcPosCorrect.h
===================================================================
--- trunk/MagicSoft/Mars/mpointing/MSrcPosCorrect.h	(revision 7143)
+++ trunk/MagicSoft/Mars/mpointing/MSrcPosCorrect.h	(revision 7143)
@@ -0,0 +1,30 @@
+#ifndef MARS_MSrcPosCorrect
+#define MARS_MSrcPosCorrect
+
+#ifndef MARS_MTask
+#include "MTask.h"
+#endif
+
+class MSrcPosCam;
+
+class MSrcPosCorrect : public MTask
+{
+private:
+    MSrcPosCam   *fSrcPosCam;
+    MSrcPosCam   *fSrcPosAnti;
+
+    UShort_t fRunType;            //! Run Type to decide where to get pointing position from
+    UInt_t   fRunNumber;
+
+    // MTask
+    Bool_t ReInit(MParList *pList);
+    Int_t  PreProcess(MParList *pList);
+    Int_t  Process();
+
+public:
+    MSrcPosCorrect(const char *name=NULL, const char *title=NULL);
+
+    ClassDef(MSrcPosCorrect, 0) // Corrects MSrcPOsCam for missfocussing
+};
+
+#endif
Index: trunk/MagicSoft/Mars/mpointing/PointingLinkDef.h
===================================================================
--- trunk/MagicSoft/Mars/mpointing/PointingLinkDef.h	(revision 7142)
+++ trunk/MagicSoft/Mars/mpointing/PointingLinkDef.h	(revision 7143)
@@ -13,4 +13,5 @@
 #pragma link C++ class MSrcPosCam+;
 #pragma link C++ class MSrcPosCalc+;
+#pragma link C++ class MSrcPosCorrect+;
 #pragma link C++ class MSrcPosFromModel+;