Fixed collimation examples

Collimation/collimatebunch.py

@@ -19,7 +19,7 @@
 d = 0
 angle = 0
 
-collimator =Collimator(length, ma, density_fac, shape, a, b, c, d, angle)
+collimator =Collimator(length, ma, density_fac, shape, a, b, c, d, angle,0)
 
 #------------------------------
 #Main Bunch init

Collimation/lattice_with_collimator_nodes.py

@@ -52,7 +52,7 @@
 d = 0
 angle = 0
 
-collimator = TeapotCollimatorNode(length, ma, density_fac, shape, a, b, c, d, angle, "Collimator 1")
+collimator = TeapotCollimatorNode(length, ma, density_fac, shape, a, b, c, d, angle,0, "Collimator 1")
 
 addTeapotCollimatorNode(teapot_latt, 18.5,collimator)
 print "===========Lattice modified ======================================="

FullSNSExample/snsring.py

@@ -335,14 +335,22 @@
 i = 0
 for node in nodes:
 	print i, " node=", node.getName()," s start,stop = %4.3f %4.3f "%teapot_latt.getNodePositionsDict()[node]
+	#if node.getName().strip() == "DH_A12":
+		#print node.getnParts()
+	print "nParts=",node.getnParts()
 	print "There are ", node.getNumberOfBodyChildren()," child nodes."
+	j=0
+	for childNode in node.getAllChildren():
+		print "		",j, " child node=", childNode.getName()
+		j=j+1
 	i=i+1
 
 #================Do some turns===========================================
 
 teapot_latt.trackBunch(b, paramsDict)
 bunch_pyorbit_to_orbit(teapot_latt.getLength(), b, "mainbunch_1.dat")
-
+b.dumpBunch()
+sys.exit(0)
 for i in xrange(99):
 	teapot_latt.trackBunch(b, paramsDict)
 

InjectionRegion/BeamLatticeFiles/ClosedBeam.txt

@@ -0,0 +1,57 @@
+#lattice info
+lattice=MAD_Injection_Region_Lattice/InjectionRegionOnly_Chicane_Replaced_With_Kickers_ClosedWaste.LAT
+
+pencilBeam=False
+
+#whether or not to use Strippers
+doDipoleStrippers=True
+#whether or not stripper node can strip
+firstStripperIsStripper=False
+secondStripperIsStripper=False
+
+firstStripperPositionArray=1
+firstStripperPositionMax=1
+
+#secondStripperPositionArray=-1,0
+secondStripperPositionArray=-1
+secondStripperPositionMax=0
+
+useFoil=False
+#adds foil to end of the indexed lattice (index starts at 0)
+latticeToAddFoilTo=0
+
+#useChicaneScaleFile=True
+useChicaneScaleFile=True
+chicaneScaleFile_UseScales=True
+chicaneScaleFile_UsePX=False
+chicaneScaleFile_UsePX_Position=6
+chicaneScaleFile_UsePY=False
+chicaneScaleFile_UsePY_Position=7
+
+#would prefer to make a foil node that changes the charge or a child node that does this but this is how it done currently (using this variable)
+latticeIndexToMakeBunchChargePlusOneAtEndOf=-1
+
+#beam info
+#GeV
+e_kin_ini=1.3
+mass=0.93827231
+initial_charge=1
+nParts=10000
+
+#units [m/rad]
+xOffset=0
+pxOffset=0
+yOffset=0
+pyOffset=0
+
+alphaZ=0.0196
+betaZ=0.5844
+emittZ=0.24153
+
+alphaX=.224
+betaX=10.5
+emittX=1.445
+
+alphaY=.224
+betaY=10.5
+emittY=1.445

InjectionRegion/BeamLatticeFiles/ClosedBeam_Method1.txt

@@ -0,0 +1,57 @@
+#lattice info
+lattice=MAD_Injection_Region_Lattice/InjectionRegionOnly_Chicane_Replaced_With_Kickers_ClosedWaste.LAT
+
+pencilBeam=False
+
+#whether or not to use Strippers
+doDipoleStrippers=True
+#whether or not stripper node can strip
+firstStripperIsStripper=False
+secondStripperIsStripper=False
+
+firstStripperPositionArray=1
+firstStripperPositionMax=1
+
+#secondStripperPositionArray=-1,0
+secondStripperPositionArray=-1
+secondStripperPositionMax=0
+
+useFoil=False
+#adds foil to end of the indexed lattice (index starts at 0)
+latticeToAddFoilTo=0
+
+#useChicaneScaleFile=True
+useChicaneScaleFile=True
+chicaneScaleFile_UseScales=True
+chicaneScaleFile_UsePX=False
+chicaneScaleFile_UsePX_Position=6
+chicaneScaleFile_UsePY=False
+chicaneScaleFile_UsePY_Position=7
+
+#would prefer to make a foil node that changes the charge or a child node that does this but this is how it done currently (using this variable)
+latticeIndexToMakeBunchChargePlusOneAtEndOf=-1
+
+#beam info
+#GeV
+e_kin_ini=1.3
+mass=0.93827231
+initial_charge=1
+nParts=10000
+
+#units [m/rad]
+xOffset=0
+pxOffset=0
+yOffset=0
+pyOffset=0
+
+alphaZ=0.0196
+betaZ=0.5844
+emittZ=0.24153
+
+alphaX=.224
+betaX=10.5
+emittX=1.445
+
+alphaY=.224
+betaY=10.5
+emittY=1.445

InjectionRegion/BeamLatticeFiles/ClosedBeam_Method1_strippersNotClosed.txt

@@ -0,0 +1,57 @@
+#lattice info
+lattice=MAD_Injection_Region_Lattice/InjectionRegionOnly_Chicane_Replaced_With_Kickers_ClosedWaste.LAT
+
+pencilBeam=False
+
+#whether or not to use Strippers
+doDipoleStrippers=False
+#whether or not stripper node can strip
+firstStripperIsStripper=False
+secondStripperIsStripper=False
+
+firstStripperPositionArray=1
+firstStripperPositionMax=1
+
+#secondStripperPositionArray=-1,0
+secondStripperPositionArray=-1
+secondStripperPositionMax=0
+
+useFoil=False
+#adds foil to end of the indexed lattice (index starts at 0)
+latticeToAddFoilTo=0
+
+#useChicaneScaleFile=True
+useChicaneScaleFile=True
+chicaneScaleFile_UseScales=True
+chicaneScaleFile_UsePX=False
+chicaneScaleFile_UsePX_Position=6
+chicaneScaleFile_UsePY=False
+chicaneScaleFile_UsePY_Position=7
+
+#would prefer to make a foil node that changes the charge or a child node that does this but this is how it done currently (using this variable)
+latticeIndexToMakeBunchChargePlusOneAtEndOf=-1
+
+#beam info
+#GeV
+e_kin_ini=1.3
+mass=0.93827231
+initial_charge=1
+nParts=10000
+
+#units [m/rad]
+xOffset=0
+pxOffset=0
+yOffset=0
+pyOffset=0
+
+alphaZ=0.0196
+betaZ=0.5844
+emittZ=0.24153
+
+alphaX=.224
+betaX=10.5
+emittX=1.445
+
+alphaY=.224
+betaY=10.5
+emittY=1.445

InjectionRegion/BeamLatticeFiles/ClosedBeam_Method1_strippersNotClosed_ArrayConfig_LL.txt

@@ -0,0 +1,48 @@
+#lattice info
+lattice=MAD_Injection_Region_Lattice/InjectionRegionOnly_Chicane_Replaced_With_Kickers_ClosedWaste.LAT
+
+pencilBeam=False
+
+#whether or not to use Strippers
+doDipoleStrippers=False
+#whether or not stripper node can strip
+
+useFoil=False
+#adds foil to end of the indexed lattice (index starts at 0)
+latticeToAddFoilTo=0
+
+#useChicaneScaleFile=True
+useChicaneScaleFile=True
+chicaneScaleFile_UseScales=True
+chicaneScaleFile_UsePX=False
+chicaneScaleFile_UsePX_Position=6
+chicaneScaleFile_UsePY=False
+chicaneScaleFile_UsePY_Position=7
+
+#would prefer to make a foil node that changes the charge or a child node that does this but this is how it done currently (using this variable)
+latticeIndexToMakeBunchChargePlusOneAtEndOf=-1
+
+#beam info
+#GeV
+e_kin_ini=1.3
+mass=0.93827231
+initial_charge=1
+nParts=10000
+
+#units [m/rad]
+xOffset=0
+pxOffset=0
+yOffset=0
+pyOffset=0
+
+alphaZ=0.0196
+betaZ=0.5844
+emittZ=0.24153
+
+alphaX=.224
+betaX=10.5
+emittX=1.445
+
+alphaY=.224
+betaY=10.5
+emittY=1.445

InjectionRegion/BeamLatticeFiles/ClosedBeam_Method1_strippersNotClosed_ArrayConfig_LRL.txt

@@ -0,0 +1,48 @@
+#lattice info
+lattice=MAD_Injection_Region_Lattice/InjectionRegionOnly_Chicane_Replaced_With_Kickers_ClosedWaste.LAT
+
+pencilBeam=False
+
+#whether or not to use Strippers
+doDipoleStrippers=False
+#whether or not stripper node can strip
+
+useFoil=False
+#adds foil to end of the indexed lattice (index starts at 0)
+latticeToAddFoilTo=0
+
+#useChicaneScaleFile=True
+useChicaneScaleFile=True
+chicaneScaleFile_UseScales=True
+chicaneScaleFile_UsePX=False
+chicaneScaleFile_UsePX_Position=6
+chicaneScaleFile_UsePY=False
+chicaneScaleFile_UsePY_Position=7
+
+#would prefer to make a foil node that changes the charge or a child node that does this but this is how it done currently (using this variable)
+latticeIndexToMakeBunchChargePlusOneAtEndOf=-1
+
+#beam info
+#GeV
+e_kin_ini=1.3
+mass=0.93827231
+initial_charge=1
+nParts=10000
+
+#units [m/rad]
+xOffset=0
+pxOffset=0
+yOffset=0
+pyOffset=0
+
+alphaZ=0.0196
+betaZ=0.5844
+emittZ=0.24153
+
+alphaX=.224
+betaX=10.5
+emittX=1.445
+
+alphaY=.224
+betaY=10.5
+emittY=1.445

InjectionRegion/BeamLatticeFiles/ClosedBeam_Method1_strippersNotClosed_ArrayConfig_RLR.txt

@@ -0,0 +1,48 @@
+#lattice info
+lattice=MAD_Injection_Region_Lattice/InjectionRegionOnly_Chicane_Replaced_With_Kickers_ClosedWaste.LAT
+
+pencilBeam=False
+
+#whether or not to use Strippers
+doDipoleStrippers=False
+#whether or not stripper node can strip
+
+useFoil=False
+#adds foil to end of the indexed lattice (index starts at 0)
+latticeToAddFoilTo=0
+
+#useChicaneScaleFile=True
+useChicaneScaleFile=True
+chicaneScaleFile_UseScales=True
+chicaneScaleFile_UsePX=False
+chicaneScaleFile_UsePX_Position=6
+chicaneScaleFile_UsePY=False
+chicaneScaleFile_UsePY_Position=7
+
+#would prefer to make a foil node that changes the charge or a child node that does this but this is how it done currently (using this variable)
+latticeIndexToMakeBunchChargePlusOneAtEndOf=-1
+
+#beam info
+#GeV
+e_kin_ini=1.3
+mass=0.93827231
+initial_charge=1
+nParts=10000
+
+#units [m/rad]
+xOffset=0
+pxOffset=0
+yOffset=0
+pyOffset=0
+
+alphaZ=0.0196
+betaZ=0.5844
+emittZ=0.24153
+
+alphaX=.224
+betaX=10.5
+emittX=1.445
+
+alphaY=.224
+betaY=10.5
+emittY=1.445