diff --git a/GenDevice/excelIcd.py b/GenDevice/excelIcd.py index 946aa945b2ee85c3ffe0dcea0ba4810ff6bb0d09..bb135b9bcd2fa6254ac02a0865ab9664fa0eae73 100755 --- a/GenDevice/excelIcd.py +++ b/GenDevice/excelIcd.py @@ -34,8 +34,15 @@ class excelIcd: self.nsheets = len(self.book.sheet_names) if(self.debug): print(self.nsheets,self.book.sheet_names) + actor="ALL" for sheet_name in (self.book.sheet_names): - she=(self.book.parse(sheet_name)) #.dropna(axis=0,how='all') + + #print(sheet_name) + if( sheet_name!="Main"): + query="`Actor` =="+ "'"+actor+"'" + she=(self.book.parse(sheet_name)).query(query) #.dropna(axis=0,how='all') + else: + she=(self.book.parse(sheet_name)) self.sheets[sheet_name]=she #.dropna(axis=1,how='all') siz=self.sheets[sheet_name].shape if(self.debug): diff --git a/install.sh b/install.sh index 16bb570645096ee2def929994a488daed142044a..abcebdd9df4e73219308296264f1978b1328cf19 100644 --- a/install.sh +++ b/install.sh @@ -1,2 +1,2 @@ python setup.py bdist_wheel -python -m pip install dist/GenDevice-0.3-py3-none-any.whl +python -m pip install dist/GenDevice-0.7-py3-none-any.whl diff --git a/setup.py b/setup.py index d8af525d6eaa1822fa6f99515786437c90ed5eb7..766f4aa6a3f618f1e05cbd6061f996310e76a454 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ from setuptools import setup setup(name='GenDevice', -version='0.3', +version='0.7', description='Python code generator for ASTRI-MA', url='#', author='Gino Tosti', diff --git a/test/readIcdFile.py b/test/readIcdFile.py index 91f1abf34001c0276300f27a56d1a0738937af90..6acae4d0e5af62ada65faf9aebdbe12d98a03db8 100644 --- a/test/readIcdFile.py +++ b/test/readIcdFile.py @@ -15,13 +15,17 @@ if __name__=="__main__": help="ICD Exel File ", metavar="FILE") parser.add_option("-s", "--sheet", dest="sheet", default='Main', help="ICD Exel File Sheet Name to show", metavar="SHEET") + parser.add_option("-a", "--actor", dest="actor", default='ALL', + help="ICD Exel File Actor Name to show", metavar="ACTOR") (options, args) = parser.parse_args() gen_dir=os.environ["PYGEN"] excel_file =options.book_file wb=excelIcd(excel_file) get=wb.getSheet(options.sheet) - print(get) + #query="`Actor` =="+ "'"+options.actor+"'" + #get=(wb.book.parse(options.sheet)).query(query) + print(get["Actor"])