Changeset 1762 for trunk/MagicSoft/Mars/manalysis

Timestamp:

02/19/03 13:47:29 (22 years ago)

Author:

wittek

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• MHillasCalc.cc (modified) (1 diff)
• MHillasSrcCalc.cc (modified) (3 diffs)
• MHillasSrcCalc.h (modified) (2 diffs)
• MSelBasic.cc (added)
• MSelBasic.h (added)
• MSelStandard.cc (added)
• MSelStandard.h (added)

trunk/MagicSoft/Mars/manalysis/MHillasCalc.cc

@@ -84 +84 @@
     }
 
-    fHillas = (MHillas*)pList->FindCreateObj(fHilName);
+    fHillas = (MHillas*)pList->FindCreateObj("MHillas",fHilName);
     if (!fHillas)
         return kFALSE;

trunk/MagicSoft/Mars/manalysis/MHillasSrcCalc.cc

@@ -56 +56 @@
 // The default is "MHillasSrc"
 //
+//MHillasSrcCalc::MHillasSrcCalc(const char *src, const char *hil,
+//                               const char *name, const char *title)
+//    : fHillas(NULL), fSrcPos(NULL), fHillasSrc(NULL)
+//{
+//    fName  = name  ? name  : gsDefName.Data();
+//    fTitle = title ? title : gsDefTitle.Data();
+
+//    fSrcName    = src;
+//    fHillasName = hil;
+//    fHillasInput = "MHillas";
+//}
+// -------------------------------------------------------------------------
+//
 MHillasSrcCalc::MHillasSrcCalc(const char *src, const char *hil,
-                               const char *name, const char *title)
+                               const char *name, const char *title,
+                               const char *hilinput)
     : fHillas(NULL), fSrcPos(NULL), fHillasSrc(NULL)
 {
@@ -65 +79 @@
     fSrcName    = src;
     fHillasName = hil;
+    fHillasInput = hilinput;
 }
 
@@ -71 +86 @@
 Bool_t MHillasSrcCalc::PreProcess(MParList *pList)
 {
-    fHillas = (MHillas*)pList->FindObject("MHillas");
+    fHillas = (MHillas*)pList->FindObject(fHillasInput);
     if (!fHillas)
     {

trunk/MagicSoft/Mars/manalysis/MHillasSrcCalc.h

@@ -19 +19 @@
     TString     fSrcName;
     TString     fHillasName;
+    TString     fHillasInput;
 
     Int_t       fErrors;
@@ -29 +30 @@
 
 public:
+    //    MHillasSrcCalc(const char *src="MSrcPosCam", const char *hil="MHillasSrc",
+    //               const char *name=NULL, const char *title=NULL);
+
     MHillasSrcCalc(const char *src="MSrcPosCam", const char *hil="MHillasSrc",
-                   const char *name=NULL, const char *title=NULL);
+                   const char *name=NULL, const char *title=NULL,
+                   const char *hilinput="MHillas");
 
     ClassDef(MHillasSrcCalc, 1) // task to calculate the source position depandant hillas parameters