Changeset 9564 for trunk

Timestamp:

03/30/10 13:52:57 (15 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• mbase/MQuaternion.h (modified) (1 diff)
• mbase/MTime.cc (modified) (1 diff)
• mjobs/MJSimulation.cc (modified) (1 diff)
• msimreflector/MMirror.h (modified) (2 diffs)
• msimreflector/MSimReflector.cc (modified) (5 diffs)
• msimreflector/MSimReflector.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -24 +24 @@
      - moved ARCHDEFS from DEFINES to CXXFLAGS otherwise it might get
        ignored
+
+   * mbase/MQuaternion.h:
+     - added member-function to normalize vector part of quaternion
+
+   * mbase/MTime.cc:
+     - issue an error if __LINUX__ is not set
+
+   * mjobs/MJSimulation.cc:
+     - set name of reflector explicitly to "Reflector"
+
+   * msimreflector/MMirror.h:
+     - added member function to set z position (for optimization purpose)
+     - added SimPSF(TVector3&)
+
+   * msimreflector/MSimReflector.[h,cc]:
+     - added name of reflector as data member 
 
 

trunk/MagicSoft/Mars/NEWS

@@ -2 +2 @@
 
 == <cvs> ==
+
+ ;general:
+
+   * On some systems (version of make?) the __LINUX__ definition was not set
+     when compiling. This lead to MTime(-1) not working properly. Fixed.
+
+
 
 == Version 2.4 (2009/12/23) ==

trunk/MagicSoft/Mars/mbase/MQuaternion.h

@@ -76 +76 @@
     //void Normalize() { fVectorPart *= TMath::Sqrt(1 - R2())/Z(); }
 
+    void NormalizeVector() { fVectorPart = fVectorPart.Unit(); }
+
     ClassDef(MQuaternion, 1)
 };

trunk/MagicSoft/Mars/mbase/MTime.cc

@@ -692 +692 @@
         Set(tv);
 #else
-    Clear();
+#error __LINUX__ not set
 #endif
 }

trunk/MagicSoft/Mars/mjobs/MJSimulation.cc

@@ -398 +398 @@
     MSimReflector reflect;
     reflect.SetNameGeomCam("GeomCones");
+    reflect.SetNameReflector("Reflector");
 //  MSimStarField stars;
 

trunk/MagicSoft/Mars/msimreflector/MMirror.h

@@ -49 +49 @@
     }
 
+    void SetZ(Double_t z) { fPos.SetZ(z); }
+
     Double_t X() const { return fPos.X(); }
     Double_t Y() const { return fPos.Y(); }
@@ -65 +67 @@
 
     TVector3 SimPSF(const TVector3 &n, Double_t F, Double_t psf) const;
+    TVector3 SimPSF(const TVector3 &n) const
+    {
+        return SimPSF(n, fFocalLength, fSigmaPSF/10); // Convert from mm to cm
+    }
 
     Bool_t ExecuteMirror(MQuaternion &p, MQuaternion &u) const;

trunk/MagicSoft/Mars/msimreflector/MSimReflector.cc

@@ -75 +75 @@
     : fEvt(0), fMirror0(0), fMirror1(0), fMirror2(0), fMirror3(0),
     fMirror4(0), /*fRunHeader(0),*/ fEvtHeader(0), fReflector(0),
-    fGeomCam(0), fPointing(0), fDetectorMargin(0)
+    fGeomCam(0), fPointing(0), fNameReflector("MReflector"),
+    fDetectorMargin(0)
 {
     fName  = name  ? name  : "MSimReflector";
@@ -103 +104 @@
         return kFALSE;
 
-    fReflector = (MReflector*)pList->FindObject("Reflector", "MReflector");
+    fReflector = (MReflector*)pList->FindObject(fNameReflector, "MReflector");
     if (!fReflector)
     {
-        *fLog << err << "Reflector [MReflector] not found... aborting." << endl;
+        *fLog << err << fNameReflector << " [MReflector] not found..." << endl;
         return kFALSE;
     }
@@ -112 +113 @@
     if (fReflector->GetNumMirrors()==0)
     {
-        *fLog << err << "ERROR - Reflector doesn't contain a single mirror." << endl;
+        *fLog << err << "ERROR - Reflector '" << fNameReflector << "' doesn't contain a single mirror." << endl;
         return kFALSE;
     }
@@ -119 +120 @@
     if (!fGeomCam)
     {
-        *fLog << inf << fNameGeomCam << " [MGeomCam] not found..." << endl;
+        if (!fNameGeomCam.IsNull())
+            *fLog << inf << fNameGeomCam << " [MGeomCam] not found..." << endl;
 
         fGeomCam = (MGeomCam*)pList->FindObject("MGeomCam");
@@ -300 +302 @@
 
     if (fSigmaPSF>0)
-        n += SimPSF(n, fFocalLength, fSigmaPSF/10); // Convert from mm to cm
+        n += SimPSF(n);
 
     // Changes also the sign of the z-direction of flight

trunk/MagicSoft/Mars/msimreflector/MSimReflector.h

@@ -31 +31 @@
 
     TString fNameGeomCam;        // Name of the geometry container storing the APD gemeotry
+    TString fNameReflector;      // Name of the container storing the reflector geometry 
 
     Double_t fDetectorMargin;    // A margin around the detector (MGeomCam::HitCamera) in which photons are also stored
@@ -45 +46 @@
 
     // MSimReflector
-    void SetNameGeomCam(const char *name="MGeomCam") { fNameGeomCam = name; }
+    void SetNameGeomCam(const char *name="MGeomCam")     { fNameGeomCam   = name; }
+    void SetNameReflector(const char *name="MReflector") { fNameReflector = name; }
 
     ClassDef(MSimReflector, 0) // Task to calculate reflection on a mirror