Changeset 1952
- Timestamp:
- 04/12/03 16:50:35 (22 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r1950 r1952 1 1 -*-*- END OF LINE -*-*- 2 3 2003/04/12: Thomas Bretz 4 5 * manalysis/MPadding.[h,cc]: 6 - simplified includes 7 - changed some code (discussed with Robert) 8 - fixed comments in header 9 - changed ClassDef to 0 10 - changed output to Mars style 11 - fixed the memory leak of fHSigmabarMax 12 - replaced TRandom by gRandom 13 - removed usage of ->operator 14 15 * manalysis/MApplyPadding.[h,cc]: 16 - replaced fRnd by gRandom 17 - used MH::SetBinning 18 - use telescope theta instead of theta 19 - removed usage of ->operator 20 - removed PostProcess 21 22 * manalysis/MPadSchweizer.cc: 23 - fixed outputs in PreProcess 24 25 * manalysis/MSigmabar.[h,cc]: 26 - added Reset member function 27 - usage of memset 28 - don't skip NumPhotons==0 29 - changes discussed with Robert 30 - small simplifications in loops 31 - some fixes to the output 32 33 * manalysis/MSigmabarCalc.[h,cc]: 34 - fixed outputs 35 - some small simplifications 36 - moved test for theta<120deg to MCT1ReadPreProc 37 38 * mfileio/MCT1ReadPreProc.[h,cc]: 39 - skip events with theta>90deg 40 41 * mhist/MHSigmaPixel.[h,cc]: 42 - fixes to the screen output 43 - simplified usage of MBinning 44 45 * mhist/MHSigmaTheta.[h,cc]: 46 - fixes to the screen output 47 - simplified usage of MBinning 48 - lower cased upper case local variables 49 - removed DrawClone from Finalize (call from macro or executable) 50 51 * mhist/MHSigmabarTheta.[h,cc]: 52 - fixes to the screen output 53 54 * mhist/MHStarMap.cc: 55 - added some const qualifiers 56 57 * mhist/MHHadronnes.cc: 58 - removed output of function name in Finalize because this 59 information is already available on the screen. 60 61 * manalysis/MCT1PointingCorrCalc.h: 62 - changed ClassDef to 0 63 - removed empty PostProcess 64 - fixes to the screen output in PreProcess 65 - changed the order of the arguments in the constructor 66 (name, title to the end) 67 68 2 69 3 70 2003/04/12: Wolfgang Wittek … … 8 75 * manalysis/AnalysisLinkDef.h 9 76 Makefile 10 11 12 2003/04/12: Wolfgang Wittek13 77 14 78 * mbase/MFilter.h … … 21 85 - type of 3rd argument of member function Fill 22 86 changed from 'MF' to 'MFilter' 87 23 88 24 89 … … 49 114 50 115 51 2003/04/10: Thomas Bretz 116 2003/04/10: Thomas Bretz 52 117 53 118 * mbase/MContinue.[h,cc]: -
trunk/MagicSoft/Mars/manalysis/MCT1PointingCorrCalc.cc
r1950 r1952 49 49 // Default constructor. 50 50 // 51 MCT1PointingCorrCalc::MCT1PointingCorrCalc(const char *name, const char *title, 52 const char *srcname) 51 MCT1PointingCorrCalc::MCT1PointingCorrCalc(const char *srcname, 52 const char *name, const char *title) 53 : fSrcName(srcname) 53 54 { 54 55 fName = name ? name : "MCT1PointingCorrCalc"; 55 56 fTitle = title ? title : "Task to do the CT1 pointing correction"; 56 57 fSrcName = srcname;58 57 } 59 58 60 59 // -------------------------------------------------------------------------- 61 //62 //63 //64 //65 60 // 66 61 Bool_t MCT1PointingCorrCalc::PreProcess(MParList *pList) … … 78 73 if (!fMcEvt) 79 74 { 80 *fLog << dbginf<< "MMcEvt not found... aborting." << endl;75 *fLog << err << "MMcEvt not found... aborting." << endl; 81 76 return kFALSE; 82 77 } … … 85 80 if (!fHourAngle) 86 81 { 87 *fLog << dbginf << "HourAnglenot found... aborting." << endl;82 *fLog << err << "HourAngle [MParameterD] not found... aborting." << endl; 88 83 return kFALSE; 89 84 } … … 93 88 if (!fSrcPos) 94 89 { 95 *fLog << err << dbginf <<fSrcName << " [MSrcPosCam] not found... aborting." << endl;90 *fLog << err << fSrcName << " [MSrcPosCam] not found... aborting." << endl; 96 91 return kFALSE; 97 92 } … … 135 130 return kTRUE; 136 131 } 137 // --------------------------------------------------------------------------138 //139 //140 //141 Bool_t MCT1PointingCorrCalc::PostProcess()142 {143 return kTRUE;144 }145 //============================================================================146 132 147 148 149 150 151 -
trunk/MagicSoft/Mars/manalysis/MCT1PointingCorrCalc.h
r1950 r1952 30 30 31 31 public: 32 MCT1PointingCorrCalc(const char * name=NULL, const char *title=NULL,33 const char * srcname="MSrcPosCam");32 MCT1PointingCorrCalc(const char *srcname="MSrcPosCam", 33 const char *name=NULL, const char *title=NULL); 34 34 35 35 Bool_t PreProcess(MParList *pList); 36 36 Bool_t Process(); 37 Bool_t PostProcess();38 37 39 ClassDef(MCT1PointingCorrCalc, 1) // Task to do the CT1 pointing correction for Mkn421 2001 data38 ClassDef(MCT1PointingCorrCalc, 0) // Task to do the CT1 pointing correction for Mkn421 2001 data 40 39 }; 41 40 -
trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc
r1936 r1952 708 708 // look for the HourAngle container in the plist 709 709 // 710 fHourAngle = (MParameterD*)pList->FindCreateObj("MParameterD", "HourAngle");710 fHourAngle = (MParameterD*)pList->FindCreateObj("MParameterD", "HourAngle"); 711 711 if (!fHourAngle) 712 712 return kFALSE; … … 716 716 // look for the ThetaOrig container in the plist 717 717 // 718 fThetaOrig = (MParameterD*)pList->FindCreateObj("MParameterD", "ThetaOrig");718 fThetaOrig = (MParameterD*)pList->FindCreateObj("MParameterD", "ThetaOrig"); 719 719 if (!fThetaOrig) 720 720 return kFALSE; … … 826 826 // Mars structures and data members 827 827 // 828 voidMCT1ReadPreProc::ProcessEvent(const struct eventrecord &event)828 Bool_t MCT1ReadPreProc::ProcessEvent(const struct eventrecord &event) 829 829 { 830 830 /* … … 912 912 fThetaOrig->SetVal(theta); 913 913 914 //*fLog << "Theta, smearedTheta = " << theta << ", " << SmearTheta(theta)915 // << endl;914 if (theta>TMath::Pi()/2) 915 return kCONTINUE; 916 916 917 917 // store hour angle … … 959 959 fMcTrig->SetReadyToSave(); 960 960 fMcEvt->SetReadyToSave(); 961 962 return kTRUE; 961 963 } 962 964 … … 1085 1087 fIn->read((Byte_t*)&event, sizeof(struct eventrecord)); 1086 1088 1087 ProcessEvent(event); 1089 switch (ProcessEvent(event)) 1090 { 1091 case kFALSE: 1092 return kFALSE; 1093 case kCONTINUE: 1094 return kCONTINUE; 1095 } 1088 1096 1089 1097 fNumEvents++; -
trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.h
r1899 r1952 68 68 Bool_t CheckFilePosition(); 69 69 void ProcessRunHeader(const struct outputpars &outpars); 70 voidProcessEvent(const struct eventrecord &event);70 Bool_t ProcessEvent(const struct eventrecord &event); 71 71 72 72 Double_t SmearTheta(Double_t theta); -
trunk/MagicSoft/Mars/mhist/MHHadronness.cc
r1948 r1952 251 251 const Stat_t sump = fPhness->Integral(); 252 252 253 *fLog << inf << " MHHadronness::Finalize -Sum Hadronness: gammas=" << sumg << " hadrons=" << sump << endl;253 *fLog << inf << "Sum Hadronness: gammas=" << sumg << " hadrons=" << sump << endl; 254 254 255 255 if (sumg==0 ) 256 *fLog << warn << " MHHadronness::Finalize:Cannot calculate hadronness for 'gammas'." << endl;256 *fLog << warn << "Cannot calculate hadronness for 'gammas'." << endl; 257 257 if (sump==0) 258 *fLog << warn << "MHHadronness::Finalize: Cannot calculate hadronness for 'hadrons'." << endl; 259 258 *fLog << warn << "Cannot calculate hadronness for 'hadrons'." << endl; 260 259 261 260 // Normalize photon distribution
Note:
See TracChangeset
for help on using the changeset viewer.