Changeset 867 for trunk/MagicSoft/Mars/mmontecarlo

Timestamp:

07/13/01 18:13:06 (24 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mmontecarlo

Files:

• MMcCollectionAreaCalc.cc (modified) (3 diffs)
• MMcCollectionAreaCalc.h (modified) (1 diff)
• MMcThresholdCalc.cc (modified) (1 diff)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/mmontecarlo/MMcCollectionAreaCalc.cc

@@ -36 +36 @@
 #include "MHMcCollectionArea.h"
 
-ClassImp(MMcCollectionAreaCalc)
+ClassImp(MMcCollectionAreaCalc);
 
-MMcCollectionAreaCalc::MMcCollectionAreaCalc (const char *name, const char *title)
+MMcCollectionAreaCalc::MMcCollectionAreaCalc(const char *input,
+                                             const char *name, const char *title)
 {
     *fName  = name  ? name  : "MMcCollectionAreaCalc";
-    *fTitle = title ? title : "Task to calc the collection area ";
+    *fTitle = title ? title : "Task to calculate the collection area";
+
+    fObjName = input ? input : "MMcTrig";
 } 
 
@@ -55 +58 @@
     }
 
-    fMcTrig = (MMcTrig*)pList->FindObject("MMcTrig");
+    fMcTrig = (MMcTrig*)pList->FindObject(fObjName);
     if (!fMcTrig)
     {
-        *fLog << dbginf << "MMcTrig not found... exit." << endl;
+        *fLog << dbginf << fObjName << " not found... exit." << endl;
         return kFALSE;
     }
@@ -84 +87 @@
 }
 
-Bool_t MMcCollectionAreaCalc::PostProcess () 
+Bool_t MMcCollectionAreaCalc::PostProcess()
 { 
     //

trunk/MagicSoft/Mars/mmontecarlo/MMcCollectionAreaCalc.h

@@ -19 +19 @@
     MHMcCollectionArea *fCollArea;
 
+    TString fObjName;
+
 public:
-    MMcCollectionAreaCalc(const char *name=NULL, const char *title=NULL);
+    MMcCollectionAreaCalc(const char *input=NULL,
+                          const char *name=NULL, const char *title=NULL);
 
     Bool_t PreProcess(MParList *pList);
-    Bool_t Process() ;
-    Bool_t PostProcess() ;
+    Bool_t Process();
+    Bool_t PostProcess();
 
     ClassDef(MMcCollectionAreaCalc, 0) // Task to calculate the collection area histogram

trunk/MagicSoft/Mars/mmontecarlo/MMcThresholdCalc.cc

@@ -110 +110 @@
     {
         if (fDimension>1)
-            sprintf(auxname+7, ";%i.", i+1);
+            sprintf(auxname+7, ";%i", i+1);
 
         fMcTrig[i] = (MMcTrig*)pList->FindObject(auxname);

trunk/MagicSoft/Mars/mmontecarlo/Makefile

@@ -33 +33 @@
 SRCS    = $(SRCFILES)
 HEADERS = $(SRCFILES:.cc=.h)
-OBJS    = $(SRCFILES:.cc=.o) 
+OBJS    = $(SRCFILES:.cc=.o)
 
 ############################################################