Changeset 6355 for trunk/MagicSoft/Mars

Timestamp:

02/10/05 16:06:21 (22 years ago)

Author:

mazin

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mtemp/mmpi/SupercutsONOFFClasses

Files:

• MFindSupercutsONOFF.cc (modified) (14 diffs)
• MFindSupercutsONOFF.h (modified) (2 diffs)
• MFindSupercutsONOFFThetaLoop.h (added)
• MHFindSignificanceONOFF.cc (modified) (7 diffs)
• MSupercutsCalcONOFF.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mtemp/mmpi/SupercutsONOFFClasses/MFindSupercutsONOFF.cc

@@ -319 +319 @@
     
 
+    // Degree of polynomials used to fit the ON and the OFF data are retrieved from 
+    // the event loop
+
+    Int_t degreeON;
+    Int_t degreeOFF;
+
+    MDataValue* DegreeONContainer = (MDataValue*) ONDataplistfcn->FindObject("DegreeON");
+    degreeON = int(DegreeONContainer -> GetValue());
+
+    MDataValue* DegreeOFFContainer = (MDataValue*) OFFDataplistfcn->FindObject("DegreeOFF");
+    degreeOFF = int(DegreeOFFContainer -> GetValue());
+
+    gLog << "fcnSupercuts : fDegreeON and fDegreeOFF retrieved from ONDataplistfcn and OFFDataplistfcn: " << endl
+         << "fDegreeON, fDegreeOFF: = " << degreeON << " ," << degreeOFF << endl;
+
+
     Double_t AlphaSig = 0.0;
     MDataValue* AlphaSigContainer = (MDataValue*) ONDataplistfcn->FindObject("AlphaSigValue");
@@ -484 +500 @@
    // alpha min for bkg region in ON data
     const Double_t alphamax = AlphaBkgMax; // alpha max for bkg region in ON data
-    const Int_t    degreeON   =    2; 
-    // degree of polynomial used to fit ON data in Bkg  region
-    const Int_t    degreeOFF   =    2; 
-    // degree of polynomial used to fit OFF data in ALL region
+
 
     Bool_t drawpoly;
@@ -523 +536 @@
     
     TString DummyPs = ("Dummy");
+  
 
     const Bool_t rc = findsig.FindSigmaONOFF(&alphaHist,&alphaHistOFF, 
@@ -788 +802 @@
     ////////////////////////////////////////////////////
     
-
-
+    
+    // Degree of polynomials used to fit the ON OFF data is 
+    // set initially to 2.
+
+    fDegreeON = 2;
+    fDegreeOFF = 2;
 
 
@@ -1931 +1949 @@
 
 
-
-
-
-    
-
-
-
-    
     Double_t prob = whichfractiontrain/(whichfractiontrain + whichfractiontest);
 
@@ -2492 +2502 @@
     AlphaBkgMaxCont.SetName("AlphaBkgMaxValue");
     
+
+    MDataValue DegreeONCont (fDegreeON);
+    DegreeONCont.SetName("DegreeON");
+
+    MDataValue DegreeOFFCont (fDegreeOFF);
+    DegreeOFFCont.SetName("DegreeOFF");
+
+
+
+
     
     // Value of fUseFittedQuantities is stored in container 
@@ -2593 +2613 @@
     parlistfcn.AddToList(&AlphaBkgMinCont);
     parlistfcn.AddToList(&AlphaBkgMaxCont);
+    parlistfcn.AddToList(&DegreeONCont);
     parlistfcn.AddToList(&UseFittedQuantitiesCont);
     parlistfcn.AddToList(&UseNormFactorFromAlphaBkgCont);
@@ -2698 +2719 @@
     parlistfcnOFF.AddToList(&alphaOFF);
 
+    parlistfcnOFF.AddToList(&DegreeOFFCont);
     
 
@@ -3521 +3543 @@
     
     const Double_t alphamax = fAlphaBkgMax;
-    const Int_t    degree   =    2;
-    const Int_t    degreeOFF   =    2;
+//    const Int_t    degree   =    2;
+//    const Int_t    degreeOFF   =    2;
     const Bool_t   drawpoly  = kTRUE;
     const Bool_t   fitgauss  = kTRUE;
@@ -3574 +3596 @@
                                        fNormFactorTest, 
                                        alphamin, alphamax, 
-                                       degree, degreeOFF,
+                                       fDegreeON, fDegreeOFF,
                                        alphasig, drawpolyTest, 
                                        fitgaussTest, printTest, 
@@ -3684 +3706 @@
                            fNormFactorTest, 
                            alphamin, alphamax, 
-                           degree, degreeOFF,
+                           fDegreeON, fDegreeOFF,
                            alphasig, drawpoly, fitgauss, print, 
                            saveplots, psfilename);
@@ -4208 +4230 @@
     
     const Double_t alphamax = fAlphaBkgMax;
-    const Int_t    degree   =    2;
-    const Int_t    degreeOFF   =    2;
+//    const Int_t    degree   =    2;
+//    const Int_t    degreeOFF   =    2;
     const Bool_t   drawpoly  = kTRUE;
     const Bool_t   fitgauss  = kTRUE;
@@ -4262 +4284 @@
                                       fNormFactorTrain, 
                                       alphamin, alphamax, 
-                                      degree, degreeOFF,
+                                      fDegreeON, fDegreeOFF,
                                       alphasig, drawpolyTest, 
                                       fitgaussTest, printTest, 
@@ -4365 +4387 @@
                            fNormFactorTrain, 
                            alphamin, alphamax, 
-                           degree, degreeOFF,
+                           fDegreeON, fDegreeOFF,
                            alphasig, drawpoly, fitgauss, print, 
                            saveplots, psfilename);

trunk/MagicSoft/Mars/mtemp/mmpi/SupercutsONOFFClasses/MFindSupercutsONOFF.h

@@ -66 +66 @@
 
 
-
-
+    Int_t fDegreeON;
+    Int_t fDegreeOFF;
 
 
@@ -317 +317 @@
   Bool_t CheckAlphaSigBkg();
 
-
-
+  void SetDegreeON (Int_t d) {fDegreeON = d;}
+  void SetDegreeOFF (Int_t d) {fDegreeOFF = d;}
 
 

trunk/MagicSoft/Mars/mtemp/mmpi/SupercutsONOFFClasses/MHFindSignificanceONOFF.cc

@@ -547 +547 @@
     //*fLog << "MHFindSignificanceONOFF::FindSigma;" << endl;
  
-
     // Pointer to object TPostScript where plots will be stored 
     // is copied into member varialbe 
@@ -1215 +1214 @@
       // prepare fit of a polynomial :   (a0 + a1*x + a2*x**2 + a3*x**3 + ...)
 
+
       TString funcname = "PolyOFF";
       Double_t xmin =   0.0;
@@ -1721 +1721 @@
       //--------------------------------------------------
       // prepare fit of a polynomial :   (a0 + a1*x + a2*x**2 + a3*x**3 + ...)
-
+ 
       TString funcname = "Poly";
       Double_t xmin =   0.0;
@@ -3234 +3234 @@
         fHist -> SetTitle("Alpha Plot");
         fHist-> SetTitleOffset(1.5, "Y");
+        fHist-> SetLineColor(kRed);
         fHist-> DrawCopy();
         
@@ -3254 +3255 @@
         }
 
-        fHistOFFNormalized->SetLineColor(kRed);
-        fHistOFFNormalized->DrawCopy("same");
+
+//      fHistOFFNormalized->SetLineColor(kRed);
+//      fHistOFFNormalized->DrawCopy("same");
 
     }
@@ -3278 +3280 @@
         *fLog << "MHFindSignificanceONOFF::DrawFit; fbackg = NULL" << endl;
 
+    if (fHistOFFNormalized)
+      {
+      fHistOFFNormalized->SetFillStyle(3002);
+      fHistOFFNormalized->SetFillColor(9);
+      fHistOFFNormalized->DrawCopy("Psamebar");}
+
+
       if (fbackg)
       {
         // 10, 1 is white and solid
-        fbackg->SetLineColor(kRed);
+        //fbackg->SetLineColor(kRed);
+        fbackg->SetLineColor(196);
         fbackg->SetLineStyle(1);
         fbackg->SetLineWidth(4);
-        //fbackg->DrawCopy("same"); // I do not want to draw it... already too many things.
+        fbackg->DrawCopy("same"); // I do not want to draw it... already too many things.
       }
     }
 
+//    fCanvas->SaveAs("plot.root");
+//    fCanvas->SaveAs("plot.ps");
 
     //-------------------------------
@@ -3455 +3467 @@
         if (!fPsFilenameString.IsNull())
         {
-            TString filename = (fPsFilenameString);
+            TString filename  = (fPsFilenameString);
+            TString filename2 = (fPsFilenameString);
             // Train or Test Sample is specified outside 
             // class MHFindSignificanceONOFF, and included in 
             // fPsFilenameString
             
-            filename += ("AlphaPlot.ps");
+            filename  += ("AlphaPlot.ps");
+            filename2 += ("AlphaPlot.C");
             cout << filename << endl;   
             fCanvas -> SaveAs(filename);
+            fCanvas -> SaveAs(filename2);
         }
         

trunk/MagicSoft/Mars/mtemp/mmpi/SupercutsONOFFClasses/MSupercutsCalcONOFF.cc

@@ -108 +108 @@
     // as external variables.
 
-    fSizeOffset = 3000; // photons
+    fSizeOffset = 3000; // still in photons !
     fDistOffset = 0.9; // degrees  
     fThetaOffset = 20; // degrees   NOT USED FOR THE TIME BEING