Changeset 891 for trunk/MagicSoft

Timestamp:

07/20/01 16:44:11 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mbase/MParList.cc (modified) (2 diffs)
• mbase/MParList.h (modified) (3 diffs)
• mhist/MHMcEnergies.cc (deleted)
• mhist/MHMcEnergies.h (deleted)
• mhist/MHMcEnergy.cc (modified) (3 diffs)
• mhist/MHMcEnergy.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -7 +7 @@
    * mhist/MFillH.cc:
      - added comments
+
+   * mbase/MParList.[h,cc]:
+     - Added AddToList from a TObjArray
+     - Added GetClassName
+     - Added GetObjName
+     - Added FindObjectList
+     - Added FindCreateObjList
+     - Added CreateObjList
 
 

trunk/MagicSoft/Mars/mbase/MParList.cc

@@ -69 +69 @@
 // --------------------------------------------------------------------------
 //
-// copy constructor
+//  Copy constructor. It copies all entries of the parameter list, but it
+//  takes care of, that the automatically created entries are only deleted
+//  once. (doesn't copy the list which holds the automatically created
+//  entries)
 //
 MParList::MParList(MParList &ts)
@@ -78 +81 @@
 // --------------------------------------------------------------------------
 //
-//  create the Iterator over the tasklist
+//  Set the logging streamer of the parameter list and all contained
+//  parameter containers
 //
 void MParList::SetLogStream(MLog *log)

trunk/MagicSoft/Mars/mbase/MParList.h

@@ -29 +29 @@
     TOrdCollection fAutodelete; // All what this list contains is deleted in the destructor
 
+    static TString GetClassName(const char *classname);
+    static TString GetObjectName(const char *classname, const char *objname);
+
 public:
     MParList(const char *name=NULL, const char *title=NULL);
@@ -38 +41 @@
 
     Bool_t AddToList(MParContainer *obj, MParContainer *where = NULL);
+    void   AddToList(TObjArray *list);
 
     void SetLogStream(MLog *log);
@@ -44 +48 @@
     TObject       *FindObject(TObject *obj) const;
     MParContainer *FindCreateObj(const char *classname, const char *objname=NULL);
+
+    TObjArray FindObjectList(const char *name, const UInt_t from, const UInt_t to=0) const;
+    TObjArray FindCreateObjList(const char *cname, const UInt_t from, const UInt_t to=0, const char *oname=NULL);
+
+    static TObjArray CreateObjList(const char *cname, const UInt_t from, const UInt_t to=0, const char *oname=NULL);
 
     void Reset();

trunk/MagicSoft/Mars/mhist/MHMcEnergy.cc

@@ -33 +33 @@
 #include "MHMcEnergy.h" 
 
+#include <stdlib.h>
 #include <iostream.h>
 
@@ -46 +47 @@
 //  Default Constructor.
 //
-MHMcEnergy::MHMcEnergy(const UInt_t idx, const char *name, const char *title)
+MHMcEnergy::MHMcEnergy(const char *name, const char *title)
 { 
-    char aux[15]="MHMcEnergy";
-
-    if (idx>0)
-        sprintf(aux+strlen(aux), ";%i", idx);
-
-    *fName  = name  ? name  : aux;
-    *fTitle = title ? title : "Container for an energy distribution histogram" ;
+    *fTitle = title ? title : "Container for an energy distribution histogram";
 
     //  - we initialize the histogram
@@ -60 +55 @@
     //    root don't allow us to have diferent histograms with the same name
 
+    fHist = new TH1F("", "", 40, 0.5, 4.5);
+    fHist->SetXTitle("log(E/GeV)");
+    fHist->SetYTitle("dN/dE");
+
+    SetName(name ? name : "MHMcEnergy");
+}
+
+// -------------------------------------------------------------------------
+//
+//  This doesn't only set the name. It tries to get the number from the
+//  name and creates also name and title of the histogram.
+//
+//  This is necessary for example if a list of such MHMcEnergy histograms
+//  is created (s. MParList::CreateObjList)
+//
+void MHMcEnergy::SetName(const char *name)
+{
+    TString cname(name);
+    const char *semicolon = strrchr(cname, ';');
+
+    UInt_t idx = semicolon ? atoi(semicolon+1) : 0;
+
+    *fName = cname;
+
     char text[256];
-    sprintf(text, "Energy Distribution for trigger condition #%i", idx);
-
+    if (idx>0)
+        sprintf(text, "Energy Distribution for trigger condition #%i", idx);
+    else
+        sprintf(text, "Energy Distribution");
+
+    char aux[256];
     strcpy(aux, "log(E)");
+
     if (idx>0)
         sprintf(aux+strlen(aux), " #%i", idx);
-    fHist = new TH1F(aux, text, 40, 0.5, 4.5);
-    fHist->SetXTitle("log(E/GeV)");
-    fHist->SetYTitle("dN/dE");
+
+    fHist->SetName(aux);
+    fHist->SetTitle(text);
 }
 

trunk/MagicSoft/Mars/mhist/MHMcEnergy.h

@@ -31 +31 @@
 public:
 
-    MHMcEnergy(const UInt_t idx=0, const char *name=NULL, const char *title=NULL);
+    MHMcEnergy(const char *name=NULL, const char *title=NULL);
     ~MHMcEnergy();
+
+    void SetName(const char *name);
 
     Float_t GetThreshold() const { return fThreshold; }