Skip to content

Commit 838d5c5

Browse files
committed
Bring back changes from merge loss
1 parent f6cfe68 commit 838d5c5

File tree

1 file changed

+9
-10
lines changed

1 file changed

+9
-10
lines changed

src/alice/dip/DipMessagesProcessor.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ private void handleBeamModeMessage(DipData dipData) throws BadParameter, TypeMis
354354
private void handleBetaStarMessage(DipData dipData) throws BadParameter, TypeMismatch {
355355
var betaStarPayload = dipData.extractInt("payload");
356356
// Per documentation, value is in cm, we convert it to m
357-
var betaStar = betaStarPayload / 1000.f; // in m
357+
var betaStar = betaStarPayload / 100.f; // in m
358358

359359
var time = dipData.extractDipTime().getAsMillis();
360360

@@ -739,11 +739,10 @@ private void handleBookkeepingSourceMessage(DipData dipData) throws BadParameter
739739
var crossSection = dipData.extractFloat("CrossSection");
740740
var efficiency = dipData.extractFloat("Efficiency");
741741
AliDip2BK.log(
742-
2,
743-
"ProcData.dispatch",
744-
" Bookkeeping Source: Acceptance=" + acceptance + " CrossSection=" + crossSection
745-
+ " Efficiency=" + efficiency
746-
);
742+
2,
743+
"ProcData.dispatch",
744+
" Bookkeeping Source: Acceptance=" + acceptance + " CrossSection=" + crossSection + " Efficiency=" + efficiency
745+
);
747746
luminosityManager.setTriggerEfficiency(efficiency);
748747
luminosityManager.setTriggerAcceptance(acceptance);
749748
luminosityManager.setCrossSection(crossSection);
@@ -754,10 +753,10 @@ private void handleBookkeepingCtpClockMessage(DipData dipData) throws BadParamet
754753
var phaseShiftBeam2 = dipData.extractFloat("PhaseShift_Beam2");
755754

756755
AliDip2BK.log(
757-
2,
758-
"ProcData.dispatch",
759-
" Bookkeeping CTP Clock: PhaseShift_Beam1=" + phaseShiftBeam1 + " PhaseShift_Beam2=" + phaseShiftBeam2
760-
);
756+
2,
757+
"ProcData.dispatch",
758+
" Bookkeeping CTP Clock: PhaseShift_Beam1=" + phaseShiftBeam1 + " PhaseShift_Beam2=" + phaseShiftBeam2
759+
);
761760
luminosityManager.setPhaseShift(new PhaseShift(phaseShiftBeam1, phaseShiftBeam2));
762761
}
763762
}

0 commit comments

Comments
 (0)