Changeset 6172 for trunk/MagicSoft

Timestamp:

02/01/05 15:47:04 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• callisto.rc (modified) (1 diff)
• mjobs/MJPedestal.h (modified) (3 diffs)
• mjobs/MJob.h (modified) (2 diffs)

trunk/MagicSoft/Mars/callisto.rc

@@ -77 +77 @@
 # Set color to be used
 #MJCalibration.Color:
-# Type of used data format 
-#MJCalibration.DataType: Raw,Root,MC
+# Type of used data format: raw, root, mc
+#MJCalibration.DataType: Root
 # Type of displayed plots
 #MJCalibration.Display: Full,DataCheck,Normal

trunk/MagicSoft/Mars/mjobs/MJPedestal.h

@@ -59 +59 @@
     Byte_t fStorage;                         // Bit-field for chosen storage type
 
-    Bool_t fDataCheck;                       // Flag if the data check is run on raw data
-
     enum Extract_t { kUseData, kUsePedRun, kUseHists };  // Possible flags for the extraction of the pedestal
     Extract_t fExtractType;                  // Chosen extractor type
@@ -92 +90 @@
     const char*  GetOutputFile() const;
 
-    const Bool_t IsDataCheck() const { return fDataCheck; }
     const Bool_t IsUseData() const { return fExtractType == kUseData; }
 
@@ -105 +102 @@
     void SetUseHists()                          { fExtractType = kUseHists;  }
     void SetUsePedRun()                         { fExtractType = kUsePedRun; }
-    void SetDataCheck(const Bool_t b=kTRUE)     { fDataCheck   = b; }
     void SetDataCheckDisplay()                  { fDisplayType = kDisplayDataCheck; }
     void SetNormalDisplay()                     { fDisplayType = kDisplayNormal;    }

trunk/MagicSoft/Mars/mjobs/MJob.h

@@ -19 +19 @@
 
     enum DataType_t {
-      kIsRawData,
-      kIsRootData,
-      kIsMC
+      kIsUseRawData,
+      kIsUseRootData,
+      kIsUseMC
     };
 
@@ -36 +36 @@
     MSequence fSequence;      // Sequence
 
-    Bool_t IsRawData()  const { return TESTBIT(fDataFlag,kIsRawData);  }
-    Bool_t IsRootData() const { return TESTBIT(fDataFlag,kIsRootData); }
-    Bool_t IsMC()       const { return TESTBIT(fDataFlag,kIsMC);       }
+    Bool_t IsUseRawData()  const { return TESTBIT(fDataFlag,kIsUseRawData);  }
+    Bool_t IsUseRootData() const { return TESTBIT(fDataFlag,kIsUseRootData); }
+    Bool_t IsUseMC()       const { return TESTBIT(fDataFlag,kIsUseMC);       }
 
-    void   SetRawData ( const Bool_t b=kTRUE )  { b ? SETBIT(fDataFlag,kIsRawData)  : CLRBIT(fDataFlag,kIsRawData);  }
-    void   SetRootData( const Bool_t b=kTRUE )  { b ? SETBIT(fDataFlag,kIsRootData) : CLRBIT(fDataFlag,kIsRootData); }
-    void   SetMC      ( const Bool_t b=kTRUE )  { b ? SETBIT(fDataFlag,kIsMC)       : CLRBIT(fDataFlag,kIsMC);       }
+    void   SetUseRawData ( const Bool_t b=kTRUE )  { b ? SETBIT(fDataFlag,kIsUseRawData)  : CLRBIT(fDataFlag,kIsUseRawData);  }
+    void   SetUseRootData( const Bool_t b=kTRUE )  { b ? SETBIT(fDataFlag,kIsUseRootData) : CLRBIT(fDataFlag,kIsUseRootData); }
+    void   SetUseMC      ( const Bool_t b=kTRUE )  { b ? SETBIT(fDataFlag,kIsUseMC)       : CLRBIT(fDataFlag,kIsUseMC);       }
 
     const TEnv *GetEnv() const { return fEnv; }