Changeset 7211 for trunk

Timestamp:

07/22/05 14:50:50 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mpointing/MHPointing.cc (modified) (9 diffs)
• mpointing/MHPointing.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -63 +63 @@
        starguider reports
 
-   * mpointing/MHPointing.cc:
+   * mpointing/MHPointing.[h,cc]:
      - allow skipping MHPointing for very old files without
        starguider reports
+     - removed displaying nominal Az
 
 

trunk/MagicSoft/Mars/mpointing/MHPointing.cc

@@ -86 +86 @@
 
     // Init Graphs
-    fDevTimeSG.SetNameTitle("DevSG",      "Drive (black) and starguider (blue) deviation");
+    fDevTimeSG.SetNameTitle("DevSG",      "Absolute deviation of drive (black) and starguider (blue)");
     fDevTimeCosy.SetNameTitle("DevCosy",  "Cosy deviation");
     fBrightness.SetNameTitle("Brigtness", "Arbitrary Sky Brightness (black), No. of stars identified by starguider (blue)");
     fNumStars.SetNameTitle("NumStars",    "Number of stars identified by starguider");
-    fDevZd.SetNameTitle("DevZd",          "Starguider Deviation Zd (blue), Az(black)");
+    fDevZd.SetNameTitle("DevZd",          "Starguider deviation Zd (blue), Az (black)");
     fDevAz.SetNameTitle("DevAz",          "Starguider Deviation Az");
-    fPosZd.SetNameTitle("PosZd",          "Nominal position Zd (black), Az (blue)");
-    fPosAz.SetNameTitle("PosZd",          "Position Az");
+    fPosZd.SetNameTitle("PosZd",          "Nominal position Zd");
+    //fPosAz.SetNameTitle("PosZd",          "Position Az");
 
     InitGraph(fDevTimeSG);
@@ -102 +102 @@
     InitGraph(fDevAz);
     InitGraph(fPosZd);
-    InitGraph(fPosAz);
+    //InitGraph(fPosAz);
 
     fDevTimeSG.SetMinimum(0);
@@ -112 +112 @@
     fDevZd.SetMarkerColor(kBlue);
     fNumStars.SetMarkerColor(kBlue);
-    fPosAz.SetMarkerColor(kBlue);
+    //fPosAz.SetMarkerColor(kBlue);
 }
 
@@ -167 +167 @@
         }
 
-        AddPoint(fBrightness, tm, fReportSG->GetSkyBrightness());
-        AddPoint(fNumStars,   tm, fReportSG->GetNumIdentifiedStars());
+        // Check for old files
+        if (fReportSG->GetSkyBrightness()>0)
+        {
+            AddPoint(fBrightness, tm, fReportSG->GetSkyBrightness());
+            AddPoint(fNumStars,   tm, fReportSG->GetNumIdentifiedStars());
+        }
 
         const Bool_t zdok     = TMath::Abs(fReportSG->GetDevZd())<30;
@@ -196 +200 @@
         if (fPosZd.GetY()[fPosZd.GetN()-1] != fReportCosy->GetNominalZd())
             AddPoint(fPosZd, tm, fReportCosy->GetNominalZd());
-        if (fPosAz.GetY()[fPosAz.GetN()-1] != fReportCosy->GetNominalAz())
-            AddPoint(fPosAz, tm, fReportCosy->GetNominalAz());
+        //if (fPosAz.GetY()[fPosAz.GetN()-1] != fReportCosy->GetNominalAz())
+        //    AddPoint(fPosAz, tm, fReportCosy->GetNominalAz());
         return kTRUE;
     }
@@ -302 +306 @@
     gPad->SetGridy();
     fPosZd.Draw("AP");
-    fPosAz.Draw("P");
-    DrawRightAxis("Az [\\circ]");
+    //fPosAz.Draw("P");
+    //DrawRightAxis("Az [\\circ]");
 }
 
@@ -315 +319 @@
     DrawGraph(fDevAz,       "\\Delta [arcmin]");
     DrawGraph(fPosZd,       "Zd [\\circ]");
-    DrawGraph(fPosAz,       "Az [\\circ]");
+    //DrawGraph(fPosAz,       "Az [\\circ]");
 
     TVirtualPad *pad = gPad;
@@ -325 +329 @@
         UpdateRightAxis(fNumStars);
     }
-
+/*
     pad->cd(4);
     if (gPad)
@@ -331 +335 @@
         fPosAz.GetHistogram()->GetYaxis()->SetTitleColor(kBlue);
         UpdateRightAxis(fPosAz);
-    }
-}
+    }*/
+}

trunk/MagicSoft/Mars/mpointing/MHPointing.h

@@ -30 +30 @@
 
     TGraph             fPosZd;       // Position Zd
-    TGraph             fPosAz;       // Position Az
+    //TGraph             fPosAz;       // Position Az
 
     void ResetGraph(TGraph &g) const;