gutc61 / Membrane (public) (License: Free) (since 2018-04-23) (hash sha1)
Membane project software
Clone URLs: https://rocketgit.com/user/gutc61/Membrane ssh://rocketgit@ssh.rocketgit.com/user/gutc61/Membrane git://git.rocketgit.com/user/gutc61/Membrane
master
List of commits:
Subject Hash Author Date (UTC)
Cosmetics and speed-up of entanglement_evaluation_test.m 80585dfe632ac9169e348b52417cee832132abbe Jason Hoelscher-Obermaier 2017-02-07 13:38:21
Add convenience superclass class_conveniences.m to collect generally applicable methods and properties 79eeef150668a3c5ab0470c4ba542c9f8241e154 Jason Hoelscher-Obermaier 2017-02-07 12:37:18
Add properties homodyne_visibility, detection_efficiency to entanglement_evaluation 6c21d00289fdb43f375912a0becdeba3cb088285 Jason Hoelscher-Obermaier 2017-02-07 11:05:25
Adapt entanglement_evaluation_test to changes in the default pulse-length c268f45a34790579fcbe5c0c8f51c18024e0d4c7 Jason Hoelscher-Obermaier 2017-02-07 11:03:03
'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
Commit 80585dfe632ac9169e348b52417cee832132abbe - Cosmetics and speed-up of entanglement_evaluation_test.m
Author: Jason Hoelscher-Obermaier
Author date (UTC): 2017-02-07 13:38
Committer name: Jason Hoelscher-Obermaier
Committer date (UTC): 2017-02-07 13:38
Parent(s): 79eeef150668a3c5ab0470c4ba542c9f8241e154
Signer:
Signing key:
Signing status: N
Tree: 29185f23ce2c849db92a347185d68d92aab43d41
File Lines added Lines deleted
data_analysis/@entanglement_evaluation/calculatePulsedQuadratures.m 8 10
data_analysis/unittests/entanglement_evaluation_test.m 1 5
File data_analysis/@entanglement_evaluation/calculatePulsedQuadratures.m changed (mode: 100644) (index f8e278b..538ae2c)
... ... function obj = calculatePulsedQuadratures(obj, tracepair_ind, varargin)
15 15
16 16 modes_no = obj.mech_frequencies_no*obj.pulse_gammas_no; modes_no = obj.mech_frequencies_no*obj.pulse_gammas_no;
17 17
18 Q = zeros(pulsepairs_no, modes_no);
19 P = zeros(pulsepairs_no, modes_no);
20 X = zeros(pulsepairs_no, modes_no);
21 Y = zeros(pulsepairs_no, modes_no);
18 Q = zeros(pulsepairs_no, modes_no);
19 P = zeros(pulsepairs_no, modes_no);
20 X = zeros(pulsepairs_no, modes_no);
21 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);
 
... ... function obj = calculatePulsedQuadratures(obj, tracepair_ind, varargin)
41 41 ampli_tr.fseek(pp*dead_time_ratio + 1); ampli_tr.fseek(pp*dead_time_ratio + 1);
42 42 phase_tr.fseek(pp*dead_time_ratio + 1); phase_tr.fseek(pp*dead_time_ratio + 1);
43 43
44 if pp==20
45 print_eta(pp, pulsepairs_no);
44 if pp==20, print_eta(pp, pulsepairs_no);
46 45 elseif floor(pp/pulsepairs_no*100)>(percent_done+5) elseif floor(pp/pulsepairs_no*100)>(percent_done+5)
47 percent_done=percent_done+5
46 percent_done = percent_done + 5
48 47 end end
49 48 end end
50 49 else else
 
... ... function obj = calculatePulsedQuadratures(obj, tracepair_ind, varargin)
53 52 obj, ampli_tr, phase_tr); obj, ampli_tr, phase_tr);
54 53 Q(pp,:) = q; P(pp,:) = p; X(pp,:) = x; Y(pp,:) = y; Q(pp,:) = q; P(pp,:) = p; X(pp,:) = x; Y(pp,:) = y;
55 54
56 if pp==20
57 print_eta(pp, pulsepairs_no);
55 if pp==20, print_eta(pp, pulsepairs_no);
58 56 elseif floor(pp/pulsepairs_no*100)>(percent_done+5) elseif floor(pp/pulsepairs_no*100)>(percent_done+5)
59 percent_done=percent_done+5
57 percent_done = percent_done + 5
60 58 end end
61 59 end end
62 60 end end
File data_analysis/unittests/entanglement_evaluation_test.m changed (mode: 100644) (index aa6dfa9..e01bc58)
... ... function run_quick_test(shared)
258 258 [T,ev] = evalc('ev.calculatePulsedQuadratures(2, ''pulsepairs'', pulsepairs_no);'); [T,ev] = evalc('ev.calculatePulsedQuadratures(2, ''pulsepairs'', pulsepairs_no);');
259 259 assertEqual(size(ev.pulse_Q{1}),... assertEqual(size(ev.pulse_Q{1}),...
260 260 [pulsepairs_no, ev.mech_frequencies_no*ev.pulse_gammas_no]); [pulsepairs_no, ev.mech_frequencies_no*ev.pulse_gammas_no]);
261 ev.exportResults;
261 ev.exportResults('software_version', false);
262 262 %type(fullfile(ev.evaluation_folder, 'evaluation_parameters.txt')) %type(fullfile(ev.evaluation_folder, 'evaluation_parameters.txt'))
263 263
264 264 ev.calculatePulsedCMs; ev.calculatePulsedCMs;
 
... ... function corrfct_test(shared)
387 387 end end
388 388 end end
389 389 end end
390
391
392 % function
393 %
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