Changeset 9594 for trunk

Timestamp:

06/24/10 14:55:04 (15 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mgeom/MGeomCam.h (modified) (1 diff)
• mhbase/MH.h (modified) (1 diff)
• msimreflector/MMirrorDisk.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2010/06/24 Thomas Bretz
+
+   * mgeom/MGeomCam.h:
+     - call constructor of base class in copy-constructor
+
+   * mhbase/MH.h:
+     - remove argument name where obsolete
+
+   * mjobs/MJSimulation.cc:
+     - fixed some axis labels
+
+   * msimreflector/MMirrorDisk.cc:
+     - changed interpretation from file from radius to diameter
+
+
+
  2010/06/24 Daniela Dorner
 

trunk/MagicSoft/Mars/mgeom/MGeomCam.h

@@ -55 +55 @@
 public:
     MGeomCam(UInt_t npix=0, Float_t dist=1, const char *name=NULL, const char *title=NULL);
-    MGeomCam(const MGeomCam &cam) { cam.Copy(*this); }
+    MGeomCam(const MGeomCam &cam) : MParContainer(cam) { cam.Copy(*this); }
 
     TObject *Clone(const char *name="") const;

trunk/MagicSoft/Mars/mhbase/MH.h

@@ -46 +46 @@
     Bool_t OverwritesDraw(TClass *cls=NULL) const;
 
-    virtual Bool_t SetupFill(const MParList *pList) { return kTRUE; }
-    virtual Bool_t ReInit(MParList *pList) { return kTRUE; }
+    virtual Bool_t SetupFill(const MParList *) { return kTRUE; }
+    virtual Bool_t ReInit(MParList *) { return kTRUE; }
     virtual Int_t  Fill(const MParContainer *par, const Stat_t weight=1);
     virtual Bool_t Finalize() { return kTRUE; }

trunk/MagicSoft/Mars/msimreflector/MMirrorDisk.cc

@@ -157 +157 @@
         return -1;
 
-    Double_t r = atof(tok[0]->GetName());
+    const Double_t d = atof(tok[0]->GetName());
 
-    if (r<=0)
+    if (d<=0)
         return -1;
 
-    fR = r;
+    fR = d/2;
 
     return 1;