Changeset 7113 for trunk

Timestamp:

05/30/05 19:55:26 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mhflux/MHDisp.cc (modified) (7 diffs)
• mjobs/MJCut.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mhflux/MHDisp.cc

@@ -42 +42 @@
 #include <TProfile.h>
 
+#include "MLog.h"
+#include "MLogManip.h"
+
+#include "MMath.h"
+
 #include "MParList.h"
 #include "MParameters.h"
@@ -49 +54 @@
 #include "MSrcPosCam.h"
 #include "MPointingPos.h"
-
-#include "MLog.h"
-#include "MLogManip.h"
 
 ClassImp(MHDisp);
@@ -201 +203 @@
 
     // Now we can safly derotate both position...
-    //TVector2 srcp(fSrcPos->GetXY());
+    TVector2 srcp(fSrcPos->GetXY());
     if (rho!=0)
     {
         pos1=pos1.Rotate(-rho);
         pos2=pos2.Rotate(-rho);
-        //srcp=srcp.Rotate(-rho);
-    }
-
-    /*if (fSrcPos)
+        srcp=srcp.Rotate(-rho);
+    }
+
+    if (fSrcPos)
     {
         pos1 -= srcp*fMm2Deg;
         pos2 -= srcp*fMm2Deg;
-    }*/
+    }
 
     // Workaround: Number-of-entries
@@ -249 +251 @@
 
     pad->cd(3);
-    TH1 *h2 = (TH1*)gPad->FindObject("Radial");
+    TH1 *h2 = (TH1*)gPad->FindObject("RadProf");
+    /*
+    if (!h2)
+    {
+        const Double_t maxr = TMath::Hypot(h1->GetXaxis()->GetXmax(), h1->GetYaxis()->GetXmax());
+        const Int_t    nbin = (h1->GetNbinsX()+h1->GetNbinsY())/2;
+        TProfile *h = new TProfile("RadProf", "Radial Profile", nbin, 0, maxr);
+        //TH1F *h = new TH1F("RadProf", "Radial Profile", nbin, 0, maxr);
+        h->Sumw2();
+        h->SetXTitle("\\vartheta [\\circ]");
+        h->SetYTitle("<cts>/\\Delta R");
+        h->SetBit(kCanDelete);
+        h->Draw();
+    }*/
     if (h1 && h2)
     {
@@ -258 +273 @@
         const Double_t x0 = h1->GetXaxis()->GetBinCenter(ix);
         const Double_t y0 = h1->GetYaxis()->GetBinCenter(iy);
-
-        h2->SetTitle(Form("Profile @ (%.2f\\circ, %.2f\\circ)", x0, y0));
 
         for (int x=0; x<h1->GetNbinsX(); x++)
@@ -269 +282 @@
             }
 
+        // Replace with MAlphaFitter?
         func.SetLineWidth(1);
         func.SetLineColor(kBlue);
+
+        func.SetParLimits(2, h2->GetBinWidth(1), 1.1);
+
         func.SetParameter(0, h2->GetBinContent(1));
         func.FixParameter(1, 0);
-        func.SetParameter(2, 0.05);
+        func.SetParameter(2, 0.15);
         func.SetParameter(4, h2->GetBinContent(10));
-        h2->Fit(&func, "IMQ");
+        h2->Fit(&func, "IMQ", "same", 0, 1.1);
+
+        const Double_t r0 = 2*func.GetParameter(2);
+        const Double_t e  = func.Integral(0, r0)/h1->GetBinWidth(1);
+        func.SetParameter(0, 0);
+        const Double_t b  = func.Integral(0, r0)/h1->GetBinWidth(1);
+        const Double_t s  = MMath::SignificanceLiMa(e, b);
+
+        h2->SetTitle(Form("P=(%.2f\\circ/%.2f\\circ) \\omega=%.2f\\circ \\sigma=%.1f E=%.0f B=%.0f", x0, y0, func.GetParameter(2), s, e-b, b));
     }
    /*
@@ -348 +373 @@
     const Double_t maxr = TMath::Hypot(h3->GetXaxis()->GetXmax(), h3->GetYaxis()->GetXmax());
     const Int_t    nbin = (h3->GetNbinsX()+h3->GetNbinsY())/2;
-    TProfile *h = new TProfile("Radial", "Radial Profile", nbin, 0, maxr, "s");
+    TProfile *h = new TProfile("RadProf", "Radial Profile", nbin, 0, maxr);
+    //TH1F *h = new TH1F("RadProf", "Radial Profile", nbin, 0, maxr);
+    h->Sumw2();
+    h->SetXTitle("\\vartheta [\\circ]");
+    h->SetYTitle("<cts>/\\Delta R");
     h->SetBit(kCanDelete);
     h->Draw();

trunk/MagicSoft/Mars/mjobs/MJCut.cc

@@ -731 +731 @@
         }
         tlist2.Replace(&falpha2);
-        if (!fIsWobble/* || !fNameHist.IsNull()*/)
+        if (!fIsWobble || !fNameHist.IsNull())
             tlist2.Replace(&ffs2);
         if (fIsWobble && !fNameHist.IsNull())