Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[ENH] Neaspec multichannel reader #739

Merged
merged 7 commits into from
Oct 3, 2024
Merged

[ENH] Neaspec multichannel reader #739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c3e45b4
feat: New class for neaspec reader of a txt dataset containing multip…
brnovasco Sep 6, 2024
f6a9af9
feat: Add new method to calculate the complex fft for input data in t…
brnovasco Sep 6, 2024
359c71c
fix: Fixing the "Avoid magic word" problem in the owfft data for the …
brnovasco Sep 6, 2024
c0b81f7
fix: fixing small linting errors in the NeaReaderGSF class
brnovasco Sep 6, 2024
99755f5
fix: error in extensions format.
brnovasco Sep 6, 2024
ab03ff9
enh: Using the default read method inherited from SpectralFileFormat,…
brnovasco Oct 2, 2024
781b1d2
(enh) Replacing map_x and map_y with constants.
brnovasco Oct 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 61 additions & 0 deletions ...rib/spectroscopy/datasets/NeaReaderMultichannel_test/Test_Au_Fourier_Scan_Synchrotron.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
# www.neaspec.com
# Scan:   Fourier Scan
# Project:   User_Jun2024
# Description:   test
# Date:   06/06/2024 11:16:43
# Scanner Center Position (X, Y): [µm] 45.11 43.71  
# Rotation: [°] 0    
# Scan Area (X, Y, Z): [µm] 0.000 0.000 0.000
# Pixel Area (X, Y, Z): [px] 1 1 10
# Interferometer Center/Distance: [µm] 715.000 489.670  
# Averaging:   3    
# Integration time: [ms] 20    
# Wavenumber Scaling:   0.979340    
# Laser Source:   Synchrotron
# Detector:   R
# Target Wavelength: [µm]    
# Demodulation Mode:   Fourier
# Tip Frequency: [Hz] 283,708.188    
# Tip Amplitude: [mV] 60.000    
# Tapping Amplitude: [nm] 85.484    
# Modulation Frequency: [Hz] 0.000    
# Modulation Amplitude: [mV] 0.000    
# Modulation Offset: [mV] 0.000    
# Setpoint: [%] 80.45    
# Regulator (P, I, D):   2.077946 2.992700 1.000000
# Tip Potential: [mV] 0.000    
# M1A Scaling: [nm/V] 0.362    
# M1A Cantilever Factor:   1,000    
# Q-Factor:   486.9    
# Version:   2.1.11145.0
Row Column Run Depth Z M O0A O0P O1A O1P O2A O2P O3A O3P
0 0 0 0 1.4830833e-06 0.0004702841 140.833 0 6.4348807 0.6645405 1.9587896 1.3941813 0.32648554 2.02239
0 0 0 1 1.4830523e-06 0.00047094605 140.89937 0 6.376804 0.6775657 2.06971 1.3237468 0.34186834 2.239848
0 0 0 2 1.4830403e-06 0.00047150656 140.72264 0 6.4284115 0.6680331 2.0108752 1.4282312 0.3066287 2.083407
0 0 0 3 1.4830321e-06 0.00047198377 141.02126 0 6.440742 0.6651447 2.1001942 1.4406391 0.3243808 2.114817
0 0 0 4 1.4830205e-06 0.00047250776 140.71957 0 6.4532413 0.6639509 2.0856764 1.3328111 0.39436918 2.2339847
0 0 0 5 1.4830451e-06 0.00047301615 140.70483 0 6.519065 0.67524594 2.0188963 1.3270559 0.3245534 2.140174
0 0 0 6 1.4830032e-06 0.00047354892 140.81462 0 6.385892 0.6718575 2.1171083 1.4143238 0.37795374 2.1460977
0 0 0 7 1.482964e-06 0.00047397628 140.86049 0 6.4647484 0.6580694 1.9117932 1.346964 0.32442412 2.06036
0 0 0 8 1.4830063e-06 0.00047444427 140.72115 0 6.3940635 0.66261894 1.9369293 1.3707676 0.34072402 1.9546772
0 0 0 9 1.482989e-06 0.00047498295 140.80338 0 6.4686675 0.67149276 2.1063504 1.3728113 0.37116763 2.19878
0 0 1 0 1.4825338e-06 0.0004702481 140.81854 0 6.4119663 0.6709071 1.9422241 1.3830261 0.38319752 2.1862426
0 0 1 1 1.482516e-06 0.0004709231 140.87456 0 6.409243 0.6731461 2.1233785 1.3569052 0.3769568 2.1356432
0 0 1 2 1.4825473e-06 0.00047149902 140.76886 0 6.450717 0.66784745 1.960403 1.39625 0.3452003 2.030382
0 0 1 3 1.4825597e-06 0.00047205604 140.92456 0 6.4817934 0.66957307 2.0517309 1.4051965 0.36747894 2.1893978
0 0 1 4 1.4825615e-06 0.00047252374 140.7098 0 6.4945116 0.6747239 2.1202147 1.3261337 0.34824422 2.1677
0 0 1 5 1.4825405e-06 0.00047299115 140.82637 0 6.4944396 0.6650799 2.078894 1.4402506 0.35788947 2.054634
0 0 1 6 1.4825727e-06 0.00047346027 140.84087 0 6.491022 0.66714317 2.0637867 1.4566696 0.40971443 2.188562
0 0 1 7 1.4824976e-06 0.00047399005 140.68579 0 6.4839234 0.6726401 2.0141037 1.316157 0.37277195 2.093988
0 0 1 8 1.4824902e-06 0.00047446677 140.74852 0 6.434334 0.6701001 2.093401 1.4185503 0.40026203 2.138171
0 0 1 9 1.4825383e-06 0.0004750186 140.77066 0 6.458346 0.68138194 2.1652575 1.4089698 0.33343133 2.2287297
0 0 2 0 1.4835095e-06 0.0004655871 140.84943 0 6.428511 0.66852653 2.1124306 1.406314 0.32755885 2.1679842
0 0 2 1 1.4834801e-06 0.00046994354 140.78981 0 6.461014 0.68173933 1.9941256 1.3394383 0.36892703 2.0712361
0 0 2 2 1.4834723e-06 0.00047150397 140.75708 0 6.4619493 0.67282456 2.177506 1.4042937 0.36492768 2.0972927
0 0 2 3 1.4835148e-06 0.00047200115 140.81462 0 6.5146437 0.6615875 2.1562595 1.3933375 0.31578675 2.1395767
0 0 2 4 1.4835242e-06 0.00047247042 140.68408 0 6.51833 0.66206515 1.9239031 1.4076596 0.3802598 2.0594769
0 0 2 5 1.4835093e-06 0.00047294653 140.9233 0 6.471621 0.67279315 1.953958 1.4078617 0.3587442 1.9888307
0 0 2 6 1.4834782e-06 0.00047348 140.78293 0 6.4170303 0.6764211 2.159531 1.3579578 0.35871413 2.161588
0 0 2 7 1.4834847e-06 0.0004740215 140.74995 0 6.4891605 0.6643903 1.979399 1.4139515 0.35736507 1.9134548
0 0 2 8 1.4834957e-06 0.00047446118 140.81374 0 6.401533 0.66336787 2.1227689 1.3395565 0.36966056 2.1297655
0 0 2 9 1.4834936e-06 0.00047489564 140.66603 0 6.452134 0.67026573 2.1386855 1.3077831 0.40882605 2.0923867
2 changes: 1 addition & 1 deletion orangecontrib/spectroscopy/io/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# Instrument-specific readers
from .agilent import AgilentImageReader, AgilentImageIFGReader, agilentMosaicReader,\
agilentMosaicIFGReader, agilentMosaicTileReader
from .neaspec import NeaReader, NeaReaderGSF
from .neaspec import NeaReader, NeaReaderGSF, NeaReaderMultiChannel
from .omnic import OmnicMapReader, SPAReader, SPCReader
from .opus import OPUSReader
from .ptir import PTIRFileReader
Expand Down
Loading
Loading