Changeset 4274 for trunk/MagicSoft/Mars
- Timestamp:
- 06/03/04 11:10:01 (20 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r4272 r4274 19 19 -*-*- END OF LINE -*-*- 20 20 21 2004/06/03: Martin Merck 22 23 * msignal/MArrivalTimeCam.h 24 * msignal/MArrivalTime.h 25 * msignal/MArrivalTimePix.h 26 * msignal/MExtractedSignalCam.h 27 * msignal/MExtractedSignalPix.h 28 * msignal/MExtractedSignalPINDiode.h 29 * msignal/MExtractedSignalBlindPixel.h 30 - Set version in ClassDef to 1 for the streamer. 31 32 * msignal/SignalLinkDef.h 33 - Added a + at the pragma for MExtractedSignalCam and 34 MExtractedSignalPix for consistency. 35 36 * msjobs/MExtractSignal.[h,cc] 37 - Added methods to set the Extractor and TimeExtractor to be 38 used when extracting the signal. 39 40 21 41 2004/06/03: Markus Gaug 22 42 … … 934 954 935 955 * mcalib/MHCalibrationRelTimeCam.[h,cc] 936 - 956 - Getter and Setter for the reference pixel 937 957 938 958 * mcalib/MCalibrate.cc … … 4224 4244 4225 4245 4226 2004/02/12: Javier L ópez4246 2004/02/12: Javier L�ez 4227 4247 4228 4248 * macros/pointspreadfunction.C … … 5919 5939 5920 5940 5921 2004/01/09: Javier L ¢pez5941 2004/01/09: Javier Lpez 5922 5942 5923 5943 * macros/bootcampstandardanalysis.C -
trunk/MagicSoft/Mars/mjobs/MJExtractSignal.cc
r4167 r4274 42 42 #include "MTaskList.h" 43 43 #include "MEvtLoop.h" 44 #include "MPrint.h" 44 45 45 46 #include "MHCamera.h" … … 59 60 #include "MWriteRootFile.h" 60 61 62 #include "MExtractSlidingWindow.h" 63 #include "MExtractor.h" 64 #include "MExtractTime.h" 65 #include "MExtractTimeFastSpline.h" 66 61 67 #include "MJExtractSignal.h" 62 68 #include "MStatusDisplay.h" … … 176 182 static_cast<MRead&>(read).AddFiles(*fRuns); 177 183 178 MGeomApply apply; // Only necessary to craete geometry 179 MBadPixelsMerge merge(&fBadPixels); 180 MExtractSignal extract; 184 MGeomApply apply; // Only necessary to craete geometry 185 MBadPixelsMerge merge(&fBadPixels); 186 MExtractTimeFastSpline exttime; 187 MExtractSlidingWindow extcharge; // Only for the cosmics filter 181 188 182 189 MHCamEvent evt("ExtSignal"); … … 186 193 MWriteRootFile write(GetOutputFileD(), "RECREATE", fRuns->GetRunsAsString(), 2); 187 194 write.AddContainer("MExtractedSignalCam", "Events"); 195 write.AddContainer("MArrivalTimeCam", "Events"); 188 196 write.AddContainer("MTime", "Events"); 189 197 write.AddContainer("MRawEvtHeader", "Events"); … … 195 203 tlist.AddToList(&apply); 196 204 tlist.AddToList(&merge); 197 tlist.AddToList(&extract); 205 206 if (fTimeExtractor) 207 tlist.AddToList(fTimeExtractor); 208 else 209 { 210 *fLog << warn << GetDescriptor() 211 << ": No extractor has been chosen, take default MExtractTimeFastSpline " << endl; 212 tlist.AddToList(&exttime); 213 } 214 215 if (fExtractor) 216 tlist.AddToList(fExtractor); 217 else 218 { 219 *fLog << warn << GetDescriptor() 220 << ": No extractor has been chosen, take default MExtractSlidingWindow " << endl; 221 tlist.AddToList(&extcharge); 222 } 223 224 // MPrint print("MExtractedSignalCam"); 225 // tlist.AddToList(&print); 226 198 227 if (TestBit(kEnableGraphicalOutput)) 199 228 tlist.AddToList(&fill); -
trunk/MagicSoft/Mars/mjobs/MJExtractSignal.h
r4167 r4274 17 17 class MCalibrationChargeCam; 18 18 class MCalibrationQECam; 19 class MExtractor; 20 class MExtractTime; 19 21 20 22 class MJExtractSignal : public MParContainer … … 24 26 25 27 MRunIter *fRuns; 28 29 MExtractor *fExtractor; // Signal extractor 30 MExtractTime *fTimeExtractor; // Arrival time extractor 26 31 27 32 MPedPhotCam fPedPhotCam; … … 48 53 const MBadPixelsCam &GetBadPixels() const { return fBadPixels; } 49 54 55 void SetExtractor(MExtractor* ext) { fExtractor = ext; } 56 void SetTimeExtractor(MExtractTime* ext) { fTimeExtractor = ext; } 50 57 void SetBadPixels(const MBadPixelsCam &bad) { bad.Copy(fBadPixels); } 51 58 -
trunk/MagicSoft/Mars/msignal/MArrivalTime.h
r3757 r4274 46 46 void DrawPixelContent(Int_t num) const; 47 47 48 ClassDef(MArrivalTime, 0) // class for an event containing the arrival times48 // ClassDef(MArrivalTime, 1) // class for an event containing the arrival times 49 49 }; 50 50 -
trunk/MagicSoft/Mars/msignal/MArrivalTimeCam.h
r3213 r4274 61 61 void DrawPixelContent(Int_t num) const; 62 62 63 ClassDef(MArrivalTimeCam, 0) // Storage Container for the ArrivalTime in the camera63 ClassDef(MArrivalTimeCam, 1) // Storage Container for the ArrivalTime in the camera 64 64 }; 65 65 -
trunk/MagicSoft/Mars/msignal/MArrivalTimePix.h
r4077 r4274 41 41 Bool_t IsValid() const; 42 42 43 ClassDef(MArrivalTimePix, 0) // Storage Container for ArrivalTime information of one pixel43 ClassDef(MArrivalTimePix, 1) // Storage Container for ArrivalTime information of one pixel 44 44 }; 45 45 -
trunk/MagicSoft/Mars/msignal/MExtractedSignalBlindPixel.h
r4190 r4274 57 57 Float_t GetPedRmsErr() const { return fPedRmsErr; } 58 58 59 ClassDef(MExtractedSignalBlindPixel, 0) // Storage Container for Extracted Signal of the blind pixel59 ClassDef(MExtractedSignalBlindPixel, 1) // Storage Container for Extracted Signal of the blind pixel 60 60 }; 61 61 -
trunk/MagicSoft/Mars/msignal/MExtractedSignalCam.h
r3446 r4274 65 65 void DrawPixelContent(Int_t num) const; 66 66 67 ClassDef(MExtractedSignalCam, 0) // Storage Container for extracted signals in the camera67 ClassDef(MExtractedSignalCam, 1) // Storage Container for extracted signals in the camera 68 68 }; 69 69 -
trunk/MagicSoft/Mars/msignal/MExtractedSignalPINDiode.h
r3655 r4274 47 47 Bool_t IsValid() const; 48 48 49 ClassDef(MExtractedSignalPINDiode, 0) // Storage Container for Extracted Signal information of one pixel49 ClassDef(MExtractedSignalPINDiode, 1) // Storage Container for Extracted Signal information of one pixel 50 50 }; 51 51 -
trunk/MagicSoft/Mars/msignal/MExtractedSignalPix.h
r3306 r4274 42 42 Bool_t IsValid() const; 43 43 44 ClassDef(MExtractedSignalPix, 0) // Storage Container for Extracted Signal information of one pixel44 ClassDef(MExtractedSignalPix, 1) // Storage Container for Extracted Signal information of one pixel 45 45 }; 46 46 -
trunk/MagicSoft/Mars/msignal/SignalLinkDef.h
r3971 r4274 25 25 #pragma link C++ class MExtractTimeFastSpline+; 26 26 #pragma link C++ class MExtractTimeHighestIntegral+; 27 #pragma link C++ class MArrivalTimeCam ;28 #pragma link C++ class MArrivalTimePix ;27 #pragma link C++ class MArrivalTimeCam+; 28 #pragma link C++ class MArrivalTimePix+; 29 29 #pragma link C++ class MArrivalTime+; 30 30 #pragma link C++ class MArrivalTimeCalc+;
Note:
See TracChangeset
for help on using the changeset viewer.