Index: sodar/branches/raw2proc-dev/proc_remtech_rawdata_pa0.py =================================================================== --- sodar/branches/raw2proc-dev/proc_remtech_rawdata_pa0.py (revision 186) +++ sodar/branches/raw2proc-dev/proc_remtech_rawdata_pa0.py (revision 188) @@ -26,4 +26,5 @@ data = { + 'block' : n.array(n.ones((numIntervals,), dtype=int) * n.nan), 'dt' : n.array(n.ones((numIntervals,), dtype=object) * n.nan), 'es' : n.array(n.ones((numIntervals,), dtype=long) * n.nan), @@ -50,4 +51,5 @@ 'snr3' : n.array(n.ones((numIntervals,), dtype=int) * n.nan), 'snr4' : n.array(n.ones((numIntervals,), dtype=int) * n.nan), + 'check' : n.array(n.ones((numIntervals,), dtype=int) * n.nan), 'jam' : n.array(n.ones((numIntervals,), dtype=int) * n.nan), 'z' : n.array(n.ones((numAltitudes,), dtype=float) * n.nan), @@ -65,4 +67,6 @@ i = rawDataObject.index(sample) + data['block'][i] = int(sample['BL#']) + dt = {'month' : int(sample['MONTH']), 'day' : int(sample['DAY']), @@ -76,6 +80,37 @@ dt = dt + timedelta(hours=sensor_info['utc_offset']) data['dt'][i] = dt + data['es'][i] = dt2es(dt) - + + data['val1'][i] = int(sample['VAL1']) + data['val2'][i] = int(sample['VAL2']) + data['val3'][i] = int(sample['VAL3']) + data['val4'][i] = int(sample['VAL4']) + + data['spu1'][i] = int(sample['SPU1']) + data['spu2'][i] = int(sample['SPU2']) + data['spu3'][i] = int(sample['SPU3']) + data['spu4'][i] = int(sample['SPU4']) + + data['nois1'][i] = int(sample['NOIS1']) + data['nois2'][i] = int(sample['NOIS2']) + data['nois3'][i] = int(sample['NOIS3']) + data['nois4'][i] = int(sample['NOIS4']) + + data['femax'][i] = int(sample['FEMAX']) + data['softw'][i] = int(sample['SOFTW']) + + data['fe11'][i] = int(sample['FE11']) + data['fe12'][i] = int(sample['FE12']) + data['fe21'][i] = int(sample['FE21']) + data['fe22'][i] = int(sample['FE22']) + + data['snr1'][i] = int(sample['SNR1']) + data['snr2'][i] = int(sample['SNR2']) + data['snr3'][i] = int(sample['SNR3']) + data['snr4'][i] = int(sample['SNR4']) + + data['check'][i] = int(sample['CHECK']) + data['jam'][i] = int(sample['JAM']) return data