Changeset 3544 for trunk/MagicSoft/Mars

Timestamp:

03/18/04 13:45:41 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/AnalysisIncl.h (modified) (1 diff)
• manalysis/MSrcPosCam.cc (modified) (2 diffs)
• manalysis/MSrcPosCam.h (modified) (2 diffs)
• mhbase/MH.cc (modified) (1 diff)
• mpointing/MPointingPos.h (modified) (2 diffs)
• mpointing/MPointingPosCalc.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2004/03/18: Thomas Bretz
+ 
+   * manalysis/AnalysisIncl.h:
+     - added TVector2
+
+   * manalysis/MSrcPosCam.[h,cc]:
+     - added Getter/Setter using TVector2
+
+   * mhbase/MH.cc:
+     - fixed GetMinimumGT for TH2 and TH3
+
+   * mpointing/MPointingPos.h:
+     - added Getter/Setter for Ra/Dec
+
+   * mpointing/MPointingPosCalc.cc:
+     - fill Ra/Dec into MPointingPos
+
+
+
  2004/03/18: Markus Gaug
 
    * mimage/MConcentration.cc
      - fixed on flog to fLog in order to compile
+
+
 
  2004/03/17: Thomas Bretz

trunk/MagicSoft/Mars/manalysis/AnalysisIncl.h

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

trunk/MagicSoft/Mars/manalysis/MSrcPosCam.cc

@@ -36 +36 @@
 #include <fstream>
 
+#include <TVector2.h>
+
 #include "MLog.h"
 #include "MLogManip.h"
@@ -64 +66 @@
     *fLog << " - x [mm] = " << fX << endl;
     *fLog << " - y [mm] = " << fY << endl;
+}
+
+void MSrcPosCam::SetXY(const TVector2 &v)
+{
+    fX = v.X();
+    fY = v.Y();
+}
+
+TVector2 MSrcPosCam::GetXY() const
+{
+    return TVector2(fX, fY);
 }
 

trunk/MagicSoft/Mars/manalysis/MSrcPosCam.h

@@ -5 +5 @@
 #include "MParContainer.h"
 #endif
+
+class TVector2;
 
 class MSrcPosCam : public MParContainer
@@ -22 +24 @@
     void SetY(Float_t y)             { fY = y; }
     void SetXY(Float_t x, Float_t y) { fX = x; fY = y; }
+    void SetXY(const TVector2 &v);
 
     Float_t GetX() const             { return fX; }
     Float_t GetY() const             { return fY; }
+    TVector2 GetXY() const;
 
     void Print(Option_t *opt=NULL) const;

trunk/MagicSoft/Mars/mhbase/MH.cc

@@ -573 +573 @@
     Double_t min = FLT_MAX;
 
-    const TAxis &axe = *((TH1&)h).GetXaxis();
-
-    for (int i=1; i<=axe.GetNbins(); i++)
-    {
-        Double_t x = h.GetBinContent(i);
-        if (gt<x && x<min)
-            min = x;
-    }
+    const TAxis &axex = *((TH1&)h).GetXaxis();
+    const TAxis &axey = *((TH1&)h).GetYaxis();
+    const TAxis &axez = *((TH1&)h).GetZaxis();
+
+    for (int iz=1; iz<=axez.GetNbins(); iz++)
+        for (int iy=1; iy<=axey.GetNbins(); iy++)
+            for (int ix=1; ix<=axex.GetNbins(); ix++)
+            {
+                const Double_t v = h.GetBinContent(h.GetBin(ix, iy, iz));
+                if (gt<v && v<min)
+                    min = v;
+            }
     return min;
 }

trunk/MagicSoft/Mars/mpointing/MPointingPos.h

@@ -12 +12 @@
     Double_t fAz;  // [deg] Azimuth
 
-    Double_t fRa;  // [deg] Right ascension
-    Double_t fHa;  // [deg] Houre angle
-    Double_t fDec; // [deg] Declination
+    Double_t fRa;  // [rad] Right ascension
+    Double_t fHa;  // [rad] Hour angle
+    Double_t fDec; // [rad] Declination
 
 public:
@@ -26 +26 @@
     void SetSkyPosition(Double_t ra, Double_t dec, Double_t ha=0) { fRa=ra; fDec=dec; fHa=ha; }
 
-    Double_t GetZd() const { return fZd; }
-    Double_t GetAz() const { return fAz; }
+    Double_t GetZd() const  { return fZd; }
+    Double_t GetAz() const  { return fAz; }
+
+    Double_t GetRa() const  { return fRa; }
+    Double_t GetDec() const { return fDec; }
 
     ClassDef(MPointingPos, 1) //Container storing the (corrected) telescope pointing position

trunk/MagicSoft/Mars/mpointing/MPointingPosCalc.cc

@@ -134 +134 @@
     case MRawRunHeader::kRTData:
         fPosition->SetLocalPosition(fReport->GetNominalZd(), fReport->GetNominalAz());
+        fPosition->SetSkyPosition(fReport->GetRa()*TMath::DegToRad()/15, fReport->GetDec()*TMath::DegToRad());
         return kTRUE;