Skip to content

Commit 2ebe40c

Browse files
shishloshishlo
committed
The typo in the names of the RF Cavity class methods is fixed: GapEtnrance replaced by GapEntrance
1 parent fe0aa5e commit 2ebe40c

File tree

4 files changed

+18
-18
lines changed

4 files changed

+18
-18
lines changed

‎examples/SNS_Linac/rf_quad_overlapping_fields/rfgap_model_longitudinal_test.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ def transitTimeFactor(bunch,cav_frequency,length):
127127
bunch = Bunch()
128128
bunch_init.copyEmptyBunchTo(bunch)
129129
three_point_gap.trackDesignBunch(bunch)
130-
cav_1st_gap_entr_phase0 = three_point_gap.getRF_Cavity().getFirstGapEtnrancePhase()
130+
cav_1st_gap_entr_phase0 = three_point_gap.getRF_Cavity().getFirstGapEntrancePhase()
131131

132132
print ("=============================================================")
133133
print ("Case 1: Cavity phase scan assuming the phase at z=0 position.")
@@ -144,7 +144,7 @@ def transitTimeFactor(bunch,cav_frequency,length):
144144
bunch_init.copyEmptyBunchTo(bunch)
145145
three_point_gap.trackDesignBunch(bunch)
146146

147-
cav_1st_gap_entr_phase = phaseNearTargetPhase(three_point_gap.getRF_Cavity().getFirstGapEtnrancePhase(),0.)
147+
cav_1st_gap_entr_phase = phaseNearTargetPhase(three_point_gap.getRF_Cavity().getFirstGapEntrancePhase(),0.)
148148
delta_phase = phaseNearTargetPhase(cav_1st_gap_entr_phase - cav_phase - cav_1st_gap_entr_phase0,0.)
149149
gap_phase = phaseNearTargetPhase(three_point_gap.getGapPhase(),cav_phase)
150150
delta_eKin_out = bunch.getSyncParticle().kinEnergy() - Ekin_init
@@ -182,7 +182,7 @@ def transitTimeFactor(bunch,cav_frequency,length):
182182
bunch = Bunch()
183183
bunch_init.copyEmptyBunchTo(bunch)
184184
three_point_gap.trackDesignBunch(bunch)
185-
cav_1st_gap_entr_phase0 = three_point_gap.getRF_Cavity().getFirstGapEtnrancePhase()
185+
cav_1st_gap_entr_phase0 = three_point_gap.getRF_Cavity().getFirstGapEntrancePhase()
186186

187187
print ("=============================================================")
188188
print ("Case 2: Cavity phase scan assuming the phase at the entrance.")
@@ -199,7 +199,7 @@ def transitTimeFactor(bunch,cav_frequency,length):
199199
bunch_init.copyEmptyBunchTo(bunch)
200200
three_point_gap.trackDesignBunch(bunch)
201201

202-
cav_1st_gap_entr_phase = phaseNearTargetPhase(three_point_gap.getRF_Cavity().getFirstGapEtnrancePhase(),0.)
202+
cav_1st_gap_entr_phase = phaseNearTargetPhase(three_point_gap.getRF_Cavity().getFirstGapEntrancePhase(),0.)
203203
delta_phase = phaseNearTargetPhase(cav_1st_gap_entr_phase - cav_phase - cav_1st_gap_entr_phase0,0.)
204204
gap_phase = phaseNearTargetPhase(three_point_gap.getGapPhase(),cav_phase)
205205
delta_eKin_out = bunch.getSyncParticle().kinEnergy() - Ekin_init

‎py/orbit/py_linac/lattice/LinacAccLatticeLib.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -424,19 +424,19 @@ def getPhase(self):
424424
"""Returns the phase for the first RF gap."""
425425
return self.getParam("phase")
426426

427-
def setFirstGapEtnrancePhase(self, phase):
427+
def setFirstGapEntrancePhase(self, phase):
428428
"""Sets the phase at the first gap entrance if Length_of_gap > 0."""
429429
self.__firstGapEntrancePhase = phase
430430

431-
def getFirstGapEtnrancePhase(self):
431+
def getFirstGapEntrancePhase(self):
432432
"""Returns the phase at the first gap entrance if Length_of_gap > 0."""
433433
return self.__firstGapEntrancePhase
434434

435-
def setFirstGapEtnranceDesignPhase(self, phase):
435+
def setFirstGapEntranceDesignPhase(self, phase):
436436
"""Sets the design phase at the first gap entrance if Length_of_gap > 0."""
437437
self.__firstGapEntranceDesignPhase = phase
438438

439-
def getFirstGapEtnranceDesignPhase(self):
439+
def getFirstGapEntranceDesignPhase(self):
440440
"""Returns the design phase at the first gap entrance if Length_of_gap > 0."""
441441
return self.__firstGapEntranceDesignPhase
442442

‎py/orbit/py_linac/lattice/LinacFieldOverlappingNodes.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ def track(self, paramsDict):
301301
arrival_time = syncPart.time()
302302
designArrivalTime = rfCavity.getDesignArrivalTime()
303303
phase_shift = rfCavity.getPhase() - rfCavity.getDesignPhase()
304-
phase = rfCavity.getFirstGapEtnrancePhase() + phase_shift
304+
phase = rfCavity.getFirstGapEntrancePhase() + phase_shift
305305
usePhaseAtEntrance = rfCavity.getUsePhaseAtEntrance()
306306
if(usePhaseAtEntrance):
307307
phase = rfCavity.getPhase()
@@ -442,7 +442,7 @@ def trackDesign(self, paramsDict):
442442
rf_ampl = rfCavity.getDesignAmp()
443443
arrival_time = syncPart.time()
444444
frequency = rfCavity.getFrequency()
445-
phase = rfCavity.getFirstGapEtnrancePhase()
445+
phase = rfCavity.getFirstGapEntrancePhase()
446446
usePhaseAtEntrance = rfCavity.getUsePhaseAtEntrance()
447447
if(usePhaseAtEntrance):
448448
phase = rfCavity.getPhase()
@@ -451,8 +451,8 @@ def trackDesign(self, paramsDict):
451451
rfCavity.setDesignArrivalTime(arrival_time)
452452
if(not usePhaseAtEntrance):
453453
phase = self.axis_field_rf_gap.calculate_first_part_phase(bunch)
454-
rfCavity.setFirstGapEtnrancePhase(phase)
455-
rfCavity.setFirstGapEtnranceDesignPhase(phase)
454+
rfCavity.setFirstGapEntrancePhase(phase)
455+
rfCavity.setFirstGapEntranceDesignPhase(phase)
456456
rfCavity.setDesignSetUp(True)
457457
rfCavity._setDesignPhase(rfCavity.getPhase())
458458
rfCavity._setDesignAmp(rfCavity.getAmp())

‎py/orbit/py_linac/lattice/LinacRfGapNodes.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -268,8 +268,8 @@ def trackDesign(self, paramsDict):
268268
if self.__isFirstGap:
269269
rfCavity.setDesignArrivalTime(arrival_time)
270270
rfCavity.setDesignSetUp(True)
271-
rfCavity.setFirstGapEtnrancePhase(rfCavity.getPhase())
272-
rfCavity.setFirstGapEtnranceDesignPhase(rfCavity.getPhase())
271+
rfCavity.setFirstGapEntrancePhase(rfCavity.getPhase())
272+
rfCavity.setFirstGapEntranceDesignPhase(rfCavity.getPhase())
273273
rfCavity._setDesignPhase(rfCavity.getPhase())
274274
rfCavity._setDesignAmp(rfCavity.getAmp())
275275
else:
@@ -616,7 +616,7 @@ def track(self, paramsDict):
616616
arrival_time = syncPart.time()
617617
designArrivalTime = rfCavity.getDesignArrivalTime()
618618
phase_shift = rfCavity.getPhase() - rfCavity.getDesignPhase()
619-
phase = rfCavity.getFirstGapEtnrancePhase() + phase_shift
619+
phase = rfCavity.getFirstGapEntrancePhase() + phase_shift
620620
usePhaseAtEntrance = rfCavity.getUsePhaseAtEntrance()
621621
if(usePhaseAtEntrance):
622622
phase = rfCavity.getPhase()
@@ -714,7 +714,7 @@ def trackDesign(self, paramsDict):
714714
rf_ampl = rfCavity.getDesignAmp()
715715
arrival_time = syncPart.time()
716716
frequency = rfCavity.getFrequency()
717-
phase = rfCavity.getFirstGapEtnrancePhase()
717+
phase = rfCavity.getFirstGapEntrancePhase()
718718
usePhaseAtEntrance = rfCavity.getUsePhaseAtEntrance()
719719
if(usePhaseAtEntrance):
720720
phase = rfCavity.getPhase()
@@ -723,8 +723,8 @@ def trackDesign(self, paramsDict):
723723
rfCavity.setDesignArrivalTime(arrival_time)
724724
if(not usePhaseAtEntrance):
725725
phase = self.__calculate_first_part_phase(bunch)
726-
rfCavity.setFirstGapEtnrancePhase(phase)
727-
rfCavity.setFirstGapEtnranceDesignPhase(phase)
726+
rfCavity.setFirstGapEntrancePhase(phase)
727+
rfCavity.setFirstGapEntranceDesignPhase(phase)
728728
rfCavity.setDesignSetUp(True)
729729
rfCavity._setDesignPhase(rfCavity.getPhase())
730730
rfCavity._setDesignAmp(rfCavity.getAmp())

0 commit comments

Comments
 (0)