Changeset 2357 for trunk/MagicSoft/Mars/mhist

Timestamp:

09/24/03 13:29:00 (21 years ago)

Author:

wittek

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhist

Files:

• MHCT1Supercuts.cc (modified) (1 diff)
• MHFindSignificance.cc (modified) (10 diffs)
• MHMatrix.h (modified) (1 diff)

trunk/MagicSoft/Mars/mhist/MHCT1Supercuts.cc

@@ -61 +61 @@
     //
     fName  = name  ? name  : "MHCT1Supercuts";
-    fTitle = title ? title : "Container for supercuts";
+    fTitle = title ? title : "Container for histograms for the supercuts";
 
 

trunk/MagicSoft/Mars/mhist/MHFindSignificance.cc

@@ -353 +353 @@
   fHistOrig = fhist;
 
-  fHist = (TH1*)fHistOrig->Clone("|alpha| plot");
+  fHist = (TH1*)fHistOrig->Clone();
+  fHist->SetName(fhist->GetName());
   if ( !fHist )
   {
@@ -362 +363 @@
   
   fHist->Sumw2();
-  fHist->SetNameTitle("Alpha", "alpha plot");
+  //fHist->SetNameTitle("Alpha", "alpha plot");
   fHist->SetXTitle("|alpha|  [\\circ]");
   fHist->SetYTitle("Counts");
+  fHist->UseCurrentStyle();
 
   fAlphamin = alphamin;
@@ -502 +504 @@
   fHistOrig = fhist;
 
-  fHist = (TH1*)fHistOrig->Clone("|alpha| plot");
+  fHist = (TH1*)fHistOrig->Clone();
+  fHist->SetName(fhist->GetName());
   fHist->Sumw2();
-  fHist->SetNameTitle("alpha", "alpha plot");
+  //fHist->SetNameTitle("alpha", "alpha plot");
   fHist->SetXTitle("|alpha|  [\\circ]");
   fHist->SetYTitle("Counts");
-
+  fHist->UseCurrentStyle();
 
   fAlphamin = alphamin;
@@ -754 +757 @@
 
   nrebin += 1;
-  //if (fHist)
-    delete fHist;
-    fHist = NULL;
+  TString histname = fHist->GetName();
+  delete fHist;
+  fHist = NULL;
 
   *fLog << "MHFindSignificance::FitPolynomial; rebin the |alpha| plot, grouping "
@@ -766 +769 @@
   fHist = new TH1F;
   fHist->Sumw2();
-  fHist->SetNameTitle("Rebinned", "Rebinned alpha plot");
-
+  fHist->SetNameTitle(histname, histname);
+  fHist->UseCurrentStyle();
 
   // do rebinning such that x0 remains a lower bin edge
@@ -911 +914 @@
       }
 
-      *fLog << "FitPolynomial : before CallMinuit()" << endl;
+      //*fLog << "FitPolynomial : before CallMinuit()" << endl;
 
       MMinuitInterface inter;
@@ -918 +921 @@
                                          kFALSE);
 
-      *fLog << "FitPolynomial : after CallMinuit()" << endl;
+      //*fLog << "FitPolynomial : after CallMinuit()" << endl;
 
       if (rc != 0)
@@ -1909 +1912 @@
   // get errors
 
+  /*
   Double_t eplus; 
   Double_t eminus; 
@@ -1943 +1947 @@
     }
   }  
+  */
 
   //----------------------------------------
+  /*
   *fLog << "Covariance matrix :" << endl;
   for (Int_t j=0; j<=fDegree; j++)
@@ -1966 +1972 @@
     *fLog << endl;
   }
+  */
 
   *fLog << "---------------------------" << endl;

trunk/MagicSoft/Mars/mhist/MHMatrix.h

@@ -30 +30 @@
     static const TString gsDefTitle; //! Default Title
 
-    Int_t   fNumRow;    //! Number of dimensions of histogram
+    Int_t   fNumRow;    // Number of dimensions of histogram
     Int_t   fRow;       //! Present row
     TMatrix fM;         // Matrix to be filled