List of commits:
Subject Hash Author Date (UTC)
Mute output from function calls in entanglement_evaluation_test.m a50a61aab38eede8c03c3735e433c47c1d7df3d3 Jason Hoelscher-Obermaier 2016-07-28 14:52:09
Turn software_version into a dependent quantity to avoid unnecessary computation 1dbf81ad075945d45064f02a037784a76c4e9069 Jason Hoelscher-Obermaier 2016-07-28 14:34:46
Move estimated_time_of_arrival_test into separate folder 'other' dd22b6c4e592ab42957d2f0c1390e16492e766de Jason Hoelscher-Obermaier 2016-07-28 14:23:00
Minor changes to aux. script running_logneg_CM.m a7ab7a8d799911d316748d69ae05169a5b27787a Jason Hoelscher-Obermaier 2016-07-28 10:19:52
Move all classes inheriting from homo_measurement into folder homo_measurements 1b6039c874cbdd37e3a5b061ff67a8b9c1cc8035 Jason Hoelscher-Obermaier 2016-07-26 13:41:47
Move calculation of NI-gain and -offset back to fopen.m d58d3c9f63b7bf78c401cfffb9424c3b769b6476 Jason Hoelscher-Obermaier 2016-07-26 13:38:39
Move homo_measurement-method get_NPS to separate file 597266637fe84b50e616763a02fea8e8f5498f45 Jason Hoelscher-Obermaier 2016-07-26 13:36:52
Move dual_homo_measurement-method add_trace_pair to separate file 9a365b27960cc706cf221f593dc245c8eb3295ed Jason Hoelscher-Obermaier 2016-07-26 13:33:38
Move homo_measurement-method show_plot to separate file 076bd9d4d99b5c497a1b81270912a2aca767a90a Jason Hoelscher-Obermaier 2016-07-26 13:29:02
Move homo_measurement and dual_homo_measurement into separate folders 7be5c41830f5c3b59c7ccbcff0e1f2c5caf8885e Jason Hoelscher-Obermaier 2016-07-26 13:11:40
Improve PXIcalibration.m 059a87f8f48a92f2f1009086201ac580f7bbb616 Jason Hoelscher-Obermaier 2016-07-26 13:05:24
Amend quickcheck_dualhomo_long by high-resolution spectra 3e6d41c6d17c57686634b5dc2cf5fba7e9cf6969 Jason Hoelscher-Obermaier 2016-07-26 13:04:21
Refactor homotrace: move all methods (apart from getters) into separate files 6c6aeb5dd9b08ffbe4e2be8e5c93c05d173b5bea Jason Hoelscher-Obermaier 2016-07-26 13:02:26
Refactor PXItrace: move all methods (apart from getters) into separate files eeb68a4e463a720faa8ad645fc4eda29e7274ceb Jason Hoelscher-Obermaier 2016-07-26 12:54:53
Script for combining pulsed traces from two evaluations w. different mode vec.s 2a01b56db573a29acf500bdcf8895a51d30e22c0 Jason Hoelscher-Obermaier 2016-07-26 12:46:05
Move homotrace and PXItrace (plus associated fcts) into @homotrace and @PXItrace e88a6682af9f8ef922c9d99931c9c0a598f3b555 Jason Hoelscher-Obermaier 2016-07-26 12:45:25
Plot into current figure (or create new one) 8e6306ea9c224f23756783d123112e46762b97b4 Jason Hoelscher-Obermaier 2016-07-26 12:42:43
Add 3rd-party fct brewermap (+ helper fct) 5c9a2f9bb1200135829ebc4c4e5d7cc7962d3cc9 Jason Hoelscher-Obermaier 2016-07-26 12:36:53
Add tests for traceOutCM.m f1066538ae43befda40f59d6f8f6c3da06f8d552 Jason Hoelscher-Obermaier 2016-07-26 12:35:23
Refactor timetrace.m 70160f921446d0399128f1a2e7ab260323946f16 Jason Hoelscher-Obermaier 2016-07-26 10:19:23
Commit a50a61aab38eede8c03c3735e433c47c1d7df3d3 - Mute output from function calls in entanglement_evaluation_test.m
- also: separate software_version_test to avoid unnecessary calls to it
Author: Jason Hoelscher-Obermaier
Author date (UTC): 2016-07-28 14:52
Committer name: Jason Hoelscher-Obermaier
Committer date (UTC): 2016-07-28 14:52
Parent(s): 1dbf81ad075945d45064f02a037784a76c4e9069
Signer:
Signing key:
Signing status: N
Tree: 81fe9b003fbeb320d139e6132e60b31eb61ae1eb
File Lines added Lines deleted
data_analysis/unittests/entanglement_evaluation_test.m 13 10
File data_analysis/unittests/entanglement_evaluation_test.m changed (mode: 100644) (index 9612770..3f250ef)
... ... function ev = entanglement_evaluation_setup_test(shared)
77 77 function entanglement_evaluation_properties_test(shared) function entanglement_evaluation_properties_test(shared)
78 78 ev = entanglement_evaluation_setup_test(shared); ev = entanglement_evaluation_setup_test(shared);
79 79 assertEqual(ev.samplingrate, shared.samplingrate); assertEqual(ev.samplingrate, shared.samplingrate);
80
81 function entanglement_software_version_test(shared)
82 ev = entanglement_evaluation_setup_test(shared);
80 83 swv = ev.software_version; swv = ev.software_version;
81 84 assert(isequal(class(swv), 'char') && ~isempty(swv)) assert(isequal(class(swv), 'char') && ~isempty(swv))
82 85
 
... ... function entanglement_evaluation_modefunctions_test(shared)
85 88 ev.mech_frequencies = [1, 2, 3]; ev.mech_frequencies = [1, 2, 3];
86 89 ev.opt_pulse_widths = ones(size(ev.mech_frequencies)); ev.opt_pulse_widths = ones(size(ev.mech_frequencies));
87 90 ev.pulse_gammas = logspace(-1,1,2); ev.pulse_gammas = logspace(-1,1,2);
88 ev.calculateModeVectors;
91 [T,ev] = evalc('ev.calculateModeVectors;'); % supress std out from fct call
89 92
90 93 %figure; plot(real(ev.readout_modes')) %figure; plot(real(ev.readout_modes'))
91 94 % check orthonormality % check orthonormality
 
... ... function entanglement_evaluation_run_test(shared)
124 127 ev.opt_pulse_widths = 1e2*[1, 1]; ev.opt_pulse_widths = 1e2*[1, 1];
125 128 ev.pulse_gammas = logspace(-1,1,10); ev.pulse_gammas = logspace(-1,1,10);
126 129
127 ev.calculateModeVectors;
128 ev.calculatePulsedQuadratures(1);
130 [T,ev] = evalc('ev.calculateModeVectors;'); % supress std out from fct call
131 [T,ev] = evalc('ev.calculatePulsedQuadratures(1);'); % supress std out from fct call
129 132 assertEqual(size(ev.pulse_Y{1}),... assertEqual(size(ev.pulse_Y{1}),...
130 133 [ev.pulse_pairs_per_trace, ev.mech_frequencies_no*ev.pulse_gammas_no]); [ev.pulse_pairs_per_trace, ev.mech_frequencies_no*ev.pulse_gammas_no]);
131 134
 
... ... function entanglement_evaluation_run_test(shared)
158 161 'relative', tolerance); 'relative', tolerance);
159 162
160 163 ev.calculatePulsedCMs(1); ev.calculatePulsedCMs(1);
161 ev.calculatePulsedQuadratures(2);
164 [T,ev] = evalc('ev.calculatePulsedQuadratures(2);'); % supress std out from fct call
162 165 ev.calculatePulsedCMs(2); ev.calculatePulsedCMs(2);
163 166 ev.calibratePulsedCMs; ev.calibratePulsedCMs;
164 167 % compare to results as of datoolbox-commit e59949293bce61f53d444a02d4646d03bc16a78a % compare to results as of datoolbox-commit e59949293bce61f53d444a02d4646d03bc16a78a
 
... ... function entanglement_evaluation_set_samples_per_pulse_test(shared)
188 191
189 192 samples_per_pulse = 200; % default for evaluation specifed above samples_per_pulse = 200; % default for evaluation specifed above
190 193 assertEqual(ev.samples_per_pulse, samples_per_pulse) assertEqual(ev.samples_per_pulse, samples_per_pulse)
191 ev.calculateModeVectors;
194 [T,ev] = evalc('ev.calculateModeVectors;'); % supress std out from fct call
192 195 assertEqual(size(ev.entangling_modes,2), samples_per_pulse) assertEqual(size(ev.entangling_modes,2), samples_per_pulse)
193 196
194 197 % check explicit setting of samples_per_pulse % check explicit setting of samples_per_pulse
195 198 samples_per_pulse = 50; samples_per_pulse = 50;
196 199 ev.samples_per_pulse = samples_per_pulse; ev.samples_per_pulse = samples_per_pulse;
197 200 assertEqual(ev.samples_per_pulse, samples_per_pulse) assertEqual(ev.samples_per_pulse, samples_per_pulse)
198 ev.calculateModeVectors;
201 [T,ev] = evalc('ev.calculateModeVectors;'); % supress std out from fct call
199 202 assertEqual(size(ev.entangling_modes,2), samples_per_pulse) assertEqual(size(ev.entangling_modes,2), samples_per_pulse)
200 203
201 204 function entanglement_evaluation_run_quick_test(shared) function entanglement_evaluation_run_quick_test(shared)
 
... ... function entanglement_evaluation_run_quick_test(shared)
204 207 ev.opt_pulse_widths = 1e3*[1, 1]; ev.opt_pulse_widths = 1e3*[1, 1];
205 208 ev.pulse_gammas = logspace(-1,1,10); ev.pulse_gammas = logspace(-1,1,10);
206 209
207 ev.calculateModeVectors;
210 [T,ev] = evalc('ev.calculateModeVectors;'); % supress std out from fct call
208 211 pulsepairs_no = 100; pulsepairs_no = 100;
209 ev.calculatePulsedQuadratures(1, 'pulsepairs', pulsepairs_no);
210 ev.calculatePulsedQuadratures(2, 'pulsepairs', pulsepairs_no);
212 [T,ev] = evalc('ev.calculatePulsedQuadratures(1, ''pulsepairs'', pulsepairs_no);');
213 [T,ev] = evalc('ev.calculatePulsedQuadratures(2, ''pulsepairs'', pulsepairs_no);');
211 214 assertEqual(size(ev.pulse_Q{1}),... assertEqual(size(ev.pulse_Q{1}),...
212 215 [pulsepairs_no, ev.mech_frequencies_no*ev.pulse_gammas_no]); [pulsepairs_no, ev.mech_frequencies_no*ev.pulse_gammas_no]);
213 216 ev.exportResults; ev.exportResults;
 
... ... function entanglement_evaluation_corrfct_test(shared)
256 259 ev = entanglement_evaluation_setup_test(shared); ev = entanglement_evaluation_setup_test(shared);
257 260
258 261 max_lags = 10; max_lags = 10;
259 ev.blocked_cross_correlation('blocksize', max_lags);
262 [T,ev] = evalc('ev.blocked_cross_correlation(''blocksize'', max_lags);'); % supress std out from fct call
260 263 xx = ev.correlation_functions{1}{1,1}; xx = ev.correlation_functions{1}{1,1};
261 264 pp = ev.correlation_functions{1}{2,2}; pp = ev.correlation_functions{1}{2,2};
262 265 xp = ev.correlation_functions{1}{1,2}; xp = ev.correlation_functions{1}{1,2};
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