Index: trunk/MagicSoft/Cosy/Changelog =================================================================== --- trunk/MagicSoft/Cosy/Changelog (revision 1794) +++ trunk/MagicSoft/Cosy/Changelog (revision 1795) @@ -4,4 +4,7 @@ * Makefile - changed order of binaries + - added make links + - added make magic + - added make model * base/timer.cc: Index: trunk/MagicSoft/Cosy/Makefile =================================================================== --- trunk/MagicSoft/Cosy/Makefile (revision 1794) +++ trunk/MagicSoft/Cosy/Makefile (revision 1795) @@ -117,4 +117,17 @@ @echo "cd .." +links: + @ln -sf ../Mars/mbase/MAGIC.h base/MAGIC.h + @ln -sf ../Mars/mbase/MLog.h base/MLog.h + @ln -sf ../Mars/mbase/MLog.cc base/MLog.cc + @ln -sf ../Mars/mbase/MLogManip.h base/MLogManip.h + @ln -sf ../Mars/mbase/MLogManip.cc base/MLogManip.cc + @ln -sf ../Mars/mbase/MGList.h base/MGList.h + @ln -sf ../Mars/mbase/MGList.cc base/MGList.cc + @ln -sf ../Mars/mbase/MParContainer.h base/MParContainer.h + @ln -sf ../Mars/mbase/MParContainer.cc base/MParContainer.cc + @ln -sf ../Mars/mtemp/MObservatory.h base/MObservatory.h + @ln -sf ../Mars/mtemp/MObservatory.cc base/MObservatory.cc + tar: mrproper @echo "Making tar-file" Index: trunk/MagicSoft/Mars/Changelog =================================================================== --- trunk/MagicSoft/Mars/Changelog (revision 1794) +++ trunk/MagicSoft/Mars/Changelog (revision 1795) @@ -1,4 +1,13 @@ - - -*-*- END -*-*- + -*-*- END OF LINE -*-*- + 2003/02/25: Thomas Bretz + + * mbase/MParContainer.cc: + - small simplification for Cosy + + * mbase/MLog.cc: + - allow a maximum of 1000 lines in the gui + + + 2003/02/25: Abelardo Moralejo @@ -9,16 +18,19 @@ - Added output file with rate histograms + + 2003/02/24: Abelardo Moralejo * mmontecarlo/MMcTriggerRateCalc.[h,cc] - - Fixed mistake when analysing camera files containing all events - (including non-triggers): fShowers was always zero. + - Fixed mistake when analysing camera files containing all + events (including non-triggers): fShowers was always zero. - Added reading of MMcTrigHeaders in ReInit - - Added procedure Draw for graphics output: rate versus discriminator - threshold (useful for camera files with several trigger conditions). + - Added procedure Draw for graphics output: rate versus + discriminator threshold (useful for camera files with several + trigger conditions). * macros/trigrate.C - - Added some explanations. Style improvements in function GetNSBEvents. - Added call to MMcTriggerRateCalc::Draw + - Added some explanations. Style improvements in function + GetNSBEvents. Added call to MMcTriggerRateCalc::Draw * mhist/MHMcRate.[h,cc] @@ -26,10 +38,12 @@ - Added members fMultiplicity and fMeanThreshold, with their corresponding Set and Get functions - - Added info on discriminator threshold and L1 trigger multiplicity - on the printout. + - Added info on discriminator threshold and L1 trigger + multiplicity on the printout. * mmc/MMcTrigHeader.hxx - Added GetMultiplicity() and GetMeanThreshold() + + 2003/02/22: Wolfgang Wittek @@ -41,5 +55,6 @@ * mhist/MHSigmaTheta.[h,cc] - - type inconsisitency removed + - type inconsistency removed + @@ -48,5 +63,6 @@ * mmontecarlo/MMcTriggerRateCalc.[h,cc] - adapted to new camera files, added warnings. - - added ReInit procedure to read relevant info from from the run headers + - added ReInit procedure to read relevant info from from the + run headers * mhist/MHMcRate.[h,cc] @@ -59,4 +75,6 @@ - adapted to changes above, changed MReadTree to MReadMarsFile to be able to read the run headers. + + 2003/02/21: Antonio Stamerra @@ -85,4 +103,5 @@ + 2003/02/20: Wolfgang Wittek @@ -109,9 +128,10 @@ * mhist/MH.cc - Removed call to TGaxis::Optimize for compilation under root - versions > 3.03, since in them this procedure is no longer existing. - I did this to allow compilation under root_3.04, since earlier - versions has a bug which prevents from plotting in the simple way - some variables in a tree (example: fConc and others in the output - of star.C). This is a temporal fix, I guess something will have to + versions > 3.03, since in them this procedure is no longer + existing. I did this to allow compilation under root_3.04, + since earlier versions has a bug which prevents from + plotting in the simple way some variables in a tree + (example: fConc and others in the output of star.C). This + is a temporal fix, I guess something will have to substitute the call to Optimize... @@ -130,5 +150,6 @@ Calc(); CalcPseudoSize (not yet implemented) - Redefined Print() function as a TObject. - - pixels_in_cell and pixels_in_lut redefined as static data members + - pixels_in_cell and pixels_in_lut redefined as static data + members * manalysis/MMcTriggerLvl2Calc.[cc|h] @@ -159,5 +180,6 @@ fHillas = (MHillas*)pList->FindCreateObj(fHilName); by - fHillas = (MHillas*)pList->FindCreateObj("MHillas",fHilName); + fHillas = (MHillas*)pList->FindCreateObj("MHillas", + fHilName); in order to allow MHillas containers with a name different from "MHillas" @@ -181,12 +203,13 @@ - add member function DefRefMatrix(); it defines the reference sample for the g/h separation; - the selection of events for the reference sample can be made such - that the distribution of a certain variable (for example Theta) - agrees with a target distribution. + the selection of events for the reference sample can be made + such that the distribution of a certain variable (for example + Theta) agrees with a target distribution. * mfilter/MFEventSelector.[h,cc] - add new argument for constructor: the name of the read object - in order to allow also read objects which have a name different from + in order to allow also read objects which have a name + different from "MRead" @@ -210,5 +233,6 @@ * Makefile.conf.osf1 - - Added -lpthread to compilation flags (otherwise linking fails in alfa) + - Added -lpthread to compilation flags (otherwise linking fails + in alfa) * manalysis/Makefile, AnalysisLinkDef.h @@ -231,7 +255,9 @@ * manalysis/MSigmabar.[h,cc] - new definition of Sigmabar (only relevant for MAGIC) - - add in member function 'Calc' a 3rd argument : 'const MCerPhotEvt &evt' + - add in member function 'Calc' a 3rd argument : 'const + MCerPhotEvt &evt' - calculate sigmabar for 'MCerPhotEvt' pixels - - in member function 'Calc' return Float_t fSigmabar instead of Bool_t + - in member function 'Calc' return Float_t fSigmabar instead of + Bool_t - copies of objects replaced by references @@ -242,8 +268,9 @@ * mfileio/MCT1ReadPreProc.cc - - add in member function PreProcess() the initialization of the total - number of pixels : + - add in member function PreProcess() the initialization of the + total number of pixels : fPedest->InitSize(iMAXNUMPIX); - - remove statements that cannot be reached ('break' after 'return') + - remove statements that cannot be reached ('break' after + 'return') * manalysis/MPadSchweizer.[h,cc] @@ -264,8 +291,9 @@ * manalysis/MTrigLvl2.[cc|h] - added new function - MTrigLvl2::GetLutCompactPixel(int cell, int lut, int neighpix=2) - which calculates the number of compact pixel in one lut - - added new function GetLutPseudoSize(int neighpix=2) which calculates - the lut-pseudosize + MTrigLvl2::GetLutCompactPixel(int cell, int lut, int + neighpix=2) which calculates the number of compact pixel + in one lut + - added new function GetLutPseudoSize(int neighpix=2) which + calculates the lut-pseudosize - added static data member pixel_in_lut - merging of the PrintCell and PrintStatus functions in a single