Changeset 9947 for trunk/Mars

Timestamp:

09/29/10 08:07:08 (14 years ago)

Author:

tbretz

Message:

Implemented a new mirror type MMirrorHex90 and a possibility to write a file with a relfector definition.

Location:

trunk/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• msimreflector/MMirror.h (modified) (3 diffs)
• msimreflector/MMirrorDisk.cc (modified) (1 diff)
• msimreflector/MMirrorDisk.h (modified) (1 diff)
• msimreflector/MMirrorHex.cc (modified) (1 diff)
• msimreflector/MMirrorHex.h (modified) (3 diffs)
• msimreflector/MReflector.cc (modified) (1 diff)
• msimreflector/MReflector.h (modified) (1 diff)
• msimreflector/SimReflectorLinkDef.h (modified) (1 diff)

trunk/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2010/09/29 Thomas Bretz
+
+   * msimreflector/MMirrorHex.[h,cc]:
+     - implemented WriteM
+     - implemented new class MMirrorHex90
+
+   * msimreflector/SimReflectorLinkDef.h:
+     - added MMirrorHex90
+
+   * msimreflector/MMirrorDisk.[h,cc], msimreflector/MMirrorSquare.[h,cc]:
+     - implemented WriteM
+
+   * msimreflector/MReflector.[h,cc]:
+     - added function to write a file with a reflector definition
+
+   * msimreflector/MMirror.h:
+     - added virtual WriteM
+     - added several Getter for Z, Nx, Ny, Nz and Shape
+
+
 
  2010/09/28 Thomas Bretz

trunk/Mars/NEWS

@@ -69 +69 @@
 
    * Added reading of re-used corsika showers (only supported if MMCS is used)
+
+   * Added new mirror type MMirrorHex90 (MMirrorHex rotated by 90deg)
 
  ;star:

trunk/Mars/msimreflector/MMirror.h

@@ -56 +56 @@
     Double_t X() const { return fPos.X(); }
     Double_t Y() const { return fPos.Y(); }
+    Double_t Z() const { return fPos.Z(); }
+
+    Double_t Nx() const { return fNorm.X(); }
+    Double_t Ny() const { return fNorm.Y(); }
+    Double_t Nz() const { return fNorm.Z(); }
 
     TVector2 GetPosXY() const { return fPos.XYvector(); }
@@ -65 +70 @@
 
     Double_t GetDist() const { return fPos.Perp(); }
+    Int_t GetShape() const { return fShape; }
 
     virtual Double_t GetMaxR() const=0;// { return TMath::Max(fMaxRX, fMaxRY); }
@@ -86 +92 @@
 
     virtual Int_t ReadM(const TObjArray &tok)=0;
+    virtual void  WriteM(std::ostream &out) const=0;
 
     // TObject

trunk/Mars/msimreflector/MMirrorDisk.cc

@@ -166 +166 @@
     return 1;
 }
+
+// ------------------------------------------------------------------------
+//
+void MMirrorDisk::WriteM(ostream &out) const
+{
+    out << fR*2;
+}

trunk/Mars/msimreflector/MMirrorDisk.h

@@ -22 +22 @@
 
     Int_t ReadM(const TObjArray &tok);
+    void  WriteM(std::ostream &out) const;
 
     //TObject

trunk/Mars/msimreflector/MMirrorHex.cc

@@ -184 +184 @@
     return 1;
 }
+
+// ------------------------------------------------------------------------
+//
+void MMirrorHex::WriteM(ostream &out) const
+{
+    out << fD*2;
+}
+
+// ------------------------------------------------------------------------
+//
+// Check if the given position coincides with the mirror. The position
+// is assumed to be the incident point on the mirror's surface.
+//
+// The coordinates are in the mirrors coordinate frame.
+//
+// The action should coincide with what is painted in Paint()
+//
+Bool_t MMirrorHex90::HasHit(const MQuaternion &p) const
+{
+    // p is the incident point in the mirror in the mirror's
+    // coordinate frame
+
+    // Black spot in the mirror center (here we can fairly ignore
+    // the distance from the plane to the mirror surface, as long
+    // as the black spot does not become too large)
+    if (p.R2()<0.5*0.5)
+        return kFALSE;
+
+    //
+    // Now check if point is outside of hexagon; just check x coordinate
+    // in three coordinate systems: the default one, in which two sides of
+    // the hexagon are paralel to the y axis (see camera displays) and two 
+    // more, rotated with respect to that one by +- 60 degrees.
+    //
+    if (TMath::Abs(p.Y())>fD)
+        return kFALSE;
+
+    const Double_t dxs = p.X()*fgSin60;
+    const Double_t dyc = p.Y()*fgCos60;
+
+    if (TMath::Abs(dxs+dyc)>fD)
+        return kFALSE;
+
+    if (TMath::Abs(dxs-dyc)>fD)
+        return kFALSE;
+
+    return kTRUE;
+}
+
+// ------------------------------------------------------------------------
+//
+// Paint the mirror in x/y.
+//
+// The graphic should coincide with the action in HasHit
+//
+void MMirrorHex90::Paint(Option_t *opt)
+{
+    MHexagon h;
+    TEllipse e;
+    h.SetFillColor(18);
+    if (!TString(opt).Contains("line", TString::kIgnoreCase))
+    {
+        h.SetFillColor(17);
+        h.SetLineStyle(0);
+        e.SetLineStyle(0);
+        e.SetFillColor(gPad->GetFillColor());
+    }
+
+    if (TString(opt).Contains("same", TString::kIgnoreCase))
+    {
+        h.SetFillStyle(0);
+        e.SetFillStyle(0);
+    }
+
+    h.PaintHexagon(X(), Y(), fD*2, TMath::Pi()/2);
+
+    if (!TString(opt).Contains("border", TString::kIgnoreCase))
+        e.PaintEllipse(X(), Y(), 0.5, 0.5, 0, 360, 0);
+}

trunk/Mars/msimreflector/MMirrorHex.h

@@ -8 +8 @@
 class MMirrorHex : public MMirror
 {
-private:
+protected:
     const static Double_t fgCos30;
     const static Double_t fgCos60;
@@ -30 +30 @@
 
     Int_t ReadM(const TObjArray &tok);
+    void  WriteM(std::ostream &out) const;
 
     // TObject
@@ -38 +39 @@
 };
 
+class MMirrorHex90 : public MMirrorHex
+{
+public:
+    MMirrorHex90() : MMirrorHex() { }
+
+    // MMirror
+    Bool_t HasHit(const MQuaternion &p) const;
+
+    // TObject
+    void Paint(Option_t *);
+
+    ClassDef(MMirrorHex90, 1) // A spherical hexagon type mirror (MMirrorHex rotated by 90deg)
+};
+
 #endif

trunk/Mars/msimreflector/MReflector.cc

@@ -351 +351 @@
 }
 
+// ------------------------------------------------------------------------
+//
+Bool_t MReflector::WriteFile(TString fname) const
+{
+    gSystem->ExpandPathName(fname);
+
+    ofstream fout(fname);
+    if (!fout)
+    {
+        *fLog << err << "Cannot open file " << fname << ": ";
+        *fLog << (errno!=0?strerror(errno):"Insufficient memory for decompression") << endl;
+        return kFALSE;
+    }
+
+    TIter Next(&fMirrors);
+    MMirror *m = 0;
+    while ((m=static_cast<MMirror*>(Next())))
+    {
+        //  x:         x-coordinate of the mirror's center
+        //  y:         y-coordinate of the mirror's center
+        //  z:         z-coordinate of the mirror's center
+        //  nx:        x-component of the normal vecor in the mirror center
+        //  ny:        y-component of the normal vecor in the mirror center
+        //  nz:        z-component of the normal vecor in the mirror center
+        //  [shape]:   S for spherical <default>, P for parabolic
+        //  F:         Focal distance of a spherical mirror
+        //  [psf]:     This number is the psf given in the units of x,y,z and
+        //             defined at the focal distance F. It can be used to overwrite
+        //             the second argument given in ReadFile for individual mirrors.
+        //  Type:      A instance of a mirrot of the class Type MMirrorType is created
+        //             (Type can be, for example, Hex for for MMirrorHex).
+        //  ...:       Additional arguments as defined in MMirrorType::ReadM
+
+        fout << setw(12) << m->X() << " ";
+        fout << setw(12) << m->Y() << " ";
+        fout << setw(12) << m->Z() << "  ";
+        fout << setw(12) << m->Nx() << " ";
+        fout << setw(12) << m->Ny() << " ";
+        fout << setw(12) << m->Nz() << " ";
+        if (m->GetShape()==1)
+            fout << "P ";
+        fout << m->GetFocalLength() << " ";
+        // cout << m->GetSigmaPSF() << " ";
+        fout << m->ClassName()+7 << " ";
+        m->WriteM(fout);
+        fout << endl;
+    }
+    return kTRUE;
+}
+
 // --------------------------------------------------------------------------
 //

trunk/Mars/msimreflector/MReflector.h

@@ -43 +43 @@
 
     Bool_t ReadFile(TString fname, Double_t defpsf=-1);
+    Bool_t WriteFile(TString fname) const;
 
     Double_t GetMaxR() const { return fMaxR; }

trunk/Mars/msimreflector/SimReflectorLinkDef.h

@@ -13 +13 @@
 #pragma link C++ class MMirrorDisk+;
 #pragma link C++ class MMirrorHex+;
+#pragma link C++ class MMirrorHex90+;
 
 #endif