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)
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
Also export calibrated CMs, log.negativity and physicality from ev-object if they exist c063641e12dc805b62f5ef8bf49a5311dc803770 Jason Hoelscher-Obermaier 2016-09-22 12:53:49
Add method plotLogneg to entanglement_evaluation-class e7443b5adbcf6a9ef4a4dc95c5e27160e5c2f704 Jason Hoelscher-Obermaier 2016-09-22 12:23:44
Add darknoise-subtraction-method to entanglement_evaluation be1fc701bd39f6a0892383f9446daf408e6f7394 Jason Hoelscher-Obermaier 2016-09-22 09:30:49
Adapt test to check for result of CM-calibration procedure in entanglement_evaluation_test... e1b9ab299b267f97a7fdd24f4e1cce6abe942185 Jason Hoelscher-Obermaier 2016-09-20 16:15:52
Change quad.order to q1,p1,q2,p2,..,x1,y1,x2,y2,... everywhere for consistency 997cd1260b8b222bd0b6ebf3f8567db04ace24fd Jason Hoelscher-Obermaier 2016-09-20 10:30:19
Check that mode order is q1, p1, q2, p2, .... in calibrate_cm_test.m f5619421e505f4305e7ee12a173c5d85aef70196 Jason Hoelscher-Obermaier 2016-09-20 10:26:34
Add help to permute_data.m 22f7ede0384bfcb1f0a86556340e9e022586a508 Jason Hoelscher-Obermaier 2016-09-20 10:25:35
Fix ineffective test on entanglement_evaluation objects which are handles d5d85b7f9a1a7abd7384983b9d49bfb217d598aa Jason Hoelscher-Obermaier 2016-09-19 17:22:06
Allow to specify the traces to use for shotnoise-calibration by hand fdec708fa527788bc7c86a57462fddf3bd8678bc Jason Hoelscher-Obermaier 2016-09-15 10:24:00
Add dummy-mode to PXItrace: creates mock file for testing instead of an actual data file 14e29d60337a57ab13b3e950182520442c06a57e Jason Hoelscher-Obermaier 2016-09-15 10:05:23
Correct documentation in parseVararginForMissingFields.m 9e8a954bda526bb307d930cf07aaf9928eb19365 Jason Hoelscher-Obermaier 2016-09-14 17:10:28
Modify TestRunDisplay to suppress annoying html-output when running tests from command line 828228430097491d6fc591177699038ad02ab35d Jason Hoelscher-Obermaier 2016-09-14 17:10:08
Turn software_version into hidden, dependent property 4c6d3523d2abe43b7b17bfba303b16a57f679169 Jason Hoelscher-Obermaier 2016-09-14 13:22:17
Add import_traces-functionality to entanglement_evaluation 35d6b299912f30fb11cdc15d9b9299d9f556b5d0 Jason Hoelscher-Obermaier 2016-09-14 12:01:12
Speed up entanglement_evaluation_test 2a113d1fab8b9473cf2b9c939ea1c474ac43763e Jason Hoelscher-Obermaier 2016-09-14 09:14:56
cleaned up /model directory: moved all files (*model*) to toolbox 'optomechanics' ddf5a93a3e61b5e05714f92c5f21b63538235474 Witlef Wieczorek 2016-09-07 11:55:18
added return of StateNames adb7cc3eacaddf2406efc00f59b97285ad842d15 Witlef Wieczorek 2016-09-07 10:38:01
Commit eca579f58fa38bdc5fa3f81bda84976d4cd46acc - Improve plotCorrelationMatrix.m
- better muting of annotations
- clearer way of specifying optional arguments
Author: Jason Hoelscher-Obermaier
Author date (UTC): 2016-10-21 09:11
Committer name: Jason Hoelscher-Obermaier
Committer date (UTC): 2016-10-21 09:11
Parent(s): 9d02f936ea3ffed8fe13039087934c3326c33350
Signer:
Signing key:
Signing status: N
Tree: 99f66e6f00b6a961c08555e83300a3149adc6b4e
File Lines added Lines deleted
data_analysis/auxfunctions/plots/plotCorrelationMatrix.m 56 46
File data_analysis/auxfunctions/plots/plotCorrelationMatrix.m changed (mode: 100644) (index e7caf5b..892219c)
1 1 function plotCorrelationMatrix(cm, varargin) function plotCorrelationMatrix(cm, varargin)
2 2 % plotCorrelationMatrix(cm, varargin) takes a covariance matrix cm and plots the entries of cm using a color encoding % plotCorrelationMatrix(cm, varargin) takes a covariance matrix cm and plots the entries of cm using a color encoding
3 % possible varargin-arguments:
4 % - 'log': use logscale for the color scale
5 % - 'abs': plot the absolute values of the covariances
6 % - a title can be specfied for the figure using the parameter-value pair: 'title', titlestring
3 %
4 % customization via key-value-pairs:
5 % - 'log', true (default: false): use logscale for the color scale
6 % - 'abs', true (default: false): plot the absolute values of the covariances
7 % - 'title', title_string (default: ''): give the figure the title
8 % title_string
9 % - 'mute', true (default: false): switch off all text
10 % - 'colormap', colormap (default: 'cool'): use colormap as colormap
11 % - 'fontsize', fontsize (default: 4): use fontsize as fontsize
7 12
8 13 %% default values %% default values
9 mycolormap = 'cool';
10 mute = false;
11 14 logscale = false; logscale = false;
12 15 absvalues = false; absvalues = false;
13 showtitle = false;
16
17 title_string = ''; % no title by default
18 show_labels = false;
19 colormap = 'cool';
14 20 fontsize = 4; fontsize = 4;
15 21 format = '%0.1e'; format = '%0.1e';
22 muted = false;
16 23
17 for k=1:length(varargin)
18 switch varargin{k}
19 case ''
20
21 case 'title'
22 showtitle = true;
23 titlestr = varargin{k+1};
24 varargin{k} = '';
25 varargin{k+1} = '';
26 case 'fontsize'
27 fontsize = varargin{k+1}
28 varargin{k} = '';
29 varargin{k+1} = '';
30 end
31 end
32
33 for k=1:length(varargin)
24 for k=1:2:length(varargin)
34 25 switch varargin{k} switch varargin{k}
35 case 'log'
36 logscale = true;
37 case 'abs'
38 absvalues = true;
39 case 'mute'
40 mute = true;
41 fontsize = 0;
42 format = '%0.0e';
43 case ''
26 case {'abs', 'Abs'}
27 absvalues = varargin{k+1};
28 case {'logscale', 'log', 'Log', 'Logscale', 'Log_scale'}
29 logscale = varargin{k+1};
44 30
31 case {'title', 'title_string', 'Title', 'titlestring', 'Titlestring'}
32 title_string = varargin{k+1};
33 case {'show_labels', 'labels', 'Labels', 'Show_labels'}
34 show_labels = true;
35 case {'colormap', 'Colormap'}
36 colormap = varargin{k+1};
37 case {'fontsize', 'Fontsize'}
38 fontsize = varargin{k+1};
39 case {'format', 'Format'}
40 format = varargin{k+1};
41 case {'mute', 'Mute'}
42 if varargin{k+1}
43 muted = true
44 elseif ismember(varargin{k+1}, {'true', 'True'})
45 muted = true;
46 end
47
45 48 otherwise otherwise
46 49 error(['Unrecognized varargin-argument: ', varargin{k}]); error(['Unrecognized varargin-argument: ', varargin{k}]);
47 50 end end
 
... ... end
50 53 N = length(cm); N = length(cm);
51 54 signmatrix = sign(cm); signmatrix = sign(cm);
52 55
53 if mute
54 labels = {};
55 else
56 for k=1:N/4
56 if muted
57 fontsize = 0;
58 format = ''; %'%0.0e';
59 end
60
61 if show_labels
62 for k=1:N/4
57 63 labels{k} = ['q',num2str(k)]; labels{k} = ['q',num2str(k)];
58 64 labels{N/4 + k} = ['p',num2str(k)]; labels{N/4 + k} = ['p',num2str(k)];
59 65 labels{N/2 + k } = ['x',num2str(k)]; labels{N/2 + k } = ['x',num2str(k)];
60 66 labels{3*N/4 + k} = ['y',num2str(k)]; labels{3*N/4 + k} = ['y',num2str(k)];
61 67 end end
68 else
69 labels = {};
62 70 end end
63 71
64 72 if absvalues if absvalues
65 mycolormap = 'summer';
73 if isequal(colormap, 'cool')
74 colormap = 'summer';
75 end
76 % don't change colormap if a colormap was chose
66 77 cm = abs(cm); cm = abs(cm);
67 78 end end
68 79
69 80
70 81 if logscale if logscale
71 82 heatmap(cm, labels, labels,... heatmap(cm, labels, labels,...
72 format,'Colormap', mycolormap,...
83 format,'Colormap', colormap,...
73 84 'UseLogColormap', true,... 'UseLogColormap', true,...
74 'FontSize', fontsize, 'Colorbar', {'SouthOutside'}, 'GridLines', ':');
85 'FontSize', fontsize,...
86 'Colorbar', {'SouthOutside'}, 'GridLines', ':');
75 87 else else
76 88 heatmap(cm, labels, labels,... heatmap(cm, labels, labels,...
77 format,'Colormap', mycolormap,...
78 'FontSize', fontsize, 'Colorbar', {'SouthOutside'}, 'GridLines', ':');
89 format,'Colormap', colormap,...
90 'FontSize', fontsize,...
91 'Colorbar', {'SouthOutside'}, 'GridLines', ':');
79 92 end end
80 93
81 if showtitle
82 title(titlestr)
83 end
94 title(title_string)
84 95
85 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