Changeset 2777 for trunk/MagicSoft/Mars/macros

Timestamp:

01/13/04 09:20:55 (21 years ago)

Author:

wittek

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/macros

Files:

• ONAnalysis.C (modified) (1 diff)
• ONOFFAnalysis.C (modified) (3 diffs)

trunk/MagicSoft/Mars/macros/ONAnalysis.C

@@ -761 +761 @@
     contbasic.SetName("SelBasic");
 
-
-    // There are 2 options for Thomas Schweizer's padding
-    //     fPadFlag = 1   get Sigmabar from fHSigmaTheta
-    //                    and Sigma    from fHDiffPixTheta
-    //     fPadFlag = 2   get Sigma    from fHSigmaPixTheta
-    
-    MPadON padthomas("MPadON","Task for the padding");
-    padthomas.SetHistograms(fHSigmaTheta, fHSigmaPixTheta, fHDiffPixTheta,
-                            fHIdBlindPixels, fHNBlindPixels);
-    padthomas.SetPadFlag(1);
+    MPad padthomas("MPad","Task for the padding");
+    padthomas.MergeONMC(fHSigmaThetaMC, fHDiffPixThetaMC, fHSigmaPixThetaMC,
+                        fHIdBlindPixelsMC, fHNBlindPixelsMC,
+                        fHSigmaThetaON, fHDiffPixThetaON, fHSigmaPixThetaON,
+                        fHIdBlindPixelsON, fHNBlindPixelsON);
 
     MFillH fillblind("MCBlindPixels[MHBlindPixels]", "MBlindPixels");

trunk/MagicSoft/Mars/macros/ONOFFAnalysis.C

@@ -357 +357 @@
     //                       and merge these histograms
 
-    MPadONOFF pad;
-    pad.SetName("MPadONOFF");
-    pad.SetPadFlag(1);
+    MPad pad;
+    pad.SetName("MPad");
     pad.SetDataType(typeInput);
 
@@ -531 +530 @@
       gLog << "=====================================================" << endl;
 
-      pad.MergeHistograms(sigthon,     sigthoff,
-                          sigpixthon,  sigpixthoff,
-                          diffpixthon, diffpixthoff,
-                          blindidthon, blindidthoff,
-                          blindnthon,  blindnthoff);
+      pad.MergeONOFFMC(sigthmc,      diffpixthmc,  sigpixthmc, 
+                       blindidthmc,  blindnthmc,
+                       sigthon,      diffpixthon,  sigpixthon, 
+                       blindidthon,  blindnthon,
+                       sigthoff,     diffpixthoff, sigpixthoff, 
+                       blindidthoff, blindnthoff);
+
 
       if (WPad)
       {
         // write the padding histograms onto a file  ---------
-        pad.WriteTargetDist(outNameSigTh);     
+        pad.WritePaddingDist(outNameSigTh);     
       }
     }
@@ -547 +548 @@
     if (RPad)
     {
-      pad.ReadTargetDist(outNameSigTh);
+      pad.ReadPaddingDist(outNameSigTh);
     }