Changes in modules/TreeWriter.cc [fd4b326:c614dd7] in git
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
modules/TreeWriter.cc
rfd4b326 rc614dd7 123 123 fBranchMap.insert(make_pair(branch, make_pair(itClassMap->second, array))); 124 124 } 125 126 param = GetParam("Info");127 TString infoName;128 Double_t infoValue;129 130 size = param.GetSize();131 for(i = 0; i < size / 2; ++i)132 {133 infoName = param[i * 2].GetString();134 infoValue = param[i * 2 + 1].GetDouble();135 136 AddInfo(infoName, infoValue);137 }138 125 } 139 126 … … 151 138 it1.Reset(); 152 139 array->Clear(); 153 140 154 141 while((candidate = static_cast<Candidate *>(it1.Next()))) 155 142 { … … 228 215 entry->Pz = momentum.Pz(); 229 216 217 entry->D0 = candidate->D0; 218 entry->DZ = candidate->DZ; 219 entry->P = candidate->P; 220 entry->PT = candidate->PT; 221 entry->CtgTheta = candidate->CtgTheta; 222 entry->Phi = candidate->Phi; 223 230 224 entry->Eta = eta; 231 225 entry->Phi = momentum.Phi(); … … 320 314 Candidate *particle = 0; 321 315 Track *entry = 0; 322 Double_t pt, signz, cosTheta, eta, rapidity, p, ctgTheta, phi , m;316 Double_t pt, signz, cosTheta, eta, rapidity, p, ctgTheta, phi; 323 317 const Double_t c_light = 2.99792458E8; 324 318 … … 354 348 355 349 entry->D0 = candidate->D0; 350 entry->ErrorD0 = candidate->ErrorD0; 356 351 entry->DZ = candidate->DZ; 352 entry->ErrorDZ = candidate->ErrorDZ; 357 353 358 354 entry->ErrorP = candidate->ErrorP; 359 355 entry->ErrorPT = candidate->ErrorPT; 360 361 // diagonal covariance matrix terms 362 entry->ErrorD0 = candidate->ErrorD0; 363 entry->ErrorC = candidate->ErrorC; 356 entry->ErrorCtgTheta = candidate->ErrorCtgTheta; 364 357 entry->ErrorPhi = candidate->ErrorPhi; 365 entry->ErrorDZ = candidate->ErrorDZ;366 entry->ErrorCtgTheta = candidate->ErrorCtgTheta;367 368 // add some offdiagonal covariance matrix elements369 entry->ErrorD0Phi = candidate->TrackCovariance(0,1);370 entry->ErrorD0C = candidate->TrackCovariance(0,2);371 entry->ErrorD0DZ = candidate->TrackCovariance(0,3);372 entry->ErrorD0CtgTheta = candidate->TrackCovariance(0,4);373 entry->ErrorPhiC = candidate->TrackCovariance(1,2);374 entry->ErrorPhiDZ = candidate->TrackCovariance(1,3);375 entry->ErrorPhiCtgTheta = candidate->TrackCovariance(1,4);376 entry->ErrorCDZ = candidate->TrackCovariance(2,3);377 entry->ErrorCCtgTheta = candidate->TrackCovariance(2,4);378 entry->ErrorDZCtgTheta = candidate->TrackCovariance(3,4);379 358 380 359 entry->Xd = candidate->Xd; … … 387 366 p = momentum.P(); 388 367 phi = momentum.Phi(); 389 m = momentum.M();390 368 ctgTheta = (TMath::Tan(momentum.Theta()) != 0) ? 1 / TMath::Tan(momentum.Theta()) : 1e10; 391 369 … … 400 378 entry->Phi = phi; 401 379 entry->CtgTheta = ctgTheta; 402 entry->C = candidate->C;403 entry->Mass = m;404 380 405 381 particle = static_cast<Candidate *>(candidate->GetCandidates()->At(0)); … … 472 448 Candidate *particle = 0; 473 449 ParticleFlowCandidate *entry = 0; 474 Double_t e, pt, signz, cosTheta, eta, rapidity, p, ctgTheta, phi , m;450 Double_t e, pt, signz, cosTheta, eta, rapidity, p, ctgTheta, phi; 475 451 const Double_t c_light = 2.99792458E8; 476 452 … … 506 482 507 483 entry->D0 = candidate->D0; 484 entry->ErrorD0 = candidate->ErrorD0; 508 485 entry->DZ = candidate->DZ; 486 entry->ErrorDZ = candidate->ErrorDZ; 509 487 510 488 entry->ErrorP = candidate->ErrorP; 511 489 entry->ErrorPT = candidate->ErrorPT; 512 490 entry->ErrorCtgTheta = candidate->ErrorCtgTheta; 513 514 515 // diagonal covariance matrix terms516 517 entry->ErrorD0 = candidate->ErrorD0;518 entry->ErrorC = candidate->ErrorC;519 491 entry->ErrorPhi = candidate->ErrorPhi; 520 entry->ErrorDZ = candidate->ErrorDZ;521 entry->ErrorCtgTheta = candidate->ErrorCtgTheta;522 523 // add some offdiagonal covariance matrix elements524 entry->ErrorD0Phi = candidate->TrackCovariance(0,1);525 entry->ErrorD0C = candidate->TrackCovariance(0,2);526 entry->ErrorD0DZ = candidate->TrackCovariance(0,3);527 entry->ErrorD0CtgTheta = candidate->TrackCovariance(0,4);528 entry->ErrorPhiC = candidate->TrackCovariance(1,2);529 entry->ErrorPhiDZ = candidate->TrackCovariance(1,3);530 entry->ErrorPhiCtgTheta = candidate->TrackCovariance(1,4);531 entry->ErrorCDZ = candidate->TrackCovariance(2,3);532 entry->ErrorCCtgTheta = candidate->TrackCovariance(2,4);533 entry->ErrorDZCtgTheta = candidate->TrackCovariance(3,4);534 492 535 493 entry->Xd = candidate->Xd; … … 543 501 p = momentum.P(); 544 502 phi = momentum.Phi(); 545 m = momentum.M();546 503 ctgTheta = (TMath::Tan(momentum.Theta()) != 0) ? 1 / TMath::Tan(momentum.Theta()) : 1e10; 547 504 … … 552 509 entry->Phi = phi; 553 510 entry->CtgTheta = ctgTheta; 554 entry->C = candidate->C;555 entry->Mass = m;556 511 557 512 particle = static_cast<Candidate *>(candidate->GetCandidates()->At(0));
Note:
See TracChangeset
for help on using the changeset viewer.