Updating the protolist generator to be more synchronized with th eonline model
This commit is contained in:
1 parent
3457c7cb43
commit
9752776dd9
1 file changed
+1
-12
+1
-12
@@ -300,12 +300,6 @@ class ProtoListe(ApplicationTemplate):
|
||||
self.p2[1:4] = p2.copy()
|
||||
self.p2[0] = self.p1[0] + L
|
||||
|
||||
if np.abs(tilt) > 0.001:
|
||||
print(ele.Prefix,ele.Name,tilt,ele.design_angle,angletmp)
|
||||
print(self.ev1)
|
||||
print(self.ev2)
|
||||
|
||||
|
||||
channels = 1
|
||||
if 'PSChannels' in ele.__dict__:
|
||||
channels = ele['PSChannels']
|
||||
@@ -318,7 +312,6 @@ class ProtoListe(ApplicationTemplate):
|
||||
|
||||
# now do the true transport:
|
||||
ele.angle = angletmp
|
||||
print(ele.Prefix,ele.Name,ele.angle)
|
||||
if np.abs(ele.angle) < 1e-5:
|
||||
self.p1 = self.p1 + (ele.getResLength() - ele.sRef) * self.ev1
|
||||
self.ev2 = self.ev1.copy() # using initial vector since there is no net deflection
|
||||
@@ -327,11 +320,7 @@ class ProtoListe(ApplicationTemplate):
|
||||
self.p1 = self.p2 + (ele.getResLength() - ele.sRef - ele.getLength()) * self.ev2
|
||||
self.ev1 = self.ev2.copy() # get new pointing
|
||||
|
||||
if np.abs(tilt) > 0.001:
|
||||
print('Nocheinmal - following the arc')
|
||||
print(ele.Prefix,ele.Name,tilt,ele.design_angle)
|
||||
print(self.ev1)
|
||||
print(self.ev2)
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user