-
Notifications
You must be signed in to change notification settings - Fork 10
Fixes typos and timezone in hall reader #56
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
RubelMozumder
pushed a commit
that referenced
this pull request
Jan 23, 2023
* Fixes typos in hall reader * Converts skipped at to date, too * Deletes requirements.txt
sanbrock
pushed a commit
that referenced
this pull request
Feb 2, 2023
* Successfully the XpsDataFileParser class working without checking the .nxs file output. * adding __init__ file for seeing reader.py as module * SuccessfullyRunNeedDocs_1: The reader with cls is running perfectlly. Task Lest: 1. The code must be revised for any irelavent code. 2. Need to write docs for the class and function. * Adding docstring and paramenter type in reader_utils.py file. * 1. Hard_to_find_bug:\n2. Hard_to_debug_with_PycharmDebug. * adding detectors and ScanDatawith numeric orders * Removing print statements and some other unnecessary code build up for debugging * Adding config file for filling up the fields from data dict from prser * Start working with config.json, template and xps_data_dict to be incorporated together * Ready to try config_file.json for data from xml data file. * adding "del" operator for deleting/removing a intended key from template/dict * The reader is able to read the xml file and plot for different sample and different region by partially perfect way. But still it is needed stoping unvalid data reading. For eample the reader includes "/specs__in-situ_PBTTT__Region4" as an entry which is invalid it does have any readable or valuable information * Inclusion of the function "check_for_siblins_with_same_name" that check for the same sibling having the same name and same tag, and correct the names by including the index at the end of the name. Still needs to check the total plot for set up in the /data/@signal" * A addition in template.py file by removing a key from optional, recommanded and required dict * able to collect all the scans counts and plot them successfully. Still it is needed to check the code and clean the code. * Reader.py perfectly including data and their units. At this moment to store data and plot, the NXdata has been utilized for each individual scans and commulative counts ove the scan separately. using the following structure: data:NXdata @signal = counts @axes = mr @mr_indices = 0 counts: float[100] --> the default dependent data mr: float[100] * The xps reader is working perfectly: reading from xps data file, congig file and eln file and plotting the graph * xps_xpecs/reader.py: Replacing code part of filling template with xps_data_dict by function "fill_template_with_xps_data" * xps_specs/reader.py: Able to plot all the channels serparately and the plot for all channels into one. * Eligible to plot separately for each channel. But still it has a little bug that plot or store similar data for the last three channel. * It is ploting perfectly. * File xps_specs/readers * xps_specs/reader.py: Some important eddition with Sandor tha includs: setting NX class for all NX class e.g. Data class, Beam class, Instrument class * xps_specs/reader.py: Including mean replacing the ultimate sum, standard deviation of the data, NXclass for CLS_xps_del, entry and data. Now the tasks are 1. concise the code, 2. Replace some variable names by with more appropriate name * The reader is completely done. Including correcting the errors in the boundary that comes up with zerros. * Renaming the folder name from "xps_specs" to "xps" * Addition of "xml" type "xps" from "specs" and "eln" file in "yaml" formate in "nomad-parser-nexus/tests/data/dataconverter/readers/xps" dir * Fixing the file dir for "config" and "eln" file" * Setting the Binding energy from Higher to Lower * Testing: line break after binary operator. * Fixing pycodestyle Errors * Fixing error from pydocstyle * Fixing: pydocstyle errors * Fxing error evolve from pydocstyle. * nexusutils/dataconverter/readers/xps/reader.py: Solving error evolve from pydocstyle and running perfectly from Jupyter-lab * nexusutils/dataconverter/readers/xps/reader.py: Some errors has been removed arrived from pylint. The code the is also running perfectly." * nomad-parser-nexus/nexusutils/dataconverter/readers/xps: pylint is chechecked and some of the resolved and some of the have been disabled. * nomad-parser-nexus/nexusutils/dataconverter/readers/xps/reader_utils.py: Errors from pylint areched and some of them have been solved and some of them have been disabled. * Removes reference to eln yaml file * Adds config file to package * Removes pylint disables in imports * Updates to include json file for xps in package * Fixes some pylinting issues * Fixes flatten and replace in xps * Updates mpes test log * Fix: Only xml files are loaded into the xps parser * Simply load default config file and overwrite * xps/Reader*: The files are checked for pylint, pydocstyle and mypy errors and resolved all the errors. * Removes pylint disables and properly renames variables * Fixes indentation for pycodestyle * Don't require example_value in json file * Fixing bug: Reader will read only reader provided config file. User proivided config file wil not be read * Removing print line. * Attempt to construct of binding energy and counts from reader_utils.py. * Binding Energy construction and counts in reader_utils.py are working perfectly * Attempt for Runing the reader.py where the data comes from xps_data_dict * Reader is Runing perfectly. Still needs to create a few functions to make the code more legible * reader.py: Including a function fill_data_class() instead of if clause inside fill_template_with_xps_data * In config file some tocken likee @AnalyseR info, @region_data have been chanaged by @xps_tocken. This change has mand the reader.py indipendent of xps_input_file. The required changed in the reader.py have been added. * reader.py, config_file.json, tests/data/dataconverter/readers/xps/xps_eln.yaml : Edit config file that with defined tocken. With that tocken data from eln, xps data dict will be utilised. Where the fill_template_with_eln_data() collects data and metadata from eln that are not available from xps file. * reader.py: Remove the del operator from the XPSReader.reader() * reader.py: Run perfectly * Reader.py: some edditions on the fill_data_group(), mainly removing replace function with fstring * reader*: removing pycodestype errors. * Testing pylint successfully working * Fixing error from pydocstyle * Removing some duplicate code * reader.py: Removing some brocken lines * README.md: Including README.md file with #61 pull request. * reader_utils.py: Including 'kinetic_energy_base' in binding energy consideration. * Adding nxdl_path_set to skip validation process for the same signature of nxdl_path for same attrributes and fields. * reader.py: Separating channeltron data(counts) from /ENTRY/DATA and set them to /NXdetector/NXdata. with new function fill_detector_group(). * reader.py: Including amplifier_type and detector_type * reader.py: Including amplifier_type and detector_type * config_file.json: changing config.json for detector data * Including detector in eln data * Rm xps_eln.yaml fle * reader.py: Check pydocstyle, pylint, mypy * setting entrace_slit to unknown * Taking version as string rather than integer * Bug:Version gets converted into float from string.\n Resolved * Optimization in nexus/nexus.py file * dataconverter optimization in helper funcion with. * Adding AXISNAME/@longname in xps reader.py * Adding chemical_formula, description attribute in xps reader. * Set imports to absolute paths for yaml2nxdl * Revised the setup process * Adds section parsing for json_yml reader * Fixes linting * Removed requirements.txt * Fixes typos and timezone in hall reader (#56) * Fixes typos in hall reader * Converts skipped at to date, too * Deletes requirements.txt * Added support for HDF5 files in JSON Map reader (#57) * Added support for HDF5 files in JSON Map reader * Added better slice handling in json map * Successfully the XpsDataFileParser class working without checking the .nxs file output. * adding __init__ file for seeing reader.py as module * SuccessfullyRunNeedDocs_1: The reader with cls is running perfectlly. Task Lest: 1. The code must be revised for any irelavent code. 2. Need to write docs for the class and function. * Adding docstring and paramenter type in reader_utils.py file. * 1. Hard_to_find_bug:\n2. Hard_to_debug_with_PycharmDebug. * adding detectors and ScanDatawith numeric orders * Removing print statements and some other unnecessary code build up for debugging * Adding config file for filling up the fields from data dict from prser * Start working with config.json, template and xps_data_dict to be incorporated together * Ready to try config_file.json for data from xml data file. * adding "del" operator for deleting/removing a intended key from template/dict * The reader is able to read the xml file and plot for different sample and different region by partially perfect way. But still it is needed stoping unvalid data reading. For eample the reader includes "/specs__in-situ_PBTTT__Region4" as an entry which is invalid it does have any readable or valuable information * Inclusion of the function "check_for_siblins_with_same_name" that check for the same sibling having the same name and same tag, and correct the names by including the index at the end of the name. Still needs to check the total plot for set up in the /data/@signal" * A addition in template.py file by removing a key from optional, recommanded and required dict * able to collect all the scans counts and plot them successfully. Still it is needed to check the code and clean the code. * Reader.py perfectly including data and their units. At this moment to store data and plot, the NXdata has been utilized for each individual scans and commulative counts ove the scan separately. using the following structure: data:NXdata @signal = counts @axes = mr @mr_indices = 0 counts: float[100] --> the default dependent data mr: float[100] * The xps reader is working perfectly: reading from xps data file, congig file and eln file and plotting the graph * xps_xpecs/reader.py: Replacing code part of filling template with xps_data_dict by function "fill_template_with_xps_data" * xps_specs/reader.py: Able to plot all the channels serparately and the plot for all channels into one. * Eligible to plot separately for each channel. But still it has a little bug that plot or store similar data for the last three channel. * It is ploting perfectly. * File xps_specs/readers * xps_specs/reader.py: Some important eddition with Sandor tha includs: setting NX class for all NX class e.g. Data class, Beam class, Instrument class * xps_specs/reader.py: Including mean replacing the ultimate sum, standard deviation of the data, NXclass for CLS_xps_del, entry and data. Now the tasks are 1. concise the code, 2. Replace some variable names by with more appropriate name * The reader is completely done. Including correcting the errors in the boundary that comes up with zerros. * Renaming the folder name from "xps_specs" to "xps" * Addition of "xml" type "xps" from "specs" and "eln" file in "yaml" formate in "nomad-parser-nexus/tests/data/dataconverter/readers/xps" dir * Fixing the file dir for "config" and "eln" file" * Setting the Binding energy from Higher to Lower * Testing: line break after binary operator. * Fixing pycodestyle Errors * Fixing error from pydocstyle * Fixing: pydocstyle errors * Fxing error evolve from pydocstyle. * nexusutils/dataconverter/readers/xps/reader.py: Solving error evolve from pydocstyle and running perfectly from Jupyter-lab * nexusutils/dataconverter/readers/xps/reader.py: Some errors has been removed arrived from pylint. The code the is also running perfectly." * nomad-parser-nexus/nexusutils/dataconverter/readers/xps: pylint is chechecked and some of the resolved and some of the have been disabled. * nomad-parser-nexus/nexusutils/dataconverter/readers/xps/reader_utils.py: Errors from pylint areched and some of them have been solved and some of them have been disabled. * Removes reference to eln yaml file * Adds config file to package * Removes pylint disables in imports * Updates to include json file for xps in package * Fixes some pylinting issues * Fixes flatten and replace in xps * Updates mpes test log * Fix: Only xml files are loaded into the xps parser * Simply load default config file and overwrite * xps/Reader*: The files are checked for pylint, pydocstyle and mypy errors and resolved all the errors. * Removes pylint disables and properly renames variables * Fixes indentation for pycodestyle * Fixing bug: Reader will read only reader provided config file. User proivided config file wil not be read * Attempt to construct of binding energy and counts from reader_utils.py. * Binding Energy construction and counts in reader_utils.py are working perfectly * Attempt for Runing the reader.py where the data comes from xps_data_dict * Reader is Runing perfectly. Still needs to create a few functions to make the code more legible * reader.py: Including a function fill_data_class() instead of if clause inside fill_template_with_xps_data * In config file some tocken likee @AnalyseR info, @region_data have been chanaged by @xps_tocken. This change has mand the reader.py indipendent of xps_input_file. The required changed in the reader.py have been added. * reader.py, config_file.json, tests/data/dataconverter/readers/xps/xps_eln.yaml : Edit config file that with defined tocken. With that tocken data from eln, xps data dict will be utilised. Where the fill_template_with_eln_data() collects data and metadata from eln that are not available from xps file. * reader.py: Remove the del operator from the XPSReader.reader() * reader.py: Run perfectly * Reader.py: some edditions on the fill_data_group(), mainly removing replace function with fstring * reader*: removing pycodestype errors. * Testing pylint successfully working * Fixing error from pydocstyle * Removing some duplicate code * reader.py: Removing some brocken lines * README.md: Including README.md file with #61 pull request. * reader_utils.py: Including 'kinetic_energy_base' in binding energy consideration. * Adding nxdl_path_set to skip validation process for the same signature of nxdl_path for same attrributes and fields. * reader.py: Separating channeltron data(counts) from /ENTRY/DATA and set them to /NXdetector/NXdata. with new function fill_detector_group(). * reader.py: Including amplifier_type and detector_type * reader.py: Including amplifier_type and detector_type * config_file.json: changing config.json for detector data * Including detector in eln data * Rm xps_eln.yaml fle * reader.py: Check pydocstyle, pylint, mypy * setting entrace_slit to unknown * Taking version as string rather than integer * Bug:Version gets converted into float from string.\n Resolved * Optimization in nexus/nexus.py file * dataconverter optimization in helper funcion with. * Adding AXISNAME/@longname in xps reader.py * Replacing AXISNAME by AXISNAME[axisname] in reader * Including atom type and chemical formula with xps * Varification of atom_types or extract atom_types from chemical formula has been added * Testing: line break after binary operator. * Updates submodule * Fixes linting * Fixing pylint errors * Fixes pylinting too-many-branches * Make xps/reader_utils.py more readable and fix some small bug * Collect xml element rather than data type * changing name from 'nxdl_path_to_type' to 'nxdl_path_to_elm' in helper.py * Resolving some review comments --------- Co-authored-by: RubelMozumder <rubelmozumder@outlook.com> Co-authored-by: domna <florian.dobener@physik.hu-berlin.de> Co-authored-by: Sherjeel Shabih <shabihsherjeel@gmail.com>
RubelMozumder
pushed a commit
that referenced
this pull request
Jun 28, 2023
* Fixes typos in hall reader * Converts skipped at to date, too * Deletes requirements.txt
RubelMozumder
added a commit
that referenced
this pull request
Jun 28, 2023
* Successfully the XpsDataFileParser class working without checking the .nxs file output. * adding __init__ file for seeing reader.py as module * SuccessfullyRunNeedDocs_1: The reader with cls is running perfectlly. Task Lest: 1. The code must be revised for any irelavent code. 2. Need to write docs for the class and function. * Adding docstring and paramenter type in reader_utils.py file. * 1. Hard_to_find_bug:\n2. Hard_to_debug_with_PycharmDebug. * adding detectors and ScanDatawith numeric orders * Removing print statements and some other unnecessary code build up for debugging * Adding config file for filling up the fields from data dict from prser * Start working with config.json, template and xps_data_dict to be incorporated together * Ready to try config_file.json for data from xml data file. * adding "del" operator for deleting/removing a intended key from template/dict * The reader is able to read the xml file and plot for different sample and different region by partially perfect way. But still it is needed stoping unvalid data reading. For eample the reader includes "/specs__in-situ_PBTTT__Region4" as an entry which is invalid it does have any readable or valuable information * Inclusion of the function "check_for_siblins_with_same_name" that check for the same sibling having the same name and same tag, and correct the names by including the index at the end of the name. Still needs to check the total plot for set up in the /data/@signal" * A addition in template.py file by removing a key from optional, recommanded and required dict * able to collect all the scans counts and plot them successfully. Still it is needed to check the code and clean the code. * Reader.py perfectly including data and their units. At this moment to store data and plot, the NXdata has been utilized for each individual scans and commulative counts ove the scan separately. using the following structure: data:NXdata @signal = counts @axes = mr @mr_indices = 0 counts: float[100] --> the default dependent data mr: float[100] * The xps reader is working perfectly: reading from xps data file, congig file and eln file and plotting the graph * xps_xpecs/reader.py: Replacing code part of filling template with xps_data_dict by function "fill_template_with_xps_data" * xps_specs/reader.py: Able to plot all the channels serparately and the plot for all channels into one. * Eligible to plot separately for each channel. But still it has a little bug that plot or store similar data for the last three channel. * It is ploting perfectly. * File xps_specs/readers * xps_specs/reader.py: Some important eddition with Sandor tha includs: setting NX class for all NX class e.g. Data class, Beam class, Instrument class * xps_specs/reader.py: Including mean replacing the ultimate sum, standard deviation of the data, NXclass for CLS_xps_del, entry and data. Now the tasks are 1. concise the code, 2. Replace some variable names by with more appropriate name * The reader is completely done. Including correcting the errors in the boundary that comes up with zerros. * Renaming the folder name from "xps_specs" to "xps" * Addition of "xml" type "xps" from "specs" and "eln" file in "yaml" formate in "nomad-parser-nexus/tests/data/dataconverter/readers/xps" dir * Fixing the file dir for "config" and "eln" file" * Setting the Binding energy from Higher to Lower * Testing: line break after binary operator. * Fixing pycodestyle Errors * Fixing error from pydocstyle * Fixing: pydocstyle errors * Fxing error evolve from pydocstyle. * nexusutils/dataconverter/readers/xps/reader.py: Solving error evolve from pydocstyle and running perfectly from Jupyter-lab * nexusutils/dataconverter/readers/xps/reader.py: Some errors has been removed arrived from pylint. The code the is also running perfectly." * nomad-parser-nexus/nexusutils/dataconverter/readers/xps: pylint is chechecked and some of the resolved and some of the have been disabled. * nomad-parser-nexus/nexusutils/dataconverter/readers/xps/reader_utils.py: Errors from pylint areched and some of them have been solved and some of them have been disabled. * Removes reference to eln yaml file * Adds config file to package * Removes pylint disables in imports * Updates to include json file for xps in package * Fixes some pylinting issues * Fixes flatten and replace in xps * Updates mpes test log * Fix: Only xml files are loaded into the xps parser * Simply load default config file and overwrite * xps/Reader*: The files are checked for pylint, pydocstyle and mypy errors and resolved all the errors. * Removes pylint disables and properly renames variables * Fixes indentation for pycodestyle * Don't require example_value in json file * Fixing bug: Reader will read only reader provided config file. User proivided config file wil not be read * Removing print line. * Attempt to construct of binding energy and counts from reader_utils.py. * Binding Energy construction and counts in reader_utils.py are working perfectly * Attempt for Runing the reader.py where the data comes from xps_data_dict * Reader is Runing perfectly. Still needs to create a few functions to make the code more legible * reader.py: Including a function fill_data_class() instead of if clause inside fill_template_with_xps_data * In config file some tocken likee @AnalyseR info, @region_data have been chanaged by @xps_tocken. This change has mand the reader.py indipendent of xps_input_file. The required changed in the reader.py have been added. * reader.py, config_file.json, tests/data/dataconverter/readers/xps/xps_eln.yaml : Edit config file that with defined tocken. With that tocken data from eln, xps data dict will be utilised. Where the fill_template_with_eln_data() collects data and metadata from eln that are not available from xps file. * reader.py: Remove the del operator from the XPSReader.reader() * reader.py: Run perfectly * Reader.py: some edditions on the fill_data_group(), mainly removing replace function with fstring * reader*: removing pycodestype errors. * Testing pylint successfully working * Fixing error from pydocstyle * Removing some duplicate code * reader.py: Removing some brocken lines * README.md: Including README.md file with #61 pull request. * reader_utils.py: Including 'kinetic_energy_base' in binding energy consideration. * Adding nxdl_path_set to skip validation process for the same signature of nxdl_path for same attrributes and fields. * reader.py: Separating channeltron data(counts) from /ENTRY/DATA and set them to /NXdetector/NXdata. with new function fill_detector_group(). * reader.py: Including amplifier_type and detector_type * reader.py: Including amplifier_type and detector_type * config_file.json: changing config.json for detector data * Including detector in eln data * Rm xps_eln.yaml fle * reader.py: Check pydocstyle, pylint, mypy * setting entrace_slit to unknown * Taking version as string rather than integer * Bug:Version gets converted into float from string.\n Resolved * Optimization in nexus/nexus.py file * dataconverter optimization in helper funcion with. * Adding AXISNAME/@longname in xps reader.py * Adding chemical_formula, description attribute in xps reader. * Set imports to absolute paths for yaml2nxdl * Revised the setup process * Adds section parsing for json_yml reader * Fixes linting * Removed requirements.txt * Fixes typos and timezone in hall reader (#56) * Fixes typos in hall reader * Converts skipped at to date, too * Deletes requirements.txt * Added support for HDF5 files in JSON Map reader (#57) * Added support for HDF5 files in JSON Map reader * Added better slice handling in json map * Successfully the XpsDataFileParser class working without checking the .nxs file output. * adding __init__ file for seeing reader.py as module * SuccessfullyRunNeedDocs_1: The reader with cls is running perfectlly. Task Lest: 1. The code must be revised for any irelavent code. 2. Need to write docs for the class and function. * Adding docstring and paramenter type in reader_utils.py file. * 1. Hard_to_find_bug:\n2. Hard_to_debug_with_PycharmDebug. * adding detectors and ScanDatawith numeric orders * Removing print statements and some other unnecessary code build up for debugging * Adding config file for filling up the fields from data dict from prser * Start working with config.json, template and xps_data_dict to be incorporated together * Ready to try config_file.json for data from xml data file. * adding "del" operator for deleting/removing a intended key from template/dict * The reader is able to read the xml file and plot for different sample and different region by partially perfect way. But still it is needed stoping unvalid da 8492 ta reading. For eample the reader includes "/specs__in-situ_PBTTT__Region4" as an entry which is invalid it does have any readable or valuable information * Inclusion of the function "check_for_siblins_with_same_name" that check for the same sibling having the same name and same tag, and correct the names by including the index at the end of the name. Still needs to check the total plot for set up in the /data/@signal" * A addition in template.py file by removing a key from optional, recommanded and required dict * able to collect all the scans counts and plot them successfully. Still it is needed to check the code and clean the code. * Reader.py perfectly including data and their units. At this moment to store data and plot, the NXdata has been utilized for each individual scans and commulative counts ove the scan separately. using the following structure: data:NXdata @signal = counts @axes = mr @mr_indices = 0 counts: float[100] --> the default dependent data mr: float[100] * The xps reader is working perfectly: reading from xps data file, congig file and eln file and plotting the graph * xps_xpecs/reader.py: Replacing code part of filling template with xps_data_dict by function "fill_template_with_xps_data" * xps_specs/reader.py: Able to plot all the channels serparately and the plot for all channels into one. * Eligible to plot separately for each channel. But still it has a little bug that plot or store similar data for the last three channel. * It is ploting perfectly. * File xps_specs/readers * xps_specs/reader.py: Some important eddition with Sandor tha includs: setting NX class for all NX class e.g. Data class, Beam class, Instrument class * xps_specs/reader.py: Including mean replacing the ultimate sum, standard deviation of the data, NXclass for CLS_xps_del, entry and data. Now the tasks are 1. concise the code, 2. Replace some variable names by with more appropriate name * The reader is completely done. Including correcting the errors in the boundary that comes up with zerros. * Renaming the folder name from "xps_specs" to "xps" * Addition of "xml" type "xps" from "specs" and "eln" file in "yaml" formate in "nomad-parser-nexus/tests/data/dataconverter/readers/xps" dir * Fixing the file dir for "config" and "eln" file" * Setting the Binding energy from Higher to Lower * Testing: line break after binary operator. * Fixing pycodestyle Errors * Fixing error from pydocstyle * Fixing: pydocstyle errors * Fxing error evolve from pydocstyle. * nexusutils/dataconverter/readers/xps/reader.py: Solving error evolve from pydocstyle and running perfectly from Jupyter-lab * nexusutils/dataconverter/readers/xps/reader.py: Some errors has been removed arrived from pylint. The code the is also running perfectly." * nomad-parser-nexus/nexusutils/dataconverter/readers/xps: pylint is chechecked and some of the resolved and some of the have been disabled. * nomad-parser-nexus/nexusutils/dataconverter/readers/xps/reader_utils.py: Errors from pylint areched and some of them have been solved and some of them have been disabled. * Removes reference to eln yaml file * Adds config file to package * Removes pylint disables in imports * Updates to include json file for xps in package * Fixes some pylinting issues * Fixes flatten and replace in xps * Updates mpes test log * Fix: Only xml files are loaded into the xps parser * Simply load default config file and overwrite * xps/Reader*: The files are checked for pylint, pydocstyle and mypy errors and resolved all the errors. * Removes pylint disables and properly renames variables * Fixes indentation for pycodestyle * Fixing bug: Reader will read only reader provided config file. User proivided config file wil not be read * Attempt to construct of binding energy and counts from reader_utils.py. * Binding Energy construction and counts in reader_utils.py are working perfectly * Attempt for Runing the reader.py where the data comes from xps_data_dict * Reader is Runing perfectly. Still needs to create a few functions to make the code more legible * reader.py: Including a function fill_data_class() instead of if clause inside fill_template_with_xps_data * In config file some tocken likee @AnalyseR info, @region_data have been chanaged by @xps_tocken. This change has mand the reader.py indipendent of xps_input_file. The required changed in the reader.py have been added. * reader.py, config_file.json, tests/data/dataconverter/readers/xps/xps_eln.yaml : Edit config file that with defined tocken. With that tocken data from eln, xps data dict will be utilised. Where the fill_template_with_eln_data() collects data and metadata from eln that are not available from xps file. * reader.py: Remove the del operator from the XPSReader.reader() * reader.py: Run perfectly * Reader.py: some edditions on the fill_data_group(), mainly removing replace function with fstring * reader*: removing pycodestype errors. * Testing pylint successfully working * Fixing error from pydocstyle * Removing some duplicate code * reader.py: Removing some brocken lines * README.md: Including README.md file with #61 pull request. * reader_utils.py: Including 'kinetic_energy_base' in binding energy consideration. * Adding nxdl_path_set to skip validation process for the same signature of nxdl_path for same attrributes and fields. * reader.py: Separating channeltron data(counts) from /ENTRY/DATA and set them to /NXdetector/NXdata. with new function fill_detector_group(). * reader.py: Including amplifier_type and detector_type * reader.py: Including amplifier_type and detector_type * config_file.json: changing config.json for detector data * Including detector in eln data * Rm xps_eln.yaml fle * reader.py: Check pydocstyle, pylint, mypy * setting entrace_slit to unknown * Taking version as string rather than integer * Bug:Version gets converted into float from string.\n Resolved * Optimization in nexus/nexus.py file * dataconverter optimization in helper funcion with. * Adding AXISNAME/@longname in xps reader.py * Replacing AXISNAME by AXISNAME[axisname] in reader * Including atom type and chemical formula with xps * Varification of atom_types or extract atom_types from chemical formula has been added * Testing: line break after binary operator. * Updates submodule * Fixes linting * Fixing pylint errors * Fixes pylinting too-many-branches * Make xps/reader_utils.py more readable and fix some small bug * Collect xml element rather than data type * changing name from 'nxdl_path_to_type' to 'nxdl_path_to_elm' in helper.py * Resolving some review comments --------- Co-authored-by: RubelMozumder <rubelmozumder@outlook.com> Co-authored-by: domna <florian.dobener@physik.hu-berlin.de> Co-authored-by: Sherjeel Shabih <shabihsherjeel@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Some small fixes in the hall reader (a typo and adding a default timezone for reading of the files times).
I'm creating this PR because I pull in pytz as a new dependency (was installed previously through pandas anyways).