adding spaces between components

kat_test/random/3D.kat

@@ -15,14 +15,14 @@
 #------------------------------------------------------------------
 
 # a Fabry-Perot cavity
-m m1 0.9 0.0001 0 n1 n2 	# mirror R=0.9 T=0.0001 phi=0
+m m1 0.9 0.0001 0 n1_1 n2 	# mirror R=0.9 T=0.0001 phi=0
 s s1 1200 n2 n3			# space L=1200
 m m2 0.8 0.1 0 n3 dump		# mirror R=0.8 T=0.1 phi=0
-
+s s0 0 n1_1 n1_2
 l i1 1 0 n0			# laser P=1W f_offset=0Hz
-mod eo1 40k 0.3 3 pm n0 n1      # phase modulator f_mod=40kHz
+mod eo1 40k 0.3 3 pm n0 n1_2      # phase modulator f_mod=40kHz
 				# midx=0.3 order=3 
-pd1 inphase 40k 0 n1		# photo detecor + mixer 
+pd1 inphase 40k 0 n1_1		# photo detecor + mixer 
 				# f_demod=40kHz phase=0
 xaxis m1 phi lin -80 80 80	# xaxis: phi at mirror m1
 				# from -80 to 80 (80 steps)

kat_test/random/4cav.kat

 
-bs bs1 0.5 0.5 0 0 n1 n2 n3 n4
-m copm_plate 0 1 0 n2 n2b
+bs bs1 0.5 0.5 0 0 n1 n2_1 n3 n4
+s s0 0 n2_1 n2_2
+m copm_plate 0 1 0 n2_2 n2b
 
 s in1 1 n0 n1
 

kat_test/random/4cav1.kat

 
-bs bs1 0.5 0.5 0 0 n1 n2 n3 n4
-m copm_plate 0 1 0 n2 n2b
+bs bs1 0.5 0.5 0 0 n1 n2_1 n3 n4
+s s0 0 n2_1 n2_2
+m copm_plate 0 1 0 n2_2 n2b
 
 s in1 1 n0 n1
 

kat_test/random/Ligo1.kat

 l laser 1 0 n0
 
-mod eo1 80M 0.45 1 pm n0 n1
-
-mod eo2 16M 0.45 1 am n1 n2
-
-m* m1 10000 50 0 n2 n3
+mod eo1 80M 0.45 1 pm n0 n1_1
+s s0 0 n1_1 n1_2
+mod eo2 16M 0.45 1 am n1_2 n2_1
+s s1 0 n2_1 n2_2
+m* m1 10000 50 0 n2_2 n3
 #m* m1 1000000 0 0 n2 n3
 
 s  l0 3.68422 n3 n4

kat_test/random/Ligo1_2.kat

 l laser 1 0 n0
 
-mod eo1 80M 0.45 1 pm n0 n1
-
-mod eo2 16M 0.45 1 am n1 n2
-
-m* m1 10000 50 0 n2 n3
+mod eo1 80M 0.45 1 pm n0 n1_1
+s s0 0 n1_1 n1_2
+mod eo2 16M 0.45 1 am n1_2 n2_1
+s s1 0 n2_1 n2_2
+m* m1 10000 50 0 n2_2 n3
 #m* m1 1000000 0 0 n2 n3
 
 s  l0 3.68422 n3 n4

kat_test/random/SBres.kat

@@ -4,12 +4,14 @@ l i1 1 0 nMU3_2
 
 #mod  eom3 $fPR 0.323002 2 pm 0 nMU3in nMU3_1    # PR control
 #mod  eom4 $fSR 0.50391 2 pm 0 nMU3_1 nMU3_2     # Schnupp1 (SR control)
-mod  eom5 $fMI 0.27758 3 pm 0 nMU3_2 nMU3_3     # Schnupp2 (MI control)
-
-lens lpr 1.8 nMU3_3 nMU3_4
+mod  eom5 $fMI 0.27758 3 pm 0 nMU3_2 nMU3_3_1     # Schnupp2 (MI control)
+s s0 0 nMU3_3_1 nMU3_3_2
+lens lpr 1.8 nMU3_3_2 nMU3_4_1
+s s1 0 nMU3_4_1 nMU3_4_2
 # some rather arbitrary thermal lense for the isolators and the EOMs:
-lens therm 5.2 nMU3_4 nMU3_5
-isol d2 120 nMU3_5 nMU3out               	# Faraday Isolator
+lens therm 5.2 nMU3_4_2 nMU3_5_1
+s s2 0 nMU3_5_1 nMU3_5_2
+isol d2 120 nMU3_5_2 nMU3out               	# Faraday Isolator
 
 # 070502 corrected length with respect to OptoCad (Roland Schilling)
 s    smcpr3 4.391 nMU3out nBDIPR1  

kat_test/random/TestLIGO3.kat

@@ -50,15 +50,15 @@
 # Laser 100W
 l l1 100 0 n0
 
-mod eom1 15M 0.1 1 pm n0 n1
-
+mod eom1 15M 0.1 1 pm n0 n1_1
 
+s s0 0 n1_1 n1_2
 /* 
 -------------------------------------------------------------------
 Power recycling cavity 
 */
 
-m mPRC 0.85 0.15 0 n1 nPRC1
+m mPRC 0.85 0.15 0 n1_2 nPRC1
 attr mPRC Rc -2085.6 
 
 s sPRC1 5 nPRC1 nBS1

kat_test/random/bs_sep_100k.kat

@@ -3,14 +3,18 @@ l i1 1.7 0 nMU3in
 
 gauss beam_in i1 nMU3in 268u -550m 
 
-mod  eom3 $fPR 0.126433 2 pm 0 nMU3in nMU3_1    # PR control
-mod  eom4 $fSR 0.199417 2 pm 0 nMU3_1 nMU3_2     # Schnupp1 (SR control)
-mod  eom5 $fMI 0.1225 2 pm 0 nMU3_2 nMU3_3     # Schnupp2 (MI control)
-
-lens lpr 1.8 nMU3_3 nMU3_4
+mod  eom3 $fPR 0.126433 2 pm 0 nMU3in nMU3_1_1    # PR control
+s s0 0 nMU3_1_1 nMU3_1_2
+mod  eom4 $fSR 0.199417 2 pm 0 nMU3_1_2 nMU3_2_1     # Schnupp1 (SR control)
+s s1 0 nMU3_2_1 nMU3_2_2
+mod  eom5 $fMI 0.1225 2 pm 0 nMU3_2_2 nMU3_3_1     # Schnupp2 (MI control)
+s s2 0 nMU3_3_1 nMU3_3_2
+lens lpr 1.8 nMU3_3_2 nMU3_4_1
+s s3 0 nMU3_4_1 nMU3_4_2
 # some rather arbitrary thermal lense for the isolators and the EOMs:
-lens therm 5.2 nMU3_4 nMU3_5
-isol d2 120 nMU3_5 nMU3out               	# Faraday Isolator
+lens therm 5.2 nMU3_4_2 nMU3_5_1
+s s4 0 nMU3_5_1 nMU3_5_2
+isol d2 120 nMU3_5_2 nMU3out               	# Faraday Isolator
 
 # 070502 corrected length with respect to OptoCad (Roland Schilling)
 s    smcpr3 4.391 nMU3out nBDIPR1  

kat_test/random/d_run1.kat

 l i1 1 0 n0
 
-mod eo1 33.2066M 0.1 3 pm 0 n0 n1
-mod eo2 166.033M 0.1 3 pm 0 n1 n2
-
+mod eo1 33.2066M 0.1 3 pm 0 n0 n1_1
+s s0 0 n1_1 n1_2
+mod eo2 166.033M 0.1 3 pm 0 n1_2 n2_1
+s s2 0 n2_1 n2_2
 
 ###Full RSE
 
-m* prm 70000 37.5 90 n2 n3
+m* prm 70000 37.5 90 n2_2 n3
 m* sem 70000 37.5 111.186 n8 n9
 m* m1i 5000 37.5 90 n10 n11
 m* m1e 10 37.5 90 n12 dump
@@ -106,7 +107,7 @@ gnuterm no
 
 ##### For demphase.m #####
 
-pd2 detSP 33.2066M 0 166.033M 0 n2		#SP,dc ## tag run1: activated
+pd2 detSP 33.2066M 0 166.033M 0 n2_2		#SP,dc ## tag run1: activated
 xaxis detSP phase1 lin 0 360 36 ## tag run1: activated
 x2axis detSP phase2 lin 0 360 36 ## tag run1: activated
 

kat_test/random/d_run10.kat

 l i1 1 0 n0
 
-mod eo1 33.2066M 0.1 3 pm 0 n0 n1
-mod eo2 166.033M 0.1 3 pm 0 n1 n2
-
+mod eo1 33.2066M 0.1 3 pm 0 n0 n1_1
+s s0 0 n1_1 n1_2
+mod eo2 166.033M 0.1 3 pm 0 n1_2 n2_1
+s s1 0 n2_1 n2_2
 
 ###Full RSE
 
-m* prm 70000 37.5 90 n2 n3
+m* prm 70000 37.5 90 n2_2 n3
 m* sem 70000 37.5 111.186 n8 n9
 m* m1i 5000 37.5 90 n10 n11
 m* m1e 10 37.5 90 n12 dump

kat_test/random/d_run11.kat

 l i1 1 0 n0
 
-mod eo1 33.2066M 0.1 3 pm 0 n0 n1
-mod eo2 166.033M 0.1 3 pm 0 n1 n2
-
+mod eo1 33.2066M 0.1 3 pm 0 n0 n1_1
+s s0 0 n1_1 n1_2
+mod eo2 166.033M 0.1 3 pm 0 n1_2 n2_1
+s s1 0 n2_1 n2_2
 
 ###Full RSE
 
-m* prm 70000 37.5 90 n2 n3
+m* prm 70000 37.5 90 n2_2 n3
 m* sem 70000 37.5 111.186 n8 n9
 m* m1i 5000 37.5 90 n10 n11
 m* m1e 10 37.5 90 n12 dump

kat_test/random/d_run12.kat

 l i1 1 0 n0
 
-mod eo1 33.2066M 0.1 3 pm 0 n0 n1
-mod eo2 166.033M 0.1 3 pm 0 n1 n2
-
+mod eo1 33.2066M 0.1 3 pm 0 n0 n1_1
+s s0 0 n1_1 n1_2
+mod eo2 166.033M 0.1 3 pm 0 n1_2 n2_1
+s s1 0 n2_1 n2_2
 
 ###Full RSE
 
-m* prm 70000 37.5 90 n2 n3
+m* prm 70000 37.5 90 n2_2 n3
 m* sem 70000 37.5 111.186 n8 n9
 m* m1i 5000 37.5 90 n10 n11
 m* m1e 10 37.5 90 n12 dump

kat_test/random/d_run13.kat

 l i1 1 0 n0
 
-mod eo1 33.2066M 0.1 3 pm 0 n0 n1
-mod eo2 166.033M 0.1 3 pm 0 n1 n2
-
+mod eo1 33.2066M 0.1 3 pm 0 n0 n1_1
+s s0 0 n1_1 n1_2
+mod eo2 166.033M 0.1 3 pm 0 n1_2 n2_1
+s s1 0 n2_1 n2_2
 
 ###Full RSE
 
-m* prm 70000 37.5 90 n2 n3
+m* prm 70000 37.5 90 n2_2 n3
 m* sem 70000 37.5 111.186 n8 n9
 m* m1i 5000 37.5 90 n10 n11
 m* m1e 10 37.5 90 n12 dump
@@ -175,7 +176,7 @@ gnuterm no
 
 fsig sigLp1 m1e 0.00001 0			#SP,L+ ## tag run13: activated
 fsig sigLp2 m2e 0.00001 0 ## tag run13: activated
-pd2 detSPL 33.2066M 0 0.00001 0 n2 ## tag run13: activated
+pd2 detSPL 33.2066M 0 0.00001 0 n2_2 ## tag run13: activated
 xaxis detSPL phase1 lin 0 360 36 ## tag run13: activated
 
 ## tag run14: disabled ## fsig sigLm1 m1e 0.00001 0			#AP,L-

kat_test/random/d_run14.kat

 l i1 1 0 n0
 
-mod eo1 33.2066M 0.1 3 pm 0 n0 n1
-mod eo2 166.033M 0.1 3 pm 0 n1 n2
-
+mod eo1 33.2066M 0.1 3 pm 0 n0 n1_1
+s s0 0 n1_1 n1_2
+mod eo2 166.033M 0.1 3 pm 0 n1_2 n2_1
+s s1 0 n2_1 n2_2
 
 ###Full RSE
 
-m* prm 70000 37.5 90 n2 n3
+m* prm 70000 37.5 90 n2_2 n3
 m* sem 70000 37.5 111.186 n8 n9
 m* m1i 5000 37.5 90 n10 n11
 m* m1e 10 37.5 90 n12 dump

kat_test/random/d_run2.kat

 l i1 1 0 n0
 
-mod eo1 33.2066M 0.1 3 pm 0 n0 n1
-mod eo2 166.033M 0.1 3 pm 0 n1 n2
-
+mod eo1 33.2066M 0.1 3 pm 0 n0 n1_1
+s s0 0 n1_1 n1_2
+mod eo2 166.033M 0.1 3 pm 0 n1_2 n2_1
+s s2 0 n2_1 n2_2
 
 ###Full RSE
 
-m* prm 70000 37.5 90 n2 n3
+m* prm 70000 37.5 90 n2_2 n3
 m* sem 70000 37.5 111.186 n8 n9
 m* m1i 5000 37.5 90 n10 n11
 m* m1e 10 37.5 90 n12 dump
@@ -111,7 +112,7 @@ gnuterm no
 ## tag run1: disabled ## x2axis detSP phase2 lin 0 360 36
 
 fsig siglp prm 0.00001 0				#SP,l+ ## tag run2: activated
-pd3 detSP 33.2066M 0 166.033M 0 0.00001 0 n2	 ## tag run2: activated
+pd3 detSP 33.2066M 0 166.033M 0 0.00001 0 n2_2	 ## tag run2: activated
 xaxis detSP phase1 lin 0 360 36 ## tag run2: activated
 x2axis detSP phase2 lin 0 360 36 ## tag run2: activated
 

kat_test/random/d_run3.kat

 l i1 1 0 n0
 
-mod eo1 33.2066M 0.1 3 pm 0 n0 n1
-mod eo2 166.033M 0.1 3 pm 0 n1 n2
-
+mod eo1 33.2066M 0.1 3 pm 0 n0 n1_1
+s s0 0 n1_1 n1_2
+mod eo2 166.033M 0.1 3 pm 0 n1_2 n2_1
+s s1 0 n2_1 n2_2
 
 ###Full RSE
 
-m* prm 70000 37.5 90 n2 n3
+m* prm 70000 37.5 90 n2_2 n3
 m* sem 70000 37.5 111.186 n8 n9
 m* m1i 5000 37.5 90 n10 n11
 m* m1e 10 37.5 90 n12 dump
@@ -119,7 +120,7 @@ fsig siglm1 m1e 0.00001 0				#SP,l- ## tag run3: activated
 fsig siglm2 m2e 0.00001 180 ## tag run3: activated
 fsig siglm3 m1i 0.00001 0 ## tag run3: activated
 fsig siglm4 m2i 0.00001 180 ## tag run3: activated
-pd3 detSP 33.2066M 0 166.033M 0 0.00001 0 n2 ## tag run3: activated
+pd3 detSP 33.2066M 0 166.033M 0 0.00001 0 n2_2 ## tag run3: activated
 xaxis detSP phase1 lin 0 360 36 ## tag run3: activated
 x2axis detSP phase2 lin 0 360 36 ## tag run3: activated
 

kat_test/random/d_run4.kat

 l i1 1 0 n0
 
-mod eo1 33.2066M 0.1 3 pm 0 n0 n1
-mod eo2 166.033M 0.1 3 pm 0 n1 n2
-
+mod eo1 33.2066M 0.1 3 pm 0 n0 n1_1
+s s0 0 n1_1 n1_2
+mod eo2 166.033M 0.1 3 pm 0 n1_2 n2_1
+s s1 0 n2_1 n2_2
 
 ###Full RSE
 
-m* prm 70000 37.5 90 n2 n3
+m* prm 70000 37.5 90 n2_2 n3    
 m* sem 70000 37.5 111.186 n8 n9
 m* m1i 5000 37.5 90 n10 n11
 m* m1e 10 37.5 90 n12 dump
@@ -124,7 +125,7 @@ gnuterm no
 ## tag run3: disabled ## x2axis detSP phase2 lin 0 360 36
 
 fsig sigls sem 0.00001 0				#SP,l+ ## tag run4: activated
-pd3 detSP 33.2066M 0 166.033M 0 0.00001 0 n2	 ## tag run4: activated
+pd3 detSP 33.2066M 0 166.033M 0 0.00001 0 n2_2	 ## tag run4: activated
 xaxis detSP phase1 lin 0 360 36 ## tag run4: activated
 x2axis detSP phase2 lin 0 360 36 ## tag run4: activated
 

kat_test/random/d_run5.kat

 l i1 1 0 n0
 
-mod eo1 33.2066M 0.1 3 pm 0 n0 n1
-mod eo2 166.033M 0.1 3 pm 0 n1 n2
-
+mod eo1 33.2066M 0.1 3 pm 0 n0 n1_1
+s s0 0 n1_1 n1_2
+mod eo2 166.033M 0.1 3 pm 0 n1_2 n2_1
+s s1 0 n2_1 n2_2
 
 ###Full RSE
 
-m* prm 70000 37.5 90 n2 n3
+m* prm 70000 37.5 90 n2_2 n3
 m* sem 70000 37.5 111.186 n8 n9
 m* m1i 5000 37.5 90 n10 n11
 m* m1e 10 37.5 90 n12 dump

kat_test/random/d_run6.kat

 l i1 1 0 n0
 
-mod eo1 33.2066M 0.1 3 pm 0 n0 n1
-mod eo2 166.033M 0.1 3 pm 0 n1 n2
-
+mod eo1 33.2066M 0.1 3 pm 0 n0 n1_1
+s s0 0 n1_1 n1_2
+mod eo2 166.033M 0.1 3 pm 0 n1_2 n2_1
+s s1 0 n2_1 n2_2
 
 ###Full RSE
 
-m* prm 70000 37.5 90 n2 n3
+m* prm 70000 37.5 90 n2_2 n3
 m* sem 70000 37.5 111.186 n8 n9
 m* m1i 5000 37.5 90 n10 n11
 m* m1e 10 37.5 90 n12 dump

kat_test/random/d_run7.kat

 l i1 1 0 n0
 
-mod eo1 33.2066M 0.1 3 pm 0 n0 n1
-mod eo2 166.033M 0.1 3 pm 0 n1 n2
-
+mod eo1 33.2066M 0.1 3 pm 0 n0 n1_1
+s s0 0 n1_1 n1_2
+mod eo2 166.033M 0.1 3 pm 0 n1_2 n2_1
+s s1 0 n2_1 n2_2
 
 ###Full RSE
 
-m* prm 70000 37.5 90 n2 n3
+m* prm 70000 37.5 90 n2_2 n3    
 m* sem 70000 37.5 111.186 n8 n9
 m* m1i 5000 37.5 90 n10 n11
 m* m1e 10 37.5 90 n12 dump