Changeset 7135 for trunk

Timestamp:

06/03/05 20:36:01 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mars.cc (modified) (1 diff)
• mjobs/MJStar.cc (modified) (1 diff)
• mmain/MEventDisplay.cc (modified) (2 diffs)
• mmuon/MHSingleMuon.cc (modified) (3 diffs)
• mmuon/MHSingleMuon.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -54 +54 @@
    * msignal/MExtractTimeAndChargeDigitalFilter.cc:
      - don't try to find automatic weights without template file name
+
+   * mjobs/MJStar.cc:
+     - set bit MFillH::kDoNotDisplay for fillmuon
+
+   * mmuon/MHSingleMuon.[h,cc]:
+     - store function in hist
+     - added Paint member function
 
 

trunk/MagicSoft/Mars/mars.cc

@@ -103 +103 @@
         new MCameraDisplay;
     else
-        new MEventDisplay(kFilename);
+    {
+        MEventDisplay *d = new MEventDisplay(kFilename);
+        d->SetBit(MStatusDisplay::kExitLoopOnExit);
+        d->SetTitle(kFilename);
+    }
 
     //

trunk/MagicSoft/Mars/mjobs/MJStar.cc

@@ -407 +407 @@
     fillmuon.SetFilter(&fmuon2);
     fillmpar.SetFilter(&fmuon3);
+    fillmuon.SetBit(MFillH::kDoNotDisplay);
 
     if (fMuonAnalysis)

trunk/MagicSoft/Mars/mmain/MEventDisplay.cc

@@ -343 +343 @@
     MMuonCalibParCalc  *mcalc   = new MMuonCalibParCalc;
     MFillH *fillmuon = new MFillH("MHSingleMuon", "", "FillMuon");
+    fillmuon->SetNameTab("Muon");
     tlist->AddToList(muscalc);
     tlist->AddToList(fillmuon);
@@ -351 +352 @@
     // Now distribute Display to all tasks
     //
-    fEvtLoop = new MEvtLoop(Form("Mars %s", gSystem->BaseName(fname)));
+    fEvtLoop = new MEvtLoop(gSystem->BaseName(fname));
     fEvtLoop->SetOwner();
     fEvtLoop->SetParList(plist);

trunk/MagicSoft/Mars/mmuon/MHSingleMuon.cc

@@ -349 +349 @@
     // Setup the function and perform the fit
     TF1 f1("f1", "gaus", startfitval, endfitval);
+    f1.SetLineColor(kBlue);
 
     // Choose starting values as accurate as possible
@@ -360 +361 @@
     //           R  use the range specified in the function range
     //           Q  quiet mode
-    fHistWidth.Fit(&f1, "NQR");
+    fHistWidth.Fit(&f1, "QR0");
 
     chi = f1.GetChisquare()/f1.GetNDF();
@@ -451 +452 @@
 }
 */
+
+void MHSingleMuon::Paint(Option_t *o)
+{
+    TF1 *f = fHistWidth.GetFunction("f1");
+    if (f)
+        f->ResetBit(1<<9);
+}
+
+void MHSingleMuon::Draw(Option_t *o)
+{
+    TVirtualPad *pad = gPad ? gPad : MakeDefCanvas(this);
+    pad->SetBorderMode(0);
+
+    AppendPad("");
+
+    pad->Divide(1,2);
+
+    pad->cd(1);
+    gPad->SetBorderMode(0);
+    fHistPhi.Draw();
+
+    pad->cd(2);
+    gPad->SetBorderMode(0);
+    fHistWidth.Draw();
+
+}

trunk/MagicSoft/Mars/mmuon/MHSingleMuon.h

@@ -41 +41 @@
     const TH1F &GetHistWidth() const { return fHistWidth; }
 
+    void Draw(Option_t *o="");
+    void Paint(Option_t *o="");
+
     ClassDef(MHSingleMuon, 1)
 };