Index: trunk/MagicSoft/Mars/Changelog =================================================================== --- trunk/MagicSoft/Mars/Changelog (revision 2357) +++ trunk/MagicSoft/Mars/Changelog (revision 2358) @@ -1,4 +1,13 @@ -*-*- END OF LINE -*-*- + 2003/09/24: Abelardo Moralejo + * macros/MagicHillas.C, star.C + - Added const qualifier to TArrayF w(15,x); I got a crash due to + this missing qualifier when changing some code in MCerPhotCalc + (not yet submitted). + + * macros/CT1Hillas.C + - removed code containing TArrayF w(15,x) (which was commented) + since it made no sense for CT1. 2003/09/24: Wolfgang Wittek Index: trunk/MagicSoft/Mars/macros/CT1Hillas.C =================================================================== --- trunk/MagicSoft/Mars/macros/CT1Hillas.C (revision 2357) +++ trunk/MagicSoft/Mars/macros/CT1Hillas.C (revision 2358) @@ -91,13 +91,4 @@ MCerPhotCalc ncalc; - // - // Alternative photon calculation: - // Example: use only 2nd to 6th FADC slices for photon calculation: - // - // MCerPhotCalc2 ncalc; - // const Float_t x[15]={0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}; - // TArrayF w(15,x); - // ncalc.SetWeights(w); - // MCameraSmooth smooth; Index: trunk/MagicSoft/Mars/macros/MagicHillas.C =================================================================== --- trunk/MagicSoft/Mars/macros/MagicHillas.C (revision 2357) +++ trunk/MagicSoft/Mars/macros/MagicHillas.C (revision 2358) @@ -96,5 +96,5 @@ // // const Float_t x[15]={0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}; - // TArrayF w(15,x); + // const TArrayF w(15,x); // ncalc.SetWeights(w); // Index: trunk/MagicSoft/Mars/macros/star.C =================================================================== --- trunk/MagicSoft/Mars/macros/star.C (revision 2357) +++ trunk/MagicSoft/Mars/macros/star.C (revision 2358) @@ -16,7 +16,7 @@ ! ! -! Author(s): Thomas Bretz, 5/2002 -! -! Copyright: MAGIC Software Development, 2000-2003 +! Author(s): Thomas Bretz 5/2002 +! +! Copyright: MAGIC Software Development, 2000-2002 ! ! @@ -32,5 +32,7 @@ ///////////////////////////////////////////////////////////////////////////// -void star() +#include "MImgCleanStd.h" + +void star(Float_t clean1=3., Float_t clean2=2.5) { // @@ -45,4 +47,5 @@ MTaskList tlist; + plist.AddToList(&tlist); @@ -66,29 +69,140 @@ // ------------- user change ----------------- - read.AddFile("magictest/test/Gamma_z*.root"); - + // read.AddFile("Pro*.root"); + // read.AddFile("Gamma_*_0_7_*.root"); + // read.AddFile("Gamma_*.root"); + + gSystem->Exec("ls Gamma_*.root > files.txt"); + + Float_t ratio = 1.; + + ifstream list; + list.open("files.txt"); + while (1) + { + Char_t file[256]; + list >> file; + if (!list.good()) break; + TChain dummy("Events"); + dummy.Add(file); + Int_t maxevents = ratio*dummy.GetEntries(); + + read.AddFile(file,maxevents); + } + list.close(); + gSystem->Exec("rm files.txt"); + MMcPedestalCopy pcopy; MMcPedestalNSBAdd pnsb; + MCerPhotCalc ncalc; + + const Float_t x[15]={0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; + const TArrayF w(15,x); + ncalc.SetWeights(w); MBlindPixelCalc blind; blind.SetUseInterpolation(); - MSigmabarCalc sgcal; - MImgCleanStd clean; + MImgCleanStd clean(clean1, clean2); + MHillasCalc hcalc; MHillasSrcCalc scalc; // !!Preliminary!! Will be removed later! + + MContinue filtersize300("MHillas.fSize<300"); + MContinue filtersize500("MHillas.fSize<500"); + MContinue filtersize1000("MHillas.fSize<1000"); + MContinue filtersize2000("MHillas.fSize<2000"); + + MFEventSelector eventselector1; + eventselector1.SetNumSelectEvts(10000); + MFEventSelector eventselector2; + eventselector2.SetNumSelectEvts(17000); + MFEventSelector eventselector3; + eventselector3.SetNumSelectEvts(27000); + MFEventSelector eventselector4; + eventselector4.SetNumSelectEvts(63000); + MFEventSelector eventselector5; + eventselector5.SetNumSelectEvts(150000); + // ------------- user change ----------------- - MWriteRootFile write("starfile.root"); - write.AddContainer("MMcEvt", "Events"); - write.AddContainer("MSigmabar", "Events"); - write.AddContainer("MHillas", "Events"); - write.AddContainer("MHillasExt", "Events"); - write.AddContainer("MHillasSrc", "Events"); - write.AddContainer("MNewImagePar", "Events"); - write.AddContainer("MRawRunHeader", "RunHeaders"); - write.AddContainer("MMcRunHeader", "RunHeaders"); - write.AddContainer("MSrcPosCam", "RunHeaders"); + + + Char_t dir[256]; + // sprintf (dir, "Clean_%.1f_%.1f/", clean1, clean2); + TString out = dir; + + out += "Sgt0/star_gammas.root"; + MWriteRootFile write1(out); + write1.SetFilter(&eventselector1); + write1.AddContainer("MRawRunHeader", "RunHeaders"); + write1.AddContainer("MMcRunHeader", "RunHeaders"); + write1.AddContainer("MSrcPosCam", "RunHeaders"); + write1.AddContainer("MMcEvt", "Events"); + write1.AddContainer("MHillas", "Events"); + write1.AddContainer("MHillasExt", "Events"); + write1.AddContainer("MHillasSrc", "Events"); + write1.AddContainer("MNewImagePar", "Events"); + + out = dir; + out += "Sgt300/star_gammas.root"; + MWriteRootFile write2(out); + write2.SetFilter(&eventselector2); + write2.AddContainer("MRawRunHeader", "RunHeaders"); + write2.AddContainer("MMcRunHeader", "RunHeaders"); + write2.AddContainer("MSrcPosCam", "RunHeaders"); + write2.AddContainer("MMcEvt", "Events"); + write2.AddContainer("MHillas", "Events"); + write2.AddContainer("MHillasExt", "Events"); + write2.AddContainer("MHillasSrc", "Events"); + write2.AddContainer("MNewImagePar", "Events"); + + // Extra ! + write2.AddContainer("MMcTrigHeader", "RunHeaders"); + write2.AddContainer("MMcCorsikaRunHeader", "RunHeaders"); + write2.AddContainer("MMcFadcHeader", "RunHeaders"); + write2.AddContainer("MMcTrig", "Events"); + write2.AddContainer("MRawEvtData", "Events"); + write2.AddContainer("MRawEvtHeader", "Events"); + + out = dir; + out += "Sgt500/star_gammas.root"; + MWriteRootFile write3(out); + write3.SetFilter(&eventselector3); + write3.AddContainer("MRawRunHeader", "RunHeaders"); + write3.AddContainer("MMcRunHeader", "RunHeaders"); + write3.AddContainer("MSrcPosCam", "RunHeaders"); + write3.AddContainer("MMcEvt", "Events"); + write3.AddContainer("MHillas", "Events"); + write3.AddContainer("MHillasExt", "Events"); + write3.AddContainer("MHillasSrc", "Events"); + write3.AddContainer("MNewImagePar", "Events"); + + out = dir; + out += "Sgt1000/star_gammas.root"; + MWriteRootFile write4(out); + write4.SetFilter(&eventselector4); + write4.AddContainer("MRawRunHeader", "RunHeaders"); + write4.AddContainer("MMcRunHeader", "RunHeaders"); + write4.AddContainer("MSrcPosCam", "RunHeaders"); + write4.AddContainer("MMcEvt", "Events"); + write4.AddContainer("MHillas", "Events"); + write4.AddContainer("MHillasExt", "Events"); + write4.AddContainer("MHillasSrc", "Events"); + write4.AddContainer("MNewImagePar", "Events"); + + out = dir; + out += "Sgt2000/star_gammas.root"; + MWriteRootFile write5(out); + write5.SetFilter(&eventselector5); + write5.AddContainer("MRawRunHeader", "RunHeaders"); + write5.AddContainer("MMcRunHeader", "RunHeaders"); + write5.AddContainer("MSrcPosCam", "RunHeaders"); + write5.AddContainer("MMcEvt", "Events"); + write5.AddContainer("MHillas", "Events"); + write5.AddContainer("MHillasExt", "Events"); + write5.AddContainer("MHillasSrc", "Events"); + write5.AddContainer("MNewImagePar", "Events"); tlist.AddToList(&read); @@ -96,10 +210,27 @@ tlist.AddToList(&pnsb); tlist.AddToList(&ncalc); + tlist.AddToList(&clean); tlist.AddToList(&blind); - tlist.AddToList(&sgcal); - tlist.AddToList(&clean); tlist.AddToList(&hcalc); tlist.AddToList(&scalc); - tlist.AddToList(&write); + + tlist.AddToList(&eventselector1); + tlist.AddToList(&write1); + tlist.AddToList(&filtersize300); //FILTER SIZE LINE + + tlist.AddToList(&eventselector2); + tlist.AddToList(&write2); + tlist.AddToList(&filtersize500); //FILTER SIZE LINE + + tlist.AddToList(&eventselector3); + tlist.AddToList(&write3); + tlist.AddToList(&filtersize1000); //FILTER SIZE LINE + + tlist.AddToList(&eventselector4); + tlist.AddToList(&write4); + tlist.AddToList(&filtersize2000); //FILTER SIZE LINE + + tlist.AddToList(&eventselector5); + tlist.AddToList(&write5); // @@ -114,5 +245,5 @@ // // Execute your analysis - // + // if (!evtloop.Eventloop()) return;