Changeset 3594 for trunk/MagicSoft/Mars
- Timestamp:
- 03/23/04 21:29:11 (21 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r3592 r3594 43 43 * mhist/MHStarMap.cc, mpointing/MSrcPosCalc.cc: 44 44 - fixed: v.Roatete() must be v=v.Rotate() 45 - MHStarMap no waorks also without MSrcPosCam, MPointingPos 46 or MObservatory (leaving out the corresponding translations) 45 47 46 48 -
trunk/MagicSoft/Mars/mhist/MHStarMap.cc
r3591 r3594 132 132 } 133 133 134 fPointPos = (MPointingPos*)plist->FindObject("MPointingPos"); 135 if (!fPointPos) 136 { 137 *fLog << err << "MPointingPos not found... aborting." << endl; 138 return kFALSE; 139 } 134 fPointPos = (MPointingPos*)plist->FindObject("MPointingPos"); 135 if (!fPointPos) 136 *fLog << warn << "MPointingPos not found... no derotation." << endl; 140 137 141 138 fSrcPos = (MSrcPosCam*)plist->FindObject(AddSerialNumber("MSrcPosCam")); 142 139 if (!fSrcPos) 143 { 144 *fLog << err << "MSrcPosCam not found... aborting" << endl; 145 return kFALSE; 146 } 140 *fLog << warn << "MSrcPosCam not found... no source translation." << endl; 147 141 148 142 … … 181 175 fObservatory = (MObservatory*)pList->FindObject(AddSerialNumber("MObservatory")); 182 176 if (!fObservatory) 183 { 184 *fLog << err << "MObservatory not found... aborting" << endl; 185 return kFALSE; 186 } 177 *fLog << err << "MObservatory not found... no derotation." << endl; 187 178 188 179 return kTRUE; … … 207 198 Float_t t = h.GetMeanY() - m*h.GetMeanX(); 208 199 209 TVector2 src(fSrcPos->GetXY()); 200 TVector2 src; 201 if (fSrcPos) 202 src = fSrcPos->GetXY(); 210 203 211 204 if (!fUseMmScale) … … 228 221 // - and perform a rotation to compensate the rotation of the 229 222 // sky image in the camera 230 const Double_t rho = fPointPos->RotationAngle(*fObservatory); 223 const Double_t rho = fPointPos && fObservatory ? 224 fPointPos->RotationAngle(*fObservatory) : 0; 231 225 232 226 if (m>-1 && m<1)
Note:
See TracChangeset
for help on using the changeset viewer.