Changeset 2106 for trunk/MagicSoft/Mars

Timestamp:

05/09/03 13:34:33 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mbase/MLog.cc (modified) (1 diff)
• mfileio/MReadTree.cc (modified) (1 diff)
• mhist/MBinning.cc (modified) (1 diff)
• mhist/MHSigmaTheta.cc (modified) (5 diffs)
• mhist/MHSigmaTheta.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -13 +13 @@
      - do not underline if eNoColors is set
      - fixed abug in Output() (last character missing when flushed)
+     - same when flushing to the GUI
      
    * mbase/MLogManip.cc:
@@ -38 +39 @@
      - deleted the fCalcPixNum variable (not used).
 
+   * macros/star.C, macros/starct1.C:
+     - updated
+
+   * mhist/MBinning.cc:
+     - fixed SetBinningCos
+     
+   * mhist/MHSigmaTheta.[h,cc]:
+     - in setting of binnings changes npix+1 to npix 
+       (SetEdges takes the number of _bins_ as argument)
+     - fixed titles (LaTeX style)
+     - added default binning (may have to be changed for Magic)
+     - removed obsolete destructor
+     - removed default canvas size of 900x900
+     - temporarily removed SetLogy() for first pad. I'm searching
+       for a solution to put it in again when using the status display
 
 

trunk/MagicSoft/Mars/mbase/MLog.cc

@@ -266 +266 @@
 
         // for the gui remove trailing characters ('\n' or '\0')
-        fBase[len-1]='\0';
+        fBase[flushed ? len : len-1]='\0';
 
         // add new text to line storage

trunk/MagicSoft/Mars/mfileio/MReadTree.cc

@@ -240 +240 @@
         SetBit(kChainWasChanged);
 
-    *fLog << warn << "WARNING: No files '" << fname << "' added to " << GetDescriptor() << endl;
+    *fLog << warn << "WARNING: '" << fname << "' not added to " << GetDescriptor() << endl;
 
     return numfiles;

trunk/MagicSoft/Mars/mhist/MBinning.cc

@@ -108 +108 @@
     fEdges.Set(nbins+1);
     for (int i=0; i<=nbins; i++)
-        fEdges[i] = (acos(binsize*i) + ld)*kRad2Deg;
+        fEdges[i] = acos(cos(ld)-binsize*i)*kRad2Deg;
 
     fType = kIsCosinic;

trunk/MagicSoft/Mars/mhist/MHSigmaTheta.cc

@@ -65 +65 @@
 //
 MHSigmaTheta::MHSigmaTheta(const char *name, const char *title)
-    : fSigmaTheta(), fSigmaPixTheta()
 {
     fName  = name  ? name  : "MHSigmaTheta";
@@ -72 +71 @@
     fSigmaTheta.SetDirectory(NULL);
     fSigmaTheta.SetName("2D-ThetaSigmabar");
-    fSigmaTheta.SetTitle("2D: Sigmabar, \\Theta");
+    fSigmaTheta.SetTitle("2D: \\bar{\\sigma}, \\Theta");
     fSigmaTheta.SetXTitle("\\Theta [\\circ]");
-    fSigmaTheta.SetYTitle("Sigmabar");
+    fSigmaTheta.SetYTitle("\\bar{\\sigma}");
 
     fSigmaPixTheta.SetDirectory(NULL);
     fSigmaPixTheta.SetName("3D-ThetaPixSigma");
-    fSigmaPixTheta.SetTitle("3D : \\Theta, Pixel Id, Sigma");
+    fSigmaPixTheta.SetTitle("3D: \\Theta, Pixel Id, \\sigma");
     fSigmaPixTheta.SetXTitle("\\Theta [\\circ]");
     fSigmaPixTheta.SetYTitle("Pixel Id");
-    fSigmaPixTheta.SetZTitle("Sigma");
+    fSigmaPixTheta.SetZTitle("\\sigma");
 
     fDiffPixTheta.SetDirectory(NULL);
     fDiffPixTheta.SetName("3D-ThetaPixDiff");
-    fDiffPixTheta.SetTitle("3D : \\Theta, Pixel Id, Sigma^2-Sigmabar^2");
+    fDiffPixTheta.SetTitle("3D: \\Theta, Pixel Id, {\\sigma}^{2}-\\bar{\\sigma}^{2}");
     fDiffPixTheta.SetXTitle("\\Theta [\\circ]");
     fDiffPixTheta.SetYTitle("Pixel Id");
-    fDiffPixTheta.SetZTitle("Sigma^2-Sigmabar^2");
-}
-// --------------------------------------------------------------------------
-//
-// Default Destructor
-//
-MHSigmaTheta::~MHSigmaTheta()
-{
-
+    fDiffPixTheta.SetZTitle("{\\sigma}^{2}-\\bar{\\sigma}^{2}");
+
+    // Set default binning
+    // FIXME: Maybe ist's necessary to adapt the value to the
+    // Magic default values
+    MBinning binsb;
+    MBinning binst;
+    MBinning binsd;
+    binsd.SetEdges(100, -5, 20);
+    binsb.SetEdges(100, 0, 5);
+    binst.SetEdgesCos(10, 0, 90);
+
+    MBinning binspix("BinningPixel");
+    binspix.SetEdges(577, -0.5, 577.5);
+
+    SetBinning(&fSigmaTheta,    &binst, &binsb);
+    SetBinning(&fSigmaPixTheta, &binst, &binspix, &binsb);
+    SetBinning(&fDiffPixTheta,  &binst, &binspix, &binsd);
 }
 
@@ -105 +113 @@
 Bool_t MHSigmaTheta::SetupFill(const MParList *plist)
 {
-
-  fMcEvt = (MMcEvt*)plist->FindObject("MMcEvt");
-  if (!fMcEvt)
-    {
-       *fLog << err << "MMcEvt not found... aborting." << endl;
-       return kFALSE;
-     }
-  
-   fPed = (MPedestalCam*)plist->FindObject("MPedestalCam");
-   if (!fPed)
-     {
-       *fLog << err << "MPedestalCam not found... aborting." << endl;
-       return kFALSE;
-     }
-  
-   fCam = (MGeomCam*)plist->FindObject("MGeomCam");
-   if (!fCam)
-     {
-       *fLog << err << "MGeomCam not found (no geometry information available)... aborting." << endl;
-       return kFALSE;
-     }
-  
-   fEvt = (MCerPhotEvt*)plist->FindObject("MCerPhotEvt");
-   if (!fEvt)
-     {
-       *fLog << err << "MCerPhotEvt not found... aborting." << endl;
-       return kFALSE;
-     }
-
-     fSigmabar = (MSigmabar*)plist->FindObject("MSigmabar");
-   if (!fSigmabar)
-     {
-       *fLog << err << "MSigmabar not found... aborting." << endl;
-       return kFALSE;
-     }
-
-   // Get Theta Binning  
-   MBinning* binstheta  = (MBinning*)plist->FindObject("BinningTheta");
-   if (!binstheta)
-     {
-       *fLog << err << "BinningTheta [MBinning] not found... aborting." << endl;
-       return kFALSE;      
-     }
-
-   // Get Sigmabar binning  
-   MBinning* binssigma = (MBinning*)plist->FindObject("BinningSigmabar");
-   if (!binssigma)
-     {
-       *fLog << err << "BinningSigmabar [MBinning] not found... aborting." << endl;
-       return kFALSE;      
-     }
-
-   // Get binning for (sigma^2-sigmabar^2)  
-   MBinning* binsdiff  = (MBinning*)plist->FindObject("BinningDiffsigma2");
-   if (!binsdiff)
-     {
-       *fLog << err << "BinningDiffsigma2 [MBinning] not found... aborting." << endl;
-       return kFALSE;      
-     }
-
-
-   // Set binnings in histograms
-   SetBinning(&fSigmaTheta, binstheta, binssigma);
-
-   // Get binning for pixel number
-   const UInt_t npix = fPed->GetSize();
-
-   MBinning binspix("BinningPixel");
-   binspix.SetEdges(npix+1, -0.5, 0.5+npix );
-
-   SetBinning(&fSigmaPixTheta, binstheta, &binspix, binssigma);
-   SetBinning(&fDiffPixTheta,  binstheta, &binspix, binsdiff);
-
-   return kTRUE;
+    fMcEvt = (MMcEvt*)plist->FindObject("MMcEvt");
+    if (!fMcEvt)
+    {
+        *fLog << err << "MMcEvt not found... aborting." << endl;
+        return kFALSE;
+    }
+
+    fPed = (MPedestalCam*)plist->FindObject("MPedestalCam");
+    if (!fPed)
+    {
+        *fLog << err << "MPedestalCam not found... aborting." << endl;
+        return kFALSE;
+    }
+
+    fCam = (MGeomCam*)plist->FindObject("MGeomCam");
+    if (!fCam)
+    {
+        *fLog << err << "MGeomCam not found (no geometry information available)... aborting." << endl;
+        return kFALSE;
+    }
+
+    fEvt = (MCerPhotEvt*)plist->FindObject("MCerPhotEvt");
+    if (!fEvt)
+    {
+        *fLog << err << "MCerPhotEvt not found... aborting." << endl;
+        return kFALSE;
+    }
+
+    fSigmabar = (MSigmabar*)plist->FindObject("MSigmabar");
+    if (!fSigmabar)
+    {
+        *fLog << err << "MSigmabar not found... aborting." << endl;
+        return kFALSE;
+    }
+
+    // Get Theta Binning
+    MBinning* binstheta  = (MBinning*)plist->FindObject("BinningTheta", "MBinning");
+    if (!binstheta)
+    {
+        *fLog << warn << "Object 'BinningTheta' [MBinning] not found... no binning applied." << endl;
+        return kTRUE;
+    }
+
+    // Get Sigmabar binning
+    MBinning* binssigma = (MBinning*)plist->FindObject("BinningSigmabar", "MBinning");
+    if (!binssigma)
+        *fLog << warn << "Object 'BinningSigmabar' [MBinning] not found... no binning applied." << endl;
+
+    // Get binning for (sigma^2-sigmabar^2)
+    MBinning* binsdiff  = (MBinning*)plist->FindObject("BinningDiffsigma2", "MBinning");
+    if (!binsdiff)
+        *fLog << warn << "Object 'BinningDiffsigma2' [MBinning] not found... no binning applied." << endl;
+
+    //FIXME: Missing: Apply new binning to only one axis!
+
+    // Get binning for pixel number
+    const UInt_t npix = fPed->GetSize();
+
+    MBinning binspix("BinningPixel");
+    binspix.SetEdges(npix, -0.5, 0.5+npix);
+
+    // Set binnings in histograms
+    if (binssigma)
+    {
+        SetBinning(&fSigmaTheta, binstheta, binssigma);
+        SetBinning(&fSigmaPixTheta, binstheta, &binspix, binssigma);
+    }
+
+    if (binsdiff)
+        SetBinning(&fDiffPixTheta,  binstheta, &binspix, binsdiff);
+
+    return kTRUE;
 }
 
@@ -221 +227 @@
 void MHSigmaTheta::Draw(Option_t *opt)
 {
-    TVirtualPad *pad = gPad ? gPad : MakeDefCanvas(this, 900, 900);
+    TVirtualPad *pad = gPad ? gPad : MakeDefCanvas(this);
     pad->SetBorderMode(0);
 
@@ -233 +239 @@
     pad->cd(1);
     gPad->SetBorderMode(0);
-    gPad->SetLogy();
+    // gPad->SetLogy();
     h = fSigmaTheta.ProjectionX("ProjX-Theta", -1, 9999, "E");
     h->SetDirectory(NULL);

trunk/MagicSoft/Mars/mhist/MHSigmaTheta.h

@@ -40 +40 @@
 public:
     MHSigmaTheta(const char *name=NULL, const char *title=NULL);
-    ~MHSigmaTheta();
 
     Bool_t SetupFill(const MParList *plist);