[Pyphant-devel] SF.net SVN: pyphant:[688] trunk/src/workers/OSC/OSC/OscAbsorption.py

[<zk...@us...>]

Revision: 688
          http://pyphant.svn.sourceforge.net/pyphant/?rev=688&view=rev
Author:   zklaus
Date:     2010-06-18 10:08:13 +0000 (Fri, 18 Jun 2010)

Log Message:
-----------
Merge branch 'master' into svn-trunk

* master:
  Fix: Flatten some index arrays to account for old numpy versions.

Modified Paths:
--------------
    trunk/src/workers/OSC/OSC/OscAbsorption.py

Modified: trunk/src/workers/OSC/OSC/OscAbsorption.py
===================================================================
--- trunk/src/workers/OSC/OSC/OscAbsorption.py	2010-06-17 18:18:00 UTC (rev 687)
+++ trunk/src/workers/OSC/OSC/OscAbsorption.py	2010-06-18 10:08:13 UTC (rev 688)
@@ -103,7 +103,9 @@
             dim = Abso.dimensions[-1]
             minVal = quantities.Quantity('654nm')/dim.unit
             maxVal = quantities.Quantity('660nm')/dim.unit
-            lamp_interval = numpy.intersect1d(numpy.argwhere(minVal < dim.data), numpy.argwhere(dim.data<maxVal))
+            high_part = numpy.argwhere(minVal<dim.data).flatten()
+            low_part = numpy.argwhere(dim.data<maxVal).flatten()
+            lamp_interval = numpy.intersect1d(high_part, low_part)
             min_index = lamp_interval[0]
             max_index = lamp_interval[-1]
             steps = max_index-min_index


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.