Changeset 2221

Timestamp:

06/23/03 17:17:01 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• macros/readMagic.C (modified) (2 diffs)
• macros/status.C (modified) (5 diffs)
• macros/sumcurrents.C (modified) (1 diff)
• mbase/MEvtLoop.cc (modified) (2 diffs)
• mhist/MHCamEvent.cc (modified) (1 diff)
• mhist/MHCamera.cc (modified) (2 diffs)
• mhist/MHTriggerLvl0.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -156 +156 @@
      - adapted to changes
      - added filename to canvas
-
+  
+   * macros/readMagic.C, macros/readCT1.C, macros/status.C:
+     - adapted to changes
+     
    * mbase/MAGIC.h:
      - replaced extern by R__EXTERN
@@ -162 +165 @@
    * mbase/MParContainer.[h,cc]:
      - added a non empty destructor with some debug options
+
+   * mbase/MPrint.cc:
+     - fixed a bug (used kSKIP instead of kSkip)
 
 

trunk/MagicSoft/Mars/macros/readMagic.C

@@ -96 +96 @@
         return;
 
-    MHCamera display(geomcam);
-    display.Draw();
+    MHCamera display1(geomcam);
+    MHCamera display2(geomcam);
+
+    TCanvas c("Events", "Real Events", 300, 600);
+    c.SetBorderMode(0);
+    c.Divide(1,2);
+    c.cd(1);
+    gPad->SetBorderMode(0);
+    gPad->Divide(1,1);
+    gPad->cd(1);
+    gPad->SetBorderMode(0);
+    display1.Draw();
+    c.cd(2);
+    gPad->SetBorderMode(0);
+    gPad->Divide(1,1);
+    gPad->cd(1);
+    gPad->SetBorderMode(0);
+    display2.Draw();
 
     // Use this if you don't want the event to be autoscaled
@@ -107 +123 @@
         cout << "Event #" << read.GetNumEntry() ":" << endl;
 
-        display.SetCamContent(*(MCerPhotEvt*)clone.GetClone());
+        display1.SetCamContent(*(MCerPhotEvt*)clone.GetClone());
+        display2.SetCamContent(*(MCerPhotEvt*)plist.FindObject("MCerPhotEvt"));
+
+        c->cd(1);
+        gPad->cd(1);
+        gPad->Modified();
+        gPad->Update();
+        c->cd(2);
+        gPad->cd(1);
+        hillas.Draw();
         gPad->Modified();
         gPad->Update();
 
-        if (!HandleInput())
-            break;
-
-        hillas.Draw();
         hillas.Print();
         hillasext.Print();
         newimgpar.Print();
-
-        display.SetCamContent(*(MCerPhotEvt*)plist.FindObject("MCerPhotEvt"));
-        gPad->Modified();
-        gPad->Update();
 
         if (!HandleInput())

trunk/MagicSoft/Mars/macros/status.C

@@ -31 +31 @@
 /////////////////////////////////////////////////////////////////////////////
 
-void status()
+void status(const char *fname="cosmics.root")
 {
     //
@@ -44 +44 @@
     // d->SetUpdateTime(-1);
 
-    d->SetLogStream(&gLog, kTRUE); // Disables output to stdout
-    gLog.SetOutputFile("status.log", kTRUE); // Enable output to file
+    d->SetLogStream(&gLog, kTRUE);            // Disables output to stdout
+    gLog.SetOutputFile("status.log", kTRUE);  // Enable output to file
     //gLog.EnableOutputDevice(MLog::eStdout); // Enable output to stdout again
 
@@ -76 +76 @@
 
     // ------------- user change -----------------
-    read.AddFile("cosmics.root");
+    read.AddFile(fname);
 
     MMcPedestalCopy   pcopy;
@@ -92 +92 @@
 
     // -------------------------------------------
+    MFillH hfill0("Uncleaned [MHCamEvent]", "MCerPhotEvt");
     MFillH hfill1("MHHillas", "MHillas");
     MFillH hfill2("MHHillasExt");
     MFillH hfill3("MHHillasExtSrc [MHHillasExt]", "MHillasSrc");
     MFillH hfill4("MHHillasSrc","MHillasSrc");
-    MFillH hfill4("MHNewImagePar","MNewImagePar");
-    MFillH hfill5("MHStarMap", "MHillas");
-    MFillH hfill6("MHCerPhotEvt", "MCerPhotEvt");
-    MFillH hfill7("MHHadronness", "MHadronness");
-    MFillH hfill8("MHSigmaTheta");
+    MFillH hfill5("MHNewImagePar","MNewImagePar");
+    MFillH hfill6("MHStarMap", "MHillas");
+    MFillH hfill7("Cleaned [MHCamEvent]", "MCerPhotEvt");
+    MFillH hfill8("MHHadronness", "MHadronness");
+    MFillH hfill9("MHSigmaTheta");
 
     tlist.AddToList(&read);
-    //tlist.AddToList(&pcopy);
-    //tlist.AddToList(&pnsb);
+    tlist.AddToList(&pcopy);
+    tlist.AddToList(&pnsb);
     tlist.AddToList(&ncalc);
+    tlist.AddToList(&hfill0);
     tlist.AddToList(&blind);
     //tlist.AddToList(&sgcal);
@@ -118 +120 @@
     tlist.AddToList(&hfill5);
     tlist.AddToList(&hfill6);
-    //tlist.AddToList(&hfill7);
+    tlist.AddToList(&hfill7);
     //tlist.AddToList(&hfill8);
 

trunk/MagicSoft/Mars/macros/sumcurrents.C

@@ -70 +70 @@
     TCanvas *c = MH::MakeDefCanvas();
     c->Divide(3, 2);
-
-    h.SetXTitle("Pixel Index");
 
     MHCamera *disp1=h.Clone();

trunk/MagicSoft/Mars/mbase/MEvtLoop.cc

@@ -74 +74 @@
 #include <TTime.h>          // TTime
 #include <TFile.h>          // gFile
+#include <TDatime.h>        // TDatime
 #include <TSystem.h>        // gSystem
 #include <TStopwatch.h>
@@ -478 +479 @@
 Bool_t MEvtLoop::Eventloop(Int_t maxcnt, const char *tlist)
 {
+    TDatime d;
+    *fLog << inf << underline << "Eventloop: " << fName << " started at " << d.AsString() << endl;
+
     Bool_t rc = PreProcess();
 

trunk/MagicSoft/Mars/mhist/MHCamEvent.cc

@@ -98 +98 @@
         delete (fSum);
     fSum = new MHCamera(*cam, fNameEvt+";avg", fTitle);
-    fSum->SetXTitle("a.u.");
+    fSum->SetYTitle("a.u.");
 
     return kTRUE;

trunk/MagicSoft/Mars/mhist/MHCamera.cc

@@ -110 +110 @@
     SetLineColor(kGreen);
     SetMarkerStyle(kFullDotMedium);
+    SetXTitle("Pixel Index");
 
     fNotify = new TList;
@@ -398 +399 @@
     Float_t fRange = fGeomCam->GetMaxRadius();
 
-    TLatex *ptitle = new TLatex(1.2*fRange, .97*fRange, GetXaxis()->GetTitle());
+    TLatex *ptitle = new TLatex(1.2*fRange, .97*fRange, GetYaxis()->GetTitle());
 
     ptitle->SetTextSize(0.03);

trunk/MagicSoft/Mars/mhist/MHTriggerLvl0.cc

@@ -111 +111 @@
         delete (fSum);
     fSum = new MHCamera(*cam, fNameEvt+";avg", fTitle);
-    fSum->SetXTitle("%");
+    fSum->SetYTitle("%");
 
     return kTRUE;