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)
Fix bug due to relative path names in run_entanglement_evaluation_simulation.m 01adcc653d8f7a95e6648fb1eacb297aa9643a1a Jason Hoelscher-Obermaier 2016-11-07 17:45:42
Save evaluation-object to ev.mat in method exportResults.m 3542d5ce7be5718da52ac3f8e164b2e2e85c2b34 Jason Hoelscher-Obermaier 2016-11-07 17:39:21
Turn potentially memory-expensive properties into transient properties 1aed22e1658fa5b8ea1ea9c4bca76abd879d1d60 Jason Hoelscher-Obermaier 2016-11-07 17:09:32
Add howto_evaluation.txt 9350c7c08c3b15b0cecfcfb3de54f1d837656bf1 Jason Hoelscher-Obermaier 2016-11-05 19:24:07
Move heatmap.m 4fda6031578abc1cb18952813b3d1df4f934d1da Jason Hoelscher-Obermaier 2016-11-04 12:11:52
Reorder y-axis in plot_logneg_gammalist.m 0e3b893335cf56d44309e6ac831d65b83638f30e Jason Hoelscher-Obermaier 2016-11-04 12:11:24
Add missing dependence export_fig 6a1acf6525c4b34a02735f213604ecf74958b349 Jason Hoelscher-Obermaier 2016-11-04 09:50:48
Fix previous commit ad41a508b9445901b51a24f77daa2f35ba8e77f4 Jason Hoelscher-Obermaier 2016-11-04 09:49:30
Add missing dependence cbrewer.m 226872c0687aaf0e055672796e3ba4aa969b14f0 Jason Hoelscher-Obermaier 2016-11-04 09:47:21
Add missing dependence num2eng.m ae92495e8af0731ce8b97a6a47573210a769f30d Jason Hoelscher-Obermaier 2016-11-04 09:44:12
Improve plot_logneg_gammalist.m d0c6f747214de647c4a642aff9d35ae00b3d572e Jason Hoelscher-Obermaier 2016-11-04 09:26:43
Add test for method calculate_mode_vectors_gammalist 9caead0502cc61fb819406d4ecf938452c6a95b4 Jason Hoelscher-Obermaier 2016-11-04 09:25:59
Add function to plot corrected log.neg. vs two different pulse widths f2ac5c5da860ae147503b7368481248baf6ffc2f Jason Hoelscher-Obermaier 2016-11-03 13:03:14
Add inverse to allcomb-function (cartesian product) cbfadf5f46f3b3e25b6b2cbd541e1ad401f9f02f Jason Hoelscher-Obermaier 2016-11-03 12:30:43
Add method calculate_mode_vectors_gammalist to allow arbitrary combinations of pulsewidths 32f32019e82563cc5f6567d095c3b260ac9682f2 Jason Hoelscher-Obermaier 2016-11-02 09:55:27
Add dummy-mode to calculateModeVectors.m 5cfea8bb14eac9563f24e04930fcb3d419d39da6 Jason Hoelscher-Obermaier 2016-10-25 11:23:21
Correct help message for permute_data.m ac030677d3f8f7c0951f42b4dc4a1370399127d1 Jason Hoelscher-Obermaier 2016-10-24 09:56:32
Improve plotCorrelationMatrix.m eca579f58fa38bdc5fa3f81bda84976d4cd46acc Jason Hoelscher-Obermaier 2016-10-21 09:11:47
Add sanity_check-scripts due to Tobias Wenzl 9d02f936ea3ffed8fe13039087934c3326c33350 Jason Hoelscher-Obermaier 2016-09-30 12:10:45
Add peak_identification function due to Tobias Wenzl c8a4a8d38e8a909a5688e8ed5d3a88712f571dfa Jason Hoelscher-Obermaier 2016-09-30 12:07:52
Commit 01adcc653d8f7a95e6648fb1eacb297aa9643a1a - Fix bug due to relative path names in run_entanglement_evaluation_simulation.m
Author: Jason Hoelscher-Obermaier
Author date (UTC): 2016-11-07 17:45
Committer name: Jason Hoelscher-Obermaier
Committer date (UTC): 2016-11-07 17:45
Parent(s): 3542d5ce7be5718da52ac3f8e164b2e2e85c2b34
Signer:
Signing key:
Signing status: N
Tree: eead826ae4f8aef4305c50574585ce83b762c04a
File Lines added Lines deleted
data_analysis/auxfunctions/files/append_string_to_txtfile.m 2 2
data_analysis/auxfunctions/run_entanglement_evaluation_simulation.m 6 5
File data_analysis/auxfunctions/files/append_string_to_txtfile.m changed (mode: 100644) (index 1758bc1..cfe9f42)
1 1 %% APPEND_STRING_TO_TXTFILE(string, file): takes a string and a file(name) %% APPEND_STRING_TO_TXTFILE(string, file): takes a string and a file(name)
2 2 % and appends the string to the file (on a new line) % and appends the string to the file (on a new line)
3 function [outputs] = append_string_to_txtfile(string, file)
4 fid = fopen(file, 'a');
3 function append_string_to_txtfile(string, file)
4 fid = fopen(file, 'a+');
5 5 fprintf(fid, '%s\n', string); fprintf(fid, '%s\n', string);
6 6 fclose(fid); fclose(fid);
7 7 end end
File data_analysis/auxfunctions/run_entanglement_evaluation_simulation.m changed (mode: 100644) (index dba4d8e..18dc766)
9 9 %run_entanglement_evaluation_simulation(simulation_dir, 'quick') runs an evaluation %run_entanglement_evaluation_simulation(simulation_dir, 'quick') runs an evaluation
10 10 % over only the first 1e3 pulse pairs. % over only the first 1e3 pulse pairs.
11 11 function [ev, model] = run_entanglement_evaluation_simulation(simulation_dir, varargin) function [ev, model] = run_entanglement_evaluation_simulation(simulation_dir, varargin)
12 simulation_dir = GetFullPath(simulation_dir);
12 13 assert_file_in_dir('setup_eval.m', simulation_dir); assert_file_in_dir('setup_eval.m', simulation_dir);
13 14 assert_file_in_dir('model.mat', simulation_dir); assert_file_in_dir('model.mat', simulation_dir);
14 15
 
... ... function [ev, model] = run_entanglement_evaluation_simulation(simulation_dir, va
55 56 ev = calculate_entanglement(ev, evaluation_mode); %% run evaluation with current params ev = calculate_entanglement(ev, evaluation_mode); %% run evaluation with current params
56 57
57 58 %% export plots and data %% export plots and data
58 export_simulation_plot(ev, model, export_dir)
59 export_evaluation_plot(ev, model, export_dir)
59 60 ev.exportResults; ev.exportResults;
60 61 dlmwrite(fullfile(export_dir, 'theory.csv'),([model.pulse_gammas; model.log_neg]')); dlmwrite(fullfile(export_dir, 'theory.csv'),([model.pulse_gammas; model.log_neg]'));
61 62
 
... ... function ev = calculate_entanglement(ev, evaluation_mode)
103 104 toc toc
104 105 end end
105 106
106 function export_simulation_plot(ev, model, export_dir)
107 simulation_fig = figure; hold all;
107 function export_evaluation_plot(ev, model, export_dir)
108 evaluation_fig = figure; hold all;
108 109 plot(model.pulse_gammas, model.log_neg,... plot(model.pulse_gammas, model.log_neg,...
109 110 'DisplayName', 'Singlemode theory with adiabatic elimination, noise-free'); 'DisplayName', 'Singlemode theory with adiabatic elimination, noise-free');
110 111 %gridxy(ev.pulse_gammas, 'Color',[0,0,0]+0.5,'Linestyle','-',... %gridxy(ev.pulse_gammas, 'Color',[0,0,0]+0.5,'Linestyle','-',...
 
... ... function export_simulation_plot(ev, model, export_dir)
126 127 parentfolders = regexp(export_dir, filesep, 'split'); parentfolders = regexp(export_dir, filesep, 'split');
127 128 title([parentfolders{end-1}, 10, parentfolders{end}], 'interpreter', 'none'); title([parentfolders{end-1}, 10, parentfolders{end}], 'interpreter', 'none');
128 129 gridxy([],0); gridxy([],0);
129 saveas(simulation_fig, fullfile(export_dir, 'simulation.fig'));
130 saveas(simulation_fig, fullfile(export_dir, 'simulation.jpg'));
130 saveas(evaluation_fig, fullfile(export_dir, 'evaluation.fig'));
131 saveas(evaluation_fig, fullfile(export_dir, 'evaluation.jpg'));
131 132 end end
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