Changeset 1543 for trunk/MagicSoft/Mars/macros

Timestamp:

10/16/02 10:45:18 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/macros

Files:

• CT1Hillas.C (modified) (1 diff)
• MagicHillas.C (modified) (6 diffs)
• collarea.C (modified) (1 diff)
• flux.C (modified) (6 diffs)
• plot.C (modified) (1 diff)
• plot2.C (modified) (1 diff)
• star.C (modified) (1 diff)
• starplot.C (modified) (1 diff)
• threshold.C (modified) (1 diff)
• trigrate.C (modified) (4 diffs)

trunk/MagicSoft/Mars/macros/CT1Hillas.C

@@ -159 +159 @@
     // Execute your analysis
     //
+    MProgressBar bar;
+    evtloop.SetProgressBar(&bar);
     if (!evtloop.Eventloop())
         return;

trunk/MagicSoft/Mars/macros/MagicHillas.C

@@ -107 +107 @@
     //
 
-    MCameraSmooth   smooth;
     MImgCleanStd    clean;
     MBlindPixelCalc blind;
@@ -121 +120 @@
 
     //
-    // Uncomment this two line if you want to use MHillasExt instead
-    // of MHillas
+    // To use MHillasExt instead of MHillas
     //
-    //MHillasExt hext;
-    //plist.AddToList(&hext);
+    MHillasExt hext;
+    plist.AddToList(&hext);
 
     MFillH hfill1("MHHillas", "MHillas");
@@ -131 +129 @@
     MFillH hfill3("MHStarMap", "MHillas");
     MFillH hfill4("HistExtSource [MHHillasExt]", "HillasSource");
-    MFillH hfill5("HistExtAntiSource [MHHillasExt]", "HillasAntiSource");
+    MFillH hfill5("HistExtAntiSrc [MHHillasExt]", "HillasAntiSrc");
     MFillH hfill6("HistSource [MHHillasSrc]", "HillasSource");
     MFillH hfill7("HistAntiSrc [MHHillasSrc]", "HillasAntiSrc");
@@ -141 +139 @@
     write.AddContainer("MMcEvt","Hillas");
     write.AddContainer("Source","RunHeaders");
-    write.AddContainer("AntiSource","RunHeaders");
+    write.AddContainer("AntiSrc","RunHeaders");
 
     tlist.AddToList(&read);
@@ -172 +170 @@
     // Execute your analysis
     //
+    MProgressBar bar;
+    evtloop.SetProgressBar(&bar);
     if (!evtloop.Eventloop())
         return;
@@ -184 +184 @@
     plist.FindObject("MHStarMap")->DrawClone();
     plist.FindObject("HistSource")->DrawClone();
-    plist.FindObject("HistAntiSource")->DrawClone();
+    plist.FindObject("HistAntiSrc")->DrawClone();
     plist.FindObject("HistExtSource")->DrawClone();
-    plist.FindObject("HistExtAntiSource")->DrawClone();
+    plist.FindObject("HistExtAntiSrc")->DrawClone();
 }
 

trunk/MagicSoft/Mars/macros/collarea.C

@@ -53 +53 @@
     // Start to loop over all events
     //
+    MProgressBar bar;
+    magic.SetProgressBar(&bar);
     if (!magic.Eventloop())
         return;

trunk/MagicSoft/Mars/macros/flux.C

@@ -420 +420 @@
      //                         and for different intervals in Theta      
 
-     char *varnametime; 
-     varnametime = "Time";
-     char *unittime;
-     unittime    =  "[ s]";
-     MHEffOnTime effontime(varnametime, unittime);
-
-     char *varnametheta; 
-     varnametheta = "Theta";
-     char *unittheta;
-     unittheta    =  "[  \\circ]";
-     MHEffOnTime effontheta(varnametheta, unittheta);
+     MHEffOnTime effontime ("Time",  "[s]");
+     MHEffOnTime effontheta("Theta", "[\\circ]");
 
      effontime.SetupFill(&parlist);
@@ -438 +429 @@
      // Draw == 0  don't draw the individual distributions of time differences
      //      != 0  draw them
-     Bool_t Draw=kFALSE;
-     effontime.Calc (dtimetime->GetHist(), Draw);
-     effontheta.Calc(dtimetheta->GetHist(),Draw);
+     Bool_t draw=kFALSE;
+     effontime.Calc (dtimetime->GetHist(), draw);
+     effontheta.Calc(dtimetheta->GetHist(),draw);
 
 
@@ -487 +478 @@
      MHGamma gamma;
 
-     Bool_t Draw = kFALSE;
      TH3D *hsubtime  = gamma.Subtract( evtsptime->GetHist(), 
                                        evtasptime->GetHist(),
-                        "Al-En-time", "3D-plot of Alpha,E-est,time", Draw);    
+                        "Al-En-time", "3D-plot of Alpha,E-est,time", draw);
 
      TH3D *hsubtheta = gamma.Subtract( evtsptheta->GetHist(), 
                                        evtasptheta->GetHist(),
-                        "Al-En-time", "3D-plot of Alpha,E-est,Theta", Draw);
+                        "Al-En-time", "3D-plot of Alpha,E-est,Theta", draw);
     
 
@@ -504 +494 @@
      Axis_t lo =   0;    // [deg]
      Axis_t up =  10;    // [deg]
-     Bool_t Draw = kFALSE;
      const TH2D &evttime  = *(gamma.GetAlphaProjection(hsubtime, 
-                              lo, up, Draw));
+                              lo, up, draw));
 
      const TH2D &evttheta = *(gamma.GetAlphaProjection(hsubtheta, 
-                              lo, up, Draw));
+                              lo, up, draw));
      
 
@@ -547 +536 @@
      // Draw == kTRUE  draw the no.of photons vs. E-est 
      //                for the individual bins of the variable Var
-     Bool_t Draw=kTRUE;
-     MHFlux fluxtime(evttime, Draw, "Time", "  [  s]");
-     fluxtime.Unfold(Draw);
+     draw=kTRUE;
+     MHFlux fluxtime(evttime, draw, "Time", "[s]");
+     fluxtime.Unfold(draw);
      fluxtime.CalcFlux(effontime.GetHist(), bartime.GetHist(),
-                       &aeff, Draw);
+                       &aeff, draw);
      
      fluxtime.DrawClone();
@@ -559 +548 @@
      //..............................................
      // get flux spectrum for different bins in Theta
-     Bool_t Draw=kTRUE;
-     MHFlux fluxtheta(evttheta, Draw, "Theta", "  [  \\circ]");
-     fluxtheta.Unfold(Draw);
+     MHFlux fluxtheta(evttheta, draw, "Theta", "[\\circ]");
+     fluxtheta.Unfold(draw);
      fluxtheta.CalcFlux(effontheta.GetHist(), bartheta.GetHist(),
-                       &aeff, Draw);
+                       &aeff, draw);
      
      fluxtheta.DrawClone();

trunk/MagicSoft/Mars/macros/plot.C

@@ -99 +99 @@
     // Execute your analysis
     //
+    MProgressBar bar;
+    evtloop.SetProgressBar(&bar);
     if (!evtloop.Eventloop())
         return;

trunk/MagicSoft/Mars/macros/plot2.C

@@ -104 +104 @@
     // Execute your analysis
     //
+    MProgressBar bar;
+    evtloop.SetProgressBar(&bar);
     if (!evtloop.Eventloop())
         return;

trunk/MagicSoft/Mars/macros/star.C

@@ -119 +119 @@
     // Create and setup the eventloop
     //
+    MProgressBar bar;
+
     MEvtLoop evtloop;
+    evtloop.SetProgressBar(&bar);
     evtloop.SetParList(&plist);
 

trunk/MagicSoft/Mars/macros/starplot.C

@@ -105 +105 @@
     // Execute your analysis
     //
+    MProgressBar bar;
+    evtloop.SetProgressBar(&bar);
     if (!evtloop.Eventloop())
         return;

trunk/MagicSoft/Mars/macros/threshold.C

@@ -90 +90 @@
     // don't try to draw the results
     //
+    MProgressBar bar;
+    evtloop.SetProgressBar(&bar);
     if (!evtloop.Eventloop())
         return;

trunk/MagicSoft/Mars/macros/trigrate.C

@@ -29 +29 @@
 !
 \* ======================================================================== */
+
+Int_t GetNSBEvents(TString name, Float_t *BgR)
+{
+    Int_t numnsbevents;
+
+    TChain events("Events");
+    events.Add(name);
+
+    TH1F h("h","",5,.5,5.5);
+
+    for (Int_t i = from; i <= to; i++)
+    {
+        TString plot = "MMcTrig;";
+        plot+=i;
+        plot+=".fNumFirstLevel>>h";
+
+        if (i == 0)
+            plot = "MMcTrig.fNumFirstLevel>>h";
+
+        events.Draw(plot,"", "goff");
+
+        // Get total number of L1 triggers from histogram:
+        BgR[dim>0? i-1: 0] = h.Integral()*h.GetMean();
+
+        numnsbevents = (Float_t) h.GetEntries();
+    }
+
+    return numnsbevents;
+}
+
 
 void trigrate(int dim=0, char *filename = "data/camera.root", 
@@ -97 +127 @@
     tasklist.AddToList(&reader);
 
- 
     // Now we have to build the BgR array, containing the number 
     // of triggers (may be more than 1 trigger/event!) from the
@@ -103 +132 @@
     // If no nsbfile is supplied, we assume no triggers from NSB
 
+    Float_t* BgR = new Float_t[num];
+    memset(BgR, 0, num*sizeof(Float_t));
+
     Float_t numnsbevents = 5.e4; // some default value.
-
-    Float_t* BgR = new float[num];
-    for(Int_t i = 0; i < num; i++)
-      BgR[i] = 0.;
-
     if (nsbfile)
-      {
-        TChain nsb_events("Events");
-        nsb_events.Add(nsbfile);
-
-        TH1F h("h","",5,.5,5.5);
-
-        for (Int_t i = from; i <= to; i++)
-          {
-            TString plot = "MMcTrig;";
-            plot+=i; 
-            plot+=".fNumFirstLevel>>h";
-
-            if (i == 0)
-              plot = "MMcTrig.fNumFirstLevel>>h";
-
-            nsb_events.Draw(plot,"", "goff");
-            // Get total number of L1 triggers from histogram:
-            BgR[dim>0? i-1: 0] = h.Integral()*h.GetMean();
-
-            numnsbevents = (Float_t) h.GetEntries();
-          }
-      }
+        numnsbevents = GetNSBEvents(nsbfile, BgR);
 
     cout << "Number of Trigger conditions: " << num << endl;
@@ -147 +153 @@
     // Start to loop over all events
     //
+    MProgressBar bar;
+    magic.SetProgressBar(&bar);
     if (!magic.Eventloop())
         return;
 
+    delete BgR;
+
     hists.Print();
 }