Skip to content

Commit 6a4df63

Browse files
committed
doing a rebase from master branch
1 parent f771422 commit 6a4df63

File tree

1 file changed

+6
-60
lines changed

1 file changed

+6
-60
lines changed

PWGMM/Lumi/Tasks/lumiStability.cxx

Lines changed: 6 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -474,22 +474,6 @@ struct LumiStabilityTask {
474474
histos.fill(HIST("FDD/hTimeForRateLeadingBC"), (bc.timestamp() - tsSOR) * 1.e-3);
475475
}
476476

477-
if (bcPatternB[localBC]) {
478-
histos.fill(HIST("FDD/hTimeForRate"), (bc.timestamp() - tsSOR) * 1.e-3); // Converting ms into seconds
479-
bool isLeadBC = true;
480-
for (int jbit = localBC - minEmpty; jbit < localBC; jbit++) {
481-
int kbit = jbit;
482-
if (kbit < 0)
483-
kbit += nbin;
484-
if (bcPatternB[kbit]) {
485-
isLeadBC = false;
486-
break;
487-
}
488-
}
489-
if (isLeadBC)
490-
histos.fill(HIST("FDD/hTimeForRateLeadingBC"), (bc.timestamp() - tsSOR) * 1.e-3);
491-
}
492-
493477
int deltaIndex = 0; // backward move counts
494478
int deltaBC = 0; // current difference wrt globalBC
495479
bool pastActivityFDDVertex = false;
@@ -572,21 +556,14 @@ struct LumiStabilityTask {
572556
}
573557
}
574558

575-
if (deltaBC < myMaxDeltaBCFDD) {
576-
std::bitset<8> fddTriggersPast = fdd_past.triggerMask();
577-
bool vertexPast = fddTriggersPast[o2::fdd::Triggers::bitVertex];
578-
pastActivityFDDVertex |= (vertexPast);
579-
}
580-
}
581-
deltaIndex = 0;
582-
deltaBC = 0;
559+
if (isCoinA && isCoinC) {
560+
histos.fill(HIST("FDD/bcVertexTriggerCoincidence"), localBC);
561+
histos.fill(HIST("FDD/hCounts"), 3);
562+
histos.fill(HIST("hOrbitFDDVertexCoinc"), orbit - minOrbit);
583563

584-
if (pastActivityFDDVertex == false) {
585-
histos.fill(HIST("FDD/hCounts"), 2);
586-
histos.fill(HIST("FDD/bcVertexTriggerPP"), localBC);
587564
if (bcPatternA[localBC]) {
588-
histos.fill(HIST("FDD/timeACbcAVertex"), fdd.timeA(), fdd.timeC());
589-
histos.fill(HIST("FDD/hBcAVertex"), localBC);
565+
histos.fill(HIST("FDD/timeACbcA"), fdd.timeA(), fdd.timeC());
566+
histos.fill(HIST("FDD/hBcA"), localBC);
590567
}
591568
if (bcPatternC[localBC]) {
592569
histos.fill(HIST("FDD/timeACbcC"), fdd.timeA(), fdd.timeC());
@@ -636,28 +613,6 @@ struct LumiStabilityTask {
636613
}
637614
}
638615
}
639-
}
640-
641-
642-
if (isCoinA && isCoinC) {
643-
histos.fill(HIST("FDD/bcVertexTriggerCoincidence"), localBC);
644-
histos.fill(HIST("FDD/hCounts"), 3);
645-
histos.fill(HIST("hOrbitFDDVertexCoinc"), orbit - minOrbit);
646-
647-
if (bcPatternA[localBC]) {
648-
histos.fill(HIST("FDD/timeACbcA"), fdd.timeA(), fdd.timeC());
649-
histos.fill(HIST("FDD/hBcA"), localBC);
650-
}
651-
if (bcPatternC[localBC]) {
652-
histos.fill(HIST("FDD/timeACbcC"), fdd.timeA(), fdd.timeC());
653-
histos.fill(HIST("FDD/hBcC"), localBC);
654-
}
655-
if (bcPatternB[localBC]) {
656-
histos.fill(HIST("FDD/timeACbcB"), fdd.timeA(), fdd.timeC());
657-
histos.fill(HIST("FDD/hBcB"), localBC);
658-
histos.fill(HIST("FDD/hTimeACoinc"), fdd.timeA());
659-
histos.fill(HIST("FDD/hTimeCCoinc"), fdd.timeC());
660-
}
661616
if (bcPatternE[localBC]) {
662617
histos.fill(HIST("FDD/timeACbcE"), fdd.timeA(), fdd.timeC());
663618
histos.fill(HIST("FDD/hBcE"), localBC);
@@ -862,15 +817,6 @@ struct LumiStabilityTask {
862817
histos.fill(HIST("FT0/hCounts"), 3);
863818
histos.fill(HIST("FT0/bcVertexTriggerBothSidesPP"), localBC);
864819
}
865-
if (pastActivityFT0Vertex == true) {
866-
histos.fill(HIST("FT0/hCounts"), 3);
867-
} else {
868-
histos.fill(HIST("FT0/bcVertexTriggerPP"), localBC);
869-
}
870-
if (pastActivityFT0TriggerA == false || pastActivityFT0TriggerC == false) {
871-
histos.fill(HIST("FT0/hCounts"), 3);
872-
histos.fill(HIST("FT0/bcVertexTriggerBothSidesPP"), localBC);
873-
}
874820
} // vertex true
875821

876822
if (sCentral) {

0 commit comments

Comments
 (0)