Changeset 9277 for trunk

Timestamp:

01/27/09 12:46:53 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• msimreflector/MReflector.cc (modified) (3 diffs)
• msimreflector/MSimReflector.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -62 +62 @@
    * mjobs/Makefile, mjobs/JobsLinkDef.h:
      - added MJSimulation
+
+   * ceres.cc, showlog.cc, callisto.cc, star.cc, ganymed.cc, sponde.cc:
+     - added parenthesis suggested by compiler
+
+   * mbase/MParEnv.cc:
+     - included TClass for newwer root versions
+
+   * msimreflector/MReflector.cc:
+     - fixed return if read file was not existing
+
+   * msimrelfector/MSimReflector.cc:
+     - added sanity check if reflector is valid
 
 

trunk/MagicSoft/Mars/msimreflector/MReflector.cc

@@ -121 +121 @@
 {
     SetTitle(fname);
+    fMirrors.Delete();
 
     gSystem->ExpandPathName(fname);
@@ -129 +130 @@
         *fLog << err << "Cannot open file " << fname << ": ";
         *fLog << (errno!=0?strerror(errno):"Insufficient memory for decompression") << endl;
+        return kFALSE;
     }
 
@@ -140 +142 @@
     */
 
-    fMirrors.Delete();
-
     while (1)
     {

trunk/MagicSoft/Mars/msimreflector/MSimReflector.cc

@@ -102 +102 @@
     }
 
+    if (fReflector->GetNumMirrors()==0)
+    {
+        *fLog << err << "ERROR - Reflector doesn't contain a single mirror." << endl;
+        return kFALSE;
+    }
+
     fGeomCam = (MGeomCam*)pList->FindObject(fNameGeomCam, "MGeomCam");
     if (!fGeomCam)