Changeset 3387

Timestamp:

03/03/04 10:14:48 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mbase/MStatusDisplay.cc (modified) (1 diff)
• mgeom/MGeomCam.cc (modified) (2 diffs)
• mgeom/MGeomMirror.cc (modified) (1 diff)
• mgeom/MGeomMirror.h (modified) (3 diffs)
• mjobs/MJCalibration.cc (modified) (1 diff)
• mjobs/MJExtractSignal.cc (modified) (3 diffs)
• mjobs/MJPedestal.cc (modified) (1 diff)
• mraw/MRawFileWrite.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc

@@ -1973 +1973 @@
         {
             line.PaintLineNDC(0, -0.00, 1, -0.00);
-            ps.SetTextAlign(23); // cent bottom
-            ps.TextNDC(0.5, -0.005, txt);
+            ps.SetTextAlign(11); // left top
+            ps.TextNDC(0, -0.005, txt);
+            ps.SetTextAlign(31); // right top
+            ps.TextNDC(1, -0.005, "(c) 2000-2004, Thomas Bretz");
         }
 

trunk/MagicSoft/Mars/mgeom/MGeomCam.cc

@@ -66 +66 @@
     : fNumPixels(0), fCamDist(0), fConvMm2Deg(0)
 {
+    fName  = "MGeomCam";
+    fTitle = "Storage container for a camera geometry";
 }
 
@@ -77 +79 @@
 {
     fName  = name  ? name  : "MGeomCam";
-    fTitle = title ? title : "Storage container for  a camera geometry";
+    fTitle = title ? title : "Storage container for a camera geometry";
 
     //

trunk/MagicSoft/Mars/mgeom/MGeomMirror.cc

@@ -128 +128 @@
     fReflectivity = ref;
 }
+
+TVector3 MGeomMirror::GetReflection(const TVector3 &star, Double_t dist)
+{
+    if (fReflector==TRotation())
+    {
+        fReflector = TRotation(); // unit matrix
+        fReflector.Rotate(TMath::Pi(), GetMirrorNorm());
+    }
+
+    // Reflect star on the mirror (done by a rotation
+    // around the normal vector of the mirror center
+    TVector3 light(star);
+    light *= fReflector;
+
+    if (dist<0)
+        return light;
+
+    // calculate distance to the camera
+    const TVector3 &pos = GetMirrorCenter();
+    const Double_t d = (dist - pos.Z()) / light.Z();
+
+    return light*d + pos;
+}

trunk/MagicSoft/Mars/mgeom/MGeomMirror.h

@@ -10 +10 @@
 #endif
 
-#ifndef ROOT_TVector3
-#include <TVector3.h>
+#ifndef ROOT_TRotation
+#include <TRotation.h>
 #endif
 
@@ -17 +17 @@
 {
 private:
-    Int_t   fMirrorId;    // the Mirror Id
+    Int_t   fMirrorId;     // the Mirror Id
 
-    Float_t fFocalDist;   // [cm] focal distance of that mirror
-    Float_t fSX;          // [cm] curvilinear coordinate of mirror's center in X
-    Float_t fSY;          // [cm] curvilinear coordinate of mirror's center in Y
-    Float_t fX;           // [cm] x coordinate of the center of the mirror
-    Float_t fY;           // [cm] y coordinate of the center of the mirror
-    Float_t fZ;           // [cm] z coordinate of the center of the mirror
-    Float_t fThetaN;      // polar theta angle of the direction where the mirror points to
-    Float_t fPhiN;        // polar phi angle of the direction where the mirror points to
-    Float_t fXN;          // xn coordinate of the normal vector in the center
-    Float_t fYN;          // yn coordinate of the normal vector in the center
-    Float_t fZN;          // zn coordinate of the normal vector in the center
-                          // Note: fXN^2*fYN^2*fZN^2 = 1
-    Float_t fDeviationX;  // [cm] deviation in x of the spot of a single mirror on the camera plane
-    Float_t fDeviationY;  // [cm] deviation in y of the spot of a single mirror on the camera plane
+    Float_t fFocalDist;    // [cm] focal distance of that mirror
+    Float_t fSX;           // [cm] curvilinear coordinate of mirror's center in X
+    Float_t fSY;           // [cm] curvilinear coordinate of mirror's center in Y
+    Float_t fX;            // [cm] x coordinate of the center of the mirror
+    Float_t fY;            // [cm] y coordinate of the center of the mirror
+    Float_t fZ;            // [cm] z coordinate of the center of the mirror
+    Float_t fThetaN;       // polar theta angle of the direction where the mirror points to
+    Float_t fPhiN;         // polar phi angle of the direction where the mirror points to
+    Float_t fXN;           // xn coordinate of the normal vector in the center
+    Float_t fYN;           // yn coordinate of the normal vector in the center
+    Float_t fZN;           // zn coordinate of the normal vector in the center
+                           // Note: fXN^2*fYN^2*fZN^2 = 1
+    Float_t fDeviationX;   // [cm] deviation in x of the spot of a single mirror on the camera plane
+    Float_t fDeviationY;   // [cm] deviation in y of the spot of a single mirror on the camera plane
 
-    TArrayF fWavelength;  // List of wavelength
-    TArrayF fReflectivity;// Mirror reflectivity
+    TArrayF fWavelength;   // List of wavelength
+    TArrayF fReflectivity; // Mirror reflectivity
+
+    TRotation fReflector;  //! Store this for acceleration
 
 public:
@@ -55 +57 @@
     TVector3 GetMirrorNorm() const   { return TVector3(fXN, fYN, fZN); }
 
+    TVector3 GetReflection(const TVector3 &star, Double_t dist=-1);
+
     ClassDef(MGeomMirror, 2)  // geometry class describing one mirror
 };

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -465 +465 @@
     if (fRuns->GetNumRuns() != fRuns->GetNumEntries())
     {
-        *fLog << err << "Number of files found doesn't metch number of runs... abort." << endl;
+        *fLog << err << "Number of files found doesn't match number of runs... abort." << endl;
         return kFALSE;
     }

trunk/MagicSoft/Mars/mjobs/MJExtractSignal.cc

@@ -289 +289 @@
     if (fRuns->GetNumRuns() != fRuns->GetNumEntries())
     {
-        *fLog << err << "Number of files found doesn't metch number of runs... abort." << endl;
+        *fLog << err << "Number of files found doesn't match number of runs... abort." << endl;
         return kFALSE;
     }
@@ -418 +418 @@
     if (fRuns->GetNumRuns() != fRuns->GetNumEntries())
     {
-        *fLog << err << "Number of files found doesn't metch number of runs... abort." << endl;
+        *fLog << err << "Number of files found doesn't match number of runs... abort." << endl;
         return kFALSE;
     }
@@ -500 +500 @@
     if (fRuns->GetNumRuns() != fRuns->GetNumEntries())
     {
-        *fLog << err << "Number of files found doesn't metch number of runs... abort." << endl;
+        *fLog << err << "Number of files found doesn't match number of runs... abort." << endl;
         return kFALSE;
     }

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -314 +314 @@
     if (fRuns->GetNumRuns() != fRuns->GetNumEntries())
     {
-        *fLog << err << "Number of files found doesn't metch number of runs... abort." << endl;
+        *fLog << err << "Number of files found doesn't match number of runs... abort." << endl;
         return kFALSE;
     }

trunk/MagicSoft/Mars/mraw/MRawFileWrite.cc

@@ -179 +179 @@
     //
     TTree *rh = new TTree("RunHeaders", "Run headers of all runs in this file");
-    rh->Branch("MRawRunHeader", "MRawRunHeader", &fRawRunHeader, 32000);
+    rh->Branch("MRawRunHeader.", "MRawRunHeader", &fRawRunHeader, 32000);
     rh->Fill();
     //rh->Write();