Changeset 1967 for trunk

Timestamp:

04/20/03 15:39:13 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• macros/status.C (modified) (5 diffs)
• manalysis/MBlindPixels.h (modified) (1 diff)
• mhist/HistLinkDef.h (modified) (1 diff)
• mhist/MH.cc (modified) (6 diffs)
• mhist/MH.h (modified) (1 diff)
• mhist/MH3.h (modified) (2 diffs)
• mhist/MHBlindPixels.cc (added)
• mhist/MHBlindPixels.h (added)
• mhist/MHMatrix.cc (modified) (2 diffs)
• mhist/MHSigmaTheta.cc (modified) (6 diffs)
• mhist/Makefile (modified) (1 diff)
• mimage/MHHillas.cc (modified) (1 diff)
• mmain/MStatusDisplay.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -2 +2 @@
 
  2003/04/21: Thomas Bretz
+
+   * manalysis/MBlindPixels.h:
+     - IsBlind -> const
+     
+   * mhist/HistLinkDef.h, mhist/Makefile:
+     - added MHBlindPixels
+   
+   * mhist/MH.[h,cc]:
+     - changed the two DrawClone functions to one.
+     
+   * mhist/MHHadronness.[h,cc]:
+     - changed to fit the requirements of MStatusDisplay
+     
+   * mhist/MHMatrix.cc:
+     - SetDirectory(NULL) for all histograms created
+
+   * mhist/MHSigmaTheta.cc:
+     - removed fNpix    (is already in MHHillas)
+     - removed fBlindId (--> MHBlindPixels)
+
+   * mhist/MHBlindPixels.[h,cc]:
+     - new
 
    * macros/plot.C:
@@ -8 +30 @@
    * macros/status.C:
      - added MHNewImagePar
+     - added MHHadronness
 
    * manalysis/MBlindPixelCalc.cc:

trunk/MagicSoft/Mars/macros/status.C

@@ -80 +80 @@
 
     // ------------- user change -----------------
+    read.AddFile("data/Pro*.root");
     read.AddFile("data/Gam*.root");
-    //read.AddFile("200*.root");
 
     MMcPedestalCopy   pcopy;
@@ -94 +94 @@
     MHillasSrcCalc    scalc; // !!Preliminary!! Will be removed later!
     MNewImageParCalc  icalc;
+    MCT1SupercutsCalc calc1;
 
     // -------------------------------------------
@@ -103 +104 @@
     MFillH hfill5("MHStarMap", "MHillas");
     MFillH hfill6("MHCerPhotEvt", "MCerPhotEvt");
+    MFillH hfill7("MHHadronness", "MHadronness");
 
     tlist.AddToList(&read);
@@ -114 +116 @@
     tlist.AddToList(&scalc);
     tlist.AddToList(&icalc);
+    tlist.AddToList(&calc1);
+    tlist.AddToList(&hfill7);
     tlist.AddToList(&hfill1);
     tlist.AddToList(&hfill2);
@@ -140 +144 @@
     {
         // Save data in a postscriptfile (status.ps)
-        d->SaveAsPS();
+       // d->SaveAsPS();
         /*
          * ----------- Write status to a root file ------------

trunk/MagicSoft/Mars/manalysis/MBlindPixels.h

@@ -23 +23 @@
     void Clear(Option_t *o="")  { fPixels.Reset(); }
 
-    Bool_t IsBlind(UShort_t id) { return fPixels.GetSize() && fPixels[id]; }
+    Bool_t IsBlind(UShort_t id) const { return fPixels.GetSize() && ((TArrayC)fPixels)[id]; }
 
     ClassDef(MBlindPixels, 1) // container to store blind pixels

trunk/MagicSoft/Mars/mhist/HistLinkDef.h

@@ -19 +19 @@
 
 #pragma link C++ class MHCerPhotEvt+;
+
+#pragma link C++ class MHBlindPixels+;
 
 #pragma link C++ class MHStarMap+;

trunk/MagicSoft/Mars/mhist/MH.cc

@@ -588 +588 @@
     gPad->Update();
 
-    h1->SetMaximum(TMath::Max(hist1.GetMaximum(), hist2.GetMaximum()));
-    h1->SetMinimum(TMath::Min(hist1.GetMinimum(), hist2.GetMinimum()));
+    // FIXME: Also align max/min with set Maximum/Minimum
+     const Double_t max = TMath::Max(hist1.GetBinContent(hist1.GetMaximumBin()), hist2.GetBinContent(hist2.GetMaximumBin()));
+     const Double_t min = TMath::Min(hist1.GetBinContent(hist1.GetMinimumBin()), hist2.GetBinContent(hist2.GetMinimumBin()));
+     h1->SetMaximum(max);
+     h1->SetMinimum(min);
 
     TPaveText *t = (TPaveText*)gPad->FindObject("title");
@@ -655 +658 @@
     gPad->Update();
 
-    hist1.SetMaximum(TMath::Max(hist1.GetMaximum(), hist2.GetMaximum()));
-    hist1.SetMinimum(TMath::Min(hist1.GetMinimum(), hist2.GetMinimum()));
+    // FIXME: Also align max/min with set Maximum/Minimum
+    /*
+     const Double_t max = TMath::Max(hist1.GetBinContent(hist1.GetMaximumBin()), hist2.GetBinContent(hist2.GetMaximumBin()));
+     const Double_t min = TMath::Min(hist1.GetBinContent(hist1.GetMinimumBin()), hist2.GetBinContent(hist2.GetMinimumBin()));
+     hist1.SetMaximum(max);
+     hist1.SetMinimum(min);
+     */
 
     TPaveText *t = (TPaveText*)gPad->FindObject("title");
@@ -711 +719 @@
 //
 // If the opt string contains 'nonew' or gPad is not given NULL is returned.
-// Other wise the present gPad is cleared and returned.
+// Otherwise the present gPad is returned.
 //
 TVirtualPad *MH::GetNewPad(Option_t *opt)
@@ -720 +728 @@
         return NULL;
 
-    gPad->Clear();
     return gPad;
 }
@@ -726 +733 @@
 // --------------------------------------------------------------------------
 //
-// The object is cloned and drawn to the present pad. The kCanDelete
-// bit is set for the clone.
-//
-TObject *MH::DrawClone(Option_t *opt="") const
-{
+// If the opt string contains 'nonew' or gPad is not given a new canvas
+// with size w/h is created. Otherwise the object is cloned and drawn
+// to the present pad. The kCanDelete bit is set for the clone.
+//
+TObject *MH::DrawClone(Option_t *opt, Int_t w, Int_t h) const
+{
+    TVirtualPad *p = GetNewPad(opt);
+    if (!p)
+        p = MakeDefCanvas(this, w, h);
+    else
+        p->Clear();
+
     gROOT->SetSelectedPad(NULL);
 
@@ -737 +751 @@
     return o;
 }
-
-// --------------------------------------------------------------------------
-//
-// If the opt string contains 'nonew' or gPad is not given a new canvas
-// with size w/h is created. Otherwise the object is cloned and drawn
-// to the present pad. The kCanDelete bit is set for the clone.
-//
-TObject *MH::DrawClone(Option_t *opt, Int_t w, Int_t h) const
-{
-    TVirtualPad *p = GetNewPad(opt);
-    if (!p)
-        p = MakeDefCanvas(this, w, h);
-
-    return MH::DrawClone(opt);
-}

trunk/MagicSoft/Mars/mhist/MH.h

@@ -70 +70 @@
 
     void Draw(Option_t *o="") { MParContainer::Draw(o); }
-    TObject *DrawClone(Option_t *opt="") const;
-    TObject *DrawClone(Option_t *opt, Int_t w, Int_t h) const;
+    TObject *DrawClone(Option_t *opt, Int_t w=580, Int_t h=435) const;
 
     static TVirtualPad *GetNewPad(Option_t *opt);

trunk/MagicSoft/Mars/mhist/MH3.h

@@ -22 +22 @@
     TString     fDataMember[3];  // Data member which should be filled into the histogram x
     MDataChain *fData[3];        // Object from which the data is filled
-    Double_t    fScale[3];
+    Double_t    fScale[3];       // Scale for the three axis (eg unit)
 
     void StreamPrimitive(ofstream &out) const;
@@ -60 +60 @@
     void SetColors() const;
     void Draw(Option_t *opt=NULL);
-    TObject *DrawClone(Option_t *opt=NULL) const;
 
     MParContainer *New() const;

trunk/MagicSoft/Mars/mhist/MHMatrix.cc

@@ -693 +693 @@
     //
     TH1F hta;
+    hta.SetDirectory(NULL);
     hta.SetName("hta");
     hta.SetTitle("Distribution after reduction");
@@ -793 +794 @@
     //
     TH1F hth("th", "Distribution before reduction", nbins, frombin, tobin);
+    hth.SetDirectory(NULL);
     for (Int_t j=0; j<nrows; j++)
         hth.Fill(fM(j, refcolumn));
 
     TH1F hthd("thd", "Correction factors", nbins, frombin, tobin);
+    hthd.SetDirectory(NULL);
     hthd.Divide((TH1F*)&thsh, &hth, 1, 1);
 

trunk/MagicSoft/Mars/mhist/MHSigmaTheta.cc

@@ -17 +17 @@
 !
 !   Author(s): Wolfgang Wittek 1/2003 <mailto:wittek@mppmu.mpg.de>
-!
-!   Copyright: MAGIC Software Development, 2000-2002
+!   Author(s): Thomas Bretz 4/2003 <mailto:tbretz@astro.uni-wuerzburg.de>
+!
+!   Copyright: MAGIC Software Development, 2000-2003
 !
 !
@@ -27 +28 @@
 //  MHSigmaTheta (extension of Robert's MHSigmabarTheta)                    //
 //                                                                          //
-//  calculates - the 1D-histogram   ID of blind pixels
-//             - the 1D-histogram   no.of pixels in MCerPhotEvt, and        //
-//             - the 2D-histogram   sigmabar vs. Theta, and                 //
+//  calculates - the 2D-histogram   sigmabar vs. Theta, and                 //
 //             - the 3D-histogram   sigma, pixel no., Theta                 //
 //             - the 3D-histogram   (sigma^2-sigmabar^2), pixel no., Theta  //
@@ -71 +70 @@
     fTitle = title ? title : "2D histogram sigmabar vs. Theta";
 
-    fNpix.SetDirectory(NULL);
-    fNpix.SetName("1D-Npix");
-    fNpix.SetTitle("1D : no.of used pixels in MCerPhotEvt");
-    fNpix.SetXTitle("no. of used pixels in MCerPhotEvt");
-    fNpix.SetYTitle("Counts");
-
-    fBlindId.SetDirectory(NULL);
-    fBlindId.SetName("1D-BlindId");
-    fBlindId.SetTitle("1D : Id of blind pixel");
-    fBlindId.SetXTitle("Id of blind pixel");
-    fBlindId.SetYTitle("Counts");
-
     fSigmaTheta.SetDirectory(NULL);
     fSigmaTheta.SetName("2D-ThetaSigmabar");
-    fSigmaTheta.SetTitle("2D : Sigmabar, \\Theta");
+    fSigmaTheta.SetTitle("2D: \\bar{\\sigma}_{ped}, \\Theta");
     fSigmaTheta.SetXTitle("\\Theta [\\circ]");
-    fSigmaTheta.SetYTitle("Sigmabar");
+    fSigmaTheta.SetYTitle("\\bar{\\Theta}");
 
     fSigmaPixTheta.SetDirectory(NULL);
     fSigmaPixTheta.SetName("3D-ThetaPixSigma");
-    fSigmaPixTheta.SetTitle("3D : \\Theta, pixel no., Sigma");
+    fSigmaPixTheta.SetTitle("3D : \\Theta, Pixel Id, \\sigma_{ped}");
     fSigmaPixTheta.SetXTitle("\\Theta [\\circ]");
-    fSigmaPixTheta.SetYTitle("pixel number");
-    fSigmaPixTheta.SetZTitle("Sigma");
+    fSigmaPixTheta.SetYTitle("Pixel Id");
+    fSigmaPixTheta.SetZTitle("\\sigma_{ped}");
 
     fDiffPixTheta.SetDirectory(NULL);
     fDiffPixTheta.SetName("3D-ThetaPixDiff");
-    fDiffPixTheta.SetTitle("3D : \\Theta, pixel, Sigma^2-Sigmabar^2");
+    fDiffPixTheta.SetTitle("3D : \\Theta, Pixel Id, \\sigma_{ped}^{2}-\\bar{\\sigma}^{2}");
     fDiffPixTheta.SetXTitle("\\Theta [\\circ]");
-    fDiffPixTheta.SetYTitle("pixel number");
-    fDiffPixTheta.SetZTitle("Sigma^2-sigmabar^2");
+    fDiffPixTheta.SetYTitle("Pixel Id");
+    fDiffPixTheta.SetZTitle("\\sigma_{ped}^{2}-\\bar{\\sigma}^{2}");
 }
 
@@ -180 +167 @@
    binspix.SetEdges(npix+1, -0.5, 0.5+npix );
 
-   SetBinning(&fNpix,    &binspix);
-   SetBinning(&fBlindId, &binspix);
    SetBinning(&fSigmaPixTheta, binstheta, &binspix, binssigma);
    SetBinning(&fDiffPixTheta,  binstheta, &binspix, binsdiff);
@@ -194 +179 @@
 Bool_t MHSigmaTheta::Fill(const MParContainer *par)
 {
-  //*fLog << "entry Fill" << endl;
-
     Double_t theta = fMcEvt->GetTelescopeTheta()*kRad2Deg;
     Double_t mySig = fSigmabar->Calc(*fCam, *fPed, *fEvt);
 
-    //*fLog << "MHSigmaTheta::Fill; theta, mySig = " << theta << ",  "
-    //      << mySig << endl;
-
     fSigmaTheta.Fill(theta, mySig);
 
     const UInt_t npix = fEvt->GetNumPixels();
 
-    Int_t npixused=0;
     for (UInt_t i=0; i<npix; i++)
     {
-      MCerPhotPix cerpix = fEvt->operator[](i);
+      MCerPhotPix cerpix = (*fEvt)[i];
       if (!cerpix.IsPixelUsed())
-      {
-        fBlindId.Fill( cerpix.GetPixId() );        
-        continue;
-      }
-      npixused++;
-
-      /*      
-      if (cerpix.GetNumPhotons() == 0)
-        continue;
-      */       
+          continue;
 
       const Int_t id = cerpix.GetPixId();
@@ -233 +203 @@
       const Double_t diff = sigma*sigma/area - mySig*mySig;
       fDiffPixTheta.Fill(theta, (Double_t)id, diff);
-
-      //*fLog << "theta, id, sigma, diff, area  = " << theta << ",  " << id 
-      //      << ",  "
-      //      << sigma << ",  " << diff << ",  " << area << endl;
     }
-    fNpix.Fill(npixused);
 
     return kTRUE;

trunk/MagicSoft/Mars/mhist/Makefile

@@ -45 +45 @@
            MHAlphaEnergyTime.cc \
            MHAlphaEnergyTheta.cc \
+           MHBlindPixels.cc \
            MHEffOnTime.cc \
            MHTimeDiffTime.cc \

trunk/MagicSoft/Mars/mimage/MHHillas.cc

@@ -316 +316 @@
 
     pad->cd(1);
+    gPad->SetBorderMode(0);
     MH::Draw(*fWidth, *fLength, "Width'n'Length");
 

trunk/MagicSoft/Mars/mmain/MStatusDisplay.cc

@@ -431 +431 @@
     //lient->ProcessEventsFor(this);
     gSystem->ProcessEvents();
+
+    //TSeqCollection   *GetListOfCleanups() const   {return fCleanups;}
+
 }
 
@@ -440 +443 @@
 MStatusDisplay::~MStatusDisplay()
 {
+    SetLogStream(NULL);
+
     delete fList;