@@ -588,40 +588,18 @@ public void newFillNo(long date, String strFno, String par1, String par2, String
588588 public void newBeamMode (long date , String BeamMode ) {
589589
590590 if (currentFill != null ) {
591+ AliDip2BK .log (
592+ 2 ,
593+ "ProcData.newBeamMode" ,
594+ "New beam mode=" + BeamMode + " for FILL_NO=" + currentFill .fillNo
595+ );
591596 currentFill .setBeamMode (date , BeamMode );
597+ bookkeepingClient .updateLhcFill (currentFill );
598+ saveState ();
599+
592600 if (this .beamModeEventsKafkaProducer != null ) {
593601 this .beamModeEventsKafkaProducer .sendEvent (currentFill .fillNo , currentFill , date );
594602 }
595-
596- int mc = -1 ;
597- for (int i = 0 ; i < AliDip2BK .endFillCases .length ; i ++) {
598- if (AliDip2BK .endFillCases [i ].equalsIgnoreCase (BeamMode )) mc = i ;
599- }
600- if (mc < 0 ) {
601-
602- AliDip2BK .log (
603- 2 ,
604- "ProcData.newBeamMode" ,
605- "New beam mode=" + BeamMode + " for FILL_NO=" + currentFill .fillNo
606- );
607- bookkeepingClient .updateLhcFill (currentFill );
608- saveState ();
609- if (beamModeEventsKafkaProducer != null ) {
610- beamModeEventsKafkaProducer .sendEvent (currentFill .fillNo , currentFill , date );
611- }
612- } else {
613- currentFill .endedTime = date ;
614- bookkeepingClient .updateLhcFill (currentFill );
615- if (AliDip2BK .KEEP_FILLS_HISTORY_DIRECTORY != null ) {
616- writeFillHistFile (currentFill );
617- }
618- AliDip2BK .log (
619- 3 ,
620- "ProcData.newBeamMode" ,
621- "CLOSE Fill_NO=" + currentFill .fillNo + " Based on new beam mode=" + BeamMode
622- );
623- currentFill = null ;
624- }
625603 } else {
626604 AliDip2BK .log (4 , "ProcData.newBeamMode" , " ERROR new beam mode=" + BeamMode + " NO FILL NO for it" );
627605 }
0 commit comments