Changeset 1862 for trunk/MagicSoft/Mars

Timestamp:

03/24/03 11:49:25 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/MHillasSrcCalc.cc (modified) (3 diffs)
• manalysis/MHillasSrcCalc.h (modified) (1 diff)
• mfilter/MFEventSelector.cc (modified) (2 diffs)
• mfilter/MFEventSelector.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -5 +5 @@
       - now energy estimation (for CT1) is done using the same model 
         as in D.Krannich's thesis.
+
+
+
+ 2003/03/24: Thomas Bretz
+
+    * manalysis/MHillasSrcCalc.[h,cc]:
+      - removed last argument in constructor, replaced by SetInput
+
+    * mfilter/MFEventSelector.[h,cc]:
+      - removed unnecessary last argument
+
+
+
 
  2003/03/21: Thomas Hengstebeck

trunk/MagicSoft/Mars/manalysis/MHillasSrcCalc.cc

@@ -70 +70 @@
 //
 MHillasSrcCalc::MHillasSrcCalc(const char *src, const char *hil,
-                               const char *name, const char *title,
-                               const char *hilinput)
+                               const char *name, const char *title)
     : fHillas(NULL), fSrcPos(NULL), fHillasSrc(NULL)
 {
@@ -77 +76 @@
     fTitle = title ? title : gsDefTitle.Data();
 
-    fSrcName    = src;
-    fHillasName = hil;
-    fHillasInput = hilinput;
+    fSrcName     = src;
+    fHillasName  = hil;
+    fHillasInput = "MHillas";
 }
 
@@ -86 +85 @@
 Bool_t MHillasSrcCalc::PreProcess(MParList *pList)
 {
-    fHillas = (MHillas*)pList->FindObject(fHillasInput);
+    fHillas = (MHillas*)pList->FindObject(fHillasInput, "MHillas");
     if (!fHillas)
     {

trunk/MagicSoft/Mars/manalysis/MHillasSrcCalc.h

@@ -34 +34 @@
 
     MHillasSrcCalc(const char *src="MSrcPosCam", const char *hil="MHillasSrc",
-                   const char *name=NULL, const char *title=NULL,
-                   const char *hilinput="MHillas");
+                   const char *name=NULL, const char *title=NULL);
+
+    void SetInput(TSTring hilname) { fHillasName = hilname; }
 
     ClassDef(MHillasSrcCalc, 1) // task to calculate the source position depandant hillas parameters

trunk/MagicSoft/Mars/mfilter/MFEventSelector.cc

@@ -94 +94 @@
 // the class description above.
 //
-MFEventSelector::MFEventSelector(const char *name, const char *title,
-                                 const char *read)
+MFEventSelector::MFEventSelector(const char *name, const char *title)
 : fNumTotalEvts(-1), fNumSelectEvts(-1), fSelRatio(-1), fNumSelectedEvts(0)
 {
     fName  = name  ? name  : gsDefName.Data();
     fTitle = title ? title : gsDefTitle.Data();
-
-    fRead = read;
 }
 
@@ -132 +129 @@
             return kFALSE;
         }
-        MRead *read = (MRead*)tlist->FindObject(fRead);
+
+        MRead *read = (MRead*)tlist->FindObject("MRead");
         if (!read)
         {

trunk/MagicSoft/Mars/mfilter/MFEventSelector.h

@@ -24 +24 @@
 
     Bool_t  fResult;
-    TString fRead;
 
     void StreamPrimitive(ofstream &out) const;
@@ -41 +40 @@
 public:
     // MFEventSelector();
-    MFEventSelector(const char *name=NULL, const char *title=NULL,
-                    const char *read="MRead");
+    MFEventSelector(const char *name=NULL, const char *title=NULL);
     ~MFEventSelector();