Changeset 6922

Timestamp:

04/08/05 18:37:37 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• NEWS (modified) (1 diff)
• mjobs/MDataSet.cc (modified) (1 diff)
• mreport/MReportStarguider.cc (modified) (2 diffs)
• mreport/MReportStarguider.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -66 +66 @@
      - implemented new values from new starguider report as defined
        in TDAS00-07 V7.1
+     - Fixed the formerly wrong unit of fDevAz and fDevZd (unit now
+       is arcmin)
 
    * mjobs/MJCalibrateSignal.cc:
@@ -81 +83 @@
      - removed condition IsUseBlindPixel() and IsUsePINDiode from
        setting filter and applied it to the corresponding task
+
+   * mjobs/MDataSet.cc:
+     - fixed a bug using the default paths
 
 

trunk/MagicSoft/Mars/NEWS

@@ -54 +54 @@
    - implemented new values from new starguider report as defined
      in TDAS00-07 V7.1 (eg SkyBrighness)
+
+   - Fixed the formerly wrong unit of azimuth and zenith angle deviation
+     in starguider report (If you merpp the same reports with this version
+     you'll get the correct units (arcmin) but a different result
+     than with old versions (wrong units))
 
 

trunk/MagicSoft/Mars/mjobs/MDataSet.cc

@@ -122 +122 @@
         // Set default sequence file and dir name
         if (name.IsNull())
-            name = Form("/magic/sequences/%04d/sequence%08d.txt", num[i]/1000, num[i]);
+            name = Form("/magic/sequences/%04d/sequence%08d.txt", num[i]/10000, num[i]);
         if (dir.IsNull())
-            name = Form("/magic/data/star/%04d/%08d", num[i]/1000, num[i]);
+            dir = Form("/magic/data/star/%04d/%08d", num[i]/10000, num[i]);
 
         if (gSystem->AccessPathName(name, kFileExists))

trunk/MagicSoft/Mars/mreport/MReportStarguider.cc

@@ -36 +36 @@
 // Class Version 1:
 // ----------------
-//  + Double_t fDevAz;          // [deg]   azimuth mispointing
-//  + Double_t fDevZd;          // [deg]   zenith  mispointing
+//  + Double_t fDevAz;          // [arcmin]   azimuth mispointing
+//  + Double_t fDevZd;          // [arcmin]   zenith  mispointing
 //
 //
@@ -95 +95 @@
 
     if (ver < 200503170)
+    {
+        // Fix a problem with the units
+        fDevAz *= 60./TMath::RadToDeg();
+        fDevZd *= 60./TMath::RadToDeg();
         return str.IsNull() ? kTRUE : kCONTINUE;
+    }
 
     MAstro::String2Angle(str, fNominalZd);   // Nom Zd
     MAstro::String2Angle(str, fNominalAz);   // Nom Az
+
+    if (ver < 999999999)
+    {
+        // Until a fix in the software the written position was nonsense
+        fNominalZd = 0;
+        fNominalAz = 0;
+    }
 
     n=sscanf(str.Data(), "%f %f %d %lf %lf %n",

trunk/MagicSoft/Mars/mreport/MReportStarguider.h

@@ -9 +9 @@
 {
 private:
-    Double_t fDevAz;              // [deg]   azimuth mispointing
-    Double_t fDevZd;              // [deg]   zenith  mispointing
+    Double_t fDevAz;              // [arcmin] azimuth mispointing
+    Double_t fDevZd;              // [arcmin] zenith  mispointing
 
     Double_t fNominalZd;          // [deg] Nominal zenith distance