Skip to content

The typo in the names of the RF Cavity class methods is fixed #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

The typo in the names of the RF Cavity class methods is fixed #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions examples/SNS_Linac/rf_quad_overlapping_fields/rfgap_model_longitudinal_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ def transitTimeFactor(bunch,cav_frequency,length):
bunch = Bunch()
bunch_init.copyEmptyBunchTo(bunch)
three_point_gap.trackDesignBunch(bunch)
cav_1st_gap_entr_phase0 = three_point_gap.getRF_Cavity().getFirstGapEtnrancePhase()
cav_1st_gap_entr_phase0 = three_point_gap.getRF_Cavity().getFirstGapEntrancePhase()

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

cav_1st_gap_entr_phase = phaseNearTargetPhase(three_point_gap.getRF_Cavity().getFirstGapEtnrancePhase(),0.)
cav_1st_gap_entr_phase = phaseNearTargetPhase(three_point_gap.getRF_Cavity().getFirstGapEntrancePhase(),0.)
delta_phase = phaseNearTargetPhase(cav_1st_gap_entr_phase - cav_phase - cav_1st_gap_entr_phase0,0.)
gap_phase = phaseNearTargetPhase(three_point_gap.getGapPhase(),cav_phase)
delta_eKin_out = bunch.getSyncParticle().kinEnergy() - Ekin_init
Expand Down Expand Up @@ -182,7 +182,7 @@ def transitTimeFactor(bunch,cav_frequency,length):
bunch = Bunch()
bunch_init.copyEmptyBunchTo(bunch)
three_point_gap.trackDesignBunch(bunch)
cav_1st_gap_entr_phase0 = three_point_gap.getRF_Cavity().getFirstGapEtnrancePhase()
cav_1st_gap_entr_phase0 = three_point_gap.getRF_Cavity().getFirstGapEntrancePhase()

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

cav_1st_gap_entr_phase = phaseNearTargetPhase(three_point_gap.getRF_Cavity().getFirstGapEtnrancePhase(),0.)
cav_1st_gap_entr_phase = phaseNearTargetPhase(three_point_gap.getRF_Cavity().getFirstGapEntrancePhase(),0.)
delta_phase = phaseNearTargetPhase(cav_1st_gap_entr_phase - cav_phase - cav_1st_gap_entr_phase0,0.)
gap_phase = phaseNearTargetPhase(three_point_gap.getGapPhase(),cav_phase)
delta_eKin_out = bunch.getSyncParticle().kinEnergy() - Ekin_init
Expand Down
8 changes: 4 additions & 4 deletions py/orbit/py_linac/lattice/LinacAccLatticeLib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,19 +424,19 @@ def getPhase(self):
"""Returns the phase for the first RF gap."""
return self.getParam("phase")

def setFirstGapEtnrancePhase(self, phase):
def setFirstGapEntrancePhase(self, phase):
"""Sets the phase at the first gap entrance if Length_of_gap > 0."""
self.__firstGapEntrancePhase = phase

def getFirstGapEtnrancePhase(self):
def getFirstGapEntrancePhase(self):
"""Returns the phase at the first gap entrance if Length_of_gap > 0."""
return self.__firstGapEntrancePhase

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

def getFirstGapEtnranceDesignPhase(self):
def getFirstGapEntranceDesignPhase(self):
"""Returns the design phase at the first gap entrance if Length_of_gap > 0."""
return self.__firstGapEntranceDesignPhase

Expand Down
8 changes: 4 additions & 4 deletions py/orbit/py_linac/lattice/LinacFieldOverlappingNodes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ def track(self, paramsDict):
arrival_time = syncPart.time()
designArrivalTime = rfCavity.getDesignArrivalTime()
phase_shift = rfCavity.getPhase() - rfCavity.getDesignPhase()
phase = rfCavity.getFirstGapEtnrancePhase() + phase_shift
phase = rfCavity.getFirstGapEntrancePhase() + phase_shift
usePhaseAtEntrance = rfCavity.getUsePhaseAtEntrance()
if(usePhaseAtEntrance):
phase = rfCavity.getPhase()
Expand Down Expand Up @@ -442,7 +442,7 @@ def trackDesign(self, paramsDict):
rf_ampl = rfCavity.getDesignAmp()
arrival_time = syncPart.time()
frequency = rfCavity.getFrequency()
phase = rfCavity.getFirstGapEtnrancePhase()
phase = rfCavity.getFirstGapEntrancePhase()
usePhaseAtEntrance = rfCavity.getUsePhaseAtEntrance()
if(usePhaseAtEntrance):
phase = rfCavity.getPhase()
Expand All @@ -451,8 +451,8 @@ def trackDesign(self, paramsDict):
rfCavity.setDesignArrivalTime(arrival_time)
if(not usePhaseAtEntrance):
phase = self.axis_field_rf_gap.calculate_first_part_phase(bunch)
rfCavity.setFirstGapEtnrancePhase(phase)
rfCavity.setFirstGapEtnranceDesignPhase(phase)
rfCavity.setFirstGapEntrancePhase(phase)
rfCavity.setFirstGapEntranceDesignPhase(phase)
rfCavity.setDesignSetUp(True)
rfCavity._setDesignPhase(rfCavity.getPhase())
rfCavity._setDesignAmp(rfCavity.getAmp())
Expand Down
12 changes: 6 additions & 6 deletions py/orbit/py_linac/lattice/LinacRfGapNodes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,8 +268,8 @@ def trackDesign(self, paramsDict):
if self.__isFirstGap:
rfCavity.setDesignArrivalTime(arrival_time)
rfCavity.setDesignSetUp(True)
rfCavity.setFirstGapEtnrancePhase(rfCavity.getPhase())
rfCavity.setFirstGapEtnranceDesignPhase(rfCavity.getPhase())
rfCavity.setFirstGapEntrancePhase(rfCavity.getPhase())
rfCavity.setFirstGapEntranceDesignPhase(rfCavity.getPhase())
rfCavity._setDesignPhase(rfCavity.getPhase())
rfCavity._setDesignAmp(rfCavity.getAmp())
else:
Expand Down Expand Up @@ -616,7 +616,7 @@ def track(self, paramsDict):
arrival_time = syncPart.time()
designArrivalTime = rfCavity.getDesignArrivalTime()
phase_shift = rfCavity.getPhase() - rfCavity.getDesignPhase()
phase = rfCavity.getFirstGapEtnrancePhase() + phase_shift
phase = rfCavity.getFirstGapEntrancePhase() + phase_shift
usePhaseAtEntrance = rfCavity.getUsePhaseAtEntrance()
if(usePhaseAtEntrance):
phase = rfCavity.getPhase()
Expand Down Expand Up @@ -714,7 +714,7 @@ def trackDesign(self, paramsDict):
rf_ampl = rfCavity.getDesignAmp()
arrival_time = syncPart.time()
frequency = rfCavity.getFrequency()
phase = rfCavity.getFirstGapEtnrancePhase()
phase = rfCavity.getFirstGapEntrancePhase()
usePhaseAtEntrance = rfCavity.getUsePhaseAtEntrance()
if(usePhaseAtEntrance):
phase = rfCavity.getPhase()
Expand All @@ -723,8 +723,8 @@ def trackDesign(self, paramsDict):
rfCavity.setDesignArrivalTime(arrival_time)
if(not usePhaseAtEntrance):
phase = self.__calculate_first_part_phase(bunch)
rfCavity.setFirstGapEtnrancePhase(phase)
rfCavity.setFirstGapEtnranceDesignPhase(phase)
rfCavity.setFirstGapEntrancePhase(phase)
rfCavity.setFirstGapEntranceDesignPhase(phase)
rfCavity.setDesignSetUp(True)
rfCavity._setDesignPhase(rfCavity.getPhase())
rfCavity._setDesignAmp(rfCavity.getAmp())
Expand Down