Changeset 5427

Timestamp:

11/18/04 11:11:36 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• msignal/MExtractTime.cc (modified) (4 diffs)
• msignal/MExtractTime.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -30 +30 @@
      - set version number by one higher because of new data member 
        "fNameSignalCam"
+
+   * msignal/MExtractTime.[h,cc]
+     - introduce possibility to choose name of MArrivalTimeCam. Need
+       access to different MArrivalTimeCams for comparative extractor
+       studies. Analogues to MPedestalCam in MPedCalcFromLoGain. Default 
+       is "MArrivalTimeCam", like before. 
+     - set version number by one higher because of new data member 
+       "fNameTimeCam"
 
 

trunk/MagicSoft/Mars/msignal/MExtractTime.cc

@@ -70 +70 @@
 using namespace std;
 
+const TString MExtractTime::fgNameTimeCam   = "MArrivalTimeCam";
 // --------------------------------------------------------------------------
 //
@@ -78 +79 @@
 // - all variables to 0
 // - fSaturationLimit to fgSaturationLimit
+// - fNameTimeCam to fgNameTimeCam
 //
 // Call:
@@ -86 +88 @@
 {
 
-    fName  = name  ? name  : "MExtractTime";
-    fTitle = title ? title : "Base class for signal extractors";
-
+  fName  = name  ? name  : "MExtractTime";
+  fTitle = title ? title : "Base class for signal extractors";
+  
+  SetNameTimeCam();
 }
 
@@ -122 +125 @@
   
   
-  fArrTime = (MArrivalTimeCam*)pList->FindCreateObj(AddSerialNumber("MArrivalTimeCam"));
+  fArrTime = (MArrivalTimeCam*)pList->FindCreateObj("MArrivalTimeCam",AddSerialNumber(fNameTimeCam));
   if (!fArrTime)
-    return kFALSE;
-  
+    {
+      *fLog << err << fNameTimeCam.Data() << " could not be found nor created... aborting" << endl;
+      return kFALSE;
+    }
 
   fPedestals = (MPedestalCam*)pList->FindObject( AddSerialNumber(fNamePedestalCam), "MPedestalCam");

trunk/MagicSoft/Mars/msignal/MExtractTime.h

@@ -13 +13 @@
 protected:
   
-  MArrivalTimeCam *fArrTime; //! Container with the photons arrival times
+  static const TString fgNameTimeCam; //! "MArrivalTimeCam"
+  TString  fNameTimeCam;              // Name of the 'MArrivalTimeCam' container
+  
+  MArrivalTimeCam *fArrTime;          //! Container with the photons arrival times
   
   virtual void FindTimeHiGain(Byte_t *firstused, Float_t &time, Float_t &dtime,
@@ -30 +33 @@
   void Print(Option_t *o) const;
 
-  ClassDef(MExtractTime, 2)   // Arrival Time Extractor Base Class
+  void SetNameTimeCam   ( const char *name=fgNameTimeCam.Data()) { fNameTimeCam = name; }
+  
+  ClassDef(MExtractTime, 3)   // Arrival Time Extractor Base Class
 };