Changeset 7202 for trunk/MagicSoft/Mars/mpointing

Timestamp:

07/21/05 11:44:05 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mpointing

Files:

• MHPointing.cc (modified) (3 diffs)
• Makefile (modified) (1 diff)
• PointingIncl.h (modified) (1 diff)
• PointingLinkDef.h (modified) (1 diff)

trunk/MagicSoft/Mars/mpointing/MHPointing.cc

@@ -42 +42 @@
 
 #include "MTime.h"
+#include "MAstro.h"
 
 #include "MReportDrive.h"
@@ -165 +166 @@
     if (t->GetName()==(TString)"MTimeStarguider")
     {
-        const Double_t max = 30; // [arcsec] maximum starguider deviation which makes sense
-
         AddPoint(fBrightness, tm, fReportSG->GetSkyBrightness());
         AddPoint(fNumStars,   tm, fReportSG->GetNumIdentifiedStars());
-        if (fReportSG->GetDevAbs()<max)
+
+        const Bool_t zdok     = TMath::Abs(fReportSG->GetDevZd())<30;
+        const Bool_t azok     = TMath::Abs(fReportSG->GetDevAz())<90;
+
+        const Double_t devzd  = fReportSG->GetDevZd();
+        const Double_t devaz  = fReportSG->GetDevAz();
+
+        if (zdok && azok)
             AddPoint(fDevTimeSG, tm, fReportSG->GetDevAbs());
-        if (TMath::Abs(fReportSG->GetDevZd())<max)
-            AddPoint(fDevZd,  tm, fReportSG->GetDevZd());
-        if (TMath::Abs(fReportSG->GetDevAz())<max)
-            AddPoint(fDevAz,  tm, fReportSG->GetDevAz());
+        if (zdok)
+            AddPoint(fDevZd, tm, devzd);
+        if (azok)
+            AddPoint(fDevAz, tm, devaz);
         return kTRUE;
     }
@@ -198 +204 @@
         TAxis *axe = h->GetXaxis();
         axe->SetLabelSize(0.033);
-        axe->SetTimeFormat("%H:%M:%S %F1995-01-01 00:00:00 GMT");
+        axe->SetTimeFormat("%H:%M %F1995-01-01 00:00:00 GMT");
         axe->SetTimeDisplay(1);
         axe->SetTitle("Time");

trunk/MagicSoft/Mars/mpointing/Makefile

@@ -23 +23 @@
 
 SRCFILES = MPointing.cc \
+           MPointingDev.cc \
+           MPointingDevCalc.cc \
            MPointingPos.cc \
            MPointingPosCalc.cc \

trunk/MagicSoft/Mars/mpointing/PointingIncl.h

@@ -1 +1 @@
 #ifndef __CINT__
 
-#include <TVector2.h>
-
 #endif // __CINT__

trunk/MagicSoft/Mars/mpointing/PointingLinkDef.h

@@ -6 +6 @@
 
 #pragma link C++ class MPointing+;
+
+#pragma link C++ class MPointingDev+;
+#pragma link C++ class MPointingDevCalc+;
 
 #pragma link C++ class MPointingPos+;