Commits

iorodeo committed 31406a4

Fixed error which effected capillary positioning.

Comments (0)

Files changed (11)

capillary_enclosure.py

         sensor_width = self.params['sensor_width']
         sensor_length = self.params['sensor_length']
         hole_offset = self.params['sensor_hole_offset']
-        x_pos = 0;
-        y_pos = -hole_offset;
+        x_pos = 0
+        # WBD
+        #y_pos = -hole_offset;
+        y_pos = 0
         hole = {
                     'panel'    : 'bottom', 
                     'type'     : 'square', 
 
         # Create sensor
         sensor = plate_w_holes(sensor_x, sensor_y, sensor_z, hole_list)
-        self.sensor = Translate(sensor,v=(0,-hole_offset,0))
+        # WBD
+        #self.sensor = Translate(sensor,v=(0,-hole_offset,0))
+        self.sensor = Translate(sensor,v=(0,0,0))
 
     def make_capillary(self):
         diameter = self.params['capillary_diam']
 
     def add_guide_tap_holes(self):
         hole_tuples = self.get_guide_plate_holes(hole_type='tap')
+        hole_offset = self.params['capillary_hole_offset']
         hole_list = []
         for x,y,diam in hole_tuples:
             hole = {
                     'panel'    : 'bottom',
                     'type'     : 'round',
-                    'location' : (x,y),
+                    'location' : (x,y+hole_offset),
                     'size'     : diam,
                     }
             hole_list.append(hole)

make_arrayed_enclosure.py

     enclosure.make()
 
     # Display size of bottom plate.
-    #print [x/INCH2MM for x in enclosure.array_bottom_size]
+    print [x/INCH2MM for x in enclosure.array_bottom_size]
 
     part_assembly = enclosure.get_assembly(
             show_top=True,

make_enclosure.py

         #'capillary_hole_size'              : (1.1,1.1,0.1),  
         #'capillary_hole_offset'            : 0.25,
         'capillary_hole_size'              : (1.4,1.4,0.2),  
-        'capillary_hole_offset'            : 0.75,
+        'capillary_hole_offset'            : 0.05*INCH2MM,
         'capillary_length'                 : 5*INCH2MM,
         'capillary_clamp_thru_hole_diam'   : 0.12*INCH2MM,
         'capillary_clamp_tap_hole_diam'    : 0.089*INCH2MM,
-        'capillary_clamp_hole_offset'      : -3.0,
+        'capillary_clamp_hole_offset'      : -2.5,
         'capillary_clamp_length'           : 18.0,
         'capillary_clamp_tolerance'        : 0.25,
         'capillary_clamp_radius'           : 1.5,
         'guide_plate_dimensions'           : (x-0.2, 0.5*INCH2MM, 0.0625*INCH2MM),
         'guide_thru_hole_diam'             : 0.0890*INCH2MM,
         'guide_tap_hole_diam'              : 0.0641*INCH2MM,
-        'guide_hole_offset'                : 0.15*INCH2MM,
+        'guide_hole_offset'                : 0.11*INCH2MM,
         }
 
 # -----------------------------------------------------------------------------
     enclosure.make()
     
     part_assembly = enclosure.get_assembly(
-            show_top=False,
-            show_bottom=False, 
+            show_top=True,
+            show_bottom=True, 
             show_front=True,
             show_back=True,
             show_left=True,
             show_standoffs=True,
             show_capillary=True,
             show_sensor=True,
-            show_diffuser=False,
-            show_diffuser_standoffs=False,
-            show_led_pcb=False,
+            show_diffuser=True,
+            show_diffuser_standoffs=True,
+            show_led_pcb=True,
             show_guide_plates=True,
-            show_guide_top=False,
+            show_guide_top=True,
             show_clamp=True,
             explode=(0,0,0),
             )
     
-    
     #print enclosure.standoff_xy_pos
     box_projection = enclosure.get_box_projection()
     diffuser_projection = enclosure.get_diffuser_projection()