Changeset 7196 for trunk/MagicSoft/Mars/mpointing

Timestamp:

07/19/05 11:04:43 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mpointing/MSrcPosCorrect.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/mpointing/MSrcPosCorrect.cc

@@ -49 +49 @@
 //
 MSrcPosCorrect::MSrcPosCorrect(const char *name, const char *title)
-    : fSrcPosCam(NULL), fSrcPosAnti(NULL)
+    : fSrcPosCam(NULL), fSrcPosAnti(NULL), fAxis(NULL)
 {
     fName  = name  ? name  : "MSrcPosCorrect";
@@ -75 +75 @@
 
     fSrcPosAnti = (MSrcPosCam*)pList->FindObject("MSrcPosAnti", "MSrcPosCam");
+
+    fAxis = (MSrcPosCam*)pList->FindCreateObj("MSrcPosCam", "OpticalAxis");
+    if (!fAxis)
+        return kFALSE;
 
     return kTRUE;
@@ -103 +107 @@
 // Performs source position correction in the camera.
 // Due to missfocussing a shift of
-//    dx=0.048deg and dy=0.032deg
+//    dx=0.048deg and dy=0.034deg
 //  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
+//    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
+//    and 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 ( sometimes
+//    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()
@@ -133 +138 @@
         return kTRUE;
 
+    // FIXME: Implement Culmination correction
+
     if (fRunNumber<56161 && fRunNumber>53832)
     {
-        // dx=-0.05deg, dy=0.03deg, d=0.06deg
+        // dx=-0.048deg, dy=0.034deg, d=0.059deg
         static const TVector2 dxy(-14.24, -9.495);
+        fAxis->SetXY(dxy);
         fSrcPosCam->Add(dxy);
         if (fSrcPosAnti)