[dxwunit@lbti-dxwfs ~/soul/stable/source]$ git diff

dxlbti-diff.diff

[dxwunit@lbti-dxwfs source]$ git diff
diff --git a/ChUI/Makefile b/ChUI/Makefile
index 73bce215..a3ad385a 100644
--- a/ChUI/Makefile
+++ b/ChUI/Makefile
@@ -34,4 +34,4 @@ tags:
        ctags -t *.[ch]
 
 install: all
-       #install BCUread $(ADOPT_ROOT)/bin
+       install BCUread $(ADOPT_ROOT)/bin
diff --git a/PyModules/AdOpt/ocam2Kfunctions.py b/PyModules/AdOpt/ocam2Kfunctions.py
index 47de2b48..a6f2bdd7 100644
--- a/PyModules/AdOpt/ocam2Kfunctions.py
+++ b/PyModules/AdOpt/ocam2Kfunctions.py
@@ -505,8 +505,15 @@ def computeTablesFromPupilLists( ocam_mode, pupil_list_o, output_dir, do_plot=Tr
                     # slopes X1Y1 X2Y2
                     subapIndexOpt = 0
 
-                    if subapIndex in optimization_map:
-                        subapIndexOpt = optimization_map.index(subapIndex)
+                    if ocam_mode!=4: 
+                        if subapIndex in optimization_map:
+                            subapIndexOpt = optimization_map.index(subapIndex)
+                    else:
+                        subapIndexOpt = subapIndex
+
+
+                    #if subapIndex in optimization_map:
+                    #    subapIndexOpt = optimization_map.index(subapIndex)
 
                     subapPairIndex = subapIndexOpt/2
                     # s = [0,1,4,5]
diff --git a/auxloops/setup.py b/auxloops/setup.py
index f85329f9..7366fde5 100644
--- a/auxloops/setup.py
+++ b/auxloops/setup.py
@@ -13,11 +13,13 @@ setup( name='auxloops',
                       'auxloops.tasks.optModalGainTask': 'tasks/optModalGainTask',
                       'auxloops.tasks.skipframeTask': 'tasks/skipframeTask',
                       'auxloops.tasks.modalplotTask': 'tasks/modalplotTask',
+                      'auxloops.tasks.badFramesTask': 'tasks/badFramesTask',
                      },
        packages=['auxloops', 'auxloops.tasks',
                  'auxloops.tasks.common',
                  'auxloops.tasks.optModalGainTask',
                  'auxloops.tasks.skipframeTask',
                  'auxloops.tasks.modalplotTask',
+                 'auxloops.tasks.badFramesTask',
                 ]
      )
diff --git a/scripts/Makefile b/scripts/Makefile
index f61089f2..4957ec09 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -101,5 +101,5 @@ install:
        install autogain_refine.py $(ADOPT_ROOT)/bin
        install change_elevation_limit.sh $(ADOPT_ROOT)/bin
        install reset_ocam.py $(ADOPT_ROOT)/bin
-
+       install bcuDumpScript.py $(ADOPT_ROOT)/bin