zebra/pyzebra
3
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Add code for 1D detector #69

Merged
usov_i merged 118 commits from det1d into master 2020-10-22 12:07:50 +02:00
Conversation 22 Commits 118 Files Changed 15
+1952 -55

118 Commits

Author SHA1 Message Date
usov_i ee788ab48a Fix image not updating 2020-10-22 12:05:33 +02:00
usov_i 7bc0ec0438 Display omega in hovertool 2020-10-22 12:05:33 +02:00
usov_i 199f8d9f61 Use 'scan' instead of 'meas' for array of counts 2020-10-22 12:03:19 +02:00
usov_i b204758523 Add hkl indices to scan table 2020-10-22 11:43:52 +02:00
usov_i 44e461f180 Make found peaks more visible 2020-10-22 11:29:32 +02:00
usov_i 0c38f9b2d7 Display std dev for counts 2020-10-22 11:02:00 +02:00
usov_i 784058b54e Reapply changes 2020-10-22 10:36:04 +02:00
usov_i db785380ba Revert "Update load_1D.py" 
This reverts commit f79553c1ba.
 2020-10-22 10:28:48 +02:00
JakHolzer 70abb97cb6 Update load_1D.py 
Correcting my stupidity
 2020-10-21 19:11:24 +02:00
JakHolzer f79553c1ba Update load_1D.py 
Added angles from meta to each scan, try except to try to get hkl from title
 2020-10-21 14:46:03 +02:00
JakHolzer 31335b398b Update load_1D.py 
Replaced the "1" to 1 in dat part
 2020-10-21 14:31:23 +02:00
JakHolzer 9783e5e7aa Update param_study_moduls.py 
Should work with new dict keys
 2020-10-21 14:00:09 +02:00
usov_i 8361fac5c3 Revert "Display omega in hovertool" 
This reverts commit 48efa93234.
 2020-10-21 13:25:26 +02:00
usov_i 3980e7abd0 Add fit results to the table 2020-10-20 13:56:54 +02:00
usov_i b07707b37d Don't stop on measurements with failed fit 
Fix #13
 2020-10-20 13:56:54 +02:00
usov_i 48efa93234 Display omega in hovertool 2020-10-20 13:56:54 +02:00
JakHolzer 6722ee601e Update fit2.py 
moved the check up so it catches it  right after fitting. I think this should solve the problem.
 2020-10-20 10:44:01 +02:00
usov_i 0156752686 Add debug script 2020-10-20 10:16:37 +02:00
usov_i 18ba623fd8 Refactor read of counts and clarify d["om"] 2020-10-19 15:41:55 +02:00
usov_i b8731b9e01 Refactor parsing of the first lines in each meas 2020-10-19 15:11:16 +02:00
JakHolzer f62aab74b7 Update load_1D.py 
changed the dat part
 2020-10-19 15:05:31 +02:00
usov_i 8104c54302 Fix issue reading ccl files with 5 digit counts 2020-10-19 14:19:33 +02:00
usov_i baf4a437d3 Fix integ values not applying in Fit Current 2020-10-16 16:44:25 +02:00
usov_i 6337afb4c3 Allow fitting of measurements without peaks 2020-10-16 16:43:43 +02:00
usov_i 23c8a573d7 Use integer keys for measurements 2020-10-16 15:53:30 +02:00
usov_i 3f8900bf87 Rename "Measurements" to "meas" 2020-10-16 15:30:52 +02:00
usov_i 306958b02a Refactor handling of the result dict 2020-10-16 15:10:20 +02:00
usov_i de0c1b1f4b Fix manual peak_index entry 2020-10-16 14:25:04 +02:00
usov_i db4aabe892 Add vertical spans for integration borders 2020-10-16 12:12:46 +02:00
usov_i cf8f19f6d9 Use omega instead of a range sequence 2020-10-16 12:12:40 +02:00
usov_i c5b0b17cb2 Compact hdf viewer panel 2020-10-16 10:33:46 +02:00
usov_i c04e6fbf1b Replace export_fit checkbox with radiobutton group 
The area method is now applying for all measurements
 2020-10-15 13:48:03 +02:00
usov_i 29c3b647a9 Add basic display for stdout and bokeh logger 2020-10-14 18:04:19 +02:00
JakHolzer 2e737df2bf Update fit2.py 
Second apology, that broke the code in another way, hopefully now its alrigh
 2020-10-14 16:43:33 +02:00
JakHolzer 8bf62274c0 Update fit2.py 2020-10-14 16:31:20 +02:00
usov_i 0777d73566 Cleanup, import sort, formatting 2020-10-14 15:32:38 +02:00
JakHolzer 6886279884 Update fit2.py 
added abs value to weights just in case
 2020-10-13 18:15:20 +02:00
JakHolzer fc70bdcb13 Update fit2.py 
fixed the weighted fit
 2020-10-13 18:07:47 +02:00
JakHolzer 6edc9c2ec4 Update param_study_moduls.py 
changed the delimiter to ","
 2020-10-13 17:50:26 +02:00
usov_i a25fab93ca Optimize layout 2020-10-13 14:08:06 +02:00
JakHolzer 0febab4292 Modules for parametric study 
Loading files from txt and list of filenames, creating and sorting the dataframe and making of the graphs
 2020-10-13 12:18:38 +02:00
usov_i 3208f6ea6a Merge branch 'master' into det1d 2020-10-13 11:09:02 +02:00
JakHolzer d0d993a813 Update fit2.py 
added option for data binning
 2020-10-09 11:26:27 +02:00
usov_i 94551acc64 Add integrate from .. to .. widgets 2020-10-08 16:38:44 +02:00
usov_i e679ccdce4 Add export_fit checkbox 2020-10-08 15:08:54 +02:00
usov_i 55c3a9bce1 Parse peak_indexes as int 2020-10-08 13:09:18 +02:00
usov_i e2f00a3bce Fix imports and apply formatter 2020-10-07 16:16:37 +02:00
JakHolzer 7a50f2c8d5 Update fit2.py 
Added user input to no peak case
 2020-10-07 10:29:04 +02:00
usov_i 01ac35f93d Merge branch 'det1d' of https://github.com/paulscherrerinstitute/pyzebra into det1d 2020-10-06 16:59:03 +02:00
JakHolzer ca5579ddd9 Update fit2.py 
Added check for stderr of fit area which can be None in case fit failure and can break the rest of the code.
 2020-10-06 16:47:00 +02:00
JakHolzer b4a0f43695 added more functions 2020-10-06 16:04:50 +02:00
usov_i e1fbe075fe Return preview of an export file 2020-10-06 15:47:20 +02:00
usov_i bd4e5980ab Display smoothed curve 2020-10-06 13:28:25 +02:00
usov_i df546cb688 Add fit param reset button 2020-10-06 13:21:39 +02:00
usov_i 5670882614 Display fit results in concise way 2020-10-06 11:53:08 +02:00
usov_i 62ecc54ee4 Add find peak and fit for currently selected data 2020-10-06 11:15:37 +02:00
usov_i 29a5126377 Add peak fit controls 2020-10-05 17:25:32 +02:00
usov_i 8b491aa300 Add possibility to change peak position 2020-10-05 17:25:32 +02:00
usov_i 7df408eff1 Display number of peaks for measurements 2020-10-05 17:25:32 +02:00
usov_i f1e9b7d889 Split process into peak find and fit steps 2020-10-05 17:25:32 +02:00
usov_i 4091d4ba32 Add find peak controls 2020-10-05 17:25:32 +02:00
usov_i 15428662f7 Replace measurement Select with DataTable 2020-10-05 17:25:32 +02:00
usov_i fdcaebb250 Rename panels 2020-10-05 17:25:32 +02:00
JakHolzer 456a15a365 Update load_1D.py 
added the data type to dict, it is necessary for adding dat files into ccl dicts
 2020-10-05 15:32:59 +02:00
JakHolzer e0227fb7e6 Update fit2.py 2020-10-05 15:27:13 +02:00
JakHolzer dc7c2afdc8 Update comm_export.py 
fixed some bugs
 2020-10-05 15:24:11 +02:00
JakHolzer d7ce156db5 Update ccl_dict_operation.py 
Added warning for negative numbers after subtraction
 2020-09-30 10:06:16 +02:00
JakHolzer b095b5762e Update ccl_dict_operation.py 
added note to trace merging and sutraction
 2020-09-30 09:22:40 +02:00
usov_i b5476fc9b0 Add input for proposal to simplify access data 2020-09-29 15:24:28 +02:00
usov_i ddc5522d8b Display gauss and bkg fits 2020-09-29 14:40:15 +02:00
usov_i e3dd010c94 Add experimental code for saving data into a file 2020-09-29 14:10:39 +02:00
JakHolzer 7afd41ea8b Update ccl_dict_operation.py 
Corrected some lines, no major changes
 2020-09-29 13:43:48 +02:00
JakHolzer 1302e4f93f Delete ccl_dict_operation_v1.py 2020-09-25 16:22:28 +02:00
JakHolzer 188f6d5163 Add files via upload 
Reuploaded from wrong folder
 2020-09-25 16:22:08 +02:00
JakHolzer 0c9e906ba4 Visualize fit 
Copy and paste into fit2 righ after:
  num_int_background = simps(background_errors, x[numfit_min:numfit_max])
  int_area = num_int_area-num_int_background

ca line 180
 2020-09-25 16:19:10 +02:00
JakHolzer 54a58dd4ca Update ccl_dict_operation_v1.py 2020-09-25 15:40:37 +02:00
JakHolzer 665de61c8c functions to merge, scan, subtract measurements 2020-09-25 13:23:49 +02:00
usov_i f79b4cbeee Check for "fit" key instead of handling KeyError 2020-09-25 10:35:20 +02:00
usov_i a502248891 Simplify value references in export loop 2020-09-25 10:34:18 +02:00
JakHolzer 52571a1aca Update fit2.py 
fit needs at least 3 points to work properly, this should not fail again in case of extremely slim peaks
 2020-09-25 09:12:00 +02:00
usov_i e5e824eb4c Do not require matplotlib to be installed 2020-09-24 16:46:35 +02:00
usov_i 1bcecec76b Display content of exported file 2020-09-24 16:36:21 +02:00
usov_i 10a65613b9 Display fitting results 2020-09-24 16:11:18 +02:00
usov_i 8bcbba5e31 Add smooth option as an example 2020-09-24 15:35:53 +02:00
usov_i c977d3c58e Display basic peakfinding results 2020-09-24 15:34:33 +02:00
usov_i fd769106b7 Add a possiblity to select a measurement 2020-09-24 10:53:42 +02:00
JakHolzer 8d397a819b Update fit2.py 2020-09-22 08:47:31 +02:00
JakHolzer 5515db234b Update load_1D.py 
added the two unknown variables are temperature and field
 2020-09-21 14:09:38 +02:00
JakHolzer 4c0b195b7a Update comm_export.py 
Added the fit value/ num integrated value choice
 2020-09-21 11:26:47 +02:00
JakHolzer bcb4ef9849 Update fit2.py 
Added uncertainty propagation to the numerical integration and weighted fit. Case for 'no peak' scenario also added. Parameter export_fit in meas["fit"] added which is decides if fitted area or numerically integrated area will be saved in comm/incomm files.
 2020-09-21 11:12:49 +02:00
usov_i b0f692a02c Add panel placeholder for 1D detector processing 2020-09-16 17:01:32 +02:00
usov_i 4d571d2fd6 Import new functions on pyzebra import 2020-09-16 16:44:55 +02:00
usov_i 321e3e83a4 Add parse_1D function 2020-09-16 16:22:17 +02:00
usov_i 2f4e097a68 Check fit results instead of excepting KeyError 2020-09-15 18:11:21 +02:00
usov_i a48b1f64c1 Use a ref to the current measurement 2020-09-15 18:03:28 +02:00
usov_i fe1d8044a3 Simplify dat file processing 
* rename "omega" -> "om", and "counts" -> "Counts" for consistency
with the column names
 2020-09-15 16:07:41 +02:00
usov_i 8b3f1b568f Break metadata and data reads 
* fix decimal issue
* add unkwn_angle
 2020-09-15 15:59:21 +02:00
usov_i ab002be606 Revert "Update load_1D.py" 
This reverts commit cc3f1d28a5.
 2020-09-15 15:53:24 +02:00
JakHolzer cc3f1d28a5 Update load_1D.py 
Corrected the dat beaking bug
 2020-09-15 15:17:00 +02:00
JakHolzer 661e284b16 Update ccl_findpeaks.py 2020-09-15 14:26:00 +02:00
JakHolzer 40f897ab58 Update ccl_findpeaks.py 2020-09-15 14:26:00 +02:00
JakHolzer 8b603c5924 guard close changed 2020-09-15 14:26:00 +02:00
JakHolzer e5609a8cd5 Add files via upload 
function to find peaks (more detailed description in email)
 2020-09-15 14:26:00 +02:00
JakHolzer 3fd7b59328 Update load_1D.py 2020-09-15 14:25:24 +02:00
usov_i 74151dd667 Stop in case of malformed metadata section 
Remove exception hadling because if there is an error in reading,
we shouldn't return partially read data, which will cause issues later.
 2020-09-15 14:25:24 +02:00
usov_i 661014ad73 Apply black formatter 2020-09-15 14:25:24 +02:00
usov_i ddebcc305f Extract constants 2020-09-15 14:25:24 +02:00
JakHolzer 96f1b36109 Add files via upload 
Try, except deleted.
Added one if/elif loop to tell apart zebra mode (bi, nb) and different angles saved
 2020-09-15 14:25:24 +02:00
JakHolzer 870fb745ba Update comm_export.py 
reworked function to export data. Added lorenntz to decide if Lorentz correction should be done and also export_fit to decide whether fitter or itegrated area is to be exported (added also to fit2.py)
 2020-09-15 14:24:33 +02:00
JakHolzer c6636ef212 removed strings, added argument 2020-09-15 14:24:33 +02:00
JakHolzer a24982fa0b Update comm_export.py 2020-09-15 14:24:33 +02:00
JakHolzer 5ad3ccc3a2 Function to export *.comm files 2020-09-15 14:24:33 +02:00
JakHolzer aa9b0c99ae Update fit2.py 
While function to find different indexes if the peak is very thin and sigma is much smaller than step, added the find_nearest which was missing for some reason.
 2020-09-15 14:23:48 +02:00
JakHolzer b157c2a3ae Update fit2.py 
corrected value range for numerical fit, added export_fit parameter, which should in future decide if exported value is fitted or integrated one.
 2020-09-15 14:23:48 +02:00
usov_i 2788c77fa1 Remove unused imports 2020-09-15 14:23:48 +02:00
JakHolzer 66819afc63 updated guard close, deleted plotting 2020-09-15 14:23:48 +02:00
JakHolzer fe5ed4b987 Update fit2.py 2020-09-15 14:23:48 +02:00
JakHolzer 087fe0fe2f peak fitting 
Fit one peak from ccl as combination of gaussian, lorentian and backgroud
 2020-09-15 14:23:48 +02:00