Changeset 4641 for trunk/MagicSoft/Mars/mjobs

Timestamp:

08/17/04 09:50:03 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJCalibration.cc (modified) (9 diffs)
• MJPedestal.cc (modified) (4 diffs)
• MJPedestal.h (modified) (1 diff)

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -686 +686 @@
       pave->ConvertNDCtoPad();
       pave->SetTextSize(0.05);
-      TText *t0 = pave->AddText("  ");
       TText *t1 = pave->AddText("Signal smaller 3 Pedestal RMS");
       t1->SetTextColor(gStyle->GetColorPalette(Int_t(1./max*numcol)));
@@ -739 +738 @@
       pave2->ConvertNDCtoPad();
       pave2->SetTextSize(0.05);
-      TText *tt0 = pave2->AddText("  ");
       TText *tt1 = pave2->AddText("High Gain Signals could not be fitted");
       tt1->SetTextColor(gStyle->GetColorPalette(Int_t(1./max2*numcol)));
@@ -1761 +1759 @@
     TFile file(oname, "UPDATE");
 
+    *fLog << inf << " - MStatusDisplay..." << flush;
     if (fDisplay && fDisplay->Write()<=0)
     {
@@ -1766 +1765 @@
         return kFALSE;
     }
-
+    *fLog << inf << "ok." << endl;
+
+    *fLog << inf << " - MCalibrationChargeCam..." << flush;
     if (fCalibrationCam.Write()<=0)
     {
@@ -1772 +1773 @@
         return kFALSE;
     }
-
+    *fLog << inf << "ok." << endl;
+
+    *fLog << inf << " - MCalibrationChargeBlindCam..." << flush;
     if (fCalibrationBlindCam.Write()<=0)
     {
@@ -1778 +1781 @@
         return kFALSE;
     }
-
+    *fLog << inf << "ok." << endl;
+
+    *fLog << inf << " - MCalibrationChargePINDiode..." << flush;
     if (fCalibrationPINDiode.Write()<=0)
     {
@@ -1784 +1789 @@
         return kFALSE;
     }
-
+    *fLog << inf << "ok." << endl;
+
+    *fLog << inf << " - MCalibrationQECam..." << flush;
     if (fQECam.Write()<=0)
     {
@@ -1790 +1797 @@
         return kFALSE;
     }
+    *fLog << inf << "ok." << endl;
+
+    *fLog << inf << " - MBadPixelsCam..." << flush;
+    if (fBadPixels.Write()<=0)
+    {
+        *fLog << err << "Unable to write MBadPixelsCam to " << oname << endl;
+        return kFALSE;
+    }
+    *fLog << inf << "ok." << endl;
 
     if (fRelTimes)
+    {
+        *fLog << inf << " - MCalibrationRelTimeCam..." << flush;
         if (fRelTimeCam.Write()<=0)
         {
@@ -1797 +1815 @@
             return kFALSE;
         }
-
-    if (fBadPixels.Write()<=0)
-    {
-        *fLog << err << "Unable to write MBadPixelsCam to " << oname << endl;
-        return kFALSE;
+        *fLog << inf << "ok." << endl;
     }
 

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -91 +91 @@
 MJPedestal::MJPedestal(const char *name, const char *title) 
     : fEnv(0), fRuns(0), fSequence(0), fExtractor(NULL), fDisplayType(kNormalDisplay),
-      fDataCheck(kFALSE)
+      fDataCheck(kFALSE), fUseData(kFALSE), fMaxEvents(0)
 {
     fName  = name  ? name  : "MJPedestal";
@@ -507 +507 @@
         SetOutputPath(e1);
     }
+
+    fMaxEvents = fEnv->GetValue("MJPedestal.MaxEvents", fMaxEvents);
+    fUseData   = fEnv->GetValue("MJPedestal.UseData",   fUseData);
 }
 
@@ -545 +548 @@
     MDirIter iter;
     if (fSequence)
-        fSequence->SetupPedRuns(iter);
+        fUseData ? fSequence->SetupDatRuns(iter) : fSequence->SetupPedRuns(iter);
 
     if (fDataCheck)
@@ -603 +606 @@
 
     // Execute first analysis
-    if (!evtloop.Eventloop())
+    if (!evtloop.Eventloop(fMaxEvents))
     {
         *fLog << err << GetDescriptor() << ": Failed." << endl;

trunk/MagicSoft/Mars/mjobs/MJPedestal.h

@@ -21 +21 @@
 {
 private:
+    static const Double_t fgPedestalMin;
+    static const Double_t fgPedestalMax;
+    static const Double_t fgPedRmsMin;
+    static const Double_t fgPedRmsMax;
 
-  static const Double_t fgPedestalMin;
-  static const Double_t fgPedestalMax;
-  static const Double_t fgPedRmsMin;
-  static const Double_t fgPedRmsMax;
-  
-  static const Float_t  fgRefPedClosedLids;
-  static const Float_t  fgRefPedExtraGalactic;
-  static const Float_t  fgRefPedGalactic;
+    static const Float_t  fgRefPedClosedLids;
+    static const Float_t  fgRefPedExtraGalactic;
+    static const Float_t  fgRefPedGalactic;
 
-  static const Float_t  fgRefPedRmsClosedLidsInner;
-  static const Float_t  fgRefPedRmsExtraGalacticInner;
-  static const Float_t  fgRefPedRmsGalacticInner;
-  
-  static const Float_t  fgRefPedRmsClosedLidsOuter;
-  static const Float_t  fgRefPedRmsExtraGalacticOuter;
-  static const Float_t  fgRefPedRmsGalacticOuter;
-  
-  TString fOutputPath;        // Directory where the F0-files get stored
-  
-  TEnv       *fEnv;           // Input setup-file
-  MRunIter   *fRuns;          // Used pedestal runs
-  MSequence  *fSequence;      // Sequence
+    static const Float_t  fgRefPedRmsClosedLidsInner;
+    static const Float_t  fgRefPedRmsExtraGalacticInner;
+    static const Float_t  fgRefPedRmsGalacticInner;
 
-  MExtractor *fExtractor;     // Signal extractor, used to find the nr. of used FADC slices
-  
-  MPedestalCam  fPedestalCam; // Created pedestal results
-  MBadPixelsCam fBadPixels;   // Bad Pixels
-  
-  enum  Display_t { kDataCheckDisplay, kNormalDisplay }; // Possible Display types
+    static const Float_t  fgRefPedRmsClosedLidsOuter;
+    static const Float_t  fgRefPedRmsExtraGalacticOuter;
+    static const Float_t  fgRefPedRmsGalacticOuter;
+    
+    TString fOutputPath;        // Directory where the F0-files get stored
 
-  Display_t fDisplayType;     // Chosen Display type    
-  
-  Bool_t fDataCheck;          // Flag if the data check is run on raw data
-  
-  Bool_t ReadPedestalCam();
-  Bool_t WriteResult();
-  
-  void   DisplayResult(MParList &plist);
-  void   DisplayReferenceLines(MHCamera *cam, const Int_t what) const;
-  void   DisplayOutliers(TH1D *hist) const;
-  void   FixDataCheckHist(TH1D *hist) const;
-  
-  void   CheckEnv();
-  
+    TEnv       *fEnv;           // Input setup-file
+    MRunIter   *fRuns;          // Used pedestal runs
+    MSequence  *fSequence;      // Sequence
+
+    MExtractor *fExtractor;     // Signal extractor, used to find the nr. of used FADC slices
+
+    MPedestalCam  fPedestalCam; // Created pedestal results
+    MBadPixelsCam fBadPixels;   // Bad Pixels
+
+    enum  Display_t { kDataCheckDisplay, kNormalDisplay }; // Possible Display types
+
+    Display_t fDisplayType;     // Chosen Display type    
+    
+    Bool_t fDataCheck;          // Flag if the data check is run on raw data
+    Bool_t fUseData;            // Use data-runs from sequence instead of pedestal runs
+
+    Int_t fMaxEvents;           // Maximum number of events
+
+    Bool_t ReadPedestalCam();
+    Bool_t WriteResult();
+
+    void   DisplayResult(MParList &plist);
+    void   DisplayReferenceLines(MHCamera *cam, const Int_t what) const;
+    void   DisplayOutliers(TH1D *hist) const;
+    void   FixDataCheckHist(TH1D *hist) const;
+    
+    void   CheckEnv();
+
 public:
+    MJPedestal(const char *name=NULL, const char *title=NULL);
+    ~MJPedestal();
 
-  MJPedestal(const char *name=NULL, const char *title=NULL);
-  ~MJPedestal();
-  
-  MPedestalCam &GetPedestalCam()            { return fPedestalCam; }
-  const MBadPixelsCam &GetBadPixels() const { return fBadPixels;   }
-  
-  const char* GetOutputFile() const;
-  const Bool_t IsDataCheck() const    { return fDataCheck;  }
-  
-  Bool_t Process();
-  Bool_t ProcessFile();
-  
-  void SetBadPixels(const MBadPixelsCam &bad) { bad.Copy(fBadPixels); }
-  void SetExtractor(MExtractor* ext) { fExtractor = ext; }
-  void SetInput(MRunIter *iter) { fRuns = iter; }
-  void SetSequence(MSequence *seq) { fSequence = seq; }
-  void SetOutputPath(const char *path=".");
-  void SetEnv(const char *env);
-  
-  void SetDataCheck(const Bool_t b=kTRUE) { fDataCheck = b; SetDataCheckDisplay(); }
-  
-  void SetDataCheckDisplay() { fDisplayType = kDataCheckDisplay; }
-  void SetNormalDisplay()    { fDisplayType = kNormalDisplay;    }
-  
-  ClassDef(MJPedestal, 0) // Tool to create a pedestal file (MPedestalCam)
+    MPedestalCam &GetPedestalCam()            { return fPedestalCam; }
+    const MBadPixelsCam &GetBadPixels() const { return fBadPixels;   }
+
+    const char* GetOutputFile() const;
+    const Bool_t IsDataCheck() const    { return fDataCheck;  }
+
+    Bool_t Process();
+    Bool_t ProcessFile();
+
+    void SetBadPixels(const MBadPixelsCam &bad) { bad.Copy(fBadPixels); }
+    void SetExtractor(MExtractor* ext) { fExtractor = ext; }
+    void SetInput(MRunIter *iter) { fRuns = iter; }
+    void SetSequence(MSequence *seq, Bool_t usedata=kFALSE) { fSequence = seq; }
+    void SetOutputPath(const char *path=".");
+    void SetEnv(const char *env);
+    void SetMaxEvents(Int_t max) { fMaxEvents = max; }
+
+    void SetDataCheck(const Bool_t b=kTRUE) { fDataCheck = b; SetDataCheckDisplay(); }
+
+    void SetDataCheckDisplay() { fDisplayType = kDataCheckDisplay; }
+    void SetNormalDisplay()    { fDisplayType = kNormalDisplay;    }
+
+    ClassDef(MJPedestal, 0) // Tool to create a pedestal file (MPedestalCam)
 };