Index: /trunk/MagicSoft/Mars/Changelog =================================================================== --- /trunk/MagicSoft/Mars/Changelog (revision 1542) +++ /trunk/MagicSoft/Mars/Changelog (revision 1543) @@ -27,4 +27,16 @@ - removed the second empty line after Print - added Getter-function for the DAQEvtNumber + + * macros/star.C, macros/starplot.C, macros/threshold.C, macros/trigrate.C, + macros/plot.C, macros/plot2.C, macros/MagicHillas.C, macros/CT1Hillas.C, + macros/collarea.C: + - added ProgressBar + + * macros/flux.C: + - fixed some coding bugs (redeclaration of Draw, Draw starting with a + capital) + + * macros/MagicHillas.C: + - fixed some typos Index: /trunk/MagicSoft/Mars/NEWS =================================================================== --- /trunk/MagicSoft/Mars/NEWS (revision 1542) +++ /trunk/MagicSoft/Mars/NEWS (revision 1543) @@ -79,4 +79,6 @@ - Changed the image cleaning so that pixels with to many 'used' neighbors are left used (to get rid of 'holes' in events) + + - Introduced more output to the camera displays Index: /trunk/MagicSoft/Mars/macros/CT1Hillas.C =================================================================== --- /trunk/MagicSoft/Mars/macros/CT1Hillas.C (revision 1542) +++ /trunk/MagicSoft/Mars/macros/CT1Hillas.C (revision 1543) @@ -159,4 +159,6 @@ // Execute your analysis // + MProgressBar bar; + evtloop.SetProgressBar(&bar); if (!evtloop.Eventloop()) return; Index: /trunk/MagicSoft/Mars/macros/MagicHillas.C =================================================================== --- /trunk/MagicSoft/Mars/macros/MagicHillas.C (revision 1542) +++ /trunk/MagicSoft/Mars/macros/MagicHillas.C (revision 1543) @@ -107,5 +107,4 @@ // - MCameraSmooth smooth; MImgCleanStd clean; MBlindPixelCalc blind; @@ -121,9 +120,8 @@ // - // 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,5 +129,5 @@ 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,5 +139,5 @@ write.AddContainer("MMcEvt","Hillas"); write.AddContainer("Source","RunHeaders"); - write.AddContainer("AntiSource","RunHeaders"); + write.AddContainer("AntiSrc","RunHeaders"); tlist.AddToList(&read); @@ -172,4 +170,6 @@ // Execute your analysis // + MProgressBar bar; + evtloop.SetProgressBar(&bar); if (!evtloop.Eventloop()) return; @@ -184,7 +184,7 @@ 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(); } Index: /trunk/MagicSoft/Mars/macros/collarea.C =================================================================== --- /trunk/MagicSoft/Mars/macros/collarea.C (revision 1542) +++ /trunk/MagicSoft/Mars/macros/collarea.C (revision 1543) @@ -53,4 +53,6 @@ // Start to loop over all events // + MProgressBar bar; + magic.SetProgressBar(&bar); if (!magic.Eventloop()) return; Index: /trunk/MagicSoft/Mars/macros/flux.C =================================================================== --- /trunk/MagicSoft/Mars/macros/flux.C (revision 1542) +++ /trunk/MagicSoft/Mars/macros/flux.C (revision 1543) @@ -420,15 +420,6 @@ // 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,7 +429,7 @@ // 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,12 +478,11 @@ 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,10 +494,9 @@ 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,9 +536,9 @@ // 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,9 +548,8 @@ //.............................................. // 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(); Index: /trunk/MagicSoft/Mars/macros/plot.C =================================================================== --- /trunk/MagicSoft/Mars/macros/plot.C (revision 1542) +++ /trunk/MagicSoft/Mars/macros/plot.C (revision 1543) @@ -99,4 +99,6 @@ // Execute your analysis // + MProgressBar bar; + evtloop.SetProgressBar(&bar); if (!evtloop.Eventloop()) return; Index: /trunk/MagicSoft/Mars/macros/plot2.C =================================================================== --- /trunk/MagicSoft/Mars/macros/plot2.C (revision 1542) +++ /trunk/MagicSoft/Mars/macros/plot2.C (revision 1543) @@ -104,4 +104,6 @@ // Execute your analysis // + MProgressBar bar; + evtloop.SetProgressBar(&bar); if (!evtloop.Eventloop()) return; Index: /trunk/MagicSoft/Mars/macros/star.C =================================================================== --- /trunk/MagicSoft/Mars/macros/star.C (revision 1542) +++ /trunk/MagicSoft/Mars/macros/star.C (revision 1543) @@ -119,5 +119,8 @@ // Create and setup the eventloop // + MProgressBar bar; + MEvtLoop evtloop; + evtloop.SetProgressBar(&bar); evtloop.SetParList(&plist); Index: /trunk/MagicSoft/Mars/macros/starplot.C =================================================================== --- /trunk/MagicSoft/Mars/macros/starplot.C (revision 1542) +++ /trunk/MagicSoft/Mars/macros/starplot.C (revision 1543) @@ -105,4 +105,6 @@ // Execute your analysis // + MProgressBar bar; + evtloop.SetProgressBar(&bar); if (!evtloop.Eventloop()) return; Index: /trunk/MagicSoft/Mars/macros/threshold.C =================================================================== --- /trunk/MagicSoft/Mars/macros/threshold.C (revision 1542) +++ /trunk/MagicSoft/Mars/macros/threshold.C (revision 1543) @@ -90,4 +90,6 @@ // don't try to draw the results // + MProgressBar bar; + evtloop.SetProgressBar(&bar); if (!evtloop.Eventloop()) return; Index: /trunk/MagicSoft/Mars/macros/trigrate.C =================================================================== --- /trunk/MagicSoft/Mars/macros/trigrate.C (revision 1542) +++ /trunk/MagicSoft/Mars/macros/trigrate.C (revision 1543) @@ -29,4 +29,34 @@ ! \* ======================================================================== */ + +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,5 +127,4 @@ 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,33 +132,10 @@ // 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,7 +153,11 @@ // Start to loop over all events // + MProgressBar bar; + magic.SetProgressBar(&bar); if (!magic.Eventloop()) return; + delete BgR; + hists.Print(); }