Changeset 375

Timestamp:

10/05/11 22:12:55 (20 months ago)

Author:

jnowacki

Message:

DACInfo section is now fully read; 'recChName' and 'recChUnit' changed to 'ADCChName' and 'ADCChUnit' to be consistent with 'DACChName' and 'DACChUnit'

Files:

• branches/neo0.2/neo/io/axonio.py (modified) (4 diffs)

branches/neo0.2/neo/io/axonio.py

@@ -272 +272 @@
                         num = header['nADCPtoLChannelMap'][i]
                     elif version >=2. :
-                        name = header['listADCInfo'][i]['recChNames']
-                        unit = header['listADCInfo'][i]['recChUnits']
+                        name = header['listADCInfo'][i]['ADCChNames']
+                        unit = header['listADCInfo'][i]['ADCChUnits']
                         num = header['listADCInfo'][i]['nADCNum']
                     t_start = float(episodArray[j]['offset'])/sampling_rate
@@ -412 +412 @@
                     else :
                         ADCInfo[key] = np.array(val)
-                ADCInfo['recChNames'] = strings[ADCInfo['lADCChannelNameIndex']-1]
-                ADCInfo['recChUnits'] = strings[ADCInfo['lADCUnitsIndex']-1]
+                ADCInfo['ADCChNames'] = strings[ADCInfo['lADCChannelNameIndex']-1]
+                ADCInfo['ADCChUnits'] = strings[ADCInfo['lADCUnitsIndex']-1]
                 
                 header['listADCInfo'].append( ADCInfo )
@@ -444 +444 @@
             header['listTag'] = listTag
             
+            # DAC sections
+            header['listDACInfo'] = [ ]
+            for i in range(sections['DACSection']['llNumEntries']) :
+                #  read DACInfo
+                fid.seek(sections['DACSection']['uBlockIndex']*\
+                            BLOCKSIZE+sections['DACSection']['uBytes']*i)
+                DACInfo = { }
+                for key, format in DACInfoDescription :
+                    val = fid.read_f(format )
+                    if len(val) == 1:
+                        DACInfo[key] = val[0]
+                    else :
+                        DACInfo[key] = np.array(val)
+                DACInfo['DACChNames'] = strings[DACInfo['lDACChannelNameIndex']-1]
+                DACInfo['DACChUnits'] = strings[DACInfo['lDACChannelUnitsIndex']-1]
+                
+            header['listDACInfo'].append( DACInfo )
             
         fid.close()
@@ -649 +666 @@
        ('fInstrumentHoldingLevel', 'f'),
        ('fDACScaleFactor','f'),
-       ('fDACHoldingLevel','h'),
+       ('fDACHoldingLevel','f'),
        ('fDACCalibrationFactor','f'),
        ('fDACCalibrationOffset','f'),