[O2B-1286] Fix luminosity parsing to correspond to JSON format (#11)

* Initialize optionals
* Add logging for new dispatches
* Add JSON representation of phase and logging

Author: graduta

TselectLHC.txt

@@ -1,13 +1,19 @@
-#Data Provides we need
+#Data Provides we need - https://confluence.cern.ch/display/expcomm/DIP+LHC 
 dip/acc/LHC/RunControl/RunConfiguration
 dip/acc/LHC/RunControl/BeamMode
 dip/acc/LHC/Beam/BetaStar/Bstar2
 dip/acc/LHC/Beam/Energy
+dip/acc/LHC/RunControl/SafeBeam
+
+# LHC_IF data added specifically for Bookkeeping
+dip/ALICE/LHC/Bookkeeping/Source
+dip/ALICE/LHC/Bookkeeping/CTPClock
+
 dip/ALICE/MCS/Dipole/Current
 dip/ALICE/MCS/Solenoid/Current
 dip/ALICE/MCS/Dipole/Polarity
 dip/ALICE/MCS/Solenoid/Polarity
-dip/acc/LHC/RunControl/SafeBeam
+
 #
 #dip/ALICE/LHClogbook/RunControl/CirculatingBunchConfig/Beam2
 #dip/acc/LHC/Beam/Intensity/Beam2

src/alice/dip/BookkeepingClient.java

@@ -285,11 +285,11 @@ public void updateRun(RunInfoObj runObj) {
 		}
 
 		if (runObj.getPhaseShiftAtStart().isPresent()) {
-			requestBody += "\n\"phaseShiftAtStart\":" + runObj.getPhaseShiftAtStart().get() + ",";
+			requestBody += "\n\"phaseShiftAtStart\":" + runObj.getPhaseShiftAtStartAsJson() + ",";
 		}
 
 		if (runObj.getPhaseShiftAtStop().isPresent()) {
-			requestBody += "\n\"phaseShiftAtEnd\":" + runObj.getPhaseShiftAtStop().get() + ",";
+			requestBody += "\n\"phaseShiftAtEnd\":" + runObj.getPhaseShiftAtStopAsJson() + ",";
 		}
 
 		if (!hasModifications) {  // no updates to be done !
@@ -304,14 +304,14 @@ public void updateRun(RunInfoObj runObj) {
 
 		requestBody += "\n}";
 
-		AliDip2BK.log(1, "BKwriter.UpdateRun", "RUN =" + runObj.RunNo + " UPDATE JSON request=\n" + requestBody);
+		AliDip2BK.log(3, "BKwriter.UpdateRun", "RUN =" + runObj.RunNo + " UPDATE JSON request=\n" + requestBody);
 
 		String patchRunRequest = bookkeepingUrl + "/api/runs?runNumber=" + runObj.RunNo;
 
 		if (bookkeepingToken != null) {
 			patchRunRequest += "&token=" + bookkeepingToken;
 		}
-
+		AliDip2BK.log(2, "BKwriter.Format of Update", requestBody);
 		HttpRequest request = HttpRequest.newBuilder()
 			.uri(URI.create(patchRunRequest))
 			.header("Content-Type", "application/json")
@@ -323,7 +323,7 @@ public void updateRun(RunInfoObj runObj) {
 			response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
 
 			if (response.statusCode() == 200) {
-				AliDip2BK.log(2, "BKwriter.UpdateRun", "Succesful Update for RUN=" + runObj.RunNo);
+				AliDip2BK.log(2, "BKwriter.UpdateRun", "Successful Update for RUN=" + runObj.RunNo);
 			} else {
 				AliDip2BK.log(3, "BKwriter.UpdateRun", "ERROR for RUN=" + runObj.RunNo + " Code=" + +response.statusCode() + " Message=" + response.body());
 			}

src/alice/dip/DipMessagesProcessor.java

@@ -787,7 +787,12 @@ private void handleBookkeepingSourceMessage(DipData dipData) throws BadParameter
 		var acceptance = dipData.extractFloat("Acceptance");
 		var crossSection = dipData.extractFloat("CrossSection");
 		var efficiency = dipData.extractFloat("Efficiency");
-
+		AliDip2BK.log(
+						2,
+						"ProcData.dispatch",
+						" Bookkeeping Source: Acceptance=" + acceptance + " CrossSection=" + crossSection
+								+ " Efficiency=" + efficiency
+				);
 		luminosityManager.setTriggerEfficiency(efficiency);
 		luminosityManager.setTriggerAcceptance(acceptance);
 		luminosityManager.setCrossSection(crossSection);
@@ -797,6 +802,11 @@ private void handleBookkeepingCtpClockMessage(DipData dipData) throws BadParamet
 		var phaseShiftBeam1 = dipData.extractFloat("PhaseShift_Beam1");
 		var phaseShiftBeam2 = dipData.extractFloat("PhaseShift_Beam2");
 
+		AliDip2BK.log(
+						2,
+						"ProcData.dispatch",
+						" Bookkeeping CTP Clock: PhaseShift_Beam1=" + phaseShiftBeam1 + " PhaseShift_Beam2=" + phaseShiftBeam2
+				);
 		luminosityManager.setPhaseShift(new PhaseShift(phaseShiftBeam1, phaseShiftBeam2));
 	}
 }

src/alice/dip/RunInfoObj.java

@@ -270,4 +270,21 @@ public Optional<PhaseShift> getPhaseShiftAtStart() {
 	public Optional<PhaseShift> getPhaseShiftAtStop() {
 		return this.luminosityAtStop.flatMap(LuminosityView::phaseShift);
 	}
+
+	private String formatPhaseShiftAsJson(PhaseShift phaseShift) {
+		return String.format("{\"beam1\":%f,\"beam2\":%f}", phaseShift.beam1(), phaseShift.beam2());
+	}
+
+	public String getPhaseShiftAtStartAsJson() {
+		return this.luminosityAtStart.phaseShift()
+			.map(this::formatPhaseShiftAsJson)
+			.orElse("{}");
+	}
+
+	public String getPhaseShiftAtStopAsJson() {
+		return this.luminosityAtStop
+			.flatMap(LuminosityView::phaseShift)
+			.map(this::formatPhaseShiftAsJson)
+			.orElse("{}");
+	}
 }