Changeset 6131 for trunk

Timestamp:

01/30/05 16:18:58 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mhcalib/MHCalibrationRelTimeCam.cc (modified) (7 diffs)
• mhcalib/MHCalibrationRelTimeCam.h (modified) (3 diffs)
• mjobs/calibrationref_Nov04.rc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -23 +23 @@
  
    * mjobs/MJPedestal.cc
+   * mhcalib/MHCalibrationRelTimeCam.[h,cc]
      - updated correct display of reference lines
 

trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc

@@ -119 +119 @@
 #include <TLegend.h>
 #include <TGraph.h>
+#include <TEnv.h>
 
 ClassImp(MHCalibrationRelTimeCam);
@@ -134 +135 @@
 const TString MHCalibrationRelTimeCam::gsHistXTitle = "Arr. Time [FADC slices]";
 const TString MHCalibrationRelTimeCam::gsHistYTitle = "Nr. events";
+const TString MHCalibrationRelTimeCam::fgReferenceFile = "mjobs/calibrationref.rc";
 // --------------------------------------------------------------------------
 //
@@ -170 +172 @@
   SetHistYTitle(gsHistYTitle.Data());
 
+  SetReferenceFile();
+
+  fInnerRefTime  = 2.95;   
+  fOuterRefTime  = 3.6;
 }
 
@@ -195 +201 @@
   cam->fFirst                  = fFirst;
   cam->fLast                   = fLast;
+
+  cam->fReferenceFile          = fReferenceFile;
+  cam->fInnerRefTime           = fInnerRefTime;
+  cam->fOuterRefTime           = fOuterRefTime;
 
   //
@@ -648 +658 @@
         {
            MHCalibrationPix &lopix = GetAverageLoGainArea(i);
-           DrawDataCheckPixel(lopix,0.);
+           DrawDataCheckPixel(lopix,i ? fOuterRefTime+1.5 : fInnerRefTime+1.5);
          }
        else
-         DrawDataCheckPixel(hipix,0.);
+         DrawDataCheckPixel(hipix,i ? fOuterRefTime : fInnerRefTime);
     }      
 }
@@ -751 +761 @@
   }
 
-  //  DisplayRefLines(null,refline);
-
-  gPad->Modified();
-  gPad->Update();
+  DisplayRefLines(null,refline);
 
   newpad->cd(2);
@@ -793 +800 @@
 }
 
+void  MHCalibrationRelTimeCam::DisplayRefLines(const TH1F *hist, const Float_t refline) const
+{
+
+  TGraph *gr = new TGraph(2);
+  gr->SetPoint(0,refline,0.);
+  gr->SetPoint(1,refline,hist->GetMaximum());
+  gr->SetBit(kCanDelete);
+  gr->SetLineColor(kGreen);
+  gr->SetLineStyle(2);
+  gr->SetLineWidth(3);
+  gr->Draw("L");
+
+  TLegend *leg = new TLegend(0.8,0.65,0.99,0.99);
+  leg->SetBit(kCanDelete);
+  leg->AddEntry(gr,"Trigger Time Calib.","l");
+  leg->Draw();
+}
+
+Int_t MHCalibrationRelTimeCam::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
+{
+
+  Bool_t rc = kFALSE;
+
+  if (IsEnvDefined(env, prefix, "ReferenceFile", print))
+    {
+      SetReferenceFile(GetEnvValue(env,prefix,"ReferenceFile",fReferenceFile.Data()));
+      rc = kTRUE;
+    }
+
+  TEnv refenv(fReferenceFile);
+
+  fInnerRefTime = refenv.GetValue("InnerRefTime",fInnerRefTime);
+  fOuterRefTime = refenv.GetValue("OuterRefTime",fOuterRefTime);
+
+  return MHCalibrationCam::ReadEnv(env,prefix,print) ? kTRUE : rc;
+
+}

trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.h

@@ -33 +33 @@
   static const TString gsHistYTitle;                 //! Default Histogram y-axis titles
   
-  MArrayD fSumareahi  ;                             //
-  MArrayD fSumarealo  ;                             //
-  MArrayD fSumsectorhi;                             //
-  MArrayD fSumsectorlo;                             //
-  MArrayI fNumareahi  ;                             //
-  MArrayI fNumarealo  ;                             //
-  MArrayI fNumsectorhi;                             //
-  MArrayI fNumsectorlo;                             //
+  static const TString fgReferenceFile;              //! default for fReferenceFile ("mjobs/calibrationref.rc")
 
-  UInt_t fReferencePixel;                           // The reference pixel for rel. times
+  UInt_t  fReferencePixel;                           // The reference pixel for rel. times
+  Float_t fInnerRefTime;                             // The reference mean arrival time inner pixels
+  Float_t fOuterRefTime;                             // The reference mean arrival time outer pixels
+
+  TString  fReferenceFile;                           // File name containing the reference values
+
+  MArrayD fSumareahi  ;                              //
+  MArrayD fSumarealo  ;                              //
+  MArrayD fSumsectorhi;                              //
+  MArrayD fSumsectorlo;                              //
+  MArrayI fNumareahi  ;                              //
+  MArrayI fNumarealo  ;                              //
+  MArrayI fNumsectorhi;                              //
+  MArrayI fNumsectorlo;                              //
 
   Bool_t ReInitHists(MParList *pList);
@@ -51 +57 @@
   void   CheckOverflow( MHCalibrationPix &pix);
   void   DrawDataCheckPixel(MHCalibrationPix &pix, const Float_t refline);
+  void   DisplayRefLines( const TH1F *hist, const Float_t refline) const;
+
+  Int_t  ReadEnv ( const TEnv &env, TString prefix, Bool_t print );
   
 public:
@@ -63 +72 @@
 
   // Setters
-  void  SetReferencePixel( const UInt_t i=fgReferencePixel) { fReferencePixel = i; }
+  void  SetReferencePixel( const UInt_t i=fgReferencePixel   ) { fReferencePixel = i;   }
+  void  SetReferenceFile ( const TString ref=fgReferenceFile ) { fReferenceFile  = ref; }
 
   Bool_t GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type=0) const;

trunk/MagicSoft/Mars/mjobs/calibrationref_Nov04.rc

@@ -11 +11 @@
 RefConvFADC2PheOuter:     0.33
 RefConvFADC2PhotInner:    0.71.
-RefConvFADC2PhotOuter:    2.9
+RefConvFADC2PhotOuter:    2.8
 RefQEInner:               0.18
 RefQEOuter:               0.12
@@ -18 +18 @@
 RefArrivalTimeRmsInner:   0.58.
 RefArrivalTimeRmsOuter:   0.57.
+
+InnerRefTime:             2.95
+OuterRefTime:             3.6