fixed bug in osci_datataking
Fix typo in gpib Marconi server
Add twistd.pid to gitignore
Modify DAC_CONTROL, elecLayout
Devices_config.py: modify TD gpib bus port
SHUTTER_CONTROL.py: change available chan
New Cfiles
Merge branch 'master' into gui_dev
Merge branch 'gui_dev2' into gui_dev