Changeset 7220 for trunk/MagicSoft

Timestamp:

07/25/05 18:44:24 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• ganymed_onoff.rc (modified) (1 diff)
• ganymed_wobble.rc (modified) (1 diff)
• mjobs/MDataSet.cc (modified) (1 diff)
• mjobs/MJPedestal.cc (modified) (2 diffs)
• mjobs/MSequence.cc (modified) (1 diff)
• mpointing/MPointingDev.h (modified) (3 diffs)
• mpointing/MPointingDevCalc.cc (modified) (1 diff)
• mpointing/MSrcPosCalc.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -42 +42 @@
    * mpointing/MPointingPos.[h,cc]:
      - added option to calculate Rotation angle using MPointingDev 
+
+   * ganymed_onoff.rc, ganymed_wobble.rc:
+     - added example for MPointingDevCalc
+
+   * mjobs/MDataSet.cc:
+     - fixed an endless loop when a sequence is added twice
+
+   * mjobs/MSequence.cc:
+     - fixed an endless loop when a run is added twice
+
+   * mjobs/MJPedestal.cc:
+     - CheckEnv doesn't return kERROR, test for kFALSE instead
+
+   * mpointing/MPointingDev.h:
+     - added fDevX
+     - added fDevY
+
+   * mpointing/MPointingDevCalc.cc:
+     - call SetDevXY instead of the starguider calibration in zd/az
+
+   * mpointing/MSrcPosCalc.cc:
+     - added the DevXY to the source position if fDeviation!=NULL
 
 

trunk/MagicSoft/Mars/NEWS

@@ -155 +155 @@
      when calculating the source position. This is especially important
      for wobble data at high zenith angles and culmination data.
+
+   - ganymed: If available the starguider data is taken into account as
+     good as it is possible without a starguider calibration. To switch
+     it off add
+        MPointingDevCalc.MaxAbsDev: -1
+     to your ganymed.rc
 
    - sponde: the zenith angle distribution is now weighted instead of

trunk/MagicSoft/Mars/ganymed_onoff.rc

@@ -39 +39 @@
 BinningDist.Raw:         25    0    2
 BinningMaxDist.Raw:      25    0    2
+
+# -------------------------------------------------------------------------
+# Using the starguider for pointing correction. 
+# To switch it off use "MPointingDevCalc.MaxAbsDev: -1"
+# -------------------------------------------------------------------------
+#MPointingDevCalc.MaxAbsDev:   15
+#MPointingDevCalc.NumMinStars: 8
+#MPointingDevCalc.NsbLevel:    3.0
+#MPointingDevCalc.NsbMin:      30
+#MPointingDevCalc.NsbMax:      60
+#MPointingDevCalc.MaxAbsDev:   15
 
 # -------------------------------------------------------------------------

trunk/MagicSoft/Mars/ganymed_wobble.rc

@@ -39 +39 @@
 BinningDist.Raw:         25    0    2
 BinningMaxDist.Raw:      25    0    2
+
+# -------------------------------------------------------------------------
+# Using the starguider for pointing correction. 
+# To switch it off use "MPointingDevCalc.MaxAbsDev: -1"
+# -------------------------------------------------------------------------
+#MPointingDevCalc.MaxAbsDev:   15
+#MPointingDevCalc.NumMinStars: 8
+#MPointingDevCalc.NsbLevel:    3.0
+#MPointingDevCalc.NsbMin:      30
+#MPointingDevCalc.NsbMax:      60
+#MPointingDevCalc.MaxAbsDev:   15
 
 # -------------------------------------------------------------------------

trunk/MagicSoft/Mars/mjobs/MDataSet.cc

@@ -122 +122 @@
 
         if (i<n)
+            *fLog << warn << "WARNING - Sequence #" << seq << " alraedy in list... skipped." << endl;
+        else
         {
-            *fLog << warn << "WARNING - Sequence #" << seq << " alraedy in list... skipped." << endl;
-            continue;
+            // set new entry
+            data.Set(n+1);
+            data[n] = seq;
         }
-
-        // set new entry
-        data.Set(n+1);
-        data[n] = seq;
 
         // remove entry from string

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -800 +800 @@
 
     // check the resource file for it
-    if (CheckEnv(tenv)==kERROR)
+    if (!CheckEnv(tenv))
         return kFALSE;
 
@@ -1105 +1105 @@
 
         // The requested setup might have been overwritten
-        if (CheckEnv(*fExtractor)==kERROR)
+        if (!CheckEnv(*fExtractor))
             return kFALSE;
 

trunk/MagicSoft/Mars/mjobs/MSequence.cc

@@ -178 +178 @@
 
         if (i<n)
+            *fLog << warn << "WARNING - Run #" << run << " alraedy in list... skipped." << endl;
+        else
         {
-            *fLog << warn << "WARNING - Run #" << run << " alraedy in list... skipped." << endl;
-            continue;
+            // set new entry
+            data.Set(n+1);
+            data[n] = run;
         }
-
-        // set new entry
-        data.Set(n+1);
-        data[n] = run;
 
         runs.Remove(0, runs.First(num)+num.Length());

trunk/MagicSoft/Mars/mpointing/MPointingDev.h

@@ -4 +4 @@
 #ifndef MARS_MParContainer
 #include "MParContainer.h"
+#endif
+#ifndef ROOT_TVector2
+#include <TVector2.h>
 #endif
 
@@ -11 +14 @@
     Double_t fDevZd;  // [deg] Pointing offset zenith distance as calculated from starguider data
     Double_t fDevAz;  // [deg] Pointing offset azimuth as calculated from starguider dat
+
+    Double_t fDevX;   // [mm]
+    Double_t fDevY;   // [mm]
 
 public:
@@ -20 +26 @@
 
     void SetDevZdAz(Double_t devzd, Double_t devaz) { fDevZd=devzd; fDevAz=devaz; }
+    void SetDevXY(Double_t dx, Double_t dy) { fDevX=dx; fDevY=dy; }
 
     Double_t GetDevZd() const  { return fDevZd; }
     Double_t GetDevAz() const  { return fDevAz; }
+
+    Double_t GetDevX() const  { return fDevX; }
+    Double_t GetDevY() const  { return fDevY; }
+
+    TVector2 GetDevXY() const { return TVector2(fDevX, fDevY); }
 
     Double_t GetDevZdRad() const  { return fDevZd*TMath::DegToRad(); }

trunk/MagicSoft/Mars/mpointing/MPointingDevCalc.cc

@@ -176 +176 @@
     }
 
+    // Calculate absolute deviation
+    const Double_t dev = MAstro::GetDevAbs(fReport->GetNominalZd(), devzd, devaz);
+
+    // Sanity check... larger deviation are strange and ignored
+    if (dev*60>fMaxAbsDev)
+    {
+        fSkip[4]++;
+        return kTRUE;
+    }
+
+    fDeviation->SetDevZdAz(devzd, devaz);
+
     // Linear starguider calibration taken from April/May data
     // For calibration add MDriveReport::GetErrorZd/Az !
-    devzd -= 2.686/60;   // 1arcmin ~ 5mm
-    devaz -= 2.840/60;
-
-    // Calculate absolute deviation
-    const Double_t dev = MAstro::GetDevAbs(fReport->GetNominalZd(), devzd, devaz);
-
-    // Sanity check... larger deviation are strange and ignored
-    if (dev*60>fMaxAbsDev)
-    {
-        fSkip[4]++;
-        return kTRUE;
-    }
-
-    fDeviation->SetDevZdAz(devzd, devaz);
+    fDeviation->SetDevXY(-7.0, 16);
+    //devzd -= 2.686/60;   // 1arcmin ~ 5mm
+    //devaz -= 2.840/60;
+
     fSkip[0]++;
 

trunk/MagicSoft/Mars/mpointing/MSrcPosCalc.cc

@@ -371 +371 @@
     if (fDeviation)
     {
-        vx = CalcXYinCamera(pos0, pos)*fGeom->GetCameraDist()*1000;
+        //vx = CalcXYinCamera(pos0, pos)*fGeom->GetCameraDist()*1000;
         pos0.SetZdAz(pos0.Theta()-fDeviation->GetDevZdRad(),
                      pos0.Phi()  -fDeviation->GetDevAzRad());
@@ -378 +378 @@
     // Calculate source position in camera, and convert to mm:
     TVector2 v = CalcXYinCamera(pos0, pos)*fGeom->GetCameraDist()*1000;
+
+    if (fDeviation)
+        v -= fDeviation->GetDevXY();
+
     SetSrcPos(v);