From 5dbd0b37f2d2d96db05e36e1f29ff57a6558caf5 Mon Sep 17 00:00:00 2001
From: Thorvald Larsen <thorvaldw@hotmail.com>
Date: Tue, 24 Oct 2017 17:10:55 +0200
Subject: [PATCH 1/5] SGS100A Driver

Adding parameter to SGS100A driver to allow on/off of IQ modulation.
---
 .DS_Store                                        | Bin 0 -> 6148 bytes
 qcodes/.DS_Store                                 | Bin 0 -> 8196 bytes
 qcodes/instrument_drivers/.DS_Store              | Bin 0 -> 6148 bytes
 .../instrument_drivers/rohde_schwarz/SGS100A.py  |  11 +++++++++++
 4 files changed, 11 insertions(+)
 create mode 100644 .DS_Store
 create mode 100644 qcodes/.DS_Store
 create mode 100644 qcodes/instrument_drivers/.DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..b2bfa2076ebd236aa4052838b04c1879127658da
GIT binary patch
literal 6148
zcmeHK!A=4(5N!c*H^#`pM2@|9;{ZYAWU@g#cr(H1K@IG>L^i=KvWpvCG5Z_(M}C37
z<4jwK1U+~$MrM-fn@(ri^zEk8GRAmo;@21}F~%%V#GDPy7lPxcOOi7lM6TxOv&c)L
zkvEjyQZzaKA_MsCitLVEGs%3m`2F6z(J+YOYW1Dx@`bhHx@Fszy=h%_1~TcyZaj%v
z?)XCW0>AGW`&7!|+;+XQpr3S0+lMlY-5~6bKZReO2ca*MmYjrsq~<ws;{oKVg}SA3
zn${bQim2CW(~3x&&1yyL)%T}U%i7tk9US*=A0E@E>GO+bmcvh|WXs?TUcp${<b7ux
z4rO=){#ni}mXH`A28e+bV89%G*2W6#m9|I>5CcDB0M7>jis%^3G^(Qm8oWN@cmWXw
zY<x=~3WJWpOe2hdaGeUMQ@MF!aGef*Vd5NvnMR$?xLO(JF)MTPLg8w4@Cy~rxTBF;
zVt^P}WFW7*C9MBP-@pGClc+}w5Ci{;0bXc#+AY|UsjW+!!&)mqd!Q&7muZ}*fT2n;
f#9}EfgDL^PKm*V*m}vwL2weme4b%_=zskS|C0SBm

literal 0
HcmV?d00001

diff --git a/qcodes/.DS_Store b/qcodes/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..dcabde42bced0ecce6cd7b36b65f103e90bb0ed6
GIT binary patch
literal 8196
zcmeHMO>7la6h7Z;ff*U-v{otF2@ebMlLD;;3Q^4KAOD1E3vKy(y!U3H6Q(oe&AeBj
zR*M*n2`m5N&w^+)M%k#rCHS*KT^XAYFuG7SZcrDxz(hTF?!1N;s_Y~%H<>we?>Xn*
zd%k|>-ket=LTkZnB&s1Ig&!gHnf$s*6MFI7&=S!|IZLoVQJxAkKo+?a++ZCK#0bO)
z#0bO)#0bO)+ztrvoh_O&#l0`J@jFH!M&PbQK%5UreuPX#a#YIj=-^ja0<aV%K-l=3
z>wwTF8Oc;6N2Ls1c}`h9AaX@iVnDjHJ}JyurXo2irF17qcS5u>q6!7!>g<;c%?T+f
z<9CcejKGZui1eu<n=5voYxe8w_cWQ@x2eeWe4hO5kUyApye!*)nH_X&KWJ#Uh(uZW
zwCOVxRaMkk%HFPiZ>THC1O>k}liwZoY}3j{-`$?)jDKgcJ8f$ytyi~sZjiBED}SB&
zo*vsZy`fgG;F^9oPiH3RXWww4v|ckj+_Y*{eX^;sail&u+}zwypIq6rdSpaV<}7Sn
zw`u>t(PP6;jXeFjj2F?FK^2qYf8$nzcl=_T3_dYd3jXqV@b}ErW*M8eY~7}9@3nKD
z+hrfK(t3r@Xl&wcXWlAutUWo;DGa!NTCdDyoLs@l1XhdV2xA_r@N;?3aXLNU4s6fu
z>kX_UL2051s@`3`mk-*)$<n%B@U15;p35#;?K~q-RV7y2J}9Q~cUpO$WnHR4hOVBO
zJ!js6#mgRPek|27R-so`-CM0`yZEo<2KE8l%I_Gm&7i+8<L4~bwB3U}MccQtj@9jE
z2CPcdtLj)q&D;kbtTl|OOnVDi`*6Vyj_P%a60VV)Z)kf=-rY9O6swr}CkoHQt1p~y
z7`uh0EpPGLj2xCMHMDM@k<l}e;qn!l)_sU+q5EPB?Ao+aGj=$ctmWvYD%V-FRx^5v
zGGu*AG`Ox>GkSC0zyOEnM`JCmhOtj9yEWqn+XpR|w{$_Q&7rO5E%gaqi)o4tDRrs6
zpM~hvr4~yR>!ctGQBieqc^ULDt>Me6n+}ji$LSQErn7X8&eK=)E&V`O=qmj|f6`y{
zHwY>!Fc<T&6!ln!<!DAb)?))U;tA}<KBUo)0eBe1VI0FVIF4s=0;ljIUdAhU6{qnY
z-p2<xgR?k?^Y|1Oa1obq8Q<XwuHqN`ir;W8QI^mWm5D03-$W@7I!pVH#;aN0(jmZk
z5FG-EH*cN?wHr2W+N^cl_IYq=wj}?3_s>Z#T)JZA+Q(bRNivBU*Yh(ZrDR>m#uD2?
zB21w8n9LGwUMYhnr^^l|vvoufIi=5#)(_P#P?(3hBD;%fmnfVmdLry<^|i}Y&Ii3r
zY8$mCg_*BUliJnV8kKWHFPGX!wRH-ofIeMn4Xs60b&{P$wH>OW<G+dhueAP#F4NES
zJ6&TsPs1!!VICHv0jrS;sk|9munjxWgFfuS9#}ZQq_%Mg0SXwx5hnHtJcpBb9xpJl
zUkZu+8s5U&cn9w?!9T=D_;{S)pW_RBjWK+WA1Bdy>qI)^r(30Su`BO7o_mn(OQ|t&
zsyn+^Cc~={^?%3IzyIIaAjHwd2;AiepuD}Sy_G?j>JUt@F3Hb+enb;?qf&-0{1PT&
lJS@jqj{n1uzmt(J70FR4S;OuB`5{1!@BjGz_wVNW{~yojV5tBA

literal 0
HcmV?d00001

diff --git a/qcodes/instrument_drivers/.DS_Store b/qcodes/instrument_drivers/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..2332f3527ab2820f2f685bcb5be6a8ba554663d3
GIT binary patch
literal 6148
zcmeHK!Ab)$5S_GDw}{w-V2`<Y>!GD;Pr_2`!JAOggG#&W7Q0Y4(%rh)TG`*wKk^Iw
z9cPlXC{<4)Qf6TCCX<<jyeydw0Ep%&r~#A!z(FO<6|wn3Xq<FGa@IpA^c+3tKn&N=
zhjbyD9siL5I=c-Rg2FQk;N$su=pFlMeCH38k5RAw-5`vUYV}Rz@`aVvHK$l~iW|;V
zyRXuA;w7WF=?yP*FARFVwNI5A%x%v<3wvp&v~{SW#0#U|@I(0Jc^CyMZK_ce#Co0+
zFX>~hUZ_(lPbT%fy^5^YYSW6GG#b^4+^z3Vr;f9|Q#&~B-ad>ckJG1T!?VCoQp={r
z8N8tJ!<O&c!)TzQ8;qLGFw10Q2ABb6U`ZIT*PFAxB>UlQFaylM?=e94gG42CEoKJw
z)qxHDKGJxBkOXadOAtznuEoqCj-UvWifB@WePRfcj(%z5T#K1OlMX_!jPux)g?*t2
zy*m1(4hP{H<dzv=20k;8H{BA||D*5U|DTh%#|$t7OT~aFwA!sEZpqfxh0Rf|m8e}*
p5{k<V&Qs9Pr5IzW6qix8pkI=K=vvGSq6dY41T+oYFav+ez&k8=R+|6-

literal 0
HcmV?d00001

diff --git a/qcodes/instrument_drivers/rohde_schwarz/SGS100A.py b/qcodes/instrument_drivers/rohde_schwarz/SGS100A.py
index f4c2857ab0c..1804745b167 100644
--- a/qcodes/instrument_drivers/rohde_schwarz/SGS100A.py
+++ b/qcodes/instrument_drivers/rohde_schwarz/SGS100A.py
@@ -56,6 +56,11 @@ def __init__(self, name, address, **kwargs):
                            set_cmd=self.set_status,
                            get_parser=self.parse_on_off,
                            vals=vals.Strings())
+        self.add_parameter('status',
+                           get_cmd=':IQ:STAT?',
+                           set_cmd=self.set_status,
+                           get_parser=self.parse_on_off,
+                           vals=vals.Strings())
         self.add_parameter('pulsemod_state',
                            get_cmd=':SOUR:PULM:STAT?',
                            set_cmd=self.set_pulsemod_state,
@@ -101,6 +106,12 @@ def set_status(self, stat):
         else:
             raise ValueError('Unable to set status to %s, ' % stat +
                              'expected "ON" or "OFF"')
+    def set_status(self, stat):
+        if stat.upper() in ('ON', 'OFF'):
+            self.write(':IQ:STAT %s' % stat)
+        else:
+            raise ValueError('Unable to set status to %s, ' % stat +
+                             'expected "ON" or "OFF"')
 
     def set_pulsemod_state(self, stat):
         if stat.upper() in ('ON', 'OFF'):

From 36df425b947451d25685f9ccbfa194aa7b92b067 Mon Sep 17 00:00:00 2001
From: Thorvald Larsen <thorvaldw@hotmail.com>
Date: Tue, 24 Oct 2017 17:14:32 +0200
Subject: [PATCH 2/5] Change parameter name

Forgot to change a few lines in previous commit.
---
 qcodes/instrument_drivers/rohde_schwarz/SGS100A.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/qcodes/instrument_drivers/rohde_schwarz/SGS100A.py b/qcodes/instrument_drivers/rohde_schwarz/SGS100A.py
index 1804745b167..7454107aadf 100644
--- a/qcodes/instrument_drivers/rohde_schwarz/SGS100A.py
+++ b/qcodes/instrument_drivers/rohde_schwarz/SGS100A.py
@@ -56,9 +56,9 @@ def __init__(self, name, address, **kwargs):
                            set_cmd=self.set_status,
                            get_parser=self.parse_on_off,
                            vals=vals.Strings())
-        self.add_parameter('status',
+        self.add_parameter('IQ_state',
                            get_cmd=':IQ:STAT?',
-                           set_cmd=self.set_status,
+                           set_cmd=self.set_IQ_state,
                            get_parser=self.parse_on_off,
                            vals=vals.Strings())
         self.add_parameter('pulsemod_state',
@@ -106,7 +106,8 @@ def set_status(self, stat):
         else:
             raise ValueError('Unable to set status to %s, ' % stat +
                              'expected "ON" or "OFF"')
-    def set_status(self, stat):
+            
+    def set_IQ_state(self, stat):
         if stat.upper() in ('ON', 'OFF'):
             self.write(':IQ:STAT %s' % stat)
         else:

From 68d5812060919faa949eaaf5a46452a3380b410f Mon Sep 17 00:00:00 2001
From: Jens Hedegaard Nielsen <j.h.nielsen@nbi.ku.dk>
Date: Thu, 26 Oct 2017 15:28:36 +0200
Subject: [PATCH 3/5] Strip trailing whitespace

---
 qcodes/instrument_drivers/rohde_schwarz/SGS100A.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qcodes/instrument_drivers/rohde_schwarz/SGS100A.py b/qcodes/instrument_drivers/rohde_schwarz/SGS100A.py
index 7454107aadf..bb487cd730d 100644
--- a/qcodes/instrument_drivers/rohde_schwarz/SGS100A.py
+++ b/qcodes/instrument_drivers/rohde_schwarz/SGS100A.py
@@ -106,7 +106,7 @@ def set_status(self, stat):
         else:
             raise ValueError('Unable to set status to %s, ' % stat +
                              'expected "ON" or "OFF"')
-            
+
     def set_IQ_state(self, stat):
         if stat.upper() in ('ON', 'OFF'):
             self.write(':IQ:STAT %s' % stat)

From f8ce2c202382c48b2ffed28ded3b680be3856fff Mon Sep 17 00:00:00 2001
From: Jens Hedegaard Nielsen <j.h.nielsen@nbi.ku.dk>
Date: Thu, 26 Oct 2017 15:31:51 +0200
Subject: [PATCH 4/5] remove .DS_Store files

---
 .DS_Store                           | Bin 6148 -> 0 bytes
 qcodes/.DS_Store                    | Bin 8196 -> 0 bytes
 qcodes/instrument_drivers/.DS_Store | Bin 6148 -> 0 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 .DS_Store
 delete mode 100644 qcodes/.DS_Store
 delete mode 100644 qcodes/instrument_drivers/.DS_Store

diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index b2bfa2076ebd236aa4052838b04c1879127658da..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHK!A=4(5N!c*H^#`pM2@|9;{ZYAWU@g#cr(H1K@IG>L^i=KvWpvCG5Z_(M}C37
z<4jwK1U+~$MrM-fn@(ri^zEk8GRAmo;@21}F~%%V#GDPy7lPxcOOi7lM6TxOv&c)L
zkvEjyQZzaKA_MsCitLVEGs%3m`2F6z(J+YOYW1Dx@`bhHx@Fszy=h%_1~TcyZaj%v
z?)XCW0>AGW`&7!|+;+XQpr3S0+lMlY-5~6bKZReO2ca*MmYjrsq~<ws;{oKVg}SA3
zn${bQim2CW(~3x&&1yyL)%T}U%i7tk9US*=A0E@E>GO+bmcvh|WXs?TUcp${<b7ux
z4rO=){#ni}mXH`A28e+bV89%G*2W6#m9|I>5CcDB0M7>jis%^3G^(Qm8oWN@cmWXw
zY<x=~3WJWpOe2hdaGeUMQ@MF!aGef*Vd5NvnMR$?xLO(JF)MTPLg8w4@Cy~rxTBF;
zVt^P}WFW7*C9MBP-@pGClc+}w5Ci{;0bXc#+AY|UsjW+!!&)mqd!Q&7muZ}*fT2n;
f#9}EfgDL^PKm*V*m}vwL2weme4b%_=zskS|C0SBm

diff --git a/qcodes/.DS_Store b/qcodes/.DS_Store
deleted file mode 100644
index dcabde42bced0ecce6cd7b36b65f103e90bb0ed6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8196
zcmeHMO>7la6h7Z;ff*U-v{otF2@ebMlLD;;3Q^4KAOD1E3vKy(y!U3H6Q(oe&AeBj
zR*M*n2`m5N&w^+)M%k#rCHS*KT^XAYFuG7SZcrDxz(hTF?!1N;s_Y~%H<>we?>Xn*
zd%k|>-ket=LTkZnB&s1Ig&!gHnf$s*6MFI7&=S!|IZLoVQJxAkKo+?a++ZCK#0bO)
z#0bO)#0bO)+ztrvoh_O&#l0`J@jFH!M&PbQK%5UreuPX#a#YIj=-^ja0<aV%K-l=3
z>wwTF8Oc;6N2Ls1c}`h9AaX@iVnDjHJ}JyurXo2irF17qcS5u>q6!7!>g<;c%?T+f
z<9CcejKGZui1eu<n=5voYxe8w_cWQ@x2eeWe4hO5kUyApye!*)nH_X&KWJ#Uh(uZW
zwCOVxRaMkk%HFPiZ>THC1O>k}liwZoY}3j{-`$?)jDKgcJ8f$ytyi~sZjiBED}SB&
zo*vsZy`fgG;F^9oPiH3RXWww4v|ckj+_Y*{eX^;sail&u+}zwypIq6rdSpaV<}7Sn
zw`u>t(PP6;jXeFjj2F?FK^2qYf8$nzcl=_T3_dYd3jXqV@b}ErW*M8eY~7}9@3nKD
z+hrfK(t3r@Xl&wcXWlAutUWo;DGa!NTCdDyoLs@l1XhdV2xA_r@N;?3aXLNU4s6fu
z>kX_UL2051s@`3`mk-*)$<n%B@U15;p35#;?K~q-RV7y2J}9Q~cUpO$WnHR4hOVBO
zJ!js6#mgRPek|27R-so`-CM0`yZEo<2KE8l%I_Gm&7i+8<L4~bwB3U}MccQtj@9jE
z2CPcdtLj)q&D;kbtTl|OOnVDi`*6Vyj_P%a60VV)Z)kf=-rY9O6swr}CkoHQt1p~y
z7`uh0EpPGLj2xCMHMDM@k<l}e;qn!l)_sU+q5EPB?Ao+aGj=$ctmWvYD%V-FRx^5v
zGGu*AG`Ox>GkSC0zyOEnM`JCmhOtj9yEWqn+XpR|w{$_Q&7rO5E%gaqi)o4tDRrs6
zpM~hvr4~yR>!ctGQBieqc^ULDt>Me6n+}ji$LSQErn7X8&eK=)E&V`O=qmj|f6`y{
zHwY>!Fc<T&6!ln!<!DAb)?))U;tA}<KBUo)0eBe1VI0FVIF4s=0;ljIUdAhU6{qnY
z-p2<xgR?k?^Y|1Oa1obq8Q<XwuHqN`ir;W8QI^mWm5D03-$W@7I!pVH#;aN0(jmZk
z5FG-EH*cN?wHr2W+N^cl_IYq=wj}?3_s>Z#T)JZA+Q(bRNivBU*Yh(ZrDR>m#uD2?
zB21w8n9LGwUMYhnr^^l|vvoufIi=5#)(_P#P?(3hBD;%fmnfVmdLry<^|i}Y&Ii3r
zY8$mCg_*BUliJnV8kKWHFPGX!wRH-ofIeMn4Xs60b&{P$wH>OW<G+dhueAP#F4NES
zJ6&TsPs1!!VICHv0jrS;sk|9munjxWgFfuS9#}ZQq_%Mg0SXwx5hnHtJcpBb9xpJl
zUkZu+8s5U&cn9w?!9T=D_;{S)pW_RBjWK+WA1Bdy>qI)^r(30Su`BO7o_mn(OQ|t&
zsyn+^Cc~={^?%3IzyIIaAjHwd2;AiepuD}Sy_G?j>JUt@F3Hb+enb;?qf&-0{1PT&
lJS@jqj{n1uzmt(J70FR4S;OuB`5{1!@BjGz_wVNW{~yojV5tBA

diff --git a/qcodes/instrument_drivers/.DS_Store b/qcodes/instrument_drivers/.DS_Store
deleted file mode 100644
index 2332f3527ab2820f2f685bcb5be6a8ba554663d3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHK!Ab)$5S_GDw}{w-V2`<Y>!GD;Pr_2`!JAOggG#&W7Q0Y4(%rh)TG`*wKk^Iw
z9cPlXC{<4)Qf6TCCX<<jyeydw0Ep%&r~#A!z(FO<6|wn3Xq<FGa@IpA^c+3tKn&N=
zhjbyD9siL5I=c-Rg2FQk;N$su=pFlMeCH38k5RAw-5`vUYV}Rz@`aVvHK$l~iW|;V
zyRXuA;w7WF=?yP*FARFVwNI5A%x%v<3wvp&v~{SW#0#U|@I(0Jc^CyMZK_ce#Co0+
zFX>~hUZ_(lPbT%fy^5^YYSW6GG#b^4+^z3Vr;f9|Q#&~B-ad>ckJG1T!?VCoQp={r
z8N8tJ!<O&c!)TzQ8;qLGFw10Q2ABb6U`ZIT*PFAxB>UlQFaylM?=e94gG42CEoKJw
z)qxHDKGJxBkOXadOAtznuEoqCj-UvWifB@WePRfcj(%z5T#K1OlMX_!jPux)g?*t2
zy*m1(4hP{H<dzv=20k;8H{BA||D*5U|DTh%#|$t7OT~aFwA!sEZpqfxh0Rf|m8e}*
p5{k<V&Qs9Pr5IzW6qix8pkI=K=vvGSq6dY41T+oYFav+ez&k8=R+|6-


From 62a501231e2156fc747cc9d5057be092b3604c67 Mon Sep 17 00:00:00 2001
From: Jens Hedegaard Nielsen <j.h.nielsen@nbi.ku.dk>
Date: Thu, 26 Oct 2017 15:32:35 +0200
Subject: [PATCH 5/5] Ignore DS_Store

---
 .gitignore | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index dde5f156f2a..f727e6ed339 100644
--- a/.gitignore
+++ b/.gitignore
@@ -79,4 +79,7 @@ tmp/
 
 docs/examples/data/*
 
-.idea/
\ No newline at end of file
+.idea/
+
+# Mac files
+.DS_Store