Changeset 2795
- Timestamp:
- 01/13/04 17:41:03 (21 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r2794 r2795 33 33 - Square Root of Reduced Sigmas not taken, if they are < 0. 34 34 - Reduced Sigma / Charge squared replaced by reduced sigma / charge 35 36 * mcalib/MCalibrationCalc.cc 37 - Blind Pixel is not additionally treated as normal pixel any more 38 - Blind Pixel Draw replaced by DrawClone 35 39 36 40 -
trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc
r2765 r2795 258 258 if (pix->IsFitValid()) 259 259 { 260 261 Float_t rsigma = pix->GetRSigmaSquare(); 262 if (rsigma > 0.) 263 rsigma = TMath::Sqrt(rsigma); 264 260 265 *fLog << pix->GetPixId() << " Pedestals: " << pix->GetPed() << " +- " << pix->GetPedRms() 261 266 << " Reduced Charge: " << pix->GetCharge() << " +- " 262 << pix->GetSigmaCharge() << " Reduced Sigma: " << TMath::Sqrt(pix->GetRSigmaSquare()) << endl; 267 << pix->GetSigmaCharge() << " Reduced Sigma: " << rsigma 268 << " Nr Phe's: " << pix->GetPheFFactorMethod() << endl; 263 269 id++; 264 270 } … … 278 284 if (!pix->IsFitValid()) 279 285 { 286 287 Float_t rsigma = pix->GetRSigmaSquare(); 288 if (rsigma > 0.) 289 rsigma = TMath::Sqrt(rsigma); 290 280 291 *fLog << pix->GetPixId() << " Pedestals: " << pix->GetPed() << " +- " << pix->GetPedRms() 281 292 << " Reduced Charge: " << pix->GetCharge() << " +- " 282 << pix->GetSigmaCharge() << " Reduced Sigma: " << TMath::Sqrt(pix->GetRSigmaSquare())<< endl;293 << pix->GetSigmaCharge() << " Reduced Sigma: " << rsigma << endl; 283 294 id++; 284 295 } … … 314 325 return kFALSE; 315 326 327 if (!(*this)[idx].IsFitValid()) 328 { 329 val = -1.; 330 return kFALSE; 331 } 332 316 333 switch (type) 317 334 { … … 338 355 break; 339 356 case 7: 340 val = (*this)[idx].GetTime Prob();357 val = (*this)[idx].GetTimeChiSquare(); 341 358 break; 342 359 case 8: … … 377 394 break; 378 395 case 17: 379 if ((*this)[idx].GetCharge() != 0.) 380 val = ((*this)[idx].GetSigmaCharge()/(*this)[idx].GetCharge())* 381 ((*this)[idx].GetSigmaCharge()/(*this)[idx].GetCharge()); 396 if ( (*this)[idx].GetRSigmaSquare() > 0. && (*this)[idx].GetCharge() > 0. ) 397 val = TMath::Sqrt((*this)[idx].GetRSigmaSquare()) / (*this)[idx].GetCharge(); 382 398 else 383 399 val = -1.; 384 400 break; 385 401 default: 386 402 return kFALSE; 387 403 } 388 return val >=0;404 return val!=-1.; 389 405 } 390 406
Note:
See TracChangeset
for help on using the changeset viewer.