Changeset 5937 for trunk

Timestamp:

01/21/05 19:05:54 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

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

trunk/MagicSoft/Mars/Changelog

@@ -50 +50 @@
    * mastro/MObservatory.[h,cc]:
      - added ReadEnv member function
+
+   * mjobs/MJPedestal.h:
+     - fixed a bug in the header. kNoStorage was 0 which cannot work in this
+       context. Set to BIT(0)
 
 

trunk/MagicSoft/Mars/mjobs/MJPedestal.h

@@ -48 +48 @@
     MBadPixelsCam fBadPixels;                            // Bad Pixels
 
-    enum Display_t {kDataCheckDisplay, kNormalDisplay};  // Possible Display types
+    enum Display_t { kDataCheckDisplay, kNormalDisplay}; // Possible Display types
     Display_t fDisplayType;                              // Chosen Display type
 
-    enum Storage_t { kNoStorage };                       // Possible flags for the storage of results
+    enum Storage_t { kNoStorage = BIT(0) };              // Possible flags for the storage of results
     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
+    enum Extract_t { kUseData, kUsePedRun, kUseHists };  // Possible flags for the extraction of the pedestal
     Extract_t fExtractType;                              // Chosen extractor type
 
@@ -102 +102 @@
     void SetNormalDisplay()                     { fDisplayType = kNormalDisplay;    }
 
-    void SetExtractionFundamental()       { fExtractionType=kFundamental; }
-    void SetExtractionWithExtractorRndm() { fExtractionType=kWithExtractorRndm; }
-    void SetExtractionWithExtractor()     { fExtractionType=kWithExtractor; }
+    void SetExtractionFundamental()       { fExtractionType=kFundamental;       /*fPedestalCamOut.SetName("MPedestalFundamental");*/   }
+    void SetExtractionWithExtractorRndm() { fExtractionType=kWithExtractorRndm; /*fPedestalCamOut.SetName("MPedestalExtractorRndm");*/ }
+    void SetExtractionWithExtractor()     { fExtractionType=kWithExtractor;     /*fPedestalCamOut.SetName("MPedestalExtractor");*/     }
 
     MExtractor *GetExtractor() const { return fExtractor; }