Changeset 6896 for trunk/MagicSoft
- Timestamp:
- 03/29/05 11:54:38 (20 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r6895 r6896 91 91 - added MHVsSize to the tabs which are shown 92 92 93 * mjobs/MJOptimize. h:93 * mjobs/MJOptimize.[h,cc]: 94 94 - added dummy parameters to FixParameter for compatibility 95 95 with SetParemeter 96 - replaced MFSupercuts by MFMagicCuts 97 - use Energy in MHAlpha instead of size 96 98 97 99 * mbase/MFilter.[h,cc]: -
trunk/MagicSoft/Mars/mfilter/FilterLinkDef.h
r6895 r6896 13 13 #pragma link C++ class MFSoftwareTrigger+; 14 14 #pragma link C++ class MFCosmics+; 15 #pragma link C++ class MFSupercuts+;16 15 #pragma link C++ class MFMagicCuts+; 17 16 -
trunk/MagicSoft/Mars/mfilter/Makefile
r6895 r6896 27 27 MFSoftwareTrigger.cc \ 28 28 MFCosmics.cc \ 29 MFMagicCuts.cc \ 29 30 MFEnergySlope.cc 30 31 -
trunk/MagicSoft/Mars/mjobs/MJOptimize.cc
r6282 r6896 108 108 #include "MF.h" 109 109 #include "MFilterList.h" 110 #include "../mfilter/MFSupercuts.h" 110 #include "../mfilter/MFMagicCuts.h" 111 //#include "../mfilter/MFSupercuts.h" 111 112 #include "MContinue.h" 112 113 #include "MGeomCamMagic.h" … … 801 802 hist.InitMapping(&m); 802 803 803 if (filter && filter->InheritsFrom(MF Supercuts::Class()))804 ((MF Supercuts*)filter)->InitMapping(&m);804 if (filter && filter->InheritsFrom(MFMagicCuts::Class())) 805 ((MFMagicCuts*)filter)->InitMapping(&m); 805 806 806 807 MReadTree read("Events"); … … 873 874 histof.SkipHistTheta(); 874 875 //histof.SkipHistEnergy(); 875 // FIXME: MHillasSrc.fAlpha is added twice! 876 histon.InitMapping(&m, 1); 877 histof.InitMapping(&m, 1); 878 879 if (filter && filter->InheritsFrom(MFSupercuts::Class())) 880 ((MFSupercuts*)filter)->InitMapping(&m); 876 histon.InitMapping(&m, 0); 877 histof.InitMapping(&m, 0); 878 879 // if (filter && filter->InheritsFrom(MFSupercuts::Class())) 880 // ((MFSupercuts*)filter)->InitMapping(&m); 881 if (filter && filter->InheritsFrom(MFMagicCuts::Class())) 882 ((MFMagicCuts*)filter)->InitMapping(&m); 881 883 882 884 parlist.AddToList(&histon); … … 975 977 parlist.AddToList(&m); 976 978 979 MHEnergyEst hist; 980 hist.InitMapping(&m); 981 977 982 MEnergyEstimate est("MParameters"); 978 983 est.SetRule(rule); 979 984 parlist.AddToList(&est); 980 985 981 MHEnergyEst hist;982 hist.InitMapping(&m);983 984 986 MReadTree read("Events"); 985 //read.DisableAutoScheme(); 987 // NECESSARY BECAUSE OF MDataFormula GetRules missing 988 read.DisableAutoScheme(); 986 989 if (fname) 987 990 read.AddFile(fname); -
trunk/MagicSoft/Mars/mjobs/MJOptimize.h
r6282 r6896 129 129 fStep[idx] = step; 130 130 } 131 void FixParameter(Int_t idx, Double_t start )131 void FixParameter(Int_t idx, Double_t start, Double_t lo=0, Double_t up=0, Double_t step=-1) 132 132 { 133 133 if (fParameters.GetSize()<=idx)
Note:
See TracChangeset
for help on using the changeset viewer.