diff --git a/handheld.py b/handheld.py index 1bc3223..12154db 100644 --- a/handheld.py +++ b/handheld.py @@ -535,7 +535,13 @@ class Handheld(object): pass self.getAvg(tmp_before_avg) self.__do_sensor_dict_interpo() - self.appendSave( ) + + # 选择追加保存, 一个Lsky 可能多组文件,只能单独保存为 Lsky Esky ..Rs + # self.appendSave() + self.getLwRs() + self.checkAndSaveData( ) + path_info_txt = self.output_path.joinpath( "info.txt" ) + self.save_dict_to_file( self.info_dict, path_info_txt ) def dealOneGroup(self, ): @@ -766,11 +772,15 @@ class Handheld(object): self.newFileByFunc( self.device_enum(1).name ) self.newFileByFunc( self.device_enum(2).name ) self.newFileByFunc( self.device_enum(3).name ) + self.newFileByFunc( self.device_enum(4).name ) + self.newFileByFunc( self.device_enum(5).name ) pass self.appendFileByFunc( self.device_enum(1).name ) self.appendFileByFunc( self.device_enum(2).name ) self.appendFileByFunc( self.device_enum(3).name ) + self.appendFileByFunc( self.device_enum(4).name ) + self.appendFileByFunc( self.device_enum(5).name ) def newFileByFunc(self, func:str) -> None: self.mydir.newFileIfNot( func+SAVE_EXT_NAME) @@ -796,6 +806,17 @@ class Handheld(object): def clearRes(self, ) -> None: self.res = { } + def getLwRs(self, ) -> bool: + """ + 并计算Lw Rs并保存 + """ + Lw = self.res["Lwater"] - ROWFACTOR * self.res["Lsky"] + self.res.update({ self.device_enum(4).name : Lw }) + Rs = self.res["Lw"] / self.res["Esky"] + self.res.update({ self.device_enum(5).name : Rs }) + + return True + def getLwRsAndSave(self, ) -> bool: """ 并计算Lw Rs并保存