Changeset 9224 for trunk

Timestamp:

01/16/09 13:24:04 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• callisto.cc (modified) (1 diff)
• mcorsika/MCorsikaRunHeader.cc (modified) (1 diff)
• mhist/MHEvent.cc (modified) (1 diff)
• mhist/MHEvent.h (modified) (1 diff)
• mpedestal/MPedestalSubtract.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2009/01/15 Thomas Bretz
+
+   * callisto.cc:
+     - cosmetics to output
+
+   * mcorsika/MCorsikaRunHeader.cc:
+     - cosmetics (removed a ;;)
+
+   * mhist/MHEvent.[h,cc]:
+     - ReInit to allow the change of the camera geoemtry in ReInit
+
+   * mpedestal/MPedestalSubtract.[h,cc]:
+     - added Print function
+
+
 
  2009/01/15 Stefan Ruegamer

trunk/MagicSoft/Mars/callisto.cc

@@ -61 +61 @@
     gLog << "   --debug-env[=1]           Display untouched resources after program execution" << endl;
     gLog << "   --debug-env=2             Display untouched resources after eventloop setup" << endl;
-    gLog << "   --debug-env=3             Debug setting resources from resource file and command line" << endl;
+    gLog << "   --debug-env=3             Debug setting resources from resource file and" << endl;
+    gLog << "                             command line" << endl;
     gLog << "   --debug-mem               Debug memory usage" << endl << endl;
     gLog << "   --rc=Name:option          Set or overwrite a resource of the resource file." << endl;

trunk/MagicSoft/Mars/mcorsika/MCorsikaRunHeader.cc

@@ -236 +236 @@
     fViewConeOuterAngle = g[152];
 
-    return kTRUE;;
+    return kTRUE;
 }
 

trunk/MagicSoft/Mars/mhist/MHEvent.cc

@@ -187 +187 @@
         break;
     }
+
+    return kTRUE;
+}
+
+// --------------------------------------------------------------------------
+//
+// The geometry read from the RunHeaders might have changed. This does not
+// effect anything in PreProcess. So we set a new geometry. We don't move
+// this away from PreProcess to support also loops without calling ReInit.
+//
+Bool_t MHEvent::ReInit(MParList *plist)
+{
+    MGeomCam *cam = (MGeomCam*)plist->FindObject("MGeomCam");
+    if (!cam)
+    {
+        *fLog << err << GetDescriptor() << ": No MGeomCam found... aborting." << endl;
+        return kFALSE;
+    }
+
+    fHist->SetGeometry(*cam);
 
     return kTRUE;

trunk/MagicSoft/Mars/mhist/MHEvent.h

@@ -53 +53 @@
     Bool_t SetupFill(const MParList *plist);
     Int_t  Fill(const MParContainer *par, const Stat_t weight=1);
+    Bool_t ReInit(MParList *par);
 
 public:

trunk/MagicSoft/Mars/mpedestal/MPedestalSubtract.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MPedestalSubtract.cc,v 1.12 2008-06-02 08:46:54 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MPedestalSubtract.cc,v 1.13 2009-01-16 13:24:04 tbretz Exp $
 ! --------------------------------------------------------------------------
 !