Changeset 5561 for trunk/MagicSoft/Mars

Timestamp:

12/06/04 13:12:16 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mjobs/MJCalibration.cc (modified) (2 diffs)
• mjobs/MJCalibration.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -38 +38 @@
      - do not allow 'wrong' time&charge calibration (without
        extractors cam)
-
+     - removed kTimeAndCharge flag because it is obsolete (nowhere used)
+       and not correctly handled at all
 
 

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -1672 +1672 @@
     if (fExtractor->InheritsFrom("MExtractTimeAndCharge"))
     {
-        SetTimeAndCharge();
         if (fExtractorCam.GetSize() == pedcam.GetSize())
             calcalc.SetPedestals(&fExtractorCam);
@@ -1714 +1713 @@
 
     MTaskEnv taskenv2("ExtractTime");
-    if (!IsTimeAndCharge())
-      {
+    if (!fExtractor->InheritsFrom("MExtractTimeAndCharge"))
+    {
         taskenv2.SetDefault(fTimeExtractor);
     
         if (IsRelTimes())
           tlist.AddToList(&taskenv2);
-      }
+    }
     
     //

trunk/MagicSoft/Mars/mjobs/MJCalibration.h

@@ -130 +130 @@
   Byte_t fStorage;                                     // Bit-field for chosen storage type
 
-  enum { kRelTimes, kDataCheck, kDebug, kIntensity, kTimeAndCharge };  // Possible flags
+  enum { kRelTimes, kDataCheck, kDebug, kIntensity };  // Possible flags
 
   Byte_t fFlags;                                       // Bit-field for the flags
@@ -143 +143 @@
   Bool_t IsDebug        () const { return TESTBIT(fFlags,kDebug);          }
   Bool_t IsIntensity    () const { return TESTBIT(fFlags,kIntensity);      }
-  Bool_t IsTimeAndCharge() const { return TESTBIT(fFlags,kTimeAndCharge);  }  
 
   Bool_t IsNoStorage    () const { return TESTBIT(fStorage,kNoStorage);    }
   Bool_t IsHistsStorage () const { return TESTBIT(fStorage,kHistsStorage); }
-
-  void   SetTimeAndCharge( const Bool_t b=kTRUE ) { b 
-                                                      ? SETBIT(fFlags,kTimeAndCharge) 
-                                                      : CLRBIT(fFlags,kTimeAndCharge); }  
 
   void   DrawTab(MParList &plist, const char *cont, const char *name, Option_t *opt);