Index: trunk/MagicSoft/Mars/Changelog =================================================================== --- trunk/MagicSoft/Mars/Changelog (revision 583) +++ trunk/MagicSoft/Mars/Changelog (revision 584) @@ -1,135 +1,148 @@ - -*-*- END -*-*- + -*-*- END -*-*- + + 2000/01/19: Thomas Bretz + + * mmc/*.hxx: + - changed include of MDefineTrigger.h back + + + 2000/01/19: Oscar Blanch + + * mmc/MTriggerDefine.h: + - added + + 2000/01/18: Thomas Bretz - - * Makefile: - - mmc-library added - - * Makefile.conf.general: - - Added definition of __MARS__ - - * Makefile.rules: - - Added definitions to rootcint - - * Oscar added the McFormat subdir of the Monte Carlo as mmc - - * mmc/MMcEvt.h: - - renamed to MMcEvt.hxx - - * mmc/*.hxx: - - added necessary defintions from MDefineTrigger.h - - * mmc/Makefile, mmc/McLinkDef.h, mmc/McIncl.h, mmc/readme.txt: - - added - - * mmc/LinkDef.h: - - removed - + + * Makefile: + - mmc-library added + + * Makefile.conf.general: + - Added definition of __MARS__ + + * Makefile.rules: + - Added definitions to rootcint + + * Oscar added the McFormat subdir of the Monte Carlo as mmc + + * mmc/MMcEvt.h: + - renamed to MMcEvt.hxx + + * mmc/*.hxx: + - added necessary defintions from MDefineTrigger.h + + * mmc/Makefile, mmc/McLinkDef.h, mmc/McIncl.h, mmc/readme.txt: + - added + + * mmc/LinkDef.h: + - removed + 2000/01/17: Thomas Bretz - - * Makefile: - - Exchanged explicit rules to make library by implicit ones - - The shared object works now. I exchanged the libraries with the object files. - But I don't know why the libraries don't work. - - * Makefile.conf.linux-gnu: - - replaced CC with gcc (instead of g++) - - * mdatacheck/DataCheckLinkDef.h: - - removed unused statements - - * mraw/RawLinkDef.h: - - added globals - - * mraw/MerppLinkDef.h: - - removed unused file - - + + * Makefile: + - Exchanged explicit rules to make library by implicit ones + - The shared object works now. I exchanged the libraries with the object + files. But I don't know why the libraries don't work. + + * Makefile.conf.linux-gnu: + - replaced CC with gcc (instead of g++) + + * mdatacheck/DataCheckLinkDef.h: + - removed unused statements + + * mraw/RawLinkDef.h: + - added globals + + * mraw/MerppLinkDef.h: + - removed unused file + + 2000/01/12: Thomas Bretz - - * MLinkDef.h, MIncl.h, marslogo.xpm, magiclogo.xpm: - - added - - * LinkDef.h: - - removed - - * Makefile: - - Added CINT, mrproper - - * mbase/Makefile, mraw/Makefile, mgui/Makefile, mdatacheck/Makefile: - - included makefile.general, Makefile.rules, - - removes corresponding lines - - * mdatacheck/MDumpEvtHeader.[h,cc], mdatacheck/MFillAdcSpect.[cc,h], - mdatacheck/MFillAdcSpect.[h,cc], mdatacheck/MGDisplayAdc.[cc,h], - mdatacheck/MHistsosAdc.[h,cc], mdatacheck.MShowSpect.[cc,h] - - changed include statements - - * mgui/MGDataCheckMain.[cc,h], mgui/MGMarsMain.[cc,h] - - changed include statements - - move enum from h to cc - - removed comma operator from delete statements (nonsense) + + * MLinkDef.h, MIncl.h, marslogo.xpm, magiclogo.xpm: + - added + + * LinkDef.h: + - removed + + * Makefile: + - Added CINT, mrproper + + * mbase/Makefile, mraw/Makefile, mgui/Makefile, mdatacheck/Makefile: + - included makefile.general, Makefile.rules, + - removes corresponding lines + + * mdatacheck/MDumpEvtHeader.[h,cc], mdatacheck/MFillAdcSpect.[cc,h], + mdatacheck/MFillAdcSpect.[h,cc], mdatacheck/MGDisplayAdc.[cc,h], + mdatacheck/MHistsosAdc.[h,cc], mdatacheck.MShowSpect.[cc,h] + - changed include statements + + * mgui/MGDataCheckMain.[cc,h], mgui/MGMarsMain.[cc,h] + - changed include statements + - move enum from h to cc + - removed comma operator from delete statements (nonsense) 2001/01/11: Harald Kornmayer - * ./ - readraw.cc, Makefile, Makefile.rules, LinkDef.h, MParList.cc, MReadTree.cc, - MReadTree.h, mbase/Makefile, mraw/Makefile - - small changes in this files. Not really critical. + * ./ + readraw.cc, Makefile, Makefile.rules, LinkDef.h, MParList.cc, MReadTree.cc, + MReadTree.h, mbase/Makefile, mraw/Makefile + - small changes in this files. Not really critical. - * mars.cc - - added the main file for the gui + * mars.cc + - added the main file for the gui - * mgui/ - GuiIncl.h, MGMarsMain.cc, GuiLinkDef.h, MGMarsMain.h, MGDataCheckMain.cc, - Makefile, MGDataCheckMain.h - - added the subdir mgui and this files + * mgui/ + GuiIncl.h, MGMarsMain.cc, GuiLinkDef.h, MGMarsMain.h, MGDataCheckMain.cc, + Makefile, MGDataCheckMain.h + - added the subdir mgui and this files - * mdatacheck/ - DataCheckIncl.h, DataCheckLinkDef.h, MHistosAdc.cc, MHistosAdc.h, - MDumpEvtHeader.cc, MDumpEvtHeader.h, MShowSpect.cc, MShowSpect.h, - MFillAdcSpect.cc, MFillAdcSpect.h, MViewAdcSpectra.cc, MViewAdcSpectra.h, - MGDisplayAdc.cc, MGDisplayAdc.h, Makefile - - added the subdir mdatacheck and this files + * mdatacheck/ + DataCheckIncl.h, DataCheckLinkDef.h, MHistosAdc.cc, MHistosAdc.h, + MDumpEvtHeader.cc, MDumpEvtHeader.h, MShowSpect.cc, MShowSpect.h, + MFillAdcSpect.cc, MFillAdcSpect.h, MViewAdcSpectra.cc, MViewAdcSpectra.h, + MGDisplayAdc.cc, MGDisplayAdc.h, Makefile + - added the subdir mdatacheck and this files - + 2000/12/28: Thomas Bretz - - * merpp.cc, MArray.cc, MArray.h, MArrayB.cc, MArrayB.h, MArrayS.cc, - MArrayS.h, MEvtLoop.cc, MEvtLoop.h, MInputStreamID.cc, MInputStreamID.h, - MParContainer.cc, MParContainer.h, MParList.cc, MParList.h, MReadTree.cc, - MTask.cc, MTask.h, MTaskList.cc, MTaskList.h, MTime.cc, MTime.h: - - Added changes some comments. - - * MLoopEvt.cc, MLoopEvt.h: - - Removed + + * merpp.cc, MArray.cc, MArray.h, MArrayB.cc, MArrayB.h, MArrayS.cc, + MArrayS.h, MEvtLoop.cc, MEvtLoop.h, MInputStreamID.cc, MInputStreamID.h, + MParContainer.cc, MParContainer.h, MParList.cc, MParList.h, MReadTree.cc, + MTask.cc, MTask.h, MTaskList.cc, MTaskList.h, MTime.cc, MTime.h: + - Added changes some comments. + + * MLoopEvt.cc, MLoopEvt.h: + - Removed 2000/12/22 - Thomas Bretz: - - * readraw.cc: - - changed some comments and the Root-Name of the program - - added check for the existance of the file - - changed name of numbers of entries from iEnt to nent - * dohtml.C: - - changed title of converted macros - - * MRawEvtData.cc: - - added a commet in Draw() - - * MRawEvtPixelIter.[h,cc]: - - Added the comment header of the file - - removed inheritance from TIterator (not needed) - - some changes to get it work (the one in the repository was untested - and not working) - - changed calling style of iterator from do...while to while-loop - - changed some comments - - * MRawRunHeader.cc: - - added some comments + * readraw.cc: + - changed some comments and the Root-Name of the program + - added check for the existance of the file + - changed name of numbers of entries from iEnt to nent - * Changelog, News: added - - * test.C: removed + * dohtml.C: + - changed title of converted macros + + * MRawEvtData.cc: + - added a commet in Draw() + + * MRawEvtPixelIter.[h,cc]: + - Added the comment header of the file + - removed inheritance from TIterator (not needed) + - some changes to get it work (the one in the repository was untested + and not working) + - changed calling style of iterator from do...while to while-loop + - changed some comments + + * MRawRunHeader.cc: + - added some comments + + * Changelog, News: added + + * test.C: removed Index: trunk/MagicSoft/Mars/readraw.cc =================================================================== --- trunk/MagicSoft/Mars/readraw.cc (revision 583) +++ trunk/MagicSoft/Mars/readraw.cc (revision 584) @@ -18,5 +18,5 @@ #include "MInputStreamID.h" -#include "MMcEvt.h" +#include "MMcEvt.hxx" #include "MGMarsMain.h" @@ -72,7 +72,5 @@ // open the file // - cout << " Open the file " << endl ; - TFile input(argv[1], "READ"); @@ -80,41 +78,37 @@ // open the Run Header and read in // - cout << " Check the RunHeader " << endl ; TTree *runtree = (TTree*) input.Get("RunHeaders") ; if (!runtree) - { - cout << endl - << " WARNING: This file has NO RunHeader " - << endl << endl ; - } + { + cout << endl + << " WARNING: This file has NO RunHeader " + << endl << endl ; + } else - { - cout << " Entries in Tree RunHeaders: " << dec << runtree->GetEntries() << endl ; - - runtree->GetBranch("MRawRunHeader")->SetAddress(&runheader); - runtree->GetEvent(0); - - runheader->Print(); - } + { + cout << " Entries in Tree RunHeaders: " << dec << runtree->GetEntries() << endl ; + + runtree->GetBranch("MRawRunHeader")->SetAddress(&runheader); + runtree->GetEvent(0); + + runheader->Print(); + } // // open the DataTree and read in // - cout << " Check the Event Tree " << endl ; - TTree *evttree = (TTree*) input.Get("Events") ; - cout << " Check all the Branches in the Tree " << endl ; - + // // check the branches in the Tree - + // TIter Next(evttree->GetListOfBranches()); TBranch *branch=NULL; - while ( (branch=(TBranch*)Next()) ) + while ((branch=(TBranch*)Next())) { // @@ -123,33 +117,30 @@ const char *name = branch->GetName(); - // cout << name << endl ; + if (!strcmp(name, "MRawEvtHeader")) + evttree->GetBranch("MRawEvtHeader")->SetAddress(&evtheader); - if ( ! strcmp(name, "MRawEvtHeader") ) - evttree->GetBranch("MRawEvtHeader")->SetAddress(&evtheader); + if (!strcmp(name, "MTime")) + evttree->GetBranch("MTime")->SetAddress(&evttime); - if ( ! strcmp(name, "MTime") ) - evttree->GetBranch("MTime")->SetAddress(&evttime); + if (!strcmp(name, "MRawEvtData")) + evttree->GetBranch("MRawEvtData")->SetAddress(&evtdata); - if ( ! strcmp(name, "MRawEvtData") ) - evttree->GetBranch("MRawEvtData")->SetAddress(&evtdata); + if (!strcmp(name, "MRawCrateArray")) + evttree->GetBranch("MRawCrateArray")->SetAddress(&evtcrate); - if ( ! strcmp(name, "MRawCrateArray") ) - evttree->GetBranch("MRawCrateArray")->SetAddress(&evtcrate); + if (!strcmp(name, "MMcEvt")) + evttree->GetBranch("MMcEvt")->SetAddress(&evtmc); - if ( ! strcmp(name, "MMcEvt") ) - evttree->GetBranch("MMcEvt")->SetAddress(&evtmc); + if (!strcmp(name, "MMcTrig")) + cout << " Not able to connect to class MMcTrig yet." << endl; + } - if ( ! strcmp(name, "MMcTrig") ) - cout << " Not able to connect to class MMcTrig yet " << endl ; + // + // loop over all entries + // + Int_t nent = (Int_t)evttree->GetEntries(); - - } - - // loop over all entries - - Int_t nent = (Int_t)evttree->GetEntries(); - - cout << endl << endl - << " Entries in Tree Data: " << dec << nent << endl; + cout << endl << endl; + cout << " Entries in Tree Data: " << dec << nent << endl; for (Int_t i = 0; iGetEvent(i); @@ -166,5 +159,4 @@ evtcrate->Print(); evtdata->Print(); - } Index: trunk/MagicSoft/include-Classes/MMcFormat/MHeaderTrig.hxx =================================================================== --- trunk/MagicSoft/include-Classes/MMcFormat/MHeaderTrig.hxx (revision 583) +++ trunk/MagicSoft/include-Classes/MMcFormat/MHeaderTrig.hxx (revision 584) @@ -11,12 +11,5 @@ #include "TObject.h" -#ifndef __MARS__ #include "MTriggerDefine.h" -#else -// -// From the include file above -// -#define TRIGGER_PIXELS 271 -#endif class MHeaderTrig : public TObject { Index: trunk/MagicSoft/include-Classes/MMcFormat/MMcTrig.hxx =================================================================== --- trunk/MagicSoft/include-Classes/MMcFormat/MMcTrig.hxx (revision 583) +++ trunk/MagicSoft/include-Classes/MMcFormat/MMcTrig.hxx (revision 584) @@ -11,14 +11,5 @@ #include "TObject.h" -#ifndef __MARS__ #include "MTriggerDefine.h" -#else -// -// From the include file above -// -#define TOTAL_TRIGGER_TIME 160 -#define LEVEL1_DEAD_TIME 50 -#define LEVEL2_DEAD_TIME 300 -#endif class MMcTrig : public TObject {