List of commits:
Subject Hash Author Date (UTC)
'pulse_pairs_coverage' factor fixes the number of skiped pulses (slow motion in phase space => small quadrature changes from two successive pulses => small significance in final averaging). Naive implementation of percentage of work done. 333240be10ffa70388736e216fa253479c6bd576 Corentin Gut 2017-01-26 16:57:00
Added object property 'pulse_pairs_coverage'. Updated initialisation of 'pulse_pairs_per_trace' to account for this new coverage factor. Reduced the number of samples per pulse by a factor of 5. 6dcad7dc617c9bed38f45823b049e556264b694f Corentin Gut 2017-01-26 16:47:16
commented currently useless and error throwing function in exportResults.m b5008194dea3acf4a534e20734abe75ae64b8a66 Corentin Gut 2017-01-26 16:42:26
Fix missing line continuation dots in get_NPS.m 63dcb57094a882d09a4ef2100de689ad9c4305ae Corentin Gut 2017-01-26 08:53:00
Add title to plots produced by plotLogneg.m ff47d809e4517074e093f5dc7377346d7b119607 Jason Hoelscher-Obermaier 2017-01-25 15:35:06
Add estimation of arrival time to convert_float_trace_to_int.m 3df75ca06ad32d054d58324a876ebe97f85f8e66 Jason Hoelscher-Obermaier 2017-01-25 10:54:51
work done by Tobias: sanity checks on PXI data 4ab1c905be0b549515d98eb68a69d807aef6b0dc Felix Roithmayr 2017-01-18 15:16:37
Make gaussianity_plots.m work with very large facet grids 57646ac15a50750365f91b900bda823a06ed97ff Jason Hoelscher-Obermaier 2016-12-23 14:52:11
Add 3rd-party fct for Anderson-Darling k-sample test 7e1d992bcd9eb7fae571d2a12b86cafe79748d5a Jason Hoelscher-Obermaier 2016-12-23 14:15:15
Add 3rd-party convenience fct: simple terminal progress bar a19212f38287ccf2883493e4f7b64056f671514f Jason Hoelscher-Obermaier 2016-12-23 14:14:22
Add thirdparty functions needed for gaussianity_plots 7df83c98609a302516348dc45223741bdd39fc2a Jason Hoelscher-Obermaier 2016-12-23 14:13:52
Adapt entanglement_evaluation_test.m to changes to calculate_mode_vectors_gammalist b081eec36a54549c774c49264ebb751b528f4690 Jason Hoelscher-Obermaier 2016-12-23 14:01:37
Remove unnecessary comments in gaussianity_plots_2d.m 3a35bfd4b321d36e82f8bf899f46e99124226f72 Jason Hoelscher-Obermaier 2016-12-23 10:42:45
Fix pdf-export of gaussianity_plots_2d by combination of saveas and pdfcrop (external tool!) 569528ef11beeaa9e946c9e6b039888690d8f6a5 Jason Hoelscher-Obermaier 2016-12-23 10:41:37
Adapt labeling in plotCorrelationMatrix.m to current convention (q1,p1,..x1,y1,..) 5e8acca419e778b07393e408080b7750758acfe9 Jason Hoelscher-Obermaier 2016-12-23 10:40:28
Fix annoying focus-stealing via "figure"-command in gaussianity_plots.m 3574d95b8227cdb8e383024f2c59df09580c7710 Jason Hoelscher-Obermaier 2016-12-22 15:04:59
Invoke suptitle after subplots to avoid clashes with plot cd77438eb754d4fa4f8e0f54999037dc33965aef Jason Hoelscher-Obermaier 2016-12-22 12:20:57
Allow customization of suptitle via varargin-key-value-pairs 4da38a97f9834b9cf32c0877c32940f6dda8198d Jason Hoelscher-Obermaier 2016-12-22 12:14:28
Add gaussianity_plots_2d.m to plot bivariate distribution functions of pulse quadratures d74f7e1e220dd0444108d1e36faae9fcc67d7792 Jason Hoelscher-Obermaier 2016-12-21 14:59:08
Clean up gaussianity_plots.m 282624b1635f855e0ff583be3804d70811310f33 Jason Hoelscher-Obermaier 2016-12-21 13:52:06
Commit 333240be10ffa70388736e216fa253479c6bd576 - 'pulse_pairs_coverage' factor fixes the number of skiped pulses (slow motion in phase space => small quadrature changes from two successive pulses => small significance in final averaging). Naive implementation of percentage of work done.
Author: Corentin Gut
Author date (UTC): 2017-01-26 16:57
Committer name: Corentin Gut
Committer date (UTC): 2017-01-26 16:57
Parent(s): 6dcad7dc617c9bed38f45823b049e556264b694f
Signer:
Signing key:
Signing status: N
Tree: 9dc302ce599ab9bb8556ff6867e41ab099d68de3
File Lines added Lines deleted
data_analysis/@entanglement_evaluation/calculatePulsedQuadratures.m 30 7
File data_analysis/@entanglement_evaluation/calculatePulsedQuadratures.m changed (mode: 100644) (index c1bff36..f8e278b)
... ... function obj = calculatePulsedQuadratures(obj, tracepair_ind, varargin)
19 19 P = zeros(pulsepairs_no, modes_no); P = zeros(pulsepairs_no, modes_no);
20 20 X = zeros(pulsepairs_no, modes_no); X = zeros(pulsepairs_no, modes_no);
21 21 Y = zeros(pulsepairs_no, modes_no); Y = zeros(pulsepairs_no, modes_no);
22
22
23 23 ampli_tr = obj.measurement.homotraces(tracepair_ind, 1); ampli_tr = obj.measurement.homotraces(tracepair_ind, 1);
24 24 phase_tr = obj.measurement.homotraces(tracepair_ind, 2); phase_tr = obj.measurement.homotraces(tracepair_ind, 2);
25 25
 
... ... function obj = calculatePulsedQuadratures(obj, tracepair_ind, varargin)
29 29 ampli_tr.dataset_label,' and ',phase_tr.dataset_label,'.']); ampli_tr.dataset_label,' and ',phase_tr.dataset_label,'.']);
30 30
31 31 print_eta = estimated_time_of_arrival; print_eta = estimated_time_of_arrival;
32 for pp=1:pulsepairs_no
33 [q,p,x,y] = getQuadsForNextPulse(...
34 obj, ampli_tr, phase_tr);
35 Q(pp,:) = q; P(pp,:) = p; X(pp,:) = x; Y(pp,:) = y;
36 if pp==20
37 print_eta(pp, pulsepairs_no);
32 percent_done=0;
33
34 if (obj.pulse_pairs_coverage<1)
35 dead_time_ratio = floor(obj.samples_per_pulse/obj.pulse_pairs_coverage);
36 for pp=1:pulsepairs_no
37 [q,p,x,y] = getQuadsForNextPulse(...
38 obj, ampli_tr, phase_tr);
39 Q(pp,:) = q; P(pp,:) = p; X(pp,:) = x; Y(pp,:) = y;
40 % moves file pointer to the next pp according to chosen covering
41 ampli_tr.fseek(pp*dead_time_ratio + 1);
42 phase_tr.fseek(pp*dead_time_ratio + 1);
43
44 if pp==20
45 print_eta(pp, pulsepairs_no);
46 elseif floor(pp/pulsepairs_no*100)>(percent_done+5)
47 percent_done=percent_done+5
48 end
49 end
50 else
51 for pp=1:pulsepairs_no
52 [q,p,x,y] = getQuadsForNextPulse(...
53 obj, ampli_tr, phase_tr);
54 Q(pp,:) = q; P(pp,:) = p; X(pp,:) = x; Y(pp,:) = y;
55
56 if pp==20
57 print_eta(pp, pulsepairs_no);
58 elseif floor(pp/pulsepairs_no*100)>(percent_done+5)
59 percent_done=percent_done+5
60 end
38 61 end end
39 62 end end
40 63
Hints:
Before first commit, do not forget to setup your git environment:
git config --global user.name "your_name_here"
git config --global user.email "your@email_here"

Clone this repository using HTTP(S):
git clone https://rocketgit.com/user/gutc61/Membrane

Clone this repository using ssh (do not forget to upload a key first):
git clone ssh://rocketgit@ssh.rocketgit.com/user/gutc61/Membrane

Clone this repository using git:
git clone git://git.rocketgit.com/user/gutc61/Membrane

You are allowed to anonymously push to this repository.
This means that your pushed commits will automatically be transformed into a merge request:
... clone the repository ...
... make some changes and some commits ...
git push origin main