Changeset 9578 for trunk

Timestamp:

05/05/10 09:51:51 (15 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mastro/MAstro.cc (modified) (1 diff)
• mbase/MParContainer.cc (modified) (1 diff)
• mbase/MParContainer.h (modified) (1 diff)
• mbase/MStatusDisplay.cc (modified) (12 diffs)
• mbase/MStatusDisplay.h (modified) (4 diffs)
• mbase/MTask.cc (modified) (1 diff)
• mbase/MTask.h (modified) (1 diff)
• msimcamera/MSimCalibrationSignal.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2010/05/05 Thomas Bretz
+
+   * mastro/MAstro.cc:
+     - fixed AngularDistance (called a non existing function and
+       the compiler didn't complain)
+
+   * mbase/MParContainer.[h,cc]:
+     - added static function Overwrites (previously in MTask)
+
+   * mbase/MStatusDisplay.[h,cc]:
+     - allow writing a MStatusDisplay without writing a MStatusArray
+       (therefore added SeveAsPlainRoot)
+     - improved reading of files just containing canvases and objects
+
+   * mbase/MTask.[h,cc]:
+     - moved code from Overwrites to a static function in MParContainer
+
+   * msimcamera/MSimCalibrationSignal.cc:
+     - changed distribution of signal from Gauss to Poissonian
+
 
  2010/04/22 Thomas Bretz

trunk/MagicSoft/Mars/mastro/MAstro.cc

@@ -376 +376 @@
 Double_t MAstro::AngularDistance(Double_t theta0, Double_t phi0, Double_t theta1, Double_t phi1)
 {
-    TVector3 v0(1);
-    v0.Rotate(phi0, theta0);
-
-    TVector3 v1(1);
-    v1.Rotate(phi1, theta1);
-
-    return v0.Angle(v1);
+    // v1 = theta0/phi0 --> theta0 / 0
+    // v2 = theta1/phi1 --> theta1 / phi1-phi0
+    // acos(alpha) = v1*v2/|v1||v2|    |v1|*|v2|=1
+    const Double_t sin2 = TMath::Sin(theta0)*TMath::Sin(theta1);
+    const Double_t cos2 = TMath::Cos(theta0)*TMath::Cos(theta1);
+
+    return TMath::ACos(sin2*TMath::Cos(phi1-phi0) + cos2);
+    /*
+     TVector3 v0;
+     v0.SetMagThetaPhi(1, theta0, phi0);
+
+     TVector3 v1;
+     v1.SetMagThetaPhi(1, theta0, phi0);
+
+     return v0.Angle(v1);
+     */
 }
 

trunk/MagicSoft/Mars/mbase/MParContainer.cc

@@ -237 +237 @@
 // --------------------------------------------------------------------------
 //
+// Check down to base whether the class given in the argument
+// overwrites the function given by name.
+//
+// This function calls itself recursively. If you want to call it,
+// leave out the argument.
+//
+Bool_t MParContainer::Overwrites(const TClass *base, const TObject &obj, const char *name, TClass *cls)
+{
+    if (!cls)
+        cls = obj.IsA();
+
+    //
+    // Check whether we reached the base class MTask
+    //
+    if (cls==base)
+        return kFALSE;
+
+    //
+    // Check whether the class cls overwrites Process
+    //
+    if (cls->GetMethodAny(name))
+        return kTRUE;
+
+    //
+    // If the class itself doesn't overload it check all it's base classes
+    //
+    TBaseClass *basecls=NULL;
+    TIter NextBase(cls->GetListOfBases());
+    while ((basecls=(TBaseClass*)NextBase()))
+    {
+        if (Overwrites(base, obj, name, basecls->GetClassPointer()))
+            return kTRUE;
+    }
+
+    return kFALSE;
+}
+
+
+// --------------------------------------------------------------------------
+//
 //  Return a unique name for this container. It is created from
 //  the container name and the unique Id. (This is mostly used

trunk/MagicSoft/Mars/mbase/MParContainer.h

@@ -82 +82 @@
     static const TString GetDescriptor(const TObject &o);
 
+    static Bool_t Overwrites(const TClass *base, const TObject &obj, const char *name, TClass *cls=NULL);
+
     virtual const TString GetDescriptor() const;
     virtual const TString GetUniqueName() const;

trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc

@@ -278 +278 @@
     savemenu->AddEntry(MString::Format("%s&C",    fname.Data()), kFileSaveAsC);
     savemenu->AddEntry(MString::Format("%s&root", fname.Data()), kFileSaveAsRoot);
+    savemenu->AddEntry(MString::Format("%s&root (plain)", fname.Data()), kFileSaveAsPlainRoot);
     savemenu->Associate(this);
 
@@ -1723 +1724 @@
         return kTRUE;
 
+    case kFileSaveAsPlainRoot:
+        SaveAsPlainRoot(kTRUE);
+        return kTRUE;
+
     case kFilePrint:
         PrintPS();
@@ -1777 +1782 @@
     case kTabSaveAsC:
         SaveAsC(fTab->GetCurrent());
+        return kTRUE;
+
+    case kTabSaveAsPlainRoot:
+        SaveAsPlainRoot(fTab->GetCurrent());
         return kTRUE;
 
@@ -2276 +2285 @@
     }
 
+    // The first entry in the list is a TNamed which is expected to
+    // contain the status display title.
     fTitle = o->GetTitle();
 
@@ -2312 +2323 @@
     //
     // If no status display was found with this name try to find canvases
-    // in the file and s´display them instead.
+    // in the file and display them instead.
     //
     if (n==0)
     {
+        // Either read the title from the file or create our own
+        TNamed *n=0;
+        gFile->GetObject("Title", n); // FIXME: Is the list allowed to take ownership?
+        list.Add(n ? n : new TNamed(GetName(), GetTitle()));
+
         const Bool_t store = TH1::AddDirectoryStatus();
         TH1::AddDirectory(kFALSE);
@@ -2325 +2341 @@
             TCanvas *c=0;
             gFile->GetObject(key->GetName(), c);
+
+            // If key doesn't correspond to a TCanvas create a new canvas
+            // and draw the object itself instead.
             if (!c)
             {
-                AddTab(key->GetName(), key->GetTitle());
                 TObject *obj = gFile->Get(key->GetName());
-                obj->SetBit(kCanDelete);
-                obj->Draw();
+
+                if (MParContainer::Overwrites(TObject::Class(), *obj, "Draw") ||
+                    MParContainer::Overwrites(TObject::Class(), *obj, "Paint"))
+                {
+                    AddTab(key->GetName(), key->GetTitle());
+                    obj->SetBit(kCanDelete);
+                    obj->Draw();
+                }
+                // FIXME: Is the object deleted?
                 continue;
             }
 
-            if (list.GetEntries()==0)
-                list.Add(new TNamed(GetName(), GetTitle()));
-
+            // Add teh canvas to the list
             c->SetTitle(gFile->GetName());
             list.Add(c);
@@ -2343 +2366 @@
         TH1::AddDirectory(store);
 
-        if (list.GetEntries()==0)
+        if (list.GetEntries()<=1)
         {
-            *fLog << warn << "MStatusDisplay::Read: No objects read from " << gFile->GetName() << endl;
+            *fLog << warn << "MStatusDisplay::Read: No drawable objects read from " << gFile->GetName() << endl;
             return 0;
         }
 
-        *fLog << inf << "MStatusDisplay: " << list.GetEntries() << " canvases directly read from file." << endl;
+        *fLog << inf << "MStatusDisplay: " << list.GetEntries()-1 << " canvases directly read from file." << endl;
     }
 
@@ -2358 +2381 @@
         return 0;
     }
-
 
     if (n==0)
@@ -2423 +2445 @@
     }
 
-    MStatusArray list;
-
-    // Be careful: So far Display() assumes that it is the first entry in the list
-    TNamed named;
-    named.SetTitle(fTitle);
-    list.Add(&named);
-
-    FillArray(list, num);
-
-    const Int_t n = list.Write(name, kSingleKey);
-
-    //*fLog << inf << "MStatusDisplay: " << n << " keys written to file as key " << name << "." << endl;
+    Int_t n = 0; // Number of keys written
+
+    TNamed named("Title", fTitle.Data());
+
+    if (TString(option)=="plain")
+    {
+        // Get canvas range to store
+        Int_t from, to;
+        GetCanvasRange(from, to, num);
+
+        n += named.Write();
+
+        TCanvas *c;
+        for (int i=from; i<to; i++)
+            if ((c = GetCanvas(i)))
+                n += c->Write();
+    }
+    else
+    {
+        // Be careful: So far Display() assumes that the TNamed
+        // is the first entry in the list
+        MStatusArray list;
+        list.Add(&named);
+
+        FillArray(list, num);
+
+        n += list.Write(name, kSingleKey);
+    }
+
+    *fLog << inf << "MStatusDisplay: " << n << " keys written to file as key " << name << "." << endl;
 
     return n;
@@ -3029 +3069 @@
 // --------------------------------------------------------------------------
 //
-// In case of num<0 all tabs are written into the PS file. If num>0
+// In case of num<0 all tabs are written into a root file. As plain
+// TCanvas objects if plain==kTRUE otherwise in a MStatusArray. If num>0
 // the canvas in the corresponding tab is written to the file.
 // Name is the name of the file (with or without extension).
@@ -3035 +3076 @@
 // Returns the number of keys written.
 //
-// To write all tabs you can also use SaveAsPS(name)
-//
-Int_t MStatusDisplay::SaveAsRoot(Int_t num, TString name)
+// To write all tabs you can also use SaveAsRoot(name)
+//
+Int_t MStatusDisplay::SaveAsRoot(Int_t num, TString name, Bool_t plain)
 {
     num = InitWriteDisplay(num, name, "root");
@@ -3045 +3086 @@
     TFile *fsave = gFile;
     TFile file(name, "RECREATE", GetTitle(), 9);
-    const Int_t keys = Write(num);
+    const Int_t keys = Write(num, plain ? "plain" : "");
     gFile = fsave;
 

trunk/MagicSoft/Mars/mbase/MStatusDisplay.h

@@ -49 +49 @@
         kFileSaveAsPS, kFileSaveAsPDF, kFileSaveAsSVG, kFileSaveAsRoot,
         kFileSaveAsPNG, kFileSaveAsGIF, kFileSaveAsJPG, kFileSaveAsXPM,
-        kFileSaveAsBMP, kFileSaveAsCSV, kFileSaveAsTIFF,
+        kFileSaveAsBMP, kFileSaveAsCSV, kFileSaveAsTIFF, kFileSaveAsPlainRoot,
         kFileSaveAsXML, kFileSaveAsC, kFilePrint, kFilePrinterName,
         kFileClose, kFileExit, kFileReset,
@@ -58 +58 @@
         kTabSaveAsRoot, kTabSaveAsPNG, kTabSaveAsGIF, kTabSaveAsJPG,
         kTabSaveAsXPM, kTabSaveAsBMP, kTabSaveAsCSV, kTabSaveAsTIFF,
-        kTabSaveAsXML, kTabSaveAsC,
+        kTabSaveAsXML, kTabSaveAsC, kTabSaveAsPlainRoot,
         kTabPrint, kTabNext, kTabPrevious, kTabRemove,
         // kSize
@@ -253 +253 @@
      Bool_t SaveAsC(TString name="")    { return SaveAsC(-1, name); }
      Int_t  SaveAsRoot(TString name="") { return SaveAsRoot(-1, name); }
+     Int_t  SaveAsPlainRoot(TString name="") { return SaveAsRoot(-1, name, kTRUE); }
      Int_t  SaveAs(TString name)        { return SaveAs(-1, name); }
 
@@ -271 +272 @@
      Bool_t SaveAsXML(Int_t num, TString name="")  { return SaveAsImage(num, name, TImage::kXml); }
      Bool_t SaveAsC(Int_t num, TString name="");
-     Int_t  SaveAsRoot(Int_t num, TString name="");
+     Int_t  SaveAsRoot(Int_t num, TString name="", Bool_t plain=kFALSE);
+     Int_t  SaveAsPlainRoot(Int_t num, TString name="") { return SaveAsRoot(num, name, kTRUE); }
      Int_t  SaveAs(Int_t num, TString name);
 

trunk/MagicSoft/Mars/mbase/MTask.cc

@@ -505 +505 @@
 }
 
-// --------------------------------------------------------------------------
-//
-// Check whether the class given in the argument overwrites MTask::Process.
-// This function calls itself recursively. If you want to call it,
-// leave out the argument.
-//
-Bool_t MTask::Overwrites(const char *name, TClass *cls) const
-{
-    if (!cls)
-        cls = IsA();
-
-    //
-    // Check whether we reached the base class MTask
-    //
-    if (cls==MTask::Class())
-        return kFALSE;
-
-    //
-    // Check whether the class cls overwrites Process
-    //
-    if (cls->GetMethodAny(name))
-        return kTRUE;
-
-    //
-    // If the class itself doesn't overload it check all it's base classes
-    //
-    TBaseClass *base=NULL;
-    TIter NextBase(cls->GetListOfBases());
-    while ((base=(TBaseClass*)NextBase()))
-    {
-        if (Overwrites(name, base->GetClassPointer()))
-            return kTRUE;
-    }
-
-    return kFALSE;
-}
-
 void MTask::SetDisplay(MStatusDisplay *d)
 {

trunk/MagicSoft/Mars/mbase/MTask.h

@@ -79 +79 @@
 
     const TList *GetListOfBranches() const { return fListOfBranches; }
-    Bool_t Overwrites(const char *name, TClass *cls=NULL) const;
+    Bool_t Overwrites(const char *name, TClass *cls=NULL) const { return MParContainer::Overwrites(MTask::Class(), *this, name, cls); }
 
     // Filter functions

trunk/MagicSoft/Mars/msimcamera/MSimCalibrationSignal.cc

@@ -61 +61 @@
 
 #include "MGeomCam.h"
-#include "MParSpline.h"
 #include "MTriggerPattern.h"
 
@@ -69 +68 @@
 #include "MPhotonEvent.h"
 #include "MPhotonData.h"
+
+#include "MParSpline.h"
 
 ClassImp(MSimCalibrationSignal);
@@ -197 +198 @@
         {
             // FIXME: Scale number of photons with the pixel size!
-            const Int_t num = TMath::Nint(gRandom->Gaus(fNumPhotons, fNumPhotons/10));
+            const Int_t num = gRandom->Poisson(fNumPhotons);
 
             // FIXME: How does the distribution look like? Poissonian?