|
@@ -502,11 +502,12 @@ class MchDataCenter(object):
|
|
|
hfive = h5py.File(self._file_name, 'r')
|
|
|
for mchid, paths in mchid_paths.items():
|
|
|
for card_type, name in card_types.items():
|
|
|
+ print('card_type=',card_type,'name=',name)
|
|
|
if card_type is None:
|
|
|
cur_paths = paths
|
|
|
else:
|
|
|
cur_paths = self._merge_mobile_type_path(paths,card_type)
|
|
|
- mdata = self._merge_data(hfive,paths)
|
|
|
+ mdata = self._merge_data(hfive,cur_paths)
|
|
|
result = self._calc_mratio(mdata,presecs,time_stamp - day_stamp)
|
|
|
mratios[mchid][name] = result
|
|
|
hfive.close()
|