Commit 9aae5ba1 authored by Edward Moyse's avatar Edward Moyse
Browse files

Merge branch 'revert-caa28232' into 'master'

Revert "Merge branch 'ATLASRECTS-6530_disable_when_doIP_false' into 'master'"

See merge request atlas/athena!45758
parents 5da8016f 6361ca58
......@@ -101,13 +101,11 @@ StatusCode IDAlignMonGenericTracksAlg::initialize()
ATH_MSG_DEBUG("Hit quality tool setup - hit quality cuts will be applied to Si hits");
m_doHitQuality = true;
}
if (m_doIP) {
ATH_CHECK(m_trackToVertexIPEstimator.retrieve());
} else {
m_trackToVertexIPEstimator.disable();
ATH_CHECK (m_trackToVertexIPEstimator.retrieve());
}
if ( m_beamSpotKey.initialize().isFailure() ) {
ATH_MSG_WARNING("Failed to retrieve beamspot service " << m_beamSpotKey << " - will use nominal beamspot at (0,0,0)");
m_hasBeamCondSvc = false;
......
......@@ -93,14 +93,9 @@ private:
ToolHandle<InDet::IInDetTrackSelectionTool> m_trackSelection; // baseline
ToolHandle<IInDetAlignHitQualSelTool> m_hitQualityTool;
//doIP false disables this one
ToolHandle<Trk::ITrackToVertexIPEstimator> m_trackToVertexIPEstimator{
this,
"TrackToVertexIPEstimator",
"Trk::TrackToVertexIPEstimator",
""
};
PublicToolHandle< Trk::ITrackToVertexIPEstimator > m_trackToVertexIPEstimator
{this,"TrackToVertexIPEstimator","Trk::TrackToVertexIPEstimator",""};
std::string m_Pixel_Manager;
std::string m_SCT_Manager;
std::string m_TRT_Manager;
......
......@@ -3,7 +3,7 @@
330470 1183722156 360 388 1 3 0 3 12 0 12
330470 1183722158 1 0 0 0 0 0 0 0 0
330470 1183722342 394 429 0 2 0 2 15 0 15
330470 1183723134 463 502 4 3 0 3 16 0 16
330470 1183723134 463 502 5 3 0 3 16 0 16
330470 1183723677 583 584 3 13 0 13 33 0 33
330470 1183724572 518 627 4 7 0 7 15 0 15
330470 1183725127 367 460 2 9 0 9 16 0 16
......@@ -55,15 +55,15 @@
330470 1183745001 320 380 0 10 0 10 12 0 12
330470 1183745791 361 401 0 19 0 19 20 0 20
330470 1183745889 371 380 1 5 0 5 10 0 10
330470 1183746019 446 489 0 7 0 7 24 0 24
330470 1183746343 492 495 0 3 0 3 16 0 16
330470 1183746019 446 489 1 7 0 7 24 0 24
330470 1183746343 492 495 1 3 0 3 16 0 16
330470 1183746391 364 441 2 15 0 15 20 0 20
330470 1183746668 459 380 0 7 0 7 20 0 20
330470 1183746710 6 0 0 0 0 0 0 0 0
330470 1183746776 348 356 1 9 0 9 27 0 27
330470 1183747953 302 377 2 4 0 4 10 0 10
330470 1183748096 455 491 0 5 0 5 17 0 17
330470 1183748136 663 654 1 12 0 12 26 0 26
330470 1183748136 663 654 2 12 0 12 26 0 26
330470 1183748263 396 410 3 8 0 8 16 0 16
330470 1183748421 460 422 1 8 0 8 15 0 15
330470 1183748705 490 523 2 9 0 9 20 0 20
......@@ -71,8 +71,8 @@
330470 1183750781 377 365 1 5 0 5 16 0 16
330470 1183750906 702 757 3 10 0 10 29 0 29
330470 1183751782 239 246 0 0 0 0 6 0 6
330470 1183752624 347 366 3 5 0 5 15 0 15
330470 1183753006 357 398 2 4 0 4 14 0 14
330470 1183752624 347 366 2 5 0 5 15 0 15
330470 1183753006 357 398 3 4 0 4 14 0 14
330470 1183753030 398 352 2 23 0 23 20 0 20
330470 1183753541 400 453 2 8 0 8 11 0 11
330470 1183754806 470 424 0 2 0 2 17 0 17
......@@ -142,7 +142,7 @@
330470 1183783921 518 489 1 22 0 22 32 0 32
330470 1183784212 561 538 0 36 0 36 28 0 28
330470 1183784686 458 490 7 5 0 5 23 0 23
330470 1183784788 350 327 3 18 0 18 16 0 16
330470 1183784788 350 327 2 18 0 18 16 0 16
330470 1183785404 682 719 4 11 0 11 32 0 32
330470 1183786663 355 436 2 2 0 2 6 0 6
330470 1183787021 684 606 2 9 0 9 33 0 33
......@@ -160,7 +160,7 @@
330470 1183792990 468 509 4 24 0 24 28 0 28
330470 1183793190 396 527 1 10 0 10 14 0 14
330470 1183793693 492 620 2 16 0 16 29 0 29
330470 1183793783 562 522 5 20 0 20 27 0 27
330470 1183793783 562 522 6 20 0 20 27 0 27
330470 1183794278 454 558 0 7 0 7 9 0 9
330470 1183794508 448 473 2 17 0 17 19 0 19
330470 1183794655 393 364 1 3 0 3 5 0 5
......@@ -235,7 +235,7 @@
330470 1183827424 359 352 1 22 0 22 16 0 16
330470 1183828215 521 413 2 12 0 12 30 0 30
330470 1183828765 562 596 4 4 0 4 25 0 25
330470 1183828961 522 572 3 4 0 4 19 0 19
330470 1183828961 522 572 2 4 0 4 19 0 19
330470 1183829595 473 418 0 5 0 5 17 0 17
330470 1183829748 592 613 0 10 0 10 23 0 23
330470 1183830135 428 476 1 14 0 14 22 0 22
......@@ -285,11 +285,11 @@
330470 1183852355 410 415 0 3 0 3 14 0 14
330470 1183852362 567 668 1 16 0 16 29 0 29
330470 1183852486 387 405 2 4 0 4 15 0 15
330470 1183852552 509 470 3 18 0 18 20 0 20
330470 1183852552 509 470 4 18 0 18 20 0 20
330470 1183853281 404 390 2 5 0 5 14 0 14
330470 1183853303 555 525 5 6 0 6 25 0 25
330470 1183853317 313 327 5 4 0 4 15 0 15
330470 1183853842 629 584 1 10 0 10 28 0 28
330470 1183853317 313 327 4 4 0 4 15 0 15
330470 1183853842 629 584 2 10 0 10 28 0 28
330470 1183854086 313 362 1 6 0 6 11 0 11
330470 1183854099 444 521 0 2 0 2 13 0 13
330470 1183854665 506 450 0 6 0 6 14 0 14
......@@ -333,7 +333,7 @@
330470 1183878363 529 583 5 15 0 15 26 0 26
330470 1183879080 615 646 3 9 0 9 30 0 30
330470 1183879154 597 628 4 8 0 8 28 0 28
330470 1183879547 423 439 3 0 0 0 13 0 13
330470 1183879547 423 439 2 0 0 0 13 0 13
330470 1183879670 489 525 2 13 0 13 21 0 21
330470 1183879957 494 578 0 12 0 12 26 0 26
330470 1183880152 349 453 3 1 0 1 16 0 16
......@@ -350,8 +350,8 @@
330470 1183884717 238 261 2 2 0 2 6 0 6
330470 1183885069 292 240 3 12 0 12 13 0 13
330470 1183885910 310 358 1 11 0 11 16 0 16
330470 1183889121 367 381 1 11 0 11 20 0 20
330470 1183889788 361 471 2 13 0 13 20 0 20
330470 1183889121 367 381 3 11 0 11 20 0 20
330470 1183889788 361 471 3 13 0 13 20 0 20
330470 1183890058 429 392 1 6 0 6 21 0 21
330470 1183890245 558 582 1 5 0 5 23 0 23
330470 1183891126 511 511 4 10 0 10 18 0 18
......@@ -419,7 +419,7 @@
330470 1183931811 465 375 0 8 0 8 18 0 18
330470 1183932465 456 541 3 11 0 11 17 0 17
330470 1183933264 514 450 2 4 0 4 10 0 10
330470 1183934061 556 608 2 15 0 15 31 0 31
330470 1183934061 556 608 1 15 0 15 31 0 31
330470 1183934188 559 640 0 11 0 11 28 0 28
330470 1183935176 505 635 1 7 0 7 21 0 21
330470 1183935243 406 422 3 15 0 15 26 0 26
......@@ -431,12 +431,12 @@
330470 1183939219 533 500 2 9 0 9 16 0 16
330470 1183939285 273 161 0 5 0 5 8 0 8
330470 1183939881 561 508 3 6 0 6 22 0 22
330470 1183941479 270 333 1 2 0 2 6 0 6
330470 1183941479 270 333 0 2 0 2 6 0 6
330470 1183943435 21 0 0 0 0 0 0 0 0
330470 1183944121 428 399 2 5 0 5 25 0 25
330470 1183944525 423 496 1 6 0 6 13 0 13
330470 1183946835 778 886 4 24 0 24 38 0 38
330470 1183949177 403 463 1 7 0 7 17 0 17
330470 1183949177 403 463 0 7 0 7 17 0 17
330470 1183949782 548 522 2 12 0 12 20 0 20
330470 1183952907 561 642 4 9 0 9 16 0 16
330470 1183953399 578 478 0 13 0 13 31 0 31
......@@ -455,14 +455,14 @@
330470 1183969905 585 593 1 14 0 14 23 0 23
330470 1183970393 350 359 0 8 0 8 14 0 14
330470 1183970582 174 223 1 2 0 2 5 0 5
330470 1183973235 544 533 1 5 0 5 17 0 17
330470 1183973235 544 533 3 5 0 5 17 0 17
330470 1183974800 386 404 1 4 0 4 15 0 15
330470 1183975144 422 516 0 8 0 8 28 0 28
330470 1183977930 266 296 0 6 0 6 8 0 8
330470 1183979636 434 503 1 4 0 4 10 0 10
330470 1183982156 373 450 1 2 0 2 10 0 10
330470 1183982855 448 401 2 2 0 2 14 0 14
330470 1183983079 512 545 2 7 0 7 29 0 29
330470 1183983079 512 545 1 7 0 7 29 0 29
330470 1183983113 387 382 1 3 0 3 17 0 17
330470 1183984897 342 293 0 14 0 14 15 0 15
330470 1183985311 421 572 1 12 0 12 12 0 12
......@@ -477,7 +477,7 @@
330470 1183997552 522 536 0 4 0 4 23 0 23
330470 1183997623 408 325 2 6 0 6 14 0 14
330470 1183997905 350 317 0 1 0 1 6 0 6
330470 1184001332 450 406 6 11 0 11 26 0 26
330470 1184001332 450 406 5 11 0 11 26 0 26
330470 1184003671 421 386 1 6 0 6 16 0 16
330470 1184007839 421 441 3 9 0 9 15 0 15
330470 1184010792 477 468 0 5 0 5 15 0 15
......@@ -487,7 +487,7 @@
330470 1184014074 358 359 0 3 0 3 12 0 12
330470 1184016450 487 503 1 13 0 13 29 0 29
330470 1184019719 414 367 1 3 0 3 20 0 20
330470 1184020401 563 454 4 7 0 7 28 0 28
330470 1184020401 563 454 3 7 0 7 28 0 28
330470 1184026109 415 333 0 11 0 11 20 0 20
330470 1184026603 601 609 2 6 0 6 26 0 26
330470 1184027737 477 484 0 0 0 0 16 0 16
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment