From ea096dba37d3e43b97dd84316321e7911ad32417 Mon Sep 17 00:00:00 2001
From: lukasc-ubc <lukasc@ece.ubc.ca>
Date: Thu, 21 Apr 2016 00:03:35 -0700
Subject: [PATCH] CML update for TM (disconnected, taper)

Former-commit-id: 08b02b4c0c9f714258dcf3417ee0410da02f9471
---
 ...alfring_straight_te1550.ice.REMOVED.git-id |   2 +-
 .../ebeam_v1.2/ebeam_disconnected_tm1550.ice  | Bin 39177 -> 39249 bytes
 .../ebeam_v1.2/ebeam_terminator_tm1550.ice    | Bin 39151 -> 39229 bytes
 .../fdtd}/crossing4/S_plot.lsf                |   0
 .../ebeam_crossing4.fsp.REMOVED.git-id        |   0
 .../fdtd}/crossing4/ebeam_crossing4.gds       | Bin
 .../bdc_TE_source}/EBeam_1550_TE_BDC.sparam   |   0
 .../nanotaper_w1=500,w2=500,L=0.1_TE.sparam   |   0
 .../nanotaper_w1=500,w2=500,L=0.1_TM.sparam   |   2 +-
 .../nanotaper_w1=500,w2=60,L=10_TE.sparam     |   0
 .../nanotaper_w1=500,w2=60,L=10_TM.sparam     |   2 +-
 .../ONA_lambda_minpeaks.ice                   | Bin
 .../ONA_wavelength.ice                        | Bin
 .../ebeam_v1.2_2016_04_20.cml.REMOVED.git-id  |   1 +
 .../pymacros/SiEPIC_EBeam_functions.lym       |  98 ++++++++++++++++++
 15 files changed, 102 insertions(+), 3 deletions(-)
 rename Lumerical_EBeam_CML/{source_files => ebeam_v1.2/fdtd}/crossing4/S_plot.lsf (100%)
 rename Lumerical_EBeam_CML/{source_files => ebeam_v1.2/fdtd}/crossing4/ebeam_crossing4.fsp.REMOVED.git-id (100%)
 rename Lumerical_EBeam_CML/{source_files => ebeam_v1.2/fdtd}/crossing4/ebeam_crossing4.gds (100%)
 rename Lumerical_EBeam_CML/{source_files => ebeam_v1.2/source_data/bdc_TE_source}/EBeam_1550_TE_BDC.sparam (100%)
 rename Lumerical_EBeam_CML/{source_files => ebeam_v1.2/source_data}/ebeam_disconnected_te1550/nanotaper_w1=500,w2=500,L=0.1_TE.sparam (100%)
 rename Lumerical_EBeam_CML/{source_files => ebeam_v1.2/source_data}/ebeam_disconnected_tm1550/nanotaper_w1=500,w2=500,L=0.1_TM.sparam (98%)
 rename Lumerical_EBeam_CML/{source_files => ebeam_v1.2/source_data}/ebeam_terminator_te1550/nanotaper_w1=500,w2=60,L=10_TE.sparam (100%)
 rename Lumerical_EBeam_CML/{source_files => ebeam_v1.2/source_data}/ebeam_terminator_tm1550/nanotaper_w1=500,w2=60,L=10_TM.sparam (98%)
 rename Lumerical_EBeam_CML/ebeam_v1.2/{v1.2.2016_04_19 => v1.2.2016_04_20}/ONA_lambda_minpeaks.ice (100%)
 rename Lumerical_EBeam_CML/ebeam_v1.2/{v1.2.2016_04_19 => v1.2.2016_04_20}/ONA_wavelength.ice (100%)
 create mode 100644 Lumerical_EBeam_CML/ebeam_v1.2_2016_04_20.cml.REMOVED.git-id

diff --git a/Lumerical_EBeam_CML/ebeam_v1.2/ebeam_dc_halfring_straight_te1550.ice.REMOVED.git-id b/Lumerical_EBeam_CML/ebeam_v1.2/ebeam_dc_halfring_straight_te1550.ice.REMOVED.git-id
index 51f7ebdd..efadebbe 100644
--- a/Lumerical_EBeam_CML/ebeam_v1.2/ebeam_dc_halfring_straight_te1550.ice.REMOVED.git-id
+++ b/Lumerical_EBeam_CML/ebeam_v1.2/ebeam_dc_halfring_straight_te1550.ice.REMOVED.git-id
@@ -1 +1 @@
-061515fbb2c1bb93d11088f2c871d25ff7043c5d
\ No newline at end of file
+9acd87f027b77670e2c37589428c453faa4a457c
\ No newline at end of file
diff --git a/Lumerical_EBeam_CML/ebeam_v1.2/ebeam_disconnected_tm1550.ice b/Lumerical_EBeam_CML/ebeam_v1.2/ebeam_disconnected_tm1550.ice
index 34a8024f5987c8b74bca14fbf57ee78b537c1907..b026ed3329c52806c6beda9df081a0e6d391f652 100644
GIT binary patch
delta 313
zcmeC&#B^~J(*#dua|^SHJ~0!|h)&$=&&0s6nUAs77ex2^mGeu8GB7Y$Svi*$m*nSK
zS*0eWCg#SM8R{8r=7{rRF*O3p>W3Dm78UE~lx8OuC+q7a=jWwmrtABZ=B5^9CMV|T
zL-gt+X+4&-gK_fzbU6+_p!U4P+|<bp5mK9%rZDm`=5AhIB+ld4gJEuPrfYzwbG)k)
z$N>Q^-UthzV$QxkNOtHK=a&{Gr^crwmL%#=zL+j4t)G{emtT@tkXjU9ZfI+2V4zcO
z1g3m!H$SW6;^t_GJs<|OwsP|RR?W?dT^uY-37M0%`>rwiPWI~8o~+w1!|1!&tA9Ty
E0POB)WdHyG

delta 276
zcmcb(iK%lF(*#duGfVS{J~7M=fesT_Co%;%Z02LE^##$re&zfuj0_A6n`Pp>Sn3Ob
zEd9{p)S_bjoYL&X;$(fF%%q~kqDp<|{JfIH%sh}xa(=E}VnIPps$OnlW{$o~Vo4%g
znJ-X8!6m;uFDE}SrC8s^z`)Ykz|=+8($&RP*Tl%cRM*1I)lApez{1JQz}(T&%+-m3
zA82WAeoAUi{N`mzYZ)QVDM(S_V@%yVwMd*t!w9G#FEKB_B(Wg1D8AfK)!4<<z(Cc=
ux!efO^Z~Lq>(z5{Gcjatw(2rxVS11}xw!8dqw8d^es?gby?Jl{6ixsD%v2lz

diff --git a/Lumerical_EBeam_CML/ebeam_v1.2/ebeam_terminator_tm1550.ice b/Lumerical_EBeam_CML/ebeam_v1.2/ebeam_terminator_tm1550.ice
index 53a81d92ec0c365f7c2153e009e4a65463b4ffb1..e66a40d2a42a5107820a347567ceb86c00f5f6ba 100644
GIT binary patch
delta 339
zcmaFAk!kNHrU{<R<`!lXePSm6>tLU_K9-4rVKX0NtuKh~^~>g$5M^Lsu(EP4EiTE=
zwX#Z0N=?j-FEi9L+WaThi^bFkD61b@oLW?@pHrHhSe&e{mz<xMmYJ^aQ<|Gvl$o5E
zqYu%mkEC^1(hkPS2h(NP`GDH<5_2a%tdrh6Gev`$QEGC1k(5NdAp;LYCN;h+F{d=u
z5XfU-0828(8*b*wSRj_x0Te;CIylocz|%S2)d}Rr02gnB8=zv&zCK9K&@av}ElN&}
zPf09EgbJ6W7UgE<C6?qD#h2t7nwlEuPu@@`#;oIGyZLM#CpS|=#O52F<}6GH$|ei;
XU1Ri}Y|yVgS-4+@(RZ^!|9(yY<uP%5

delta 310
zcmdnHiRt}DrU{<RW|rm?ePWm$0v#r<PGkyj*v!XR>kFcL{j&L47#SECHVedgvD6m=
zS^A;HsYS*5Ii=Z&#mV|UnMp;7MV0!_`FSOYnRy_Y<osN{#DapHRK489%p84}#F9j~
zGGCyGf=hmRUQT{uO0m9+fq|v7fvJnGrK^jpu8EO>sjh{atC_B`frXQqfw`llnX3~6
zKhV<L{FKz3_|3DD)-v*foWsBe#CeIisgnbvq&ByvXfRK9PmvMjfr`eLCFYc-8iEuu
zNKAf^F17hj`T{XUEwFT6eo10MYEgW-p{=Qbflj%Rt(k$Uk+YAgvCC%ZdQNVp2N|2y
gy3ARa0?H@H_g!Ojom|(iJvp&ohS7C%UH^Vg0J;8NjsO4v

diff --git a/Lumerical_EBeam_CML/source_files/crossing4/S_plot.lsf b/Lumerical_EBeam_CML/ebeam_v1.2/fdtd/crossing4/S_plot.lsf
similarity index 100%
rename from Lumerical_EBeam_CML/source_files/crossing4/S_plot.lsf
rename to Lumerical_EBeam_CML/ebeam_v1.2/fdtd/crossing4/S_plot.lsf
diff --git a/Lumerical_EBeam_CML/source_files/crossing4/ebeam_crossing4.fsp.REMOVED.git-id b/Lumerical_EBeam_CML/ebeam_v1.2/fdtd/crossing4/ebeam_crossing4.fsp.REMOVED.git-id
similarity index 100%
rename from Lumerical_EBeam_CML/source_files/crossing4/ebeam_crossing4.fsp.REMOVED.git-id
rename to Lumerical_EBeam_CML/ebeam_v1.2/fdtd/crossing4/ebeam_crossing4.fsp.REMOVED.git-id
diff --git a/Lumerical_EBeam_CML/source_files/crossing4/ebeam_crossing4.gds b/Lumerical_EBeam_CML/ebeam_v1.2/fdtd/crossing4/ebeam_crossing4.gds
similarity index 100%
rename from Lumerical_EBeam_CML/source_files/crossing4/ebeam_crossing4.gds
rename to Lumerical_EBeam_CML/ebeam_v1.2/fdtd/crossing4/ebeam_crossing4.gds
diff --git a/Lumerical_EBeam_CML/source_files/EBeam_1550_TE_BDC.sparam b/Lumerical_EBeam_CML/ebeam_v1.2/source_data/bdc_TE_source/EBeam_1550_TE_BDC.sparam
similarity index 100%
rename from Lumerical_EBeam_CML/source_files/EBeam_1550_TE_BDC.sparam
rename to Lumerical_EBeam_CML/ebeam_v1.2/source_data/bdc_TE_source/EBeam_1550_TE_BDC.sparam
diff --git a/Lumerical_EBeam_CML/source_files/ebeam_disconnected_te1550/nanotaper_w1=500,w2=500,L=0.1_TE.sparam b/Lumerical_EBeam_CML/ebeam_v1.2/source_data/ebeam_disconnected_te1550/nanotaper_w1=500,w2=500,L=0.1_TE.sparam
similarity index 100%
rename from Lumerical_EBeam_CML/source_files/ebeam_disconnected_te1550/nanotaper_w1=500,w2=500,L=0.1_TE.sparam
rename to Lumerical_EBeam_CML/ebeam_v1.2/source_data/ebeam_disconnected_te1550/nanotaper_w1=500,w2=500,L=0.1_TE.sparam
diff --git a/Lumerical_EBeam_CML/source_files/ebeam_disconnected_tm1550/nanotaper_w1=500,w2=500,L=0.1_TM.sparam b/Lumerical_EBeam_CML/ebeam_v1.2/source_data/ebeam_disconnected_tm1550/nanotaper_w1=500,w2=500,L=0.1_TM.sparam
similarity index 98%
rename from Lumerical_EBeam_CML/source_files/ebeam_disconnected_tm1550/nanotaper_w1=500,w2=500,L=0.1_TM.sparam
rename to Lumerical_EBeam_CML/ebeam_v1.2/source_data/ebeam_disconnected_tm1550/nanotaper_w1=500,w2=500,L=0.1_TM.sparam
index 1d694656..a4fa9821 100644
--- a/Lumerical_EBeam_CML/source_files/ebeam_disconnected_tm1550/nanotaper_w1=500,w2=500,L=0.1_TM.sparam
+++ b/Lumerical_EBeam_CML/ebeam_v1.2/source_data/ebeam_disconnected_tm1550/nanotaper_w1=500,w2=500,L=0.1_TM.sparam
@@ -1,4 +1,4 @@
-('port 1','TE',1,'port 1',1,'transmission')
+('port 1','TM',1,'port 1',1,'transmission')
 (101,3)
 1.81692e+14	0.190171	1.74605
 1.81943e+14	0.190676	1.75695
diff --git a/Lumerical_EBeam_CML/source_files/ebeam_terminator_te1550/nanotaper_w1=500,w2=60,L=10_TE.sparam b/Lumerical_EBeam_CML/ebeam_v1.2/source_data/ebeam_terminator_te1550/nanotaper_w1=500,w2=60,L=10_TE.sparam
similarity index 100%
rename from Lumerical_EBeam_CML/source_files/ebeam_terminator_te1550/nanotaper_w1=500,w2=60,L=10_TE.sparam
rename to Lumerical_EBeam_CML/ebeam_v1.2/source_data/ebeam_terminator_te1550/nanotaper_w1=500,w2=60,L=10_TE.sparam
diff --git a/Lumerical_EBeam_CML/source_files/ebeam_terminator_tm1550/nanotaper_w1=500,w2=60,L=10_TM.sparam b/Lumerical_EBeam_CML/ebeam_v1.2/source_data/ebeam_terminator_tm1550/nanotaper_w1=500,w2=60,L=10_TM.sparam
similarity index 98%
rename from Lumerical_EBeam_CML/source_files/ebeam_terminator_tm1550/nanotaper_w1=500,w2=60,L=10_TM.sparam
rename to Lumerical_EBeam_CML/ebeam_v1.2/source_data/ebeam_terminator_tm1550/nanotaper_w1=500,w2=60,L=10_TM.sparam
index 26663be5..dd22a2a9 100644
--- a/Lumerical_EBeam_CML/source_files/ebeam_terminator_tm1550/nanotaper_w1=500,w2=60,L=10_TM.sparam
+++ b/Lumerical_EBeam_CML/ebeam_v1.2/source_data/ebeam_terminator_tm1550/nanotaper_w1=500,w2=60,L=10_TM.sparam
@@ -1,4 +1,4 @@
-('port 1','TE',1,'port 1',1,'transmission')
+('port 1','TM',1,'port 1',1,'transmission')
 (101,3)
 1.81692e+14	0.0338205	-2.07637
 1.81943e+14	0.029838	-1.84411
diff --git a/Lumerical_EBeam_CML/ebeam_v1.2/v1.2.2016_04_19/ONA_lambda_minpeaks.ice b/Lumerical_EBeam_CML/ebeam_v1.2/v1.2.2016_04_20/ONA_lambda_minpeaks.ice
similarity index 100%
rename from Lumerical_EBeam_CML/ebeam_v1.2/v1.2.2016_04_19/ONA_lambda_minpeaks.ice
rename to Lumerical_EBeam_CML/ebeam_v1.2/v1.2.2016_04_20/ONA_lambda_minpeaks.ice
diff --git a/Lumerical_EBeam_CML/ebeam_v1.2/v1.2.2016_04_19/ONA_wavelength.ice b/Lumerical_EBeam_CML/ebeam_v1.2/v1.2.2016_04_20/ONA_wavelength.ice
similarity index 100%
rename from Lumerical_EBeam_CML/ebeam_v1.2/v1.2.2016_04_19/ONA_wavelength.ice
rename to Lumerical_EBeam_CML/ebeam_v1.2/v1.2.2016_04_20/ONA_wavelength.ice
diff --git a/Lumerical_EBeam_CML/ebeam_v1.2_2016_04_20.cml.REMOVED.git-id b/Lumerical_EBeam_CML/ebeam_v1.2_2016_04_20.cml.REMOVED.git-id
new file mode 100644
index 00000000..edbdacef
--- /dev/null
+++ b/Lumerical_EBeam_CML/ebeam_v1.2_2016_04_20.cml.REMOVED.git-id
@@ -0,0 +1 @@
+6ccc61b81accbd732eb0258e1615c7c1c4ce8d4c
\ No newline at end of file
diff --git a/klayout_dot_config/pymacros/SiEPIC_EBeam_functions.lym b/klayout_dot_config/pymacros/SiEPIC_EBeam_functions.lym
index 8c9a7f0e..887877ad 100644
--- a/klayout_dot_config/pymacros/SiEPIC_EBeam_functions.lym
+++ b/klayout_dot_config/pymacros/SiEPIC_EBeam_functions.lym
@@ -1049,6 +1049,104 @@ def find_optical_IO_pins(optical_pins):
   return pins_text
 
 
+
+def generate_short_Spice_file(topcell, optical_waveguides, optical_components):
+  # variant of generate_Spice_file
+  # - only return components that are connected to the laser.
+  
+  # list all Optical_component objects from an array
+  # input array, optical_components
+  # example output:         
+  # X_grating_coupler_1 N$7 N$6 grating_coupler library="custom/genericcml" sch_x=-1.42 sch_y=-0.265 sch_r=0 sch_f=false
+
+  text = '* Spice output from KLayout SiEPIC_EBeam_PDK v%s, %s.\n\n' % (SiEPIC_Version, strftime("%Y-%m-%d %H:%M:%S") )
+
+
+  Lumerical_schematic_scaling = 5e-2
+#  Lumerical_schematic_scaling = 20e-2
+
+  # convert KLayout GDS rotation/flip to Lumerical INTERCONNECT
+  # KLayout defines mirror as an x-axis flip, whereas INTERCONNECT does y-axis flip
+  # KLayout defines rotation as counter-clockwise, whereas INTERCONNECT does clockwise
+  # input is KLayout Rotation,Flip; output is INTERCONNECT:
+  KLayoutInterconnectRotFlip = \
+      {(0, False):[0, False], \
+       (90, False):[270, False], \
+       (180, False):[180, False], \
+       (270, False):[90, False], \
+       (0, True):[180,True], \
+       (90, True):[90, True], \
+       (180, True):[0,True], \
+       (270, True):[270, False]}
+
+  from time import strftime 
+  
+
+  # Get information about the laser and detectors:
+  laser_net, detector_nets, wavelength_start, wavelength_stop, wavelength_points = \
+        get_LumericalINTERCONNECT_analyzers(topcell, optical_pins)
+  if laser_net &gt; -1:
+    pass
+    
+    
+    # example of finding a component connected to optical_components(i)
+    # from pin j:
+    i,j=1,0
+    component1_index = optical_components[i].idx
+    pin1_index = optical_components[i].pins[j]
+    net_index = optical_pins[pin1_index].net
+    net_component1 = optical_nets[net_index].pin1_n
+    net_component2 = optical_nets[net_index].pin2_n
+    if net_component1 != component1_index &amp; net_component2 == component1_index:
+      component2_index = net_component1_index
+    if net_component2 != component1_index &amp; net_component1 == component1_index:
+      component2_index = net_component2_index
+
+
+    text += '* Optical Network Analyzer:\n'
+    text += '.ona input_unit=wavelength input_parameter=start_and_stop\n  + minimum_loss=80\n  + analysis_type=scattering_data\n  + multithreading=user_defined number_of_threads=1\n' 
+    text += '  + start=%4.3fe-9\n' % wavelength_start
+    text += '  + stop=%4.3fe-9\n' % wavelength_stop
+    text += '  + number_of_points=%s\n' % wavelength_points
+    for i in range(0,len(detector_nets)):
+      text += '  + input(%s)=%s,N$%s\n' % (i+1, topcell.name, detector_nets[i])
+    text += '  + output=%s,N$%s\n' % (topcell.name, laser_net)
+
+    # main circuit
+    text += '%s%s %s sch_x=-1 sch_y=-1\n\n' % (topcell.name, opticalIO_pins, topcell.name)
+
+  return text, len(detector_nets)
+
+def connected_component(i,j):
+  # find a component connected to optical_components(i) from pin j:
+  
+  # find all connected components and waveguides, starting at component i
+  # need to make a graph containing only components and their connections.
+  # our SiEPIC data structures has components &amp; waveguides, which need to be merged.
+  # offset the waveguide indexes by 1e6 to ensure unique index values
+
+  component1_index = optical_components[i].idx
+  print ("component1_index: %s" % component1_index)
+  print ("component1's nets: %s" % optical_components[i].nets)
+  pin1_index = optical_components[i].pins[j]
+  if optical_pins[pin1_index].pin_type == 2:
+    print ("pin is an OpticalIO; stopping.")
+  else:
+    net_index = optical_pins[pin1_index].net
+    print ("net: %s" % net_index)
+
+    net_component1 = optical_nets[net_index].pin1_n
+    print ("net's pin1 component: %s" % net_component1)
+    net_component2 = optical_nets[net_index].pin2_n
+    print ("net's pin2 component: %s" % net_component2)
+    if net_component1 != component1_index &amp; net_component2 == component1_index:
+      component2_index = net_component1_index
+      print component2_index
+    if net_component2 != component1_index &amp; net_component1 == component1_index:
+      component2_index = net_component2_index
+      print component1_index
+
+
 def generate_Spice_file(topcell, optical_waveguides, optical_components):
   # list all Optical_component objects from an array
   # input array, optical_components