Changeset 7200 for trunk/MagicSoft/Mars/mpointing

Timestamp:

07/19/05 15:53:36 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mpointing

Files:

• MHPointing.cc (modified) (9 diffs)
• MHPointing.h (modified) (1 diff)
• MSrcPosCorrect.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mpointing/MHPointing.cc

@@ -87 +87 @@
     fDevTimeSG.SetNameTitle("DevSG",      "Drive (black) and starguider (blue) deviation");
     fDevTimeCosy.SetNameTitle("DevCosy",  "Cosy deviation");
-    fBrightness.SetNameTitle("Brigtness", "Arbitrary Sky Brightness");
+    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)");
     fDevAz.SetNameTitle("DevAz",          "Starguider Deviation Az");
+    fPosZd.SetNameTitle("PosZd",          "Nominal position Zd (black), Az (blue)");
+    fPosAz.SetNameTitle("PosZd",          "Position Az");
 
     InitGraph(fDevTimeSG);
@@ -98 +100 @@
     InitGraph(fDevZd);
     InitGraph(fDevAz);
+    InitGraph(fPosZd);
+    InitGraph(fPosAz);
 
     fDevTimeSG.SetMinimum(0);
@@ -106 +110 @@
     fDevTimeSG.SetMarkerColor(kBlue);
     fDevZd.SetMarkerColor(kBlue);
+    fNumStars.SetMarkerColor(kBlue);
+    fPosAz.SetMarkerColor(kBlue);
 }
 
@@ -170 +176 @@
     {
         AddPoint(fDevTimeCosy, tm, fReportCosy->GetAbsError()*60);
+        AddPoint(fPosZd,       tm, fReportCosy->GetNominalZd());
+        AddPoint(fPosAz,       tm, fReportCosy->GetNominalAz());
         return kTRUE;
     }
@@ -190 +198 @@
     }
 }
-/*
+
 // --------------------------------------------------------------------------
 //
@@ -227 +235 @@
     axis->SetTitle(title);
     axis->SetTitleOffset(0.9);
-    axis->SetTextColor(kRed);
+    axis->SetTextColor(kBlue);
     axis->SetBit(kCanDelete);
     axis->Draw();
 }
-*/
+
 // --------------------------------------------------------------------------
 //
@@ -259 +267 @@
     gPad->SetGridy();
     fBrightness.Draw("AP");
+    fNumStars.Draw("P");
+    DrawRightAxis("N");
 
     pad->cd(3);
@@ -271 +281 @@
     gPad->SetGridx();
     gPad->SetGridy();
-    fNumStars.Draw("AP");
+    fPosZd.Draw("AP");
+    fPosAz.Draw("P");
+    DrawRightAxis("Az [\\circ]");
 }
 
@@ -282 +294 @@
     DrawGraph(fDevZd,       "\\Delta [arcmin]");
     DrawGraph(fDevAz,       "\\Delta [arcmin]");
-    /*
-    gPad->cd(1);
-
+    DrawGraph(fPosZd,       "Zd [\\circ]");
+    DrawGraph(fPosAz,       "Az [\\circ]");
+
+    TVirtualPad *pad = gPad;
+
+    pad->cd(2);
     if (gPad)
     {
-        fHumidity.GetHistogram()->GetYaxis()->SetTitleColor(kBlue);
-        UpdateRightAxis(fTemperature);
-    }*/
-}
+        fNumStars.GetHistogram()->GetYaxis()->SetTitleColor(kBlue);
+        UpdateRightAxis(fBrightness);
+    }
+
+    pad->cd(4);
+    if (gPad)
+    {
+        fPosAz.GetHistogram()->GetYaxis()->SetTitleColor(kBlue);
+        UpdateRightAxis(fPosZd);
+    }
+}

trunk/MagicSoft/Mars/mpointing/MHPointing.h

@@ -29 +29 @@
     TGraph             fDevAz;       // Starguider deviation Az
 
+    TGraph             fPosZd;       // Position Zd
+    TGraph             fPosAz;       // Position Az
+
     void ResetGraph(TGraph &g) const;
     void InitGraph(TGraph &g) const;
     void AddPoint(TGraph &g, Double_t x, Double_t y) const;
     void DrawGraph(TGraph &g, const char *y=0) const;
-    //void UpdateRightAxis(TGraph &g) const;
-    //void DrawRightAxis(const char *title) const;
+    void UpdateRightAxis(TGraph &g) const;
+    void DrawRightAxis(const char *title) const;
 
 public:

trunk/MagicSoft/Mars/mpointing/MSrcPosCorrect.cc

@@ -100 +100 @@
     fRunNumber = run->GetRunNumber();
 
+    if (fRunNumber<56161 && fRunNumber>53832)
+    {
+        *fLog << inf << "Run Number " << fRunNumber << " between 53832 and 56161." << endl;
+        *fLog << "A missfocussing correction (-0.048deg/0.034deg) will be applied." << endl;
+    }
+
     return kTRUE;
 }