Changeset 3442
- Timestamp:
- 03/08/04 17:29:04 (21 years ago)
- Location:
- trunk/MagicSoft
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r3441 r3442 4 4 5 5 -*-*- END OF LINE -*-*- 6 7 2004/03/08: Abelardo Moralejo 8 9 * macros/starmc.C, starmstereo.C, mccalibrate.C 10 - adapted to m. Gaug's changes: now one MBadPixelsCam containers is 11 added for each telescope to the parameter list. 12 13 * mmain/MEventDisplay.cc, Makefile 14 - added MBadPixelsCam to par list, and mbadpixels/ to includes. 15 Necessary due to changes in MCalibrate. 16 17 2004/03/06: Markus Gaug 18 19 * macros/calibration.C 20 - adapted call to MHCamera::ProjectionS to the new version 21 22 * mcalib/Makefile 23 - include directory mbadpixels 24 25 * manalysis/Makefile 26 - include directory mbadpixels 27 28 * mcalib/MCalibrationChargeCalc.[h,cc] 29 - include MBadPixelsCam 30 - remove exclusion of pixels from ascii-file 31 (now accessible from MBadPixelsCam) 32 33 * mcalib/MCalibrationChargePix.[h,cc] 34 - include MBadPixelsCam 35 36 * mcalib/MCalibrationChargeCam.[h,cc] 37 - include MBadPixelsCam 38 39 * mcalib/MHCalibrationChargeCam.[h,cc] 40 - include MBadPixelsCam 41 - include one additional MBadPixelsPix for the average inner and 42 outer pixel, respectively 43 44 * mcalib/MHCalibrationChargePix.[h,cc] 45 - make fSaturated and fPickup a Float_t (for average pixel) 46 47 * mbadpixels/MBadPixelsPix.h 48 - include the CalibrationType_t infos 49 - exchange "SetUnsuitable" by "SetUnsuitableRun" 50 51 * mbadpixels/MBadPixelsCam.cc 52 * mbadpixels/MMcBadPixelsSet.cc 53 - exchange "SetUnsuitable" by "SetUnsuitableRun" 54 55 * mbadpixels/MBadPixelsCalc.cc 56 - exchange "SetUnsuitable" by "SetUnsuitableEvt" 57 58 * manalysis/MGeomApply.cc 59 - remove obsolete MArrivalTime 60 - add MBadPixelsCam 61 62 * mcalib/MCalibrate.[h,cc] 63 * mcalib/MCalibrateData.[h,cc] 64 - implemented calls to MBadPixelsCam 65 66 * macros/calibration.C 67 * macros/bootcampstandardanalysis.C 68 * macros/pedphotcalc.C 69 - implemented calls to MBadPixelsCam 70 71 * mjobs/MJCalibration.cc 72 - call to MBadPixelsCam 73 74 75 2004/03/05: Nadia Tonello 76 77 * manalysis/MBlindPixelsCalc2.[h,cc] 78 * manalysis/AnalysisLinkDef.h 6 2004/03/08: Thomas Bretz 7 8 * merpp.cc: 9 - fixed a bug in the screen output 10 11 * mgeom/MGeomMirror.cc: 12 - added comment 13 14 * mmc/MMcConfigRunHeader.h: 15 - added member function GetMirrors 16 17 18 19 2004/03/08: Abelardo Moralejo 20 21 * macros/starmc.C, starmstereo.C, mccalibrate.C 22 - adapted to m. Gaug's changes: now one MBadPixelsCam containers is 23 added for each telescope to the parameter list. 24 25 * mmain/MEventDisplay.cc, Makefile 26 - added MBadPixelsCam to par list, and mbadpixels/ to includes. 27 Necessary due to changes in MCalibrate. 28 29 30 31 2004/03/06: Markus Gaug 32 33 * macros/calibration.C 34 - adapted call to MHCamera::ProjectionS to the new version 35 36 * mcalib/Makefile 37 - include directory mbadpixels 38 79 39 * manalysis/Makefile 40 - include directory mbadpixels 41 42 * mcalib/MCalibrationChargeCalc.[h,cc] 43 - include MBadPixelsCam 44 - remove exclusion of pixels from ascii-file 45 (now accessible from MBadPixelsCam) 46 47 * mcalib/MCalibrationChargePix.[h,cc] 48 - include MBadPixelsCam 49 50 * mcalib/MCalibrationChargeCam.[h,cc] 51 - include MBadPixelsCam 52 53 * mcalib/MHCalibrationChargeCam.[h,cc] 54 - include MBadPixelsCam 55 - include one additional MBadPixelsPix for the average inner and 56 outer pixel, respectively 57 58 * mcalib/MHCalibrationChargePix.[h,cc] 59 - make fSaturated and fPickup a Float_t (for average pixel) 60 61 * mbadpixels/MBadPixelsPix.h 62 - include the CalibrationType_t infos 63 - exchange "SetUnsuitable" by "SetUnsuitableRun" 64 65 * mbadpixels/MBadPixelsCam.cc, mbadpixels/MMcBadPixelsSet.cc: 66 - exchange "SetUnsuitable" by "SetUnsuitableRun" 67 68 * mbadpixels/MBadPixelsCalc.cc: 69 - exchange "SetUnsuitable" by "SetUnsuitableEvt" 70 71 * manalysis/MGeomApply.cc 72 - remove obsolete MArrivalTime 73 - add MBadPixelsCam 74 75 * mcalib/MCalibrate.[h,cc], mcalib/MCalibrateData.[h,cc] 76 - implemented calls to MBadPixelsCam 77 78 * macros/calibration.C, macros/bootcampstandardanalysis.C, 79 macros/pedphotcalc.C 80 - implemented calls to MBadPixelsCam 81 82 * mjobs/MJCalibration.cc 83 - call to MBadPixelsCam 84 85 86 87 2004/03/05: Nadia Tonello 88 89 * manalysis/MBlindPixelsCalc2.[h,cc], manalysis/AnalysisLinkDef.h, 90 manalysis/Makefile 80 91 - Temporary class added (will be included in mbadpixels/ soon) 81 92 - All the functions of MBlindPixelCalc are kept(with small improvements) … … 88 99 - Checks for Unmapped status added 89 100 90 * mastro/MAstroCatalog.cc 91 * msql/MSQLServer.cc 101 * mastro/MAstroCatalog.cc, msql/MSQLServer.cc: 92 102 - include <stdlib.h> to solve compilation error 93 103 94 104 95 2004/03/05: Sebastian Raducci 105 106 2004/03/05: Sebastian Raducci 107 96 108 * msignal/MArrivalTimeCalc.cc 97 109 - fixed a little bug (exchanged a - with a + in the Calc() method) 98 99 100 2004/03/05: Markus Gaug 110 111 112 113 2004/03/05: Markus Gaug 114 101 115 * mcalib/MCalibraitonChargeCalc.cc 102 116 - remove some runheader line: … … 107 121 108 122 123 109 124 2004/03/04: Sebastian Raducci 110 125 … … 112 127 - fixed a memory leak (the spline was not deleted...) 113 128 129 130 114 131 2004/03/04: Thomas Bretz 115 132 … … 170 187 * mjobs/MJPedestal.cc: 171 188 - adapted to changes in MHCamera 189 190 * mastro/MAstroCatalog.[h,cc]: 191 - added preliminary catalog 192 193 * mastro/Makefile, mastro/AstroLinkDef.h: 194 - added MAstroCatalog 172 195 173 196 -
trunk/MagicSoft/Mars/merpp.cc
r3364 r3442 125 125 gDebug=1; 126 126 127 MTime kTimeStart(AnalyseTime(arg.GetStringAndRemove("--start="))); 128 MTime kTimeStop(AnalyseTime(arg.GetStringAndRemove("--stop="))); 127 MTime kTimeStart; 128 MTime kTimeStop; 129 if (arg.HasOption("--star=")) 130 kTimeStart = AnalyseTime(arg.GetStringAndRemove("--start=")); 131 if (arg.HasOption("--stop=")) 132 kTimeStop = AnalyseTime(arg.GetStringAndRemove("--stop=")); 129 133 130 134 const Int_t kRunNumber = arg.HasOption("--run=") ? arg.GetIntAndRemove("--run=") : -1; -
trunk/MagicSoft/Mars/mgeom/MGeomMirror.cc
r3387 r3442 145 145 return light; 146 146 147 // calculate distance to the camera 147 // calculate distance to the camera (stretch vector such, that 148 // its Z component is the distance between the camera and 149 // the mirror 148 150 const TVector3 &pos = GetMirrorCenter(); 149 151 const Double_t d = (dist - pos.Z()) / light.Z(); -
trunk/MagicSoft/include-Classes/MMcFormat/MMcConfigRunHeader.h
r2703 r3442 69 69 MGeomMirror &GetMirror(int i) const { return *(MGeomMirror*)(fMirrors->UncheckedAt(i)); } 70 70 71 TClonesArray *GetMirrors() { return fMirrors; } 72 71 73 MGeomPMT &GetPMT(int i) { return *(MGeomPMT*)(fPMTs->UncheckedAt(i)); } 72 74 MGeomPMT &GetPMT(int i) const { return *(MGeomPMT*)(fPMTs->UncheckedAt(i)); }
Note:
See TracChangeset
for help on using the changeset viewer.