partial update to recent review

Author: jemorrison

jwst/cube_build/data_types.py

@@ -7,7 +7,6 @@
 log.setLevel(logging.DEBUG)
 
 
-# ******************************************************************************
 class DataTypes:
     """Class to handle reading input data to cube_build."""
 
@@ -26,7 +25,7 @@ def __init__(self, input_data, single, output_file, output_dir):
         Open the input data using datamodels and determine if data is
         a single input model, an association, or a set of input models
         contained in a ModelContainer. The method populates the self.input_models
-        which is list a of input models. An initial base name for the output file
+        which is a list of input models. An initial base name for the output file
         is constructed.
 
         Parameters

jwst/cube_build/file_table.py

@@ -91,12 +91,12 @@ def __init__(self):
 
     def set_file_table(self, input_models):
         """
-        Set up the MasterTable dictionary.
+        Set up the master_table dictionary.
 
-        Fill in the MasterTable which holds the files that the cube will be constructed
+        Fill in the master_table which holds the files that the cube will be constructed
         from. Since MIRI has 2 channels per image this MASTERTable dictionary helps to figure out
         which data needs to be use.
-        The MasterTable for MIRI is broken down by channel and subchannel.
+        The master_table for MIRI is broken down by channel and subchannel.
         For each channel/subchannel combination - a file is listed that covers those options
         For NIRSPEC the table contains the grating and filter for each file.
 
@@ -107,11 +107,11 @@ def set_file_table(self, input_models):
 
         Returns
         -------
-        MasterTable : dict
+        master_table : dict
             Dictionary containing the filename/model for each channel/band or grating/filter
         """
         # ________________________________________________________________________________
-        # Loop over input list of files and assign fill in the MasterTable with filename
+        # Loop over input list of files and assign fill in the master_table with filename
         # for the correct (channel-subchannel) or (grating-subchannel)
         for model in input_models:
             instrument = model.meta.instrument.name.upper()

jwst/cube_build/ifu_cube.py

@@ -65,7 +65,7 @@ class IFUCubeData:
         Dictionary containing information on the basic instrument parameters.
     master_table : dict
         Dictionary of containing the files covering each band.
-    pars_cube : dict
+    **pars_cube : dict
         Dictionary of parameters controlling how the cube is built.
     """
 

jwst/cube_build/src/cube_match_sky_driz.c

@@ -1,8 +1,7 @@
 /*
-An IFU spectral cube is building using the overlap between the detector pixels mapped
-to the spectral grid and the 3 D grid. This method is similar to 2D drizzle type
-mapping techniques. This is the top level c routine that interfaces with the python wrapper
-code: cube_wrapper_driz.
+An IFU spectral cube is built using the overlap between the detector pixels mapped
+to the 3-D spectral grid. This method is similar to 2D drizzle type mapping techniques. 
+This is the top level c routine that interfaces with the python wrapper.
 
 
 Main function for Python: cube_wrapper_driz
@@ -11,9 +10,9 @@ Python signature:  result = cube_wrapper_driz(
                             instrument,
                             flag_dq_plane,
                             start_region, end_region,
-                            self.overlap_partial,
-                            self.overlap_full,
-                            self.xcoord, self.ycoord, self.zcoord,
+                            overlap_partial,
+                            overlap_full,
+                            xcoord, ycoord, zcoord,
                             coord1, coord2,
                             wave,
                             flux,
@@ -56,7 +55,13 @@ xcoord : double array
 ycoord : double array
    size of naxis2. This array holds the center y axis values of the ifu cube
 zcoord : double array
-   size of naxis3. This array holds the center x axis values of the ifu cube
+   size of naxis3. This array holds the center z axis /wavelength values of the ifu cube
+coord1 : double array
+   The tangent projected xi values of the center of detector pixel.
+coord2 : double array
+   The tangent projected wave values of the center of detector pixel..
+wave : double array
+   The wavelength corresponding to the center of the detector pixel.
 flux : double array
    size: point cloud elements. Flux of each point cloud member
 err : double array

jwst/cube_build/src/cube_utils.c

@@ -103,8 +103,8 @@ int calcCondition(int edge, double x1, double y1, double x2, double y2,
 }
 
 // support function for sh_find_overlap. Find the intersection of polygon and regular grid
-void solveIntersection(int edge ,double x1,double y1,double x2,double y2
-                       double *x,double *y,
+void solveIntersection(int edge, double x1, double y1, double x2, double y2,
+                       double *x, double *y,
                        double left, double right, double top, double bottom){
   float m = 0;
   if(x2 != x1) m = ((double)(y2-y1)/(double)(x2-x1));