Skip to content

Commit 0712249

Browse files
committed
doing a rebase from master branch
1 parent 60345a9 commit 0712249

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
@@ -479,22 +479,6 @@ struct LumiStabilityTask {
479479
histos.fill(HIST("FDD/hTimeForRateLeadingBC"), (bc.timestamp() - tsSOR) * 1.e-3);
480480
}
481481

482-
if (bcPatternB[localBC]) {
483-
histos.fill(HIST("FDD/hTimeForRate"), (bc.timestamp() - tsSOR) * 1.e-3); // Converting ms into seconds
484-
bool isLeadBC = true;
485-
for (int jbit = localBC - minEmpty; jbit < localBC; jbit++) {
486-
int kbit = jbit;
487-
if (kbit < 0)
488-
kbit += nbin;
489-
if (bcPatternB[kbit]) {
490-
isLeadBC = false;
491-
break;
492-
}
493-
}
494-
if (isLeadBC)
495-
histos.fill(HIST("FDD/hTimeForRateLeadingBC"), (bc.timestamp() - tsSOR) * 1.e-3);
496-
}
497-
498482
int deltaIndex = 0; // backward move counts
499483
int deltaBC = 0; // current difference wrt globalBC
500484
bool pastActivityFDDVertex = false;
@@ -577,21 +561,14 @@ struct LumiStabilityTask {
577561
}
578562
}
579563

580-
if (deltaBC < myMaxDeltaBCFDD) {
581-
std::bitset<8> fddTriggersPast = fdd_past.triggerMask();
582-
bool vertexPast = fddTriggersPast[o2::fdd::Triggers::bitVertex];
583-
pastActivityFDDVertex |= (vertexPast);
584-
}
585-
}
586-
deltaIndex = 0;
587-
deltaBC = 0;
564+
if (isCoinA && isCoinC) {
565+
histos.fill(HIST("FDD/bcVertexTriggerCoincidence"), localBC);
566+
histos.fill(HIST("FDD/hCounts"), 3);
567+
histos.fill(HIST("hOrbitFDDVertexCoinc"), orbit - minOrbit);
588568

589-
if (pastActivityFDDVertex == false) {
590-
histos.fill(HIST("FDD/hCounts"), 2);
591-
histos.fill(HIST("FDD/bcVertexTriggerPP"), localBC);
592569
if (bcPatternA[localBC]) {
593-
histos.fill(HIST("FDD/timeACbcAVertex"), fdd.timeA(), fdd.timeC());
594-
histos.fill(HIST("FDD/hBcAVertex"), localBC);
570+
histos.fill(HIST("FDD/timeACbcA"), fdd.timeA(), fdd.timeC());
571+
histos.fill(HIST("FDD/hBcA"), localBC);
595572
}
596573
if (bcPatternC[localBC]) {
597574
histos.fill(HIST("FDD/timeACbcC"), fdd.timeA(), fdd.timeC());
@@ -641,28 +618,6 @@ struct LumiStabilityTask {
641618
}
642619
}
643620
}
644-
}
645-
646-
647-
if (isCoinA && isCoinC) {
648-
histos.fill(HIST("FDD/bcVertexTriggerCoincidence"), localBC);
649-
histos.fill(HIST("FDD/hCounts"), 3);
650-
histos.fill(HIST("hOrbitFDDVertexCoinc"), orbit - minOrbit);
651-
652-
if (bcPatternA[localBC]) {
653-
histos.fill(HIST("FDD/timeACbcA"), fdd.timeA(), fdd.timeC());
654-
histos.fill(HIST("FDD/hBcA"), localBC);
655-
}
656-
if (bcPatternC[localBC]) {
657-
histos.fill(HIST("FDD/timeACbcC"), fdd.timeA(), fdd.timeC());
658-
histos.fill(HIST("FDD/hBcC"), localBC);
659-
}
660-
if (bcPatternB[localBC]) {
661-
histos.fill(HIST("FDD/timeACbcB"), fdd.timeA(), fdd.timeC());
662-
histos.fill(HIST("FDD/hBcB"), localBC);
663-
histos.fill(HIST("FDD/hTimeACoinc"), fdd.timeA());
664-
histos.fill(HIST("FDD/hTimeCCoinc"), fdd.timeC());
665-
}
666621
if (bcPatternE[localBC]) {
667622
histos.fill(HIST("FDD/timeACbcE"), fdd.timeA(), fdd.timeC());
668623
histos.fill(HIST("FDD/hBcE"), localBC);
@@ -867,15 +822,6 @@ struct LumiStabilityTask {
867822
histos.fill(HIST("FT0/hCounts"), 3);
868823
histos.fill(HIST("FT0/bcVertexTriggerBothSidesPP"), localBC);
869824
}
870-
if (pastActivityFT0Vertex == true) {
871-
histos.fill(HIST("FT0/hCounts"), 3);
872-
} else {
873-
histos.fill(HIST("FT0/bcVertexTriggerPP"), localBC);
874-
}
875-
if (pastActivityFT0TriggerA == false || pastActivityFT0TriggerC == false) {
876-
histos.fill(HIST("FT0/hCounts"), 3);
877-
histos.fill(HIST("FT0/bcVertexTriggerBothSidesPP"), localBC);
878-
}
879825
} // vertex true
880826

881827
if (sCentral) {

0 commit comments

Comments
 (0)