GaiaXPy 2.1.1__tar.gz → 2.1.2__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (176) hide show
  1. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/PKG-INFO +1 -1
  2. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/GaiaXPy.egg-info/PKG-INFO +1 -1
  3. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/core/generic_functions.py +0 -6
  4. gaiaxpy-2.1.2/src/gaiaxpy/core/version.py +1 -0
  5. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/core/xml_utils.py +1 -1
  6. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/file_parser/parse_generic.py +8 -2
  7. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/generator/config.py +1 -1
  8. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/generator/generator.py +1 -3
  9. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/generator/internal_photometric_system.py +21 -13
  10. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/input_reader/archive_reader.py +6 -0
  11. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/input_reader/dataframe_reader.py +8 -2
  12. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/input_reader/list_reader.py +2 -2
  13. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/input_reader/query_reader.py +22 -4
  14. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/spectrum/multi_synthetic_photometry.py +18 -4
  15. gaiaxpy-2.1.1/src/gaiaxpy/core/version.py +0 -1
  16. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/LICENCE +0 -0
  17. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/MANIFEST.in +0 -0
  18. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/README.md +0 -0
  19. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/pyproject.toml +0 -0
  20. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/setup.cfg +0 -0
  21. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/setup.py +0 -0
  22. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/GaiaXPy.egg-info/SOURCES.txt +0 -0
  23. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/GaiaXPy.egg-info/dependency_links.txt +0 -0
  24. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/GaiaXPy.egg-info/requires.txt +0 -0
  25. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/GaiaXPy.egg-info/top_level.txt +0 -0
  26. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/__init__.py +0 -0
  27. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/calibrator/__init__.py +0 -0
  28. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/calibrator/calibrator.py +0 -0
  29. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/calibrator/external_instrument_model.py +0 -0
  30. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/cholesky/__init__.py +0 -0
  31. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/cholesky/cholesky.py +0 -0
  32. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/colour_equation/__init__.py +0 -0
  33. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/colour_equation/xp_filter_system_colour_equation.py +0 -0
  34. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/OptimisedCalibratedBases_BpId32_RpId37_withNormalisation.xml +0 -0
  35. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/TabulatedDispersionFunction-DR3-v375wiv142r_20200610.csv +0 -0
  36. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/__init__.py +0 -0
  37. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/available_systems.txt +0 -0
  38. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/bpC03_v211w_bases.csv +0 -0
  39. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/bpC03_v211w_dispersion.csv +0 -0
  40. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/bpC03_v211w_response.csv +0 -0
  41. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/bpC03_v375wi_bases.csv +0 -0
  42. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/bpC03_v375wi_dispersion.csv +0 -0
  43. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/bpC03_v375wi_response.csv +0 -0
  44. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/colour_eq_files/JkcStd_colour_eq.ini +0 -0
  45. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/colour_eq_files/SdssStd_colour_eq.ini +0 -0
  46. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/config.ini +0 -0
  47. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/correction_tables/DIDREQ-465-ElsCustomW09S2-correction-factors.csv +0 -0
  48. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/correction_tables/DIDREQ-465-EuclidVis-correction-factors.csv +0 -0
  49. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/correction_tables/DIDREQ-465-Gaia2-correction-factors.csv +0 -0
  50. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/correction_tables/DIDREQ-465-GaiaDr3Vega-correction-factors.csv +0 -0
  51. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/correction_tables/DIDREQ-465-HipparcosTycho-correction-factors-old.csv +0 -0
  52. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/correction_tables/DIDREQ-465-HipparcosTycho-correction-factors.csv +0 -0
  53. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/correction_tables/DIDREQ-465-HstAcswfc-correction-factors.csv +0 -0
  54. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/correction_tables/DIDREQ-465-HstHugsStd-correction-factors.csv +0 -0
  55. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/correction_tables/DIDREQ-465-HstWfc3uvis-correction-factors.csv +0 -0
  56. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/correction_tables/DIDREQ-465-HstWfpc2-correction-factors.csv +0 -0
  57. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/correction_tables/DIDREQ-465-Iphas-correction-factors.csv +0 -0
  58. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/correction_tables/DIDREQ-465-Jkc-correction-factors.csv +0 -0
  59. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/correction_tables/DIDREQ-465-JkcStd-correction-factors.csv +0 -0
  60. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/correction_tables/DIDREQ-465-Jpas-correction-factors.csv +0 -0
  61. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/correction_tables/DIDREQ-465-Jplus-correction-factors.csv +0 -0
  62. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/correction_tables/DIDREQ-465-JwstNircam-correction-factors.csv +0 -0
  63. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/correction_tables/DIDREQ-465-Panstarrs1-correction-factors.csv +0 -0
  64. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/correction_tables/DIDREQ-465-Panstarrs1Std-correction-factors.csv +0 -0
  65. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/correction_tables/DIDREQ-465-Pristine-correction-factors.csv +0 -0
  66. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/correction_tables/DIDREQ-465-Sdss-correction-factors.csv +0 -0
  67. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/correction_tables/DIDREQ-465-SdssStd-correction-factors.csv +0 -0
  68. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/correction_tables/DIDREQ-465-SkyMapper-correction-factors.csv +0 -0
  69. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/correction_tables/DIDREQ-465-Stromgren-correction-factors.csv +0 -0
  70. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/correction_tables/DIDREQ-465-StromgrenStd-correction-factors.csv +0 -0
  71. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/correction_tables/DIDREQ-465-Wfirst-correction-factors.csv +0 -0
  72. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/filters/XpFilter_Decam_v375wiv142r.xml +0 -0
  73. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/filters/XpFilter_ElsCustomW09S2_v375wiv142r.xml +0 -0
  74. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/filters/XpFilter_EuclidVis_v375wiv142r.xml +0 -0
  75. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/filters/XpFilter_Gaia2_v375wiv142r.xml +0 -0
  76. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/filters/XpFilter_GaiaDr3Ab_v375wiv142r.xml +0 -0
  77. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/filters/XpFilter_GaiaDr3Vega_v375wiv142r.xml +0 -0
  78. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/filters/XpFilter_GaiaNominal_v375wiv142r.xml +0 -0
  79. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/filters/XpFilter_HCustom_v375wiv142r.xml +0 -0
  80. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/filters/XpFilter_HalphaCustomAb_v375wiv142r.xml +0 -0
  81. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/filters/XpFilter_HalphaCustom_v375wiv142r.xml +0 -0
  82. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/filters/XpFilter_HipparcosTycho_v375wiv142r.xml +0 -0
  83. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/filters/XpFilter_HstAcswfc_v375wiv142r.xml +0 -0
  84. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/filters/XpFilter_HstHugsStd_v375wiv142r.xml +0 -0
  85. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/filters/XpFilter_HstWfc3uvis_v375wiv142r.xml +0 -0
  86. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/filters/XpFilter_HstWfpc2_v375wiv142r.xml +0 -0
  87. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/filters/XpFilter_IphasCustomW09S2_v375wiv142r.xml +0 -0
  88. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/filters/XpFilter_IphasCustomW09_v375wiv142r.xml +0 -0
  89. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/filters/XpFilter_IphasCustom_v375wiv142r.xml +0 -0
  90. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/filters/XpFilter_Iphas_v375wiv142r.xml +0 -0
  91. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/filters/XpFilter_JkcStd_v375wiv142r.xml +0 -0
  92. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/filters/XpFilter_Jkc_v375wiv142r.xml +0 -0
  93. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/filters/XpFilter_Jpas_v375wiv142r.xml +0 -0
  94. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/filters/XpFilter_Jplus_v375wiv142r.xml +0 -0
  95. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/filters/XpFilter_JwstNircam_v375wiv142r.xml +0 -0
  96. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/filters/XpFilter_Lsst_v375wiv142r.xml +0 -0
  97. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/filters/XpFilter_Panstarrs1Std_v375wiv142r.xml +0 -0
  98. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/filters/XpFilter_Panstarrs1_v375wiv142r.xml +0 -0
  99. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/filters/XpFilter_Pristine_v375wiv142r.xml +0 -0
  100. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/filters/XpFilter_SdssStd_v375wiv142r.xml +0 -0
  101. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/filters/XpFilter_Sdss_v375wiv142r.xml +0 -0
  102. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/filters/XpFilter_SkyMapper_v375wiv142r.xml +0 -0
  103. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/filters/XpFilter_SscAb_v375wiv142r.xml +0 -0
  104. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/filters/XpFilter_StromgrenStd_v375wiv142r.xml +0 -0
  105. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/filters/XpFilter_Stromgren_v375wiv142r.xml +0 -0
  106. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/filters/XpFilter_Ucustom_v375wiv142r.xml +0 -0
  107. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/filters/XpFilter_Wfirst_v375wiv142r.xml +0 -0
  108. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/filters/XpFilter_v211wv142r.xml +0 -0
  109. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/filters/XpFilter_v375wiv142r.xml +0 -0
  110. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/fluxCal_20230901_renorm_bspline.xml +0 -0
  111. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/paths.py +0 -0
  112. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/rpC03_v142r_bases.csv +0 -0
  113. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/rpC03_v142r_dispersion.csv +0 -0
  114. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/config/rpC03_v142r_response.csv +0 -0
  115. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/converter/__init__.py +0 -0
  116. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/converter/config.py +0 -0
  117. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/converter/converter.py +0 -0
  118. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/core/__init__.py +0 -0
  119. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/core/config.py +0 -0
  120. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/core/custom_errors.py +0 -0
  121. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/core/dispersion_function.py +0 -0
  122. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/core/generic_variables.py +0 -0
  123. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/core/input_validator.py +0 -0
  124. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/core/nature.py +0 -0
  125. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/core/satellite.py +0 -0
  126. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/core/server.py +0 -0
  127. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/error_correction/__init__.py +0 -0
  128. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/error_correction/error_correction.py +0 -0
  129. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/file_parser/__init__.py +0 -0
  130. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/file_parser/cast.py +0 -0
  131. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/file_parser/parse_external.py +0 -0
  132. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/file_parser/parse_internal_continuous.py +0 -0
  133. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/file_parser/parse_internal_sampled.py +0 -0
  134. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/file_parser/parse_inverse.py +0 -0
  135. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/file_parser/utils.py +0 -0
  136. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/generator/__init__.py +0 -0
  137. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/generator/multi_synthetic_photometry_generator.py +0 -0
  138. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/generator/photometric_system.py +0 -0
  139. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/generator/regular_photometric_system.py +0 -0
  140. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/generator/standardised_photometric_system.py +0 -0
  141. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/generator/synthetic_photometry_generator.py +0 -0
  142. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/generator/utils.py +0 -0
  143. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/input_reader/__init__.py +0 -0
  144. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/input_reader/dataframe_numpy_array_reader.py +0 -0
  145. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/input_reader/dataframe_string_array_reader.py +0 -0
  146. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/input_reader/file_reader.py +0 -0
  147. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/input_reader/hdfs_reader.py +0 -0
  148. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/input_reader/input_reader.py +0 -0
  149. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/input_reader/local_file_reader.py +0 -0
  150. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/input_reader/required_columns.py +0 -0
  151. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/output/__init__.py +0 -0
  152. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/output/continuous_spectra_data.py +0 -0
  153. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/output/ecsv_headers/headers_dict.txt +0 -0
  154. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/output/output_data.py +0 -0
  155. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/output/photometry_data.py +0 -0
  156. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/output/sampled_spectra_data.py +0 -0
  157. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/output/utils.py +0 -0
  158. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/plotter/__init__.py +0 -0
  159. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/plotter/multi_absolute.py +0 -0
  160. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/plotter/multi_xp.py +0 -0
  161. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/plotter/plot_spectra.py +0 -0
  162. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/plotter/plotter.py +0 -0
  163. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/plotter/single.py +0 -0
  164. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/spectrum/__init__.py +0 -0
  165. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/spectrum/absolute_sampled_spectrum.py +0 -0
  166. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/spectrum/calibration_absolute_sampled_spectrum.py +0 -0
  167. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/spectrum/generic_spectrum.py +0 -0
  168. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/spectrum/photometric_absolute_sampled_spectrum.py +0 -0
  169. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/spectrum/sampled_basis_functions.py +0 -0
  170. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/spectrum/sampled_spectrum.py +0 -0
  171. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/spectrum/single_synthetic_photometry.py +0 -0
  172. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/spectrum/spectral_energy_distribution.py +0 -0
  173. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/spectrum/utils.py +0 -0
  174. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/spectrum/xp_continuous_spectrum.py +0 -0
  175. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/spectrum/xp_sampled_spectrum.py +0 -0
  176. {gaiaxpy-2.1.1 → gaiaxpy-2.1.2}/src/gaiaxpy/spectrum/xp_spectrum.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: GaiaXPy
3
- Version: 2.1.1
3
+ Version: 2.1.2
4
4
  Summary: Utilities to handle BP/RP (XP) Gaia low-resolution spectra as delivered via the archive
5
5
  Home-page: https://gaia-dpci.github.io/GaiaXPy-website/
6
6
  Author: Francesca De Angeli, Zuzanna Kostrzewa-Rutkowska, Paolo Montegriffo, Lovro Palaversa, Daniela Ruz-Mieres
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: GaiaXPy
3
- Version: 2.1.1
3
+ Version: 2.1.2
4
4
  Summary: Utilities to handle BP/RP (XP) Gaia low-resolution spectra as delivered via the archive
5
5
  Home-page: https://gaia-dpci.github.io/GaiaXPy-website/
6
6
  Author: Francesca De Angeli, Zuzanna Kostrzewa-Rutkowska, Paolo Montegriffo, Lovro Palaversa, Daniela Ruz-Mieres
@@ -347,12 +347,6 @@ def format_additional_columns(additional_columns: Optional[Union[str, list, dict
347
347
  return convert_values_to_lists(additional_columns)
348
348
 
349
349
 
350
- def validate_error_correction(phot_system, error_correction):
351
- if any(system.name.startswith(ADDITIONAL_SYSTEM_PREFIX) for system in phot_system) and error_correction:
352
- raise ValueError('Photometry is requested for a non-built-in system, but error_correction is set to True. '
353
- 'Error correction is only implemented for built-in systems.')
354
-
355
-
356
350
  def validate_photometric_system(photometric_system):
357
351
  """
358
352
  Ensure photometric system input isn't empty.
@@ -0,0 +1 @@
1
+ __version__ = '2.1.2'
@@ -34,7 +34,7 @@ def get_xp_merge(x_root):
34
34
 
35
35
  def get_array_text(x_root, tag):
36
36
  result = x_root.find(tag)
37
- result = [element.text for element in result] if result else None
37
+ result = [element.text for element in result] if result is not None else None
38
38
  length = len(result) if result else None
39
39
  return result, length
40
40
 
@@ -74,12 +74,12 @@ class GenericParser(object):
74
74
  str: File extension ('.csv', '.fits', or '.xml').
75
75
  """
76
76
  if not disable_info:
77
- print(self.info_msg, end='\r')
77
+ self.print_info_msg()
78
78
  extension = _get_file_extension(file_path)
79
79
  parser = self.get_parser(extension)
80
80
  parsed_data = _cast(parser(file_path))
81
81
  if not disable_info:
82
- print(self.info_msg + ' Done!', end='\r')
82
+ self.print_info_msg(done=True)
83
83
  return parsed_data, extension
84
84
 
85
85
  def _parse_avro(self, avro_file):
@@ -156,6 +156,12 @@ class GenericParser(object):
156
156
  row[size_column]), axis=1)
157
157
  return df
158
158
 
159
+ def print_info_msg(self, done=False):
160
+ msg = self.info_msg
161
+ if done:
162
+ msg = msg + ' Done!'
163
+ print(msg, end='\r')
164
+
159
165
 
160
166
  def _get_file_extension(file_path):
161
167
  """
@@ -41,7 +41,7 @@ def __get_file_names_recursively(dir_path: str, show_warning: bool = False) -> l
41
41
  if len(compliant_files) == 0:
42
42
  raise ValueError('No filter files found in the given directory. Please check your files.')
43
43
  elif len(compliant_files) < len(all_files) and show_warning:
44
- message = 'Some files in the directory do not correspond to filter files. The program will ignore them.'
44
+ message = 'Based on their names, some files in the directory do not correspond to filter files. They will be ignored.'
45
45
  print(f'UserWarning: {message}', file=sys.stderr)
46
46
  return compliant_files
47
47
 
@@ -4,8 +4,7 @@ from typing import Union, Optional
4
4
  import pandas as pd
5
5
 
6
6
  from gaiaxpy.colour_equation.xp_filter_system_colour_equation import _apply_colour_equation
7
- from gaiaxpy.core.generic_functions import cast_output, format_additional_columns, validate_photometric_system, \
8
- validate_error_correction
7
+ from gaiaxpy.core.generic_functions import cast_output, format_additional_columns, validate_photometric_system
9
8
  from gaiaxpy.error_correction.error_correction import _apply_error_correction
10
9
  from gaiaxpy.input_reader.input_reader import InputReader
11
10
  from gaiaxpy.output.photometry_data import PhotometryData
@@ -89,7 +88,6 @@ def _generate(input_object: Union[list, Path, str], photometric_system: Union[li
89
88
  # Prepare systems, keep track of original systems (especially required for error_correction)
90
89
  internal_phot_system = photometric_system.copy() if isinstance(photometric_system, list) else (
91
90
  [photometric_system].copy())
92
- validate_error_correction(internal_phot_system, error_correction)
93
91
  gaia_system = PhotometricSystem.Gaia_DR3_Vega
94
92
  is_gaia_in_input = __is_gaia_initially_in_systems(internal_phot_system)
95
93
  if error_correction and not is_gaia_in_input:
@@ -115,27 +115,35 @@ class InternalPhotometricSystem(object):
115
115
  str: Path of a file.
116
116
  """
117
117
 
118
- def _validate_additional_system_file(_actual_path):
119
- file_names = [split(p)[1] for p in _actual_path]
118
+ def _extract_matches(_actual_path, _system_name):
119
+ __is_built_in_name = lambda fname: fname.startswith('XpFilter')
120
+ __is_exact_match = lambda fname, sysname: fname.startswith(sysname) and f'{sysname}.' in fname
121
+ __matches_additional = lambda fname: pattern.match(fname)
122
+ __split_paths = [split(p) for p in _actual_path]
123
+ __paths, __filenames = zip(*__split_paths)
120
124
  pattern = re.compile(_ADDITIONAL_SYSTEM_FILES_REGEX, re.IGNORECASE)
121
- if all(f.startswith('XpFilter') for f in file_names):
125
+ if all(__is_built_in_name(f) for f in __filenames): # If system is built-in
122
126
  return _actual_path
123
- return [join(file_path, s) for s in file_names if pattern.match(s) and not s.startswith('XpFilter')]
127
+ return [join(p, fn) for p, fn in __split_paths if not __is_built_in_name(fn) and __matches_additional(fn)
128
+ and __is_exact_match(fn, _system_name)] # If is additional
129
+
130
+ def _validate_path(_actual_path):
131
+ if len(actual_path) == 0:
132
+ raise ValueError('Filter file not found in given path.')
133
+ elif len(actual_path) > 1:
134
+ # Remove configuration file if it exists to avoid issues when reloading
135
+ if exists(_CFG_FILE_PATH):
136
+ remove(_CFG_FILE_PATH)
137
+ raise ValueError(f'More than one system named {self.label.replace(f"{ADDITIONAL_SYSTEM_PREFIX}_", "")}'
138
+ f' were found. System names in the given directory should be unique. Operation aborted.')
124
139
 
125
140
  file_name = replace_file_name(self.config_file, 'filter', 'filter', bp_model, rp_model, self.label)
126
141
  system_name = file_name.split('.')[0]
127
142
  file_path = get_file_path(self.config_file)
128
143
  # Search file in file path to obtain the actual path
129
144
  actual_path = glob(file_path + f"/**/{system_name}*.xml", recursive=True)
130
- actual_path = _validate_additional_system_file(actual_path)
131
- if len(actual_path) == 0:
132
- raise ValueError('Filter file not found in given path.')
133
- elif len(actual_path) > 1:
134
- # Remove configuration file if it exists to avoid issues on reloading
135
- if exists(_CFG_FILE_PATH):
136
- remove(_CFG_FILE_PATH)
137
- raise ValueError(f'More than one system named {self.label.replace(f"{ADDITIONAL_SYSTEM_PREFIX}_", "")}'
138
- f' were found. System names in the given directory should be unique. Operation aborted.')
145
+ actual_path = _extract_matches(actual_path, system_name)
146
+ _validate_path(actual_path)
139
147
  self.filter_file = actual_path[0]
140
148
 
141
149
  def _load_offset_from_xml(self):
@@ -33,3 +33,9 @@ class ArchiveReader(object):
33
33
  gaia.login(user=user, password=password)
34
34
  else:
35
35
  pass
36
+
37
+ def show_info_msg(self, done=False):
38
+ msg = self.info_msg
39
+ if done:
40
+ msg = msg + ' Done!'
41
+ print(msg, end='\r')
@@ -67,7 +67,7 @@ class DataFrameReader(object):
67
67
 
68
68
  def read(self):
69
69
  if not self.disable_info:
70
- print(self.info_msg, end='\r')
70
+ self.show_info_msg()
71
71
  content = self.content
72
72
  str_array_columns, np_array_columns = self.__get_parseable_columns()
73
73
  if str_array_columns:
@@ -88,10 +88,16 @@ class DataFrameReader(object):
88
88
  data[f'{band}_covariance_matrix'] = data.apply(get_covariance_matrix, axis=1, args=(band,))
89
89
  self.requested_columns = self.requested_columns + covariance_columns
90
90
  if not self.disable_info:
91
- print(self.info_msg + ' Done!', end='\r')
91
+ self.show_info_msg(done=True)
92
92
  data = _cast(data)
93
93
  if self.additional_columns:
94
94
  data = rename_with_required(data, self.additional_columns)
95
95
  data = data[self.requested_columns] if self.requested_columns else data
96
96
  # No extension returned for DataFrames
97
97
  return data, None
98
+
99
+ def show_info_msg(self, done=False):
100
+ msg = self.info_msg
101
+ if done:
102
+ msg = msg + ' Done!'
103
+ print(msg, end='\r')
@@ -43,7 +43,7 @@ class ListReader(ArchiveReader):
43
43
  self._login(gaia)
44
44
  # ADQL query
45
45
  if not self.disable_info:
46
- print(self.info_msg, end='\r')
46
+ self.show_info_msg()
47
47
  result = gaia.load_data(ids=sources, format='csv', data_release=_data_release, data_structure='raw',
48
48
  retrieval_type='XP_CONTINUOUS', avoid_datatype_check=True)
49
49
  try:
@@ -52,6 +52,6 @@ class ListReader(ArchiveReader):
52
52
  except (KeyError, IndexError):
53
53
  raise ValueError('No continuous raw data found for the given sources.')
54
54
  if not self.disable_info:
55
- print(self.info_msg + ' Done!', end='\r')
55
+ self.show_info_msg(done=True)
56
56
  return DataFrameReader(data, function_name, self.truncation, additional_columns=self.additional_columns,
57
57
  disable_info=True).read()
@@ -3,6 +3,7 @@ import re
3
3
  from astroquery.gaia import GaiaClass
4
4
 
5
5
  from gaiaxpy.core.server import data_release, gaia_server
6
+ from gaiaxpy.core.version import __version__
6
7
  from .archive_reader import ArchiveReader
7
8
  from .dataframe_reader import DataFrameReader
8
9
  from ..core.custom_errors import SelectorNotImplementedError
@@ -43,11 +44,28 @@ class QueryReader(ArchiveReader):
43
44
  except StopIteration:
44
45
  raise ValueError('Source ID column not found in query result.')
45
46
  if not isinstance(sid_col, str):
46
- raise ValueError(f'Index of source ID column should be a string, but is {type(sid_col).__name__}: {sid_col}.')
47
+ raise ValueError(
48
+ f'Index of source ID column should be a string, but is {type(sid_col).__name__}: {sid_col}.')
47
49
  return _table[sid_col]
48
50
 
49
- def read(self, _data_release=data_release):
51
+ @staticmethod
52
+ def _add_marker(query, comment):
53
+ def __remove_comments(_query: str) -> str:
54
+ single_line_comment = re.compile(r'--.*$', re.MULTILINE)
55
+ multi_line_comment = re.compile(r'/\*.*?\*/', re.DOTALL)
56
+ query_no_single_line_comments = single_line_comment.sub('', _query) # Remove single-line comments
57
+ return multi_line_comment.sub('', query_no_single_line_comments) # Remove multi-line comments
58
+
59
+ query = __remove_comments(query)
60
+
61
+ if comment:
62
+ insensitive_select = re.compile(re.escape('select'), re.IGNORECASE)
63
+ query = insensitive_select.sub(f'select --{comment} \n', query)
64
+ return query
65
+
66
+ def read(self, _data_release=data_release, _comment=f'This query was launched from within GaiaXPy {__version__}'):
50
67
  query = self.content
68
+ query = self._add_marker(query, _comment)
51
69
  function_name = self.function.__name__
52
70
  if function_name in not_supported_functions:
53
71
  raise ValueError(f'Function {function_name} does not accept ADQL queries.')
@@ -56,7 +74,7 @@ class QueryReader(ArchiveReader):
56
74
  self._login(gaia)
57
75
  # ADQL query
58
76
  if not self.disable_info:
59
- print(self.info_msg, end='\r')
77
+ self.show_info_msg()
60
78
  job = gaia.launch_job_async(query, dump_to_file=False)
61
79
  query_result = job.get_results()
62
80
  result = gaia.load_data(ids=self.get_srcids(query_result), format='csv', data_release=_data_release,
@@ -67,6 +85,6 @@ class QueryReader(ArchiveReader):
67
85
  except KeyError:
68
86
  raise ValueError('No continuous raw data found for the requested query.')
69
87
  if not self.disable_info:
70
- print(self.info_msg + ' Done!', end='\r')
88
+ self.show_info_msg(done=True)
71
89
  return DataFrameReader(data, function_name, self.truncation, additional_columns=self.additional_columns,
72
90
  disable_info=True).read()
@@ -3,6 +3,8 @@ multi_synthetic_photometry.py
3
3
  ====================================
4
4
  Module to represent a synthetic photometry in multiple photometric systems.
5
5
  """
6
+ import re
7
+ from typing import List
6
8
 
7
9
  import pandas as pd
8
10
 
@@ -39,13 +41,25 @@ class MultiSyntheticPhotometry(object):
39
41
  self.mags, self.fluxes, self.errors = _generate_variables(photometries)
40
42
 
41
43
  def _generate_output_df(self):
44
+ def _get_column_sublist(_label: str, _df: pd.DataFrame) -> List:
45
+ """
46
+ Get the columns in a DataFrame that correspond to a particular system.
47
+
48
+ Args:
49
+ _label: A system label.
50
+ _df: A DataFrame containing photometry data.
51
+
52
+ Returns:
53
+ A list of column names.
54
+ """
55
+ _pattern = fr'{_label}_(flux_error|flux|mag)_[A-Za-z0-9]+'
56
+ return list(filter(lambda col: re.match(_pattern, col), _df.columns))
57
+
42
58
  photometries_df = self._photometries_to_df()
43
59
  # Reorder DataFrame columns
44
60
  phot_system_labels = [phot_system.get_system_label() for phot_system in self.photometric_system]
45
- reordered_columns = ['source_id']
46
- for label in phot_system_labels:
47
- column_sublist = [column for column in photometries_df.columns if column.startswith(f'{label}_')]
48
- reordered_columns.extend(column_sublist)
61
+ reordered_columns = ['source_id'] + [col for label in phot_system_labels for col in _get_column_sublist(
62
+ label, photometries_df)]
49
63
  photometries_df = photometries_df[reordered_columns]
50
64
  return photometries_df
51
65
 
@@ -1 +0,0 @@
1
- __version__ = '2.1.1'
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes