Changeset 6917
- Timestamp:
- 04/08/05 10:20:12 (20 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r6912 r6917 21 21 22 22 -*-*- END OF LINE -*-*- 23 24 2005/04/08 Thomas Bretz 25 26 * mhbase/MH3.cc: 27 - replaced all Float-histograms by double histograms. This 28 is backward compatible with I/O and has the advantage, that 29 we are compatible with most other double histograms used in 30 Mars 31 32 * mhflux/MHEnergyEst.cc: 33 - made the energy binning the same than in all other classes 34 35 * mjobs/MJCalibrateSignal.cc: 36 - first replaced contmc by a new filter Markus G. used, but 37 after a discussion with Abelardo it turned out, that the 38 original filter does a better job, becuase it takes both 39 (level 1 trigger and minimum number of phes) conditions 40 used in the MC into account. 41 42 * mjobs/MJCut.cc: 43 - added a plot: Effective-On-Time versus Theta used to produce 44 a spectrum 45 46 47 48 2005/04/07 Thomas Bretz 49 50 * mpointing/MSrcPosCalc.cc: 51 - also skip Process if fSourcePos==NULL, this happens in real 52 data, too, if no pointing correction is done. 53 54 * manalysis/AnalysisLinkDef.h, manalysis/Makefile: 55 - removed MParameterI, MParameterD, MParameterDerr 56 57 * mbase/BaseLinkDef.h, mbase/Makefile: 58 - added MParameterI, MParameterD, MParameterDerr 59 60 * mbase/MParList.cc: 61 - if a container is rejected due to wrong inheritance its 62 inheritance is mentioned in the error message 63 64 * mhbase/HBaseLinkDef.h, mhbase/Makefile: 65 - removed MWeight 66 67 * mhbase/MWeight.[h,cc]: 68 - removed, replaced by MParameterD 69 70 * mhbase/MFillH.[h,cc], mmontecarlo/MMcWeightEnergySpecCalc.[h,cc]: 71 - replaced MWeight by MParameterD 72 73 * mjobs/MJStar.cc: 74 - fixed the wrong axis title in the histogram showing the rate 75 76 * manalysis/MParameters.[h,cc]: 77 - moved to mbase 78 79 * mbase/MParameters.[h,cc]: 80 - inherit MParameterDerr from MParameterD 81 - changed class version of MParameterDerr from 1 to 2 82 83 * mfbase/MFEventSelector2.cc: 84 - fixed that in SelectProb the wrong bin was chosen 85 86 87 88 2005/04/07 Markus Gaug (2005/04/06) 89 90 * mjobs/calibrationref_Dec04.rc 91 * callisto_Dec04Jan05.rc 92 - update the reference lines in the display according to the spline 93 extractor. 94 95 * msignal/MExtractTimeAndChargeSpline.cc 96 - move fgHiGainFirst from 2 to 0. This is important for the Dec. und 97 January data where the calib. pulse position changes much. 98 99 * mjobs/MJCalib.cc 100 * mjobs/MJCalibration.cc 101 - move fDevice and functions IsUseBlindPixel() and 102 IsUsePINDiode() into the base class. 103 104 * mjobs/MJCalibrateSignal.cc 105 - do not apply the modified extraction window to the interlaced 106 calibration events. This is a bugfix especially for the 107 December and January data. 108 - extract and fit blind pixel and pin diode only if flag 109 IsUseBlindPixel() or IsUsePINDiode() is set. 110 111 112 113 2005/04/07 Markus Gaug (2005/04/03) 114 115 * mcalib/MCalibrateData.cc 116 - made one warning more understandable. 117 118 * msignal/MExtractTimeAndChargeDigitalFilter.cc 119 - moved fgOffsetFromLogain from -1.8 to -2.5. This corrects only an 120 defective extraction of the MC at low-gain signals lower than 90 121 phes. (IN THE CODE THE CHANGE IS FROM -1.8 to -2.8!!!!) 122 123 124 125 2005/04/07 Markus Gaug (2005/04/01) 126 127 * mpedestal/MExtractPedestal.[h,cc] 128 - use the standard way to define the default for fNumEventsDump 129 - added missing "NumDump" in ReadEnv 130 131 * callisto_*.rc 132 - correct the default of the number of events used in 133 pedestal calculation (NumEventsDump). 134 - added missing lines for setting of parameters for the 135 MJCalibrateSignal.PedCalcFromExtractRndm.* 136 (CORRECTED SOME BUGS IN THIS LINES) 137 - Replaced NumEventsDump by NumDump 138 139 23 140 24 141 2005/04/05 Thomas Bretz -
trunk/MagicSoft/Mars/NEWS
r6909 r6917 38 38 - added all resource files necessary to handle spline extraction 39 39 of signal for the late 2004 and the early 2005 data 40 41 - update the reference lines for the december data 42 43 - changed default for fgHiGainFirst from 2 to 0 in spline extractor 44 This is important for the Dec. and Jan. data where the calibration 45 pulse position changes much. 46 47 - changed default for fgOffsetFromLogain from -1.8 to -2.8 in digital 48 filter. This corrects only an defective extraction of the MC at low-gain 49 signals lower than 90 phes. 50 51 - fixed some slowdown in calibrating data with interleaved events from 52 Jan and Dec. 40 53 41 54 -
trunk/MagicSoft/Mars/mhbase/MH3.cc
r6869 r6917 32 32 // In the constructor you can give up to three variables which should be 33 33 // filled in the histogram. Dependend on the number of given variables 34 // (data members) a TH1 F, TH2F or TH3Fis created.34 // (data members) a TH1D, TH2D or TH3D is created. 35 35 // Specify the data mamber like the following: 36 36 // "MHillas.fLength" … … 108 108 { 109 109 case 1: 110 fHist = new TH1 F;110 fHist = new TH1D; 111 111 fHist->SetYTitle("Counts"); 112 112 break; 113 113 case 2: 114 fHist = new TH2 F;114 fHist = new TH2D; 115 115 fHist->SetZTitle("Counts"); 116 116 break; 117 117 case 3: 118 fHist = new TH3 F;118 fHist = new TH3D; 119 119 break; 120 120 } … … 140 140 // -------------------------------------------------------------------------- 141 141 // 142 // Creates an TH1 F. memberx is filled into the X-bins. For a more detailed142 // Creates an TH1D. memberx is filled into the X-bins. For a more detailed 143 143 // description see the class description above. 144 144 // … … 146 146 : fDimension(1) 147 147 { 148 fHist = new TH1 F;148 fHist = new TH1D; 149 149 150 150 fData[0] = new MDataChain(memberx); … … 198 198 // -------------------------------------------------------------------------- 199 199 // 200 // Creates an TH2 F. memberx is filled into the X-bins. membery is filled200 // Creates an TH2D. memberx is filled into the X-bins. membery is filled 201 201 // into the Y-bins. For a more detailed description see the class 202 202 // description above. … … 205 205 : fDimension(2) 206 206 { 207 fHist = new TH2 F;207 fHist = new TH2D; 208 208 209 209 fData[0] = new MDataChain(memberx); … … 225 225 // -------------------------------------------------------------------------- 226 226 // 227 // Creates an TH3 F. memberx is filled into the X-bins. membery is filled227 // Creates an TH3D. memberx is filled into the X-bins. membery is filled 228 228 // into the Y-bins. membery is filled into the Z-bins. For a more detailed 229 229 // description see the class description above. … … 232 232 : fDimension(3) 233 233 { 234 fHist = new TH3 F;234 fHist = new TH3D; 235 235 236 236 fData[0] = new MDataChain(memberx); -
trunk/MagicSoft/Mars/mhflux/MHEnergyEst.cc
r6890 r6917 94 94 95 95 MBinning binsi, binse, binst, binsr; 96 binse.SetEdgesLog( 25, 10, 10000);96 binse.SetEdgesLog(15, 10, 1000000); 97 97 binst.SetEdgesCos(50, 0, 60); 98 98 binsi.SetEdges(10, 0, 400); -
trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc
r6913 r6917 92 92 #include "MTriggerPatternDecode.h" 93 93 #include "MFTriggerPattern.h" 94 #include "MFTriggerLvl1.h"95 94 #include "MGeomApply.h" 96 95 //#include "MMcPedestalCopy.h" … … 464 463 465 464 466 // Skips empty MC events (Not necessary, but faster!)467 MFTriggerLvl1 trigmc;468 MContinue contmc(&trigmc, "ContTrigMC");469 contmc.SetInverted();465 // Skips MC which have no contents. This are precisely the 466 // events which fullfilled the MC Lvl1 trigger and an 467 // arbitrary cut (typically at 50phe) to speed up simulation 468 MContinue contmc("MRawEvtData.GetNumPixels<0.5", "ContEmptyMC"); 470 469 471 470 MPointingPosInterpolate pextr; -
trunk/MagicSoft/Mars/mjobs/MJCut.cc
r6907 r6917 55 55 56 56 #include "../mhflux/MAlphaFitter.h" 57 #include "MH3.h" 57 58 #include "MBinning.h" 58 #include "MWeight.h"59 59 #include "MDataSet.h" 60 60 #include "MParameters.h" … … 68 68 // -------------------------------------------------------------------------- 69 69 // 70 // Default constructor. 70 // Default constructor. Set defaults for fStoreSummary, fStoreresult, 71 // fWriteOnly, fIsWobble and fFullDisplay to kFALSE and initialize 72 // fEstimateEnergy and fCalcHadronness with NULL. 71 73 // 72 74 MJCut::MJCut(const char *name, const char *title) … … 79 81 } 80 82 83 // -------------------------------------------------------------------------- 84 // 85 // Destructor. Delete fEstimateEnergy and fCalcHadronness if != NULL 86 // 81 87 MJCut::~MJCut() 82 88 { … … 522 528 fill6b.SetDrawOption(set.HasOffSequences()||fIsWobble?"same":""); 523 529 fill7b.SetDrawOption(set.HasOffSequences()||fIsWobble?"same":""); 530 531 /* 532 MHVsTime hvs("MEffectiveOnTime.fVal"); 533 hvs.SetTitle("Effective On-Time vs. Time;;T_{on}"); 534 MFillH fillvs(&hvs, "MTimeEffectiveOnTime", "FillOnTime"); 535 fillvs.SetNameTab("OnTime"); 536 */ 537 MH3 hvs("MPointingPos.fZd"); 538 hvs.SetName("Theta"); 539 hvs.SetTitle("Effective On-Time vs. Zenith Angle;\\Theta [\\circ];T_{on} [s]"); 540 MFillH fillvs(&hvs, "", "FillOnTime"); 541 fillvs.SetWeight("MEffectiveOnTime"); 542 fillvs.SetNameTab("OnTime"); 543 524 544 /* 525 545 MWeight weight; … … 554 574 if (!fIsWobble) 555 575 tlist2.Replace(&ffs2); 576 577 tlist.AddToList(&fillvs, "EffectiveOnTime"); 556 578 } 557 579
Note:
See TracChangeset
for help on using the changeset viewer.