diff --git a/config/config.properties b/config/config.properties
index 3b014ad..914b94b 100755
--- a/config/config.properties
+++ b/config/config.properties
@@ -1,19 +1,26 @@
-#Tue Oct 13 10:42:18 CEST 2020
+#Tue Mar 30 11:55:18 CEST 2021
autoSaveScanData=true
-simulation=true
+simulation=false
commandExecutionEvents=true
logDaysToLive=50
dataScanSaveOutput=false
+handleSessions=true
userAuthenticator=ch.psi.pshell.security.LdapAuthenticator | ldap\://d.psi.ch | d.psi.ch | users.psi
logLevelConsole=Off
scanStreamerPort=5563
dataScanSaveScript=false
dataScanSaveSetpoints=false
+notifiedTasks=Test1,TestDate, xxx
parallelInitialization=false
+dataTransferPath=~/test/transfer
+saveConsoleSessionFiles=false
+dataTransferHost=
versionTrackingManual=true
+dataTransferMode=Off
hostName=
userManagement=true
instanceName=Dev
+disableEmbeddedAttributes=true
dataServerPort=5573
hideServerMessages=false
serverPort=8080
@@ -22,15 +29,18 @@ dataPath={data}/{year}_{month}/{date}/{date}_{time}_{name}
serverEnabled=false
dataScanReleaseRecords=false
depthDimension=0
-dataScanPreserveTypes=true
+dataScanPreserveTypes=false
logLevel=Fine
dataScanFlushRecords=false
logPath={logs}/{date}_{time}
dataLayout=default
+disableDataFileLogs=false
+sessionHandling=On
generateCommandExecutionEvents=true
terminalEnabled=false
notificationLevel=Off
terminalPort=0
+dataTransferUser=gobbo_a
createSessionFiles=false
versionTrackingLogin={context}/svcusr-hlapp_robot
versionTrackingRemote=git@git.psi.ch\:pshell_config/dev.git
diff --git a/config/devices.properties b/config/devices.properties
index 5b51e8c..37bb6cd 100755
--- a/config/devices.properties
+++ b/config/devices.properties
@@ -37,10 +37,10 @@ deting=ch.psi.pshell.imaging.CameraSource|det||-500|
#marco=ch.psi.pshell.epics.ChannelDouble|TESTIOC:TESTSINUS:SinCalc 3||5000|false
#ts=ch.psi.pshell.epics.ChannelDouble|TESTIOC:TESTSINUS:SinCalc 3 true|||true
#tsa=ch.psi.pshell.epics.ChannelDoubleArray|TESTIOC:TESTWF2:MyWF 2 -1 true|||
-m1=ch.psi.pshell.epics.Motor|MTEST-HW3:MOT1|||true
-ai1=ch.psi.pshell.epics.ChannelDouble|MTEST-HW3-AI1:AI_01|||true
-ai2=ch.psi.pshell.epics.ChannelDouble|MTEST-HW3-AI1:AI_05|||true
-$mb=ch.psi.pshell.modbus.ModbusTCP|MTEST-CWAG-OFF:502|||
+#m1=ch.psi.pshell.epics.Motor|MTEST-HW3:MOT1|||true
+#ai1=ch.psi.pshell.epics.ChannelDouble|MTEST-HW3-AI1:AI_01|||true
+#ai2=ch.psi.pshell.epics.ChannelDouble|MTEST-HW3-AI1:AI_05|||true
+#$mb=ch.psi.pshell.modbus.ModbusTCP|MTEST-CWAG-OFF:502|||
#mbs=ch.psi.pshell.modbus.ModbusSerial||||
#mb_delay=ch.psi.pshell.modbus.Register|mb 0x1037|||
#mbdo=ch.psi.pshell.modbus.DigitalOutput|mb 4||50|
@@ -67,7 +67,7 @@ sin=ch.psi.pshell.epics.ChannelDouble|TESTIOC:TESTSINUS:SinCalc 3 true|||true
#isin=ch.psi.pshell.epics.ChannelInteger|TESTIOC:TESTSINUS:SinCalc|||true
arr=ch.psi.pshell.epics.ChannelDoubleArray|TESTIOC:TESTWF2:MyWF 6 -1 false|||true
histo=ch.psi.pshell.device.HistogramGenerator|sin|||false
-histo2=ch.psi.pshell.device.HistogramGenerator|sin 200 NaN NaN 100||3000|false
+histo2=ch.psi.pshell.device.HistogramGenerator|sin 200 NaN NaN 100|||false
arr1=ch.psi.pshell.epics.ChannelIntegerArray|TESTIOC:TESTWF2:MyWF -1 false|||
mt=ch.psi.pshell.epics.GenericMatrix|TESTIOC:TESTWF2:MyWF 2 3 false|||
mt1=ch.psi.pshell.epics.GenericMatrix|TESTIOC:TESTWF2:MyWF 3 2 False None [i|||
@@ -125,7 +125,10 @@ eta=ch.psi.pshell.device.DummyMotor||||true
chi=ch.psi.pshell.device.DummyMotor||||true
phi=ch.psi.pshell.device.DummyMotor||||true
#sixc=ch.psi.pshell.device.MotorGroupBase|mu delta gamma eta chi phi|||
-fivec=ch.psi.pshell.device.MotorGroupBase|delta gamma eta chi phi|||
+#fivec=ch.psi.pshell.device.MotorGroupBase|delta gamma eta chi phi|||
#fourc=ch.psi.pshell.device.MotorGroupBase|delta eta chi phi|||
-#fourcv=ch.psi.pshell.device.MotorGroupBase|mu delta gamma eta|||
+fourcv=ch.psi.pshell.device.MotorGroupBase|mu delta gamma eta|||
energy=ch.psi.pshell.device.DummyPositioner||||true
+gch=ch.psi.pshell.epics.GenericChannel|TESTIOC:TESTSINUS:SinCalc|||
+garr=ch.psi.pshell.epics.GenericArray|TESTIOC:TESTWF2:MyWF -1 False|||
+darr=ch.psi.pshell.epics.ChannelDoubleArray|TESTIOC:TESTWF2:MyWF|||
diff --git a/config/jcae.properties b/config/jcae.properties
index 6455793..d142e0e 100755
--- a/config/jcae.properties
+++ b/config/jcae.properties
@@ -1,12 +1,12 @@
-#Mon Oct 12 15:07:30 CEST 2020
+#Mon Mar 08 09:04:03 CET 2021
ch.psi.jcae.ContextFactory.maxArrayBytes=10000000
ch.psi.jcae.impl.DefaultChannelService.timeout=500
-ch.psi.jcae.ChannelFactory.timeout=200
-ch.psi.jcae.ContextFactory.maxSendArrayBytes=
+ch.psi.jcae.ChannelFactory.timeout=500
+ch.psi.jcae.ContextFactory.maxSendArrayBytes=1000000
ch.psi.jcae.ChannelFactory.retries=1
ch.psi.jcae.ContextFactory.useShellVariables=false
ch.psi.jcae.ContextFactory.addLocalBroadcastInterfaces=false
-ch.psi.jcae.ContextFactory.addressList=127.0.0.1\:54321
+ch.psi.jcae.ContextFactory.addressList=127.0.0.1 127.0.0.1\:54321
ch.psi.jcae.ContextFactory.serverPort=
ch.psi.jcae.impl.DefaultChannelService.retries=1
ch.psi.jcae.ContextFactory.autoAddressList=true
diff --git a/config/mail.properties b/config/mail.properties
index a6371d2..c0d4ca2 100755
--- a/config/mail.properties
+++ b/config/mail.properties
@@ -1,10 +1,9 @@
-#Wed Oct 18 15:31:18 CEST 2017
-auth=None
-from=pshell.dev@psi.ch
-host=smtpint.psi.ch
-port=0
-pwd=
-smsSuffix=@sms.switch.ch
-to=alexandre.gobbo@psi.ch;0774526821
-usr=
-
+#Wed Jan 13 17:08:33 CET 2021
+auth=None
+port=0
+usr=
+smsSuffix=@sms.switch.ch
+host=smtpint.psi.ch
+from=pshell.dev@psi.ch
+to=alexandre.gobbo@psi.ch;0774526821@sms.switch.ch
+pwd=
diff --git a/config/scicat.properties b/config/scicat.properties
new file mode 100644
index 0000000..702e6a9
--- /dev/null
+++ b/config/scicat.properties
@@ -0,0 +1,11 @@
+#Wed Feb 03 15:17:53 CET 2021
+environment=test
+testParameters=-testenv -user slssim\:4DMGBarXmr
+sourceFolder=/Users/gobbo_a/dev/pshell/config/home/data
+prodParameters=\ -user slssim\:4DMGBarXmr
+devParameters=-devenv -user slssim slssim
+ownerGroup=p00001
+type=raw
+parameters=-ingest -allowexistingsource -noninteractive
+creationLocation=/PSI/SLS/SIM
+principalInvestigator=
diff --git a/config/session_metadata.properties b/config/session_metadata.properties
new file mode 100644
index 0000000..ef6756e
--- /dev/null
+++ b/config/session_metadata.properties
@@ -0,0 +1,12 @@
+#Thu Mar 04 12:05:11 CET 2021
+Proposer=String;Alex
+Proposal=String;Test
+P-group=String;P001
+Sample=String;MySample
+Authors=List;[]
+Real=Double;3.14
+Int=Integer;3
+Bool=Boolean;true
+scientificMetadata=Map;{}
+beamlineState=Map;{}
+x=String
diff --git a/config/sessions.properties b/config/sessions.properties
new file mode 100644
index 0000000..5f147e7
--- /dev/null
+++ b/config/sessions.properties
@@ -0,0 +1,3 @@
+#Mon Mar 08 08:50:39 CET 2021
+SessionCounter=161
+CurrentSession=161
diff --git a/config/settings.properties b/config/settings.properties
index 1cee9ae..e35f65d 100644
--- a/config/settings.properties
+++ b/config/settings.properties
@@ -1,5 +1,6 @@
-#Tue Oct 13 10:42:09 CEST 2020
+#Wed Apr 28 09:28:40 CEST 2021
test=1
geometry=fourcv
ScanIndex=5
+RSYNC_PATH=~/test/transfer
FdaBrowser=true
diff --git a/config/setup.properties b/config/setup.properties
index f11b77e..844a8a2 100755
--- a/config/setup.properties
+++ b/config/setup.properties
@@ -1,22 +1,25 @@
-#Fri Sep 06 09:47:35 CEST 2019
-configFile={config}/config.properties
-configFileDevices={config}/devices.properties
-configFileImageSources={config}/imaging.properties
-configFilePlugins={config}/plugins.properties
-configFileSettings={config}/settings.properties
-configFileTasks={config}/tasks.properties
-configFileUpdateStrategy={config}/update.properties
-configFileVariables={config}/variables.properties
-configPath={home}/config
-contextPath={outp}/context
-dataPath={outp}/data
-devicesPath={home}/devices
-extensionsPath={home}/extensions
-imagesPath={outp}/images
-libraryPath={script}; {script}/Lib; src/main/assembly/script/tutorial
-logPath={outp}/log
-pluginsPath={home}/plugins
+#Thu Feb 11 17:17:34 CET 2021
scriptPath={home}/script
-scriptType=py
sessionsPath={outp}/sessions
+configFileDevices={config}/devices.properties
+extensionsPath={home}/extensions
+configFileUpdateStrategy={config}/update.properties
+configPath={home}/config
+configFileSessions={config}/sessions.properties
+userSessionsPath={sessions}/user
+dataPath={outp}/data
+configFileVariables={config}/variables.properties
+logPath={outp}/log
wwwPath={home}/www
+configFile={config}/config.properties
+configFileTasks={config}/tasks.properties
+configFileImageSources={config}/imaging.properties
+pluginsPath={home}/plugins
+consoleSessionsPath={sessions}/console
+libraryPath={script}; {script}/Lib; src/main/assembly/script/tutorial
+configFilePlugins={config}/plugins.properties
+contextPath={outp}/context
+devicesPath={home}/devices
+configFileSettings={config}/settings.properties
+imagesPath={outp}/images
+scriptType=py
diff --git a/config/variables.properties b/config/variables.properties
index b4bcd91..65f7320 100644
--- a/config/variables.properties
+++ b/config/variables.properties
@@ -1,2 +1,6 @@
-#Mon Oct 12 14:39:17 CEST 2020
-FileSequentialNumber=1183
+#Mon Apr 12 12:26:10 CEST 2021
+LastRunDate=210412
+SessionCounter=127
+CurrentSession=122
+FileSequentialNumber=1859
+DaySequentialNumber=1
diff --git a/devices/C1.properties b/devices/C1.properties
new file mode 100644
index 0000000..9f4654d
--- /dev/null
+++ b/devices/C1.properties
@@ -0,0 +1,6 @@
+#Fri Mar 19 09:06:16 CET 2021
+unit=
+offset=10.0
+precision=0
+sign_bit=0
+scale=4.0
diff --git a/devices/C2.properties b/devices/C2.properties
new file mode 100644
index 0000000..564dd2e
--- /dev/null
+++ b/devices/C2.properties
@@ -0,0 +1,6 @@
+#Fri Mar 19 09:06:16 CET 2021
+unit=
+offset=20.0
+precision=0
+sign_bit=0
+scale=1.0
diff --git a/devices/CurrentCamera.properties b/devices/CurrentCamera.properties
index ecd110f..abe48d1 100755
--- a/devices/CurrentCamera.properties
+++ b/devices/CurrentCamera.properties
@@ -1,12 +1,12 @@
-#Tue Oct 13 09:58:45 CEST 2020
-spatialCalOffsetY=-243.68687682073843
-spatialCalOffsetX=-319.849247649355
+#Fri Apr 23 13:56:44 CEST 2021
+spatialCalOffsetY=-485.427166868422
+spatialCalOffsetX=-638.5965043983313
colormapLogarithmic=false
scale=1.0
grayscale=false
-spatialCalScaleX=-70.42253749214824
-spatialCalScaleY=-96.77418718434343
-colormapMax=50660.0
+spatialCalScaleX=-35.21126791588346
+spatialCalScaleY=-48.38709170854271
+colormapMax=16542.0
serverURL=http\://gfa-lc6-64\:8889
rescaleOffset=0.0
roiWidth=-1
diff --git a/devices/ca.properties b/devices/ca.properties
index 2d75d98..821a40d 100644
--- a/devices/ca.properties
+++ b/devices/ca.properties
@@ -1,25 +1,25 @@
-#Wed Jul 31 16:32:54 CEST 2019
-colormap=Temperature
-colormapAutomatic=false
-colormapLogarithmic=false
-colormapMax=NaN
-colormapMin=NaN
-flipHorizontally=false
-flipVertically=false
-grayscale=true
-invert=false
-rescaleFactor=1.0
-rescaleOffset=0.0
-roiHeight=-1
-roiWidth=-1
-roiX=0
-roiY=0
-rotation=0.0
-rotationCrop=false
-scale=1.0
-spatialCalOffsetX=NaN
+#Mon Mar 22 14:17:46 CET 2021
spatialCalOffsetY=NaN
+spatialCalOffsetX=NaN
+colormapLogarithmic=false
+scale=1.0
+grayscale=true
spatialCalScaleX=NaN
spatialCalScaleY=NaN
+colormapMax=NaN
+rescaleOffset=0.0
+roiWidth=-1
+colormap=Temperature
+invert=false
+colormapMin=NaN
+rotation=0.0
+rotationCrop=false
+rescaleFactor=1.0
spatialCalUnits=mm
+flipVertically=false
+roiHeight=-1
+flipHorizontally=false
+colormapAutomatic=true
+roiY=0
+roiX=0
transpose=false
diff --git a/devices/cam_server.properties b/devices/cam_server.properties
index fbcea59..a654acc 100755
--- a/devices/cam_server.properties
+++ b/devices/cam_server.properties
@@ -1,4 +1,4 @@
-#Thu Apr 02 10:47:01 CEST 2020
+#Thu Oct 15 09:46:07 CEST 2020
spatialCalOffsetY=-485.427166868422
spatialCalOffsetX=-638.5965043983313
colormapLogarithmic=false
@@ -10,7 +10,7 @@ spatialCalScaleY=-48.38709170854271
colormapMax=NaN
rescaleOffset=0.0
roiWidth=-1
-colormap=Temperature
+colormap=Flame
invert=false
colormapMin=NaN
rotationCrop=false
diff --git a/plugins/PanelPlugin.form b/plugins/PanelPlugin.form
index 64507fd..0fbdc12 100755
--- a/plugins/PanelPlugin.form
+++ b/plugins/PanelPlugin.form
@@ -46,7 +46,15 @@
-
+
+
+
+
+
+
+
+
+
@@ -71,7 +79,11 @@
-
+
+
+
+
+
@@ -141,5 +153,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/plugins/PanelPlugin.java b/plugins/PanelPlugin.java
index ee126cf..b40099e 100755
--- a/plugins/PanelPlugin.java
+++ b/plugins/PanelPlugin.java
@@ -2,9 +2,13 @@
* Copyright (c) 2014 Paul Scherrer Institute. All rights reserved.
*/
+import ch.psi.pshell.core.Context;
import ch.psi.pshell.ui.Panel;
import ch.psi.utils.State;
import java.awt.Component;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.swing.JButton;
/**
*
@@ -35,6 +39,7 @@ public class PanelPlugin extends Panel {
public void setEnabled(boolean value) {
super.setEnabled(value);
}
+
@SuppressWarnings("unchecked")
// //GEN-BEGIN:initComponents
@@ -49,6 +54,8 @@ public class PanelPlugin extends Panel {
jSpinner3 = new javax.swing.JSpinner();
jRadioButton1 = new javax.swing.JRadioButton();
jRadioButton2 = new javax.swing.JRadioButton();
+ buttonExecShellCmd = new javax.swing.JButton();
+ jButton2 = new javax.swing.JButton();
motorPanel2.setDeviceName("m1");
@@ -74,6 +81,15 @@ public class PanelPlugin extends Panel {
buttonGroup1.add(jRadioButton2);
jRadioButton2.setText("jRadioButton2");
+ buttonExecShellCmd.setText("Exec Async");
+ buttonExecShellCmd.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ buttonExecShellCmdActionPerformed(evt);
+ }
+ });
+
+ jButton2.setText("Exec Sync");
+
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
this.setLayout(layout);
layout.setHorizontalGroup(
@@ -97,7 +113,13 @@ public class PanelPlugin extends Panel {
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jRadioButton2)
.addComponent(jRadioButton1))))
- .addContainerGap(12, Short.MAX_VALUE))
+ .addContainerGap(168, Short.MAX_VALUE))
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
+ .addGap(0, 0, Short.MAX_VALUE)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(jButton2)
+ .addComponent(buttonExecShellCmd))
+ .addGap(225, 225, 225))
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -118,12 +140,39 @@ public class PanelPlugin extends Panel {
.addComponent(jRadioButton1)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(jRadioButton2)
- .addContainerGap(62, Short.MAX_VALUE))
+ .addGap(18, 18, 18)
+ .addComponent(buttonExecShellCmd)
+ .addGap(18, 18, 18)
+ .addComponent(jButton2)
+ .addContainerGap(35, Short.MAX_VALUE))
);
}// //GEN-END:initComponents
+ private void buttonExecShellCmdActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonExecShellCmdActionPerformed
+ try {
+ String shellCommand="sleep 5; uname";
+ boolean background = false;
+
+ evalAsync("exec_cmd('" + shellCommand + "')", background).handle((ret,ex)->{
+ ((JButton)evt.getSource()).setEnabled(true);
+ if (ex!=null){
+ showException((Exception)ex);
+ } else {
+ getContext().scriptingLog(String.format("Shell command '%s' return value: %s", shellCommand, String.valueOf(ret)));
+ }
+ return ret;
+ });
+
+ ((JButton)evt.getSource()).setEnabled(false);
+ } catch (Exception ex) {
+ showException(ex);
+ }
+ }//GEN-LAST:event_buttonExecShellCmdActionPerformed
+
// Variables declaration - do not modify//GEN-BEGIN:variables
+ private javax.swing.JButton buttonExecShellCmd;
private javax.swing.ButtonGroup buttonGroup1;
+ private javax.swing.JButton jButton2;
private javax.swing.JRadioButton jRadioButton1;
private javax.swing.JRadioButton jRadioButton2;
private javax.swing.JSpinner jSpinner1;
diff --git a/plugins/ScreenPanel7.form b/plugins/ScreenPanel7.form
index ed23354..3db5cb3 100644
--- a/plugins/ScreenPanel7.form
+++ b/plugins/ScreenPanel7.form
@@ -623,7 +623,7 @@
-
+
@@ -658,23 +658,24 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -683,7 +684,10 @@
-
+
+
+
+
@@ -692,12 +696,12 @@
-
+
-
+
@@ -987,6 +991,7 @@
+
@@ -1059,6 +1064,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/plugins/ScreenPanel7.java b/plugins/ScreenPanel7.java
index c76bc27..9e99528 100644
--- a/plugins/ScreenPanel7.java
+++ b/plugins/ScreenPanel7.java
@@ -93,13 +93,10 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.ImageIcon;
import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JCheckBoxMenuItem;
import javax.swing.JComboBox;
import javax.swing.JComponent;
import javax.swing.JDialog;
import javax.swing.JLabel;
-import javax.swing.JMenu;
import javax.swing.JMenuItem;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
@@ -107,6 +104,7 @@ import javax.swing.JSpinner;
import javax.swing.JTable;
import javax.swing.JTextField;
import javax.swing.ListSelectionModel;
+import javax.swing.SpinnerNumberModel;
import javax.swing.SwingUtilities;
import javax.swing.event.PopupMenuEvent;
import javax.swing.event.PopupMenuListener;
@@ -154,11 +152,13 @@ public class ScreenPanel7 extends Panel {
String camServerUrl;
String instanceName;
Overlay titleOv = null;
+ Overlay backgOv = null;
//int integration = 0;
boolean persistCameraState;
Map> groups;
Map aliases;
final Logger logger;
+ List types;
public class CameraState extends Config {
@@ -392,6 +392,7 @@ public class ScreenPanel7 extends Panel {
logger = Logger.getLogger(getClass().getName());
try {
initComponents();
+ spinnerBackground.setVisible(false);
spinnerThreshold.setVisible(false);
btFixColormapRange.setVisible(false);
setGoodRegionOptionsVisible(false);
@@ -407,10 +408,18 @@ public class ScreenPanel7 extends Panel {
setPersistedComponents(new Component[]{buttonTitle});
comboCameras.setEnabled(false);
comboType.setEnabled(false);
- if (App.hasArgument(ARG_LIST) || App.hasArgument(ARG_TYPE)){
+ if (App.hasArgument(ARG_LIST)){
comboType.setVisible(false);
labelType.setVisible(false);
}
+ if (App.hasArgument(ARG_TYPE)){
+ types = new ArrayList<>();
+ for (String token : App.getArgumentValue(ARG_TYPE).split(",")){
+ if (!token.isBlank()){
+ types.add(token.trim());
+ }
+ }
+ }
SwingUtils.setEnumCombo(comboColormap, Colormap.class);
if (App.hasArgument("poll")) {
@@ -821,21 +830,28 @@ public class ScreenPanel7 extends Panel {
);
} else {
+ String[] types = new String[]{"All"};
try (CameraServer srv = newCameraServer()) {
- groups = srv.getCameraGroups();
- comboType.setModel(new javax.swing.DefaultComboBoxModel(Arr.insert(Arr.sort(groups.keySet().toArray(new String[0])), "All", 0)));
+ groups = srv.getCameraGroups();
+ types = Arr.insert(Arr.sort(groups.keySet().toArray(new String[0])), "All", 0);
aliases = srv.getCameraAliases();
} catch (Exception ex){
groups = null;
aliases = null;
+ }
+ if (this.types!=null){
+ types = this.types.toArray(new String[0]);
}
+ comboType.setModel(new javax.swing.DefaultComboBoxModel(types));
usingServer = buttonServer.isSelected();
- updateCameraList();
comboCameras.setEnabled(true);
comboType.setEnabled(true);
setComboCameraSelection(null);
- setComboTypeSelection("All");
+ if (Arr.containsEqual(types, "All")){
+ setComboTypeSelection("All");
+ }
+ updateCameraList();
if (comboCameras.getModel().getSize() > 0) {
try {
@@ -853,10 +869,7 @@ public class ScreenPanel7 extends Panel {
}
boolean isVisible(String camera) {
- if (App.hasArgument(ARG_TYPE)){
- return getCameraTypes(camera).contains(App.getArgumentValue(ARG_TYPE));
- }
- return ((comboType.getSelectedIndex() == 0) || (getCameraTypes(camera).contains(comboType.getSelectedItem())));
+ return ((comboType.getSelectedItem().toString().toLowerCase().equals("all")) || (getCameraTypes(camera).contains(comboType.getSelectedItem())));
}
DefaultComboBoxModel getCameraList(boolean fromServer) throws Exception {
@@ -1006,11 +1019,31 @@ public class ScreenPanel7 extends Panel {
}
synchronized (lockOverlays) {
- renderer.updateOverlays(to, titleOv);
+ renderer.updateOverlays(to, titleOv);
titleOv = to;
- }
+ }
}
-
+
+
+ void manageOverlayErrorOverlay(boolean error) {
+ if ((error) != (backgOv != null)){
+
+ Overlay bo = null;
+ if (error){
+ String text = "Invalid image background";
+ Font font = new Font("Arial", Font.PLAIN, 14);
+ bo = new Text(renderer.getPenErrorText(), text, font, new Point(-SwingUtils.getTextSize(text, renderer.getGraphics().getFontMetrics(font)).width - 14, 46));
+ bo.setFixed(true);
+ bo.setAnchor(Overlay.ANCHOR_VIEWPORT_OR_IMAGE_TOP_RIGHT);
+ }
+ synchronized (lockOverlays) {
+ renderer.updateOverlays(bo,backgOv);
+ backgOv = bo;
+ }
+ }
+ }
+
+
@Override
public void onStateChange(State state, State former) {
@@ -1076,6 +1109,7 @@ public class ScreenPanel7 extends Panel {
this.cameraName = cameraName;
if (changed || buttonDirect.isSelected()) {
+ spinnerBackground.setVisible(false);
spinnerThreshold.setVisible(false);
checkThreshold.setEnabled(false);
checkRotation.setEnabled(false);
@@ -1524,11 +1558,31 @@ public class ScreenPanel7 extends Panel {
btFixColormapRange.setVisible(buttonAutomatic.isSelected());
spinnerMin.setEnabled(buttonManual.isSelected());
spinnerMax.setEnabled(buttonManual.isSelected());
+
+ boolean signed = spinnerBackground.isVisible() && "signed".equals(spinnerBackground.getValue());
+ Integer min = signed ? -65535: 0;
+ if (!min.equals(((SpinnerNumberModel)spinnerMin.getModel()).getMinimum())){
+ spinnerMin.setModel(new SpinnerNumberModel(0, min.intValue(), 65535, 1));
+ spinnerMax.setModel(new SpinnerNumberModel(255, min.intValue(), 65535, 1));
+ if ((Integer)((SpinnerNumberModel)spinnerMin.getModel()).getValue() < min){
+ spinnerMin.setValue(min);
+ }
+ if ((Integer)((SpinnerNumberModel)spinnerMax.getModel()).getValue() < min){
+ spinnerMax.setValue(min);
+ }
+ }
+
if (!Double.isNaN(config.colormapMin)) {
- spinnerMin.setValue(Math.min(Math.max((int) config.colormapMin, 0), 65535));
+ Integer value = Math.min(Math.max((int) config.colormapMin, min), 65535);
+ if (spinnerMin.getModel().getValue()!= value){
+ spinnerMin.setValue(value);
+ }
}
if (!Double.isNaN(config.colormapMax)) {
- spinnerMax.setValue(Math.min(Math.max((int) config.colormapMax, 0), 65535));
+ Integer value = Math.min(Math.max((int) config.colormapMax, min), 65535);
+ if (spinnerMax.getModel().getValue()!= value){
+ spinnerMax.setValue(value);
+ }
}
}
} catch (Exception ex) {
@@ -1539,6 +1593,7 @@ public class ScreenPanel7 extends Panel {
void updatePipelineProperties() {
goodRegion = checkGoodRegion.isSelected();
+ spinnerBackground.setVisible(checkBackground.isSelected());
spinnerThreshold.setVisible(checkThreshold.isSelected());
setGoodRegionOptionsVisible(goodRegion);
slicing = goodRegion && checkSlicing.isSelected();
@@ -1557,7 +1612,14 @@ public class ScreenPanel7 extends Panel {
updatingServerControls = true;
if (server.isStarted()) {
try {
- checkBackground.setSelected(server.getBackgroundSubtraction());
+ checkBackground.setSelected(server.isBackgroundSubtractionEnabled());
+ setBackgoundControl(server.getBackgroundSubtraction());
+ Object bg = server.getBackgroundSubtraction();
+ if (bg.equals("signed") || bg.equals("passive")){
+ spinnerBackground.setValue(bg);
+ } else {
+ spinnerBackground.setValue("normal");
+ }
Double threshold = (server.getThreshold());
checkThreshold.setSelected(threshold != null);
spinnerThreshold.setValue((threshold == null) ? 0 : threshold);
@@ -1607,7 +1669,7 @@ public class ScreenPanel7 extends Panel {
boolean changedPipelinePars(Map pars1, Map pars2) {
String[] keys = new String[]{"image_background_enable", "image_threshold", "image_good_region",
- "threshold", "gfscale", "image_slices", "number_of_slices", "scale", "orientation"};
+ "threshold", "gfscale", "image_slices", "number_of_slices", "scale", "orientation", "image_background_ok"};
for (String key : keys) {
Object o1 = pars1.get(key);
Object o2 = pars2.get(key);
@@ -1621,13 +1683,21 @@ public class ScreenPanel7 extends Panel {
}
return false;
}
+
+ void setBackgoundControl(Object background){
+ spinnerBackground.setValue((background.equals("signed") || background.equals("passive")) ? background : "normal");
+ }
void updatePipelineControls(Map pars) {
if (pars != null) {
updatingServerControls = true;
try {
- boolean background = (boolean) pars.get("image_background_enable");
- checkBackground.setSelected(background);
+ Object background = pars.get("image_background_enable");
+ checkBackground.setSelected(!background.equals("") && !background.equals(false) && !background.equals("false"));
+ setBackgoundControl(background);
+
+ manageOverlayErrorOverlay(Boolean.FALSE.equals(pars.get("image_background_ok")));
+
Double threshold = (Double) (pars.get("image_threshold"));
checkThreshold.setSelected(threshold != null);
spinnerThreshold.setValue((threshold == null) ? 0 : threshold);
@@ -2357,13 +2427,17 @@ public class ScreenPanel7 extends Panel {
boolean getLaserState(int bunch) throws Exception {
//return (Epics.get("SIN-TIMAST-TMA:Beam-Las-Delay-Sel", Integer.class) == 0);
- if (bunch<=0){
- return getLaserState(1) && getLaserState(2);
+ try{
+ if (bunch<=0){
+ return getLaserState(1) && getLaserState(2);
+ }
+ if (bunch==2){
+ return (Epics.get("SWISSFEL-STATUS:Bunch-2-OnDelay-Sel", Integer.class) == 0);
+ }
+ return (Epics.get("SWISSFEL-STATUS:Bunch-1-OnDelay-Sel", Integer.class) == 0);
+ } catch (Exception ex){
+ return false;
}
- if (bunch==2){
- return (Epics.get("SWISSFEL-STATUS:Bunch-2-OnDelay-Sel", Integer.class) == 0);
- }
- return (Epics.get("SWISSFEL-STATUS:Bunch-1-OnDelay-Sel", Integer.class) == 0);
}
void elog(String logbook, String title, String message, String[] attachments) throws Exception {
@@ -3016,6 +3090,7 @@ public class ScreenPanel7 extends Panel {
labelAvFrames = new javax.swing.JLabel();
labelAvMode = new javax.swing.JLabel();
spinnerAvMode = new javax.swing.JSpinner();
+ spinnerBackground = new javax.swing.JSpinner();
topPanel = new javax.swing.JPanel();
toolBar = new javax.swing.JToolBar();
buttonSidePanel = new javax.swing.JToggleButton();
@@ -3542,7 +3617,7 @@ public class ScreenPanel7 extends Panel {
labelMode.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
labelMode.setText("Mode:");
- spinnerRotationMode.setModel(new javax.swing.SpinnerListModel(new String[] {"constant", "reflect", "nearest", "mirror", "wrap"}));
+ spinnerRotationMode.setModel(new javax.swing.SpinnerListModel(new String[] {"constant", "reflect", "nearest", "mirror", "wrap", "ortho"}));
spinnerRotationMode.addChangeListener(new javax.swing.event.ChangeListener() {
public void stateChanged(javax.swing.event.ChangeEvent evt) {
spinnerRotationAngleStateChanged(evt);
@@ -3589,6 +3664,13 @@ public class ScreenPanel7 extends Panel {
}
});
+ spinnerBackground.setModel(new javax.swing.SpinnerListModel(new String[] {"normal", "signed", "passive"}));
+ spinnerBackground.addChangeListener(new javax.swing.event.ChangeListener() {
+ public void stateChanged(javax.swing.event.ChangeEvent evt) {
+ spinnerBackgroundStateChanged(evt);
+ }
+ });
+
javax.swing.GroupLayout panelScreen2Layout = new javax.swing.GroupLayout(panelScreen2);
panelScreen2.setLayout(panelScreen2Layout);
panelScreen2Layout.setHorizontalGroup(
@@ -3622,30 +3704,33 @@ public class ScreenPanel7 extends Panel {
.addComponent(labelConstant, javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(labelMode, javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(labelGrThreshold, javax.swing.GroupLayout.Alignment.TRAILING))))
- .addGap(2, 2, 2)
- .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
- .addComponent(spinnerGrThreshold, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(spinnerGrScale)
- .addComponent(spinnerThreshold)
- .addComponent(spinnerRotationOrder)
- .addComponent(spinnerRotationMode)
- .addComponent(spinnerRotationAngle)
- .addComponent(spinnerRotationConstant)
- .addComponent(spinnerAvFrames)
- .addComponent(spinnerAvMode)))
+ .addGap(2, 2, 2))
.addGroup(panelScreen2Layout.createSequentialGroup()
.addComponent(checkBackground)
- .addGap(0, 0, Short.MAX_VALUE)))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
+ .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+ .addComponent(spinnerGrThreshold, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(spinnerGrScale, javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(spinnerThreshold, javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(spinnerRotationOrder, javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(spinnerRotationMode, javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(spinnerRotationAngle, javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(spinnerRotationConstant, javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(spinnerAvFrames, javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(spinnerAvMode, javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(spinnerBackground, javax.swing.GroupLayout.Alignment.TRAILING))
.addContainerGap())
);
- panelScreen2Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {spinnerAvFrames, spinnerAvMode, spinnerGrScale, spinnerGrThreshold, spinnerRotationAngle, spinnerRotationConstant, spinnerRotationMode, spinnerRotationOrder, spinnerThreshold});
+ panelScreen2Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {spinnerAvFrames, spinnerAvMode, spinnerBackground, spinnerGrScale, spinnerGrThreshold, spinnerRotationAngle, spinnerRotationConstant, spinnerRotationMode, spinnerRotationOrder, spinnerThreshold});
panelScreen2Layout.setVerticalGroup(
panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(panelScreen2Layout.createSequentialGroup()
.addContainerGap()
- .addComponent(checkBackground)
+ .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(checkBackground)
+ .addComponent(spinnerBackground, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGap(2, 2, 2)
.addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(checkThreshold)
@@ -3690,7 +3775,7 @@ public class ScreenPanel7 extends Panel {
.addContainerGap())
);
- panelScreen2Layout.linkSize(javax.swing.SwingConstants.VERTICAL, new java.awt.Component[] {spinnerGrScale, spinnerGrThreshold, spinnerRotationAngle, spinnerRotationConstant, spinnerRotationMode, spinnerRotationOrder, spinnerThreshold});
+ panelScreen2Layout.linkSize(javax.swing.SwingConstants.VERTICAL, new java.awt.Component[] {spinnerAvFrames, spinnerAvMode, spinnerBackground, spinnerGrScale, spinnerGrThreshold, spinnerRotationAngle, spinnerRotationConstant, spinnerRotationMode, spinnerRotationOrder, spinnerThreshold});
javax.swing.GroupLayout sidePanelLayout = new javax.swing.GroupLayout(sidePanel);
sidePanel.setLayout(sidePanelLayout);
@@ -4161,7 +4246,9 @@ public class ScreenPanel7 extends Panel {
if (!updatingServerControls) {
try {
if (server.isStarted()) {
- server.setBackgroundSubtraction(checkBackground.isSelected());
+ spinnerBackground.setVisible(checkBackground.isSelected());
+ Object bg_mode = checkBackground.isSelected() ? String.valueOf(spinnerBackground.getValue()) : false;
+ server.setBackgroundSubtraction(bg_mode.equals("normal") ? true : bg_mode);
}
} catch (Exception ex) {
showException(ex);
@@ -4531,6 +4618,18 @@ public class ScreenPanel7 extends Panel {
checkAveragingActionPerformed(null);
}//GEN-LAST:event_spinnerAvFramesStateChanged
+ private void spinnerBackgroundStateChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_spinnerBackgroundStateChanged
+ if (!updatingServerControls) {
+ try {
+ Object bg_mode = String.valueOf(spinnerBackground.getValue());
+ server.setBackgroundSubtraction((bg_mode=="normal") ? true : bg_mode);
+ } catch (Exception ex) {
+ showException(ex);
+ updatePipelineControls();
+ }
+ }
+ }//GEN-LAST:event_spinnerBackgroundStateChanged
+
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton btFixColormapRange;
private javax.swing.JRadioButton buttonAutomatic;
@@ -4604,6 +4703,7 @@ public class ScreenPanel7 extends Panel {
private javax.swing.JPanel sidePanel;
private javax.swing.JSpinner spinnerAvFrames;
private javax.swing.JSpinner spinnerAvMode;
+ private javax.swing.JSpinner spinnerBackground;
private javax.swing.JSpinner spinnerGrScale;
private javax.swing.JSpinner spinnerGrThreshold;
private javax.swing.JSpinner spinnerMax;
diff --git a/plugins/ScreenPanel8.form b/plugins/ScreenPanel8.form
new file mode 100644
index 0000000..3db5cb3
--- /dev/null
+++ b/plugins/ScreenPanel8.form
@@ -0,0 +1,1380 @@
+
+
+
diff --git a/plugins/ScreenPanel8.java b/plugins/ScreenPanel8.java
new file mode 100644
index 0000000..d203a12
--- /dev/null
+++ b/plugins/ScreenPanel8.java
@@ -0,0 +1,4737 @@
+/*
+ * Copyright (c) 2014 Paul Scherrer Institute. All rights reserved.
+ */
+
+import ch.psi.pshell.bs.CameraServer;
+import ch.psi.pshell.core.Context;
+import java.io.IOException;
+import java.nio.file.Paths;
+import javax.swing.DefaultComboBoxModel;
+import ch.psi.pshell.ui.Panel;
+import ch.psi.pshell.imaging.ImageListener;
+import ch.psi.utils.State;
+import ch.psi.utils.Chrono;
+import ch.psi.utils.swing.SwingUtils;
+import ch.psi.utils.swing.TextEditor;
+import ch.psi.pshell.bs.PipelineServer;
+import ch.psi.pshell.bs.StreamValue;
+import ch.psi.pshell.core.JsonSerializer;
+import ch.psi.pshell.data.DataManager;
+import ch.psi.pshell.device.Device;
+import ch.psi.pshell.device.Readable.ReadableArray;
+import ch.psi.pshell.device.Readable.ReadableNumber;
+import ch.psi.pshell.device.ReadableRegister.ReadableRegisterArray;
+import ch.psi.pshell.device.ReadableRegister.ReadableRegisterNumber;
+import ch.psi.pshell.epics.ChannelInteger;
+import ch.psi.pshell.epics.DiscretePositioner;
+import ch.psi.pshell.epics.Epics;
+import ch.psi.pshell.imaging.Colormap;
+import ch.psi.pshell.imaging.ColormapSource;
+import ch.psi.pshell.imaging.ColormapSource.ColormapSourceConfig;
+import ch.psi.pshell.ui.App;
+import ch.psi.pshell.imaging.Data;
+import ch.psi.pshell.imaging.DimensionDouble;
+import ch.psi.pshell.imaging.Histogram;
+import ch.psi.pshell.imaging.ImageBuffer;
+import ch.psi.pshell.imaging.Overlay;
+import ch.psi.pshell.imaging.Overlays;
+import ch.psi.pshell.imaging.Overlays.Text;
+import ch.psi.pshell.imaging.Pen;
+import ch.psi.pshell.imaging.PointDouble;
+import ch.psi.pshell.imaging.Renderer;
+import ch.psi.pshell.imaging.RendererListener;
+import ch.psi.pshell.imaging.RendererMode;
+import ch.psi.pshell.imaging.Source;
+import ch.psi.pshell.scripting.InterpreterResult;
+import ch.psi.pshell.scripting.ScriptManager;
+import ch.psi.pshell.swing.DeviceValueChart;
+import ch.psi.pshell.swing.ValueSelection;
+import ch.psi.pshell.swing.ValueSelection.ValueSelectionListener;
+import ch.psi.pshell.ui.Console;
+import ch.psi.utils.Arr;
+import ch.psi.utils.ArrayProperties;
+import ch.psi.utils.Config;
+import ch.psi.utils.Convert;
+import ch.psi.utils.Str;
+import ch.psi.utils.swing.Editor.EditorDialog;
+import ch.psi.utils.swing.MainFrame;
+import ch.psi.utils.swing.StandardDialog;
+import ch.psi.utils.swing.StandardDialog.StandardDialogListener;
+import ch.psi.utils.swing.SwingUtils.OptionResult;
+import ch.psi.utils.swing.SwingUtils.OptionType;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Toolkit;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.StringSelection;
+import java.awt.datatransfer.Transferable;
+import java.awt.event.ActionEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.FileInputStream;
+import java.lang.reflect.Array;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JComponent;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JMenuItem;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JSpinner;
+import javax.swing.JTable;
+import javax.swing.JTextField;
+import javax.swing.ListSelectionModel;
+import javax.swing.SpinnerNumberModel;
+import javax.swing.SwingUtilities;
+import javax.swing.event.PopupMenuEvent;
+import javax.swing.event.PopupMenuListener;
+import javax.swing.table.DefaultTableModel;
+import org.apache.commons.math3.analysis.function.Gaussian;
+import org.apache.commons.math3.fitting.GaussianCurveFitter;
+import org.apache.commons.math3.fitting.PolynomialCurveFitter;
+import org.apache.commons.math3.fitting.WeightedObservedPoint;
+import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
+
+/**
+ *
+ */
+public class ScreenPanel8 extends Panel {
+
+ public static final String ARG_TYPE = "cam_type";
+ public static final String ARG_LIST = "cam_list";
+ public static final String ARG_ALIAS = "alias";
+
+ public static final String LASER_TYPE = "Laser";
+ public static final String ELECTRONS_TYPE = "Electrons";
+ public static final String PHOTONICS_TYPE = "Photonics";
+
+ final String CAMERA_DEVICE_NAME = "CurrentCamera";
+ boolean useServerStats = true;
+ String userOverlaysConfigFile;
+ ColormapSource camera;
+ PipelineServer server;
+ String cameraName;
+ String cameraAlias;
+ int polling = 1000;
+ Overlay marker = null;
+ JDialog histogramDialog;
+ DiscretePositioner screen;
+ DiscretePositioner filter;
+ boolean showFit;
+ boolean showProfile;
+ Overlay[] userOv;
+ Overlay[] fitOv;
+ Overlay[] profileOv;
+ Overlay errorOverlay;
+ boolean requestCameraListUpdate;
+ boolean goodRegion;
+ boolean slicing;
+ String serverUrl;
+ String camServerUrl;
+ String instanceName;
+ Overlay titleOv = null;
+ Overlay backgOv = null;
+ //int integration = 0;
+ boolean persistCameraState;
+ Map> groups;
+ Map aliases;
+ final Logger logger;
+ List types;
+
+ public class CameraState extends Config {
+
+ public boolean valid;
+ public boolean showSidePanel;
+ //public boolean showMarker; Saved in the stream instance config
+ public boolean showProfile;
+ public boolean showFit;
+ public boolean showReticle;
+ public boolean showScale;
+ public boolean showTitle;
+ public double zoom;
+ public RendererMode mode;
+ public boolean colormapAutomatic;
+ public double colormapMin;
+ public double colormapMax;
+ public Colormap colormap;
+ public boolean colormapLogarithmic;
+
+ String getFile() {
+ if (camera == null) {
+ return null;
+ }
+ return getContext().getSetup().expandPath("{context}/screen_panel/" + cameraName + ".properties");
+ }
+ }
+
+ void loadCameraState() {
+ if (persistCameraState) {
+ try {
+ CameraState state = new CameraState();
+ state.load(state.getFile());
+ if (state.valid) {
+ buttonSidePanel.setSelected(state.showSidePanel);
+ buttonSidePanelActionPerformed(null);
+ buttonProfile.setSelected(state.showProfile);
+ buttonProfileActionPerformed(null);
+ buttonFit.setSelected(state.showFit);
+ buttonFitActionPerformed(null);
+ buttonReticle.setSelected(state.showReticle);
+ buttonReticleActionPerformed(null);
+ buttonScale.setSelected(state.showScale);
+ buttonScaleActionPerformed(null);
+ buttonTitle.setSelected(state.showTitle);
+ buttonTitleActionPerformed(null);
+ renderer.setMode(state.mode);
+ renderer.setZoom(state.zoom);
+ if (camera instanceof ColormapSource) {
+ camera.getConfig().colormap = state.colormap;
+ camera.getConfig().colormapAutomatic = state.colormapAutomatic;
+ camera.getConfig().colormapLogarithmic = state.colormapLogarithmic;
+ camera.getConfig().colormapMax = state.colormapMax;
+ camera.getConfig().colormapMin = state.colormapMin;
+ updateColormap();
+ }
+ }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ }
+
+ void saveCameraState() {
+ if (persistCameraState) {
+ try {
+ CameraState state = new CameraState();
+ state.valid = true;
+ if (camera instanceof ColormapSource) {
+ state.colormap = camera.getConfig().colormap;
+ state.colormapAutomatic = camera.getConfig().colormapAutomatic;
+ state.colormapLogarithmic = camera.getConfig().colormapLogarithmic;
+ state.colormapMax = camera.getConfig().colormapMax;
+ state.colormapMin = camera.getConfig().colormapMin;
+ }
+ state.mode = renderer.getMode();
+ state.zoom = renderer.getZoom();
+
+ state.showSidePanel = buttonSidePanel.isSelected();
+ state.showProfile = buttonProfile.isSelected();
+ state.showFit = buttonFit.isSelected();
+ state.showReticle = buttonReticle.isSelected();
+ state.showScale = buttonScale.isSelected();
+ state.showTitle = buttonTitle.isSelected();
+
+ state.save(state.getFile());
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ }
+
+ String pipelineSuffix = "_sp";
+
+ Double getServerDouble(String name) {
+ return (Double) Convert.toDouble(server.getValue(name));
+ }
+
+ double[] getServerDoubleArray(String name) {
+ return (double[]) Convert.toDouble(server.getValue(name));
+ }
+
+ class ImageData {
+
+ ImageData() {
+ if (server != null) {
+ cache = server.getStream().take();
+ String prefix = goodRegion ? "gr_" : "";
+ x_fit_mean = getDouble(prefix + "x_fit_mean");
+ y_fit_mean = getDouble(prefix + "y_fit_mean");
+ x_fit_standard_deviation = getDouble(prefix + "x_fit_standard_deviation");
+ y_fit_standard_deviation = getDouble(prefix + "y_fit_standard_deviation");
+ x_fit_gauss_function = getDoubleArray(prefix + "x_fit_gauss_function");
+ y_fit_gauss_function = getDoubleArray(prefix + "y_fit_gauss_function");
+ x_profile = getDoubleArray("x_profile");
+ y_profile = getDoubleArray("y_profile");
+ x_center_of_mass = getDouble("x_center_of_mass");
+ y_center_of_mass = getDouble("y_center_of_mass");
+ x_rms = getDouble("x_rms");
+ y_rms = getDouble("y_rms");
+ if (goodRegion) {
+ double[] gX2 = new double[x_profile.length];
+ Arrays.fill(gX2, Double.NaN);
+ try {
+ double[] axis = getDoubleArray("x_axis");
+ gr_x_axis = getDoubleArray("gr_x_axis");
+ double x = gr_x_axis[0];
+ gr_size_x = x_fit_gauss_function.length;
+ //If gr axis values are not identical, calculate the index...
+ gr_pos_x = (int) ((renderer.getCalibration() != null) ? renderer.getCalibration().convertToImageX(x) : x);
+ //But prefer checking the value to avoid raounding errors
+ for (int i=0;i imageBuffer = new ArrayList();
+ Frame currentFrame;
+ int imageBufferLenght = 1;
+ Text imagePauseOverlay;
+ final Console console;
+
+ public ScreenPanel8() {
+ logger = Logger.getLogger(getClass().getName());
+ try {
+ initComponents();
+ spinnerBackground.setVisible(false);
+ spinnerThreshold.setVisible(false);
+ btFixColormapRange.setVisible(false);
+ setGoodRegionOptionsVisible(false);
+ setSlicingOptionsVisible(false);
+ setRotationOptionsVisible(false);
+ setAveragingOptionsVisible(false);
+ JComponent editor = spinnerSlOrientation.getEditor();
+ if (editor instanceof JSpinner.DefaultEditor) {
+ ((JSpinner.DefaultEditor) editor).getTextField().setHorizontalAlignment(JTextField.RIGHT);
+ }
+ renderer.setPersistenceFile(Paths.get(getContext().getSetup().getContextPath(), "Renderer_Cameras.bin"));
+ //setPersistedComponents(new Component[]{buttonServer, buttonDirect});
+ setPersistedComponents(new Component[]{buttonTitle});
+ comboCameras.setEnabled(false);
+ comboType.setEnabled(false);
+ if (App.hasArgument(ARG_LIST)){
+ comboType.setVisible(false);
+ labelType.setVisible(false);
+ }
+ if (App.hasArgument(ARG_TYPE)){
+ types = new ArrayList<>();
+ for (String token : App.getArgumentValue(ARG_TYPE).split(",")){
+ if (!token.isBlank()){
+ types.add(token.trim());
+ }
+ }
+ }
+
+ SwingUtils.setEnumCombo(comboColormap, Colormap.class);
+ if (App.hasArgument("poll")) {
+ try {
+ polling = Integer.valueOf(App.getArgumentValue("poll"));
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ if (App.hasArgument("zoom")) {
+ try {
+ renderer.setDefaultZoom(Double.valueOf(App.getArgumentValue("zoom")));
+ renderer.resetZoom();
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ if (App.hasArgument("buf")) {
+ try {
+ imageBufferLenght = Integer.valueOf(App.getArgumentValue("buf"));
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+
+ if (App.hasArgument("usr_ov")) {
+ try {
+ userOverlaysConfigFile = App.getArgumentValue("usr_ov");
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+
+ if (App.hasArgument("srv_url")) {
+ serverUrl = App.getArgumentValue("srv_url");
+ }
+
+ if (App.hasArgument("cam_srv_url")) {
+ camServerUrl = App.getArgumentValue("cam_srv_url");
+ }
+
+ if (App.hasArgument("calc")) {
+ useServerStats = false;
+ }
+
+ if (App.hasArgument("persist")) {
+ persistCameraState = true;
+ }
+
+ if (App.hasArgument("suffix")) {
+ pipelineSuffix = App.getArgumentValue("suffix");
+ }
+ /*
+ if (App.hasArgument("integration")) {
+ try {
+ setIntegration(Integer.valueOf(App.getArgumentValue("integration")));
+ if (integration != 0) {
+ buttonFit.setSelected(false);
+ buttonProfile.setSelected(false);
+ }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ */
+
+ renderer.setProfileNormalized(true);
+ renderer.setShowProfileLimits(false);
+
+ JMenuItem menuCalibrate = new JMenuItem("Calibrate...");
+ menuCalibrate.addActionListener((ActionEvent e) -> {
+ try {
+ calibrate();
+ } catch (Exception ex) {
+ showException(ex);
+ }
+ });
+
+ JMenuItem menuRendererConfig = new JMenuItem("Renderer Parameters");
+ menuRendererConfig.addActionListener((ActionEvent e) -> {
+ try {
+ if (camera != null) {
+ this.showDeviceConfigDialog(camera, false);
+ }
+ } catch (Exception ex) {
+ showException(ex);
+ }
+ });
+
+ JMenuItem menuCameraConfig = new JMenuItem("Camera Configurarion");
+ menuCameraConfig.addActionListener((ActionEvent e) -> {
+ try {
+ if (camera != null) {
+ String cameraConfigJson = null;
+ if (usingServer) {
+ String cameraServerUrl = (camServerUrl == null) ? server.getUrl().substring(0, server.getUrl().length() - 1) + "8" : camServerUrl;
+ try (CameraServer srv = newCameraServer()) {
+ //TODO: replace into encodeMultiline
+ cameraConfigJson = JsonSerializer.encode(srv.getConfig(cameraName), true);
+ }
+ } else {
+ String configFolder = (String) getContext().getClassByName("SfCamera").getMethod("getConfigFolder", new Class[]{}).invoke(null);
+ Path configFile = Paths.get(configFolder, cameraName + ".json");
+ cameraConfigJson = configFile.toFile().exists() ? new String(Files.readAllBytes(configFile)) : null;
+ }
+ TextEditor configEditor = new TextEditor();
+ configEditor.setText(cameraConfigJson);
+ configEditor.setReadOnly(true);
+ configEditor.setTitle(cameraName);
+ EditorDialog dlg = configEditor.getDialog(getTopLevel(), false);
+ dlg.setSize(480, 640);
+ dlg.setVisible(true);
+ SwingUtils.centerComponent(getTopLevel(), dlg);
+ }
+ } catch (Exception ex) {
+ showException(ex);
+ }
+ });
+
+ JMenuItem menuSetImageBufferSize = new JMenuItem("Set Stack Size...");
+ menuSetImageBufferSize.addActionListener((ActionEvent e) -> {
+ try {
+ String ret = SwingUtils.getString(getTopLevel(), "Enter size of image buffer: ", String.valueOf(imageBufferLenght));
+ if (ret != null) {
+ this.setImageBufferSize(Integer.valueOf(ret));
+ }
+ } catch (Exception ex) {
+ showException(ex);
+ }
+ });
+
+ JMenuItem menuSaveStack = new JMenuItem("Save Stack");
+ menuSaveStack.addActionListener((ActionEvent e) -> {
+ try {
+ saveStack();
+ } catch (Exception ex) {
+ showException(ex);
+ }
+ });
+
+ JMenuItem menuSetROI = new JMenuItem("Set ROI...");
+ menuSetROI.addActionListener((ActionEvent e) -> {
+ renderer.abortSelection();
+ if (server != null) {
+ final Overlays.Rect selection = new Overlays.Rect(renderer.getPenMovingOverlay());
+ renderer.addListener(new RendererListener() {
+ @Override
+ public void onSelectionFinished(Renderer renderer, Overlay overlay) {
+ try {
+ renderer.setShowReticle(false);
+ Rectangle roi = overlay.isFixed() ? renderer.toImageCoord(overlay.getBounds()) : overlay.getBounds();
+ if (server.isRoiEnabled()) {
+ int[] cur = server.getRoi();
+ server.setRoi(new int[]{roi.x + cur[0], roi.y + cur[1], roi.width, roi.height});
+ } else {
+ server.setRoi(new int[]{roi.x, roi.y, roi.width, roi.height});
+ }
+ } catch (Exception ex) {
+ } finally {
+ renderer.removeListener(this);
+ }
+ }
+
+ @Override
+ public void onSelectionAborted(Renderer renderer, Overlay overlay) {
+ renderer.removeListener(this);
+ }
+ });
+ selection.setFixed(true);
+ renderer.startSelection(selection);
+ }
+ });
+
+ JMenuItem menuResetROI = new JMenuItem("Reset ROI");
+ menuResetROI.addActionListener((ActionEvent e) -> {
+ renderer.abortSelection();
+ if (server != null) {
+ try {
+ renderer.setShowReticle(false);
+ server.resetRoi();
+ } catch (IOException ex) {
+ showException(ex);
+ }
+ }
+ });
+ /*
+ JCheckBoxMenuItem menuFrameIntegration = new JCheckBoxMenuItem("Multi-Frame", (integration != 0));
+ menuFrameIntegration.addActionListener((ActionEvent e) -> {
+ if (integration == 0) {
+ JPanel panel = new JPanel();
+ GridBagLayout layout = new GridBagLayout();
+ layout.columnWidths = new int[]{150, 50}; //Minimum width
+ layout.rowHeights = new int[]{30, 30}; //Minimum height
+ panel.setLayout(layout);
+ JCheckBox checkContinuous = new JCheckBox("");
+ checkContinuous.setSelected(true);
+ JTextField textFrames = new JTextField();
+ GridBagConstraints c = new GridBagConstraints();
+ c.gridx = 0;
+ c.gridy = 0;
+ panel.add(new JLabel("Number of frames:"), c);
+ c.gridy = 1;
+ panel.add(new JLabel("Continuous:"), c);
+ c.fill = GridBagConstraints.HORIZONTAL;
+ c.gridx = 1;
+ panel.add(checkContinuous, c);
+ c.gridy = 0;
+ panel.add(textFrames, c);
+ if (SwingUtils.showOption(getTopLevel(), "Multi-Frame Integration", panel, OptionType.OkCancel) == OptionResult.Yes) {
+ setIntegration(checkContinuous.isSelected() ? -(Integer.valueOf(textFrames.getText())) : (Integer.valueOf(textFrames.getText())));
+ }
+ } else {
+ if (SwingUtils.showOption(getTopLevel(), "Multi-Frame Integration",
+ "Do you want to disable " + ((integration < 0) ? "continuous " : "") + "multi-frame integration (" + Math.abs(integration) + ")?", OptionType.YesNo) == OptionResult.Yes) {
+ setIntegration(0);
+ }
+ }
+ });
+
+ for (Component cmp : SwingUtils.getComponentsByType(renderer.getPopupMenu(), JMenu.class)) {
+ JMenu menu = (JMenu) cmp;
+ if (menu.getText().equals("Integration")) {
+ menu.addSeparator();
+ menu.add(menuFrameIntegration);
+ }
+ }
+ */
+ renderer.getPopupMenu().addSeparator();
+ renderer.getPopupMenu().add(menuRendererConfig);
+ renderer.getPopupMenu().add(menuCameraConfig);
+ renderer.getPopupMenu().add(menuSetImageBufferSize);
+ renderer.getPopupMenu().add(menuSaveStack);
+ renderer.getPopupMenu().addSeparator();
+ renderer.getPopupMenu().add(menuCalibrate);
+ renderer.getPopupMenu().addSeparator();
+ renderer.getPopupMenu().add(menuSetROI);
+ renderer.getPopupMenu().add(menuResetROI);
+ renderer.getPopupMenu().addPopupMenuListener(new PopupMenuListener() {
+ @Override
+ public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
+ menuResetROI.setEnabled(server != null);
+ menuSetROI.setEnabled(server != null);
+ menuCalibrate.setVisible(server != null);
+ menuCalibrate.setEnabled((calibrationDialolg == null) || (!calibrationDialolg.isShowing()));
+ menuSaveStack.setEnabled(imageBufferLenght > 0);
+ menuSetImageBufferSize.setEnabled(!renderer.isPaused());
+ //menuFrameIntegration.setSelected(integration != 0);
+ }
+
+ @Override
+ public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
+ }
+
+ @Override
+ public void popupMenuCanceled(PopupMenuEvent e) {
+ }
+ });
+ renderer.getPopupMenu().setVisible(false);
+ buttonScale.setSelected(renderer.getShowColormapScale());
+ clearMarker();
+
+ showFit = buttonFit.isSelected();
+ showProfile = buttonProfile.isSelected();
+
+ pauseSelection.setVisible(false);
+ pauseSelection.setMinValue(1);
+ pauseSelection.addListener(new ValueSelectionListener() {
+ @Override
+ public void onValueChanged(ValueSelection origin, double value, boolean editing) {
+ if (editing && (value >= 1) && (value <= imageBuffer.size())) {
+ updatePause();
+ }
+ }
+ });
+ renderer.addListener(new RendererListener() {
+ @Override
+ public void onMoveFinished(Renderer renderer, Overlay overlay) {
+ if (overlay == marker) {
+ try {
+ onMarkerChanged();
+ } catch (IOException ex) {
+ logger.log(Level.WARNING, null, ex);
+ }
+ }
+ }
+ });
+ if (MainFrame.isDark()) {
+ textState.setDisabledTextColor(textState.getForeground());
+ }
+
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+
+ console = (!App.hasArgument("console")) ? null : new Console() {
+ /*
+ protected void onConsoleCommand(String name, String[] pars, String trimming) throws Exception {
+ switch (name) {
+ case "cam":
+ comboCameras.setSelectedItem(tokens[1]);
+ break;
+ }
+ }*/
+ @Override
+ protected void onConsoleCommand(String command) {
+ String[] tokens = command.split(" ");
+ if ((tokens.length > 1) && tokens[0].equals("cam")) {
+ try {
+ if (!tokens[1].equals(comboCameras.getSelectedItem())) {
+ setComboTypeSelection("All");
+ updateCameraList();
+ comboCameras.setSelectedItem(tokens[1]);
+ if (!tokens[1].equals(comboCameras.getSelectedItem())) {
+ comboCameras.setSelectedItem("");
+ throw new Exception("Invalid camera name : " + tokens[1]);
+ }
+ System.out.println("Console set camera: " + tokens[1]);
+ }
+ } catch (Exception ex) {
+ System.err.println(ex);
+ }
+ } else {
+ System.err.println("Invalid command: " + command);
+ }
+ }
+ };
+ }
+
+ /*
+ void setIntegration(int frames) {
+ try {
+ if (integration != frames) {
+ integration = frames;
+ if (camera != null) {
+ if (Math.abs(integration) > 1) {
+ renderer.setDevice(new ImageIntegrator(integration));
+ } else {
+ renderer.setDevice(camera);
+ }
+ synchronized (imageBuffer) {
+ currentFrame = null;
+ imageBuffer.clear();
+ }
+ }
+ }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ */
+
+ @Override
+ public void onStart() {
+ super.onStart();
+ updateDialogTitle();
+ if (App.hasArgument("ct")) {
+ boolean direct = App.getArgumentValue("ct").equals("0") || App.getArgumentValue("ct").equalsIgnoreCase("false");
+ buttonServer.setSelected(!direct);
+ buttonDirect.setSelected(direct);
+ }
+ if (App.hasArgument("console")) {
+ console.start();
+ }
+ }
+
+ @Override
+ public void onStop() {
+ try {
+ if (camera != null) {
+ saveCameraState();
+ camera.close();
+ camera = null;
+ server = null;
+ updateButtons();
+ }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ try {
+ if (console != null) {
+ console.stop();
+ }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ super.onStop();
+ }
+
+ //Overridable callbacks
+ @Override
+ public void onInitialize(int runCount) {
+ comboCameras.setEnabled(false);
+ comboType.setEnabled(false);
+ if (App.hasArgument("s")) {
+ renderer.setDevice((Source) getDevice("image"));
+ renderer.setAutoScroll(true);
+ ((Source) getDevice("image")).addListener(new ImageListener() {
+ @Override
+ public void onImage(Object o, BufferedImage bi, Data data) {
+ manageFit(bi, data);
+ manageUserOverlays(bi, data);
+ }
+
+ @Override
+ public void onError(Object o, Exception ex) {
+ }
+ }
+ );
+
+ } else {
+ String[] types = new String[]{"All"};
+ try (CameraServer srv = newCameraServer()) {
+ groups = srv.getCameraGroups();
+ types = Arr.insert(Arr.sort(groups.keySet().toArray(new String[0])), "All", 0);
+ aliases = srv.getCameraAliases();
+ } catch (Exception ex){
+ groups = null;
+ aliases = null;
+ }
+ if (this.types!=null){
+ types = this.types.toArray(new String[0]);
+ }
+ comboType.setModel(new javax.swing.DefaultComboBoxModel(types));
+
+ usingServer = buttonServer.isSelected();
+ comboCameras.setEnabled(true);
+ comboType.setEnabled(true);
+ setComboCameraSelection(null);
+ if (Arr.containsEqual(types, "All")){
+ setComboTypeSelection("All");
+ }
+ updateCameraList();
+
+ if (comboCameras.getModel().getSize() > 0) {
+ try {
+ if (App.hasArgument("cam")) {
+ setComboCameraSelection(App.getArgumentValue("cam"));
+ comboCamerasActionPerformed(null);
+ }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ }
+ updateButtons();
+ startTimer(1000);
+ }
+
+
+ boolean isVisible(String camera) {
+ return ((comboType.getSelectedItem().toString().toLowerCase().equals("all")) || (getCameraTypes(camera).contains(comboType.getSelectedItem())));
+ }
+
+ DefaultComboBoxModel getCameraList(boolean fromServer) throws Exception {
+ DefaultComboBoxModel model = new DefaultComboBoxModel();
+ if (App.hasArgument(ARG_LIST)){
+ List lists = App.getArgumentValues(ARG_LIST);
+ for (String list: lists){
+ String[] tokens = list.split(",");
+ for (String token : tokens){
+ if (!token.isBlank()){
+ model.addElement(token.trim());
+ }
+ }
+ }
+ } else {
+ if (fromServer) {
+ try (CameraServer srv = newCameraServer()) {
+ List cameras = srv.getCameras();
+ Collections.sort(cameras);
+ if (App.hasArgument(ARG_ALIAS) && (aliases!=null)){
+ if ("only".equals(App.getArgumentValue(ARG_ALIAS))){
+ cameras = new ArrayList();
+ }
+ cameras.addAll(0, aliases.keySet());
+ }
+ for (String camera : cameras) {
+ if (isVisible(camera)) {
+ model.addElement(camera);
+ }
+ }
+ }
+
+ } else {
+ ArrayList cameras = (ArrayList) getContext().getClassByName("SfCamera").getMethod("getCameras", new Class[]{}).invoke(null);
+ for (String camera : cameras) {
+ if (isVisible(camera)) {
+ model.addElement(camera);
+ }
+ }
+ }
+ }
+ if (App.hasArgument("cam")) {
+ String camera = App.getArgumentValue("cam");
+ if (model.getIndexOf(camera) < 0) {
+ if (isVisible(camera)) {
+ model.addElement(camera);
+ }
+ }
+ }
+ model.addElement("");
+
+ return model;
+ }
+
+ PipelineServer newServer() throws IOException {
+ if (serverUrl != null) {
+ System.out.println("Connecting to server: " + serverUrl);
+ server = new PipelineServer(CAMERA_DEVICE_NAME, serverUrl);
+ } else {
+ System.out.println("Connecting to server");
+ server = new PipelineServer(CAMERA_DEVICE_NAME);
+ }
+ updateButtons();
+ return server;
+ }
+
+ CameraServer newCameraServer() throws IOException, InterruptedException {
+ String cameraServerUrl = (camServerUrl == null) ? server.getUrl().substring(0, server.getUrl().length() - 1) + "8" : camServerUrl;
+ CameraServer srv = new CameraServer("CamServer", cameraServerUrl);
+ srv.initialize();
+ return srv;
+ }
+
+ boolean updatingCameraSelection;
+
+ void setComboCameraSelection(Object selection) {
+ updatingCameraSelection = true;
+ try {
+ comboCameras.setSelectedItem(selection);
+ } finally {
+ updatingCameraSelection = false;
+ }
+ }
+
+ void setComboTypeSelection(Object selection) {
+ updatingCameraSelection = true;
+ try {
+ comboType.setSelectedItem(selection);
+ } finally {
+ updatingCameraSelection = false;
+ }
+ }
+ boolean usingServer;
+
+ void updateCameraList() {
+ try {
+ String selected = (String) comboCameras.getSelectedItem();
+ comboCameras.setModel(getCameraList(usingServer));
+ if ((selected != null) && (((DefaultComboBoxModel) comboCameras.getModel()).getIndexOf(selected) > 0)){
+ setComboCameraSelection(selected);
+ } else{
+ setComboCameraSelection("");
+ }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ } finally {
+ updateButtons();
+ }
+ }
+
+ final Object lockOverlays = new Object();
+
+ void manageFit(BufferedImage bi, Data data) {
+ Overlay[][] fo = null;
+ if ((showFit || showProfile)) {
+ try {
+ fo = getFitOverlays(data);
+ } catch (Exception ex) {
+ System.err.println(ex);
+ }
+ }
+ synchronized (lockOverlays) {
+ fo = (fo == null) ? new Overlay[][]{null, null} : fo;
+ renderer.updateOverlays(fo[0], profileOv);
+ profileOv = fo[0];
+ renderer.updateOverlays(fo[1], fitOv);
+ fitOv = fo[1];
+ }
+ }
+
+ void manageUserOverlays(BufferedImage bi, Data data) {
+ Overlay[] fo = (bi == null) ? null : getUserOverlays(data);
+ synchronized (lockOverlays) {
+ renderer.updateOverlays(fo, userOv);
+ userOv = fo;
+ }
+ }
+
+ void updateDialogTitle() {
+ if (App.isDetached()) {
+ getTopLevel().setTitle(cameraName == null ? "ScreenPanel" : cameraName);
+ }
+ }
+
+ void manageTitleOverlay() {
+ Overlay to = null;
+ String text = cameraAlias;
+ if ((buttonTitle.isSelected()) && (text != null)) {
+ Font font = new Font("Arial", Font.PLAIN, 28);
+ to = new Text(renderer.getPenErrorText(), text, font, new Point(-SwingUtils.getTextSize(text, renderer.getGraphics().getFontMetrics(font)).width - 14, 26));
+ to.setFixed(true);
+ to.setAnchor(Overlay.ANCHOR_VIEWPORT_OR_IMAGE_TOP_RIGHT);
+ }
+
+ synchronized (lockOverlays) {
+ renderer.updateOverlays(to, titleOv);
+ titleOv = to;
+ }
+ }
+
+
+ void manageOverlayErrorOverlay(boolean error) {
+ if ((error) != (backgOv != null)){
+
+ Overlay bo = null;
+ if (error){
+ String text = "Invalid image background";
+ Font font = new Font("Arial", Font.PLAIN, 14);
+ bo = new Text(renderer.getPenErrorText(), text, font, new Point(-SwingUtils.getTextSize(text, renderer.getGraphics().getFontMetrics(font)).width - 14, 46));
+ bo.setFixed(true);
+ bo.setAnchor(Overlay.ANCHOR_VIEWPORT_OR_IMAGE_TOP_RIGHT);
+ }
+ synchronized (lockOverlays) {
+ renderer.updateOverlays(bo,backgOv);
+ backgOv = bo;
+ }
+ }
+ }
+
+
+ @Override
+ public void onStateChange(State state, State former) {
+
+ }
+
+ @Override
+ public void onExecutedFile(String fileName, Object result) {
+ }
+
+ //Callback to perform update - in event thread
+ @Override
+ protected void doUpdate() {
+ }
+
+ Thread devicesInitTask;
+
+ void setCamera(String cameraName) throws IOException, InterruptedException {
+ System.out.println("Initializing: " + cameraName);
+ parseUserOverlays();
+ errorOverlay = null;
+ lastMarkerPos = null;
+ lastFrame = null;
+ lastPipelinePars = null;
+
+ if (dataTableDialog != null) {
+ dataTableDialog.dispose();
+ dataTableDialog = null;
+ }
+ dataTableModel = null;
+
+ if (calibrationDialolg != null) {
+ calibrationDialolg.dispose();
+ calibrationDialolg = null;
+ }
+
+ boolean was_server = false;
+ if (camera != null) {
+ saveCameraState();
+ //camera.removeAllListeners();
+ was_server = (server != null);
+ camera.close();
+ camera = null;
+ server = null;
+ }
+ updateButtons();
+ instanceName = null;
+ renderer.setDevice(null);
+ renderer.setShowReticle(false);
+ renderer.removeOverlays(fitOv);
+ renderer.removeOverlays(profileOv);
+ renderer.removeOverlays(userOv);
+ renderer.clear();
+ renderer.resetZoom();
+
+ cameraAlias = cameraName;
+ if ((aliases!=null) && (cameraName!=null) && (aliases.containsKey(cameraName))){
+
+ cameraName = aliases.get(cameraName);
+ System.out.println("Camera name is alias to: " + cameraName);
+ }
+
+ boolean changed = !String.valueOf(cameraName).equals(this.cameraName);
+ this.cameraName = cameraName;
+
+ if (changed || buttonDirect.isSelected()) {
+ spinnerBackground.setVisible(false);
+ spinnerThreshold.setVisible(false);
+ checkThreshold.setEnabled(false);
+ checkRotation.setEnabled(false);
+ checkAveraging.setEnabled(false);
+ checkGoodRegion.setEnabled(false);
+ setGoodRegionOptionsVisible(false);
+ setSlicingOptionsVisible(false);
+ setRotationOptionsVisible(false);
+ setAveragingOptionsVisible(false);
+ }
+ synchronized (imageBuffer) {
+ currentFrame = null;
+ imageBuffer.clear();
+ }
+ if (changed) {
+ checkBackground.setEnabled(false);
+ if ((devicesInitTask != null) && (devicesInitTask.isAlive())) {
+ devicesInitTask.interrupt();
+ }
+ if (screen != null) {
+ screen.close();
+ screen = null;
+ }
+ if (filter != null) {
+ filter.close();
+ filter = null;
+ }
+ if (renderer.isPaused()) {
+ renderer.resume();
+ removePauseOverlay();
+ pauseSelection.setVisible(false);
+ panelCameraSelection.setVisible(true);
+ }
+ }
+ manageTitleOverlay();
+ updateDialogTitle();
+
+ if (cameraName == null) {
+ return;
+ }
+
+ System.out.println("Setting camera: " + cameraName + " [" + (buttonServer.isSelected() ? "server" : "direct") + "]");
+ try {
+ if (buttonServer.isSelected()) {
+ camera = newServer();
+ camera.getConfig().flipHorizontally = false;
+ camera.getConfig().flipVertically = false;
+ camera.getConfig().rotation = 0.0;
+ camera.getConfig().roiX = 0;
+ camera.getConfig().roiY = 0;
+ camera.getConfig().roiWidth = -1;
+ camera.getConfig().roiHeight = -1;
+ } else {
+ //camera = new SfCamera(CAMERA_DEVICE_NAME, cameraName);
+ camera = (ColormapSource) getContext().getClassByName("SfCamera").getConstructor(new Class[]{String.class, String.class}).newInstance(new Object[]{CAMERA_DEVICE_NAME, cameraName});
+ }
+ camera.initialize();
+ camera.assertInitialized();
+ System.out.println("Camera initialization OK");
+ loadCameraState();
+ if (server != null) {
+ //server.start(cameraName, false);
+ String pipelineName = cameraName + pipelineSuffix;
+ instanceName = cameraName + pipelineSuffix + "1";
+ if (!server.getPipelines().contains(pipelineName)) {
+ System.out.println("Creating pipeline: " + pipelineName);
+ HashMap config = new HashMap<>();
+ config.put("camera_name", cameraName);
+ //server.createFromConfig(config, pipelineName);
+ server.savePipelineConfig(pipelineName, config);
+ }
+ server.start(pipelineName, instanceName);
+
+ updatePipelineControls();
+ checkThreshold.setEnabled(true);
+ checkRotation.setEnabled(true);
+ checkAveraging.setEnabled(true);
+ checkGoodRegion.setEnabled(true);
+ } else {
+ checkThreshold.setSelected(false);
+ checkRotation.setSelected(false);
+ checkAveraging.setSelected(false);
+ checkGoodRegion.setSelected(false);
+ if (polling <= 0) {
+ camera.setMonitored(true);
+ } else {
+ camera.setPolling(polling);
+ }
+ camera.setBackgroundEnabled(checkBackground.isSelected());
+ }
+ updateButtons();
+ camera.getConfig().save();
+
+ //if (Math.abs(integration) > 1) {
+ // renderer.setDevice(new ImageIntegrator(integration));
+ //} else {
+ renderer.setDevice(camera);
+ //}
+
+ renderer.setAutoScroll(true);
+ //renderer.setMarker(marker);
+ clearMarker();
+ imageSize = null;
+
+ camera.addListener(new ImageListener() {
+ @Override
+ public void onImage(Object o, BufferedImage bi, Data data) {
+ if (bi != null) {
+ if ((imageSize == null) || imageSize.width != bi.getWidth() || imageSize.height != bi.getHeight()) {
+ SwingUtilities.invokeLater(new Runnable() {
+ @Override
+ public void run() {
+ if ((renderer.getMode() == RendererMode.Zoom) || (renderer.getMode() == RendererMode.Fixed)) {
+ centralizeRenderer();
+ }
+ checkReticle();
+ }
+ });
+ imageSize = new Dimension(bi.getWidth(), bi.getHeight());
+ }
+ renderer.setProfileSize(Math.min(bi.getWidth(), bi.getHeight()));
+ }
+ //renderer.setCalibration(camera.getCalibration());
+ if (!renderer.isPaused()) {
+ if (data != null) {
+ synchronized (imageBuffer) {
+ currentFrame = new Frame(data);
+ if (imageBufferLenght >= 1) {
+ imageBuffer.add(currentFrame);
+ if (imageBuffer.size() > imageBufferLenght) {
+ imageBuffer.remove(0);
+ setBufferFull(true);
+ } else {
+ setBufferFull(false);
+ }
+ } else {
+ setBufferFull(true);
+ }
+ //Update data
+ if (!renderer.isPaused()) {
+ updateStreamData();
+ }
+ updateMarker();
+ }
+ }
+ manageFit(bi, data);
+ manageUserOverlays(bi, data);
+ }
+ //updateImageData();
+ }
+
+ @Override
+ public void onError(Object o, Exception ex) {
+ //System.err.println(ex);
+ }
+ });
+
+ } catch (Exception ex) {
+ showException(ex);
+ renderer.clearOverlays();
+ updatePipelineControls();
+ if (renderer.getDevice() == null) {
+ //renderer.setZoom(1.0);
+ //renderer.setMode(RendererMode.Zoom);
+ errorOverlay = new Text(renderer.getPenErrorText(), ex.toString(), new Font("Verdana", Font.PLAIN, 12), new Point(20, 20));
+ errorOverlay.setFixed(true);
+ errorOverlay.setAnchor(Overlay.ANCHOR_VIEWPORT_TOP_LEFT);
+ renderer.addOverlay(errorOverlay);
+ }
+ } finally {
+ //checkReticle();
+ onTimer();
+ }
+ onChangeColormap(null);
+ checkBackground.setEnabled(true);
+ if (changed) {
+ boolean electrons = getCameraTypes(this.cameraName).contains(ELECTRONS_TYPE);
+ comboScreen.setModel(new DefaultComboBoxModel());
+ comboScreen.setEnabled(false);
+ comboFilter.setModel(new DefaultComboBoxModel());
+ comboFilter.setEnabled(false);
+ panelFilter.setVisible(electrons);
+ panelScreen.setVisible(electrons);
+ if (electrons) {
+ //Parallelizing initialization
+ devicesInitTask = new Thread(() -> {
+ try {
+ if (this.cameraName.contains("DSRM")) {
+ screen = new DiscretePositioner("CurrentScreen", this.cameraName + ":POSITION_SP", this.cameraName + ":POSITION");
+ } else {
+ screen = new DiscretePositioner("CurrentScreen", this.cameraName + ":SET_SCREEN1_POS", this.cameraName + ":GET_SCREEN1_POS");
+ }
+ screen.setMonitored(true);
+ screen.initialize();
+ DefaultComboBoxModel model = new DefaultComboBoxModel();
+ for (String pos : screen.getPositions()) {
+ model.addElement(pos);
+ }
+ comboScreen.setModel(model);
+ comboScreen.setSelectedItem(screen.read());
+
+ } catch (Exception ex) {
+ comboScreen.setModel(new DefaultComboBoxModel());
+ System.err.println(ex.getMessage());
+ screen = null;
+ }
+ comboScreen.setEnabled(screen != null);
+ valueScreen.setDevice(screen);
+
+ try {
+ filter = new DiscretePositioner("CurrentFilter", this.cameraName + ":SET_FILTER", this.cameraName + ":GET_FILTER");
+ filter.setMonitored(true);
+ filter.initialize();
+ DefaultComboBoxModel model = new DefaultComboBoxModel();
+ for (String pos : filter.getPositions()) {
+ model.addElement(pos);
+ }
+ comboFilter.setModel(model);
+ comboFilter.setSelectedItem(filter.read());
+ } catch (Exception ex) {
+ System.err.println(ex.getMessage());
+ filter = null;
+ }
+ comboFilter.setEnabled(filter != null);
+ valueFilter.setDevice(filter);
+ });
+ devicesInitTask.start();
+ }
+ }
+ }
+ /*
+ class ImageIntegrator extends ColormapSource {
+
+ ImageIntegrator(int num) {
+ super("Image Averager", camera.getConfig());
+ boolean continuous = (num < 0);
+ final int numImages = Math.abs(num);
+
+ camera.addListener(new ImageListener() {
+ final ArrayList buffer = new ArrayList();
+ Data integration = null;
+
+ @Override
+ public void onImage(Object o, BufferedImage bi, Data data) {
+ try {
+ if (continuous) {
+ buffer.add(data);
+ if (buffer.size() >= numImages) {
+ for (Data d : buffer) {
+ process(d);
+ }
+ }
+ } else {
+ buffer.add(null); //Just to count
+ process(data);
+ }
+ } catch (Exception ex) {
+ buffer.clear();
+ integration = null;
+ ImageIntegrator.this.pushData(null);
+ ex.printStackTrace();
+ return;
+ }
+ if (buffer.size() >= numImages) {
+ if (continuous) {
+ buffer.remove(0);
+ } else {
+ buffer.clear();
+ }
+ if (integration != null) {
+ //integration.div(numImages);
+ ImageIntegrator.this.pushData(integration);
+ }
+ integration = null;
+ }
+ }
+
+ void process(Data data) {
+ if (integration == null) {
+ integration = new Data(data);
+ } else {
+ integration.sum(data);
+ }
+ }
+
+ @Override
+ public void onError(Object origin, Exception ex) {
+ }
+ });
+
+ }
+ }
+ */
+
+ boolean bufferFull = true;
+
+ void setBufferFull(boolean value) {
+ if (value != bufferFull) {
+ SwingUtilities.invokeLater(() -> {
+ buttonPause.setBackground(value ? buttonSave.getBackground() : buttonSave.getBackground().brighter());
+ });
+ bufferFull = value;
+ }
+ }
+
+ volatile Dimension imageSize;
+
+ void checkReticle() {
+ if ((renderer.getDevice() != null) && (camera != null) && (camera.getConfig().isCalibrated()) && buttonReticle.isSelected()) {
+ //renderer.setCalibration(camera.getCalibration());
+ renderer.configureReticle(new Dimension(800, 800), 200);
+ renderer.setShowReticle(true);
+ } else {
+ //renderer.setCalibration(null);
+ renderer.setShowReticle(false);
+ }
+ renderer.refresh();
+ }
+
+ void checkMarker(Point p) throws IOException {
+ if (camera != null) {
+ if (buttonMarker.isSelected()) {
+ Dimension d = renderer.getImageSize();
+ if (p == null) {
+ p = (d == null) ? new Point(renderer.getWidth() / 2, renderer.getHeight() / 2) : new Point(d.width / 2, d.height / 2);
+ }
+ Overlay ov = null;
+ marker = new Overlays.Crosshairs(renderer.getPenMarker(), p, new Dimension(100, 100));
+ marker.setMovable(true);
+ marker.setPassive(false);
+ } else {
+ marker = null;
+ }
+ renderer.setMarker(marker);
+ onMarkerChanged();
+ }
+ }
+
+ Point lastMarkerPos;
+
+ void onMarkerChanged() throws IOException {
+ lastMarkerPos = getStreamMarkerPos();
+ if (marker == null) {
+ setInstanceConfigValue("Marker", null);
+ } else {
+ setInstanceConfigValue("Marker", new int[]{marker.getPosition().x, marker.getPosition().y});
+ }
+ }
+
+ void updateMarker() {
+ try {
+ if (server != null) {
+ Point p = getStreamMarkerPos();
+ if (p != null) {
+ //To prevent a local change being overriden by a message having the old settings.
+ //TODO: This is not bullet-proof, as one can have 2 changes between 2 frames...
+ if (!p.equals(lastMarkerPos)) {
+ if (p.x == Integer.MIN_VALUE) {
+ if (buttonMarker.isSelected()) {
+ buttonMarker.setSelected(false);
+ checkMarker(null);
+ }
+ } else {
+ if (!buttonMarker.isSelected()) {
+ buttonMarker.setSelected(true);
+ checkMarker(p);
+ } else {
+ if (!p.equals(marker.getPosition())) {
+ marker.setPosition(p);
+ }
+ }
+ }
+ }
+ }
+ }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+
+ Point getStreamMarkerPos() throws IOException {
+ //System.out.println(server.getInstanceConfig().get("Marker"));
+ Map pars = server.getProcessingParameters();
+ if (pars != null) {
+ List markerPosition = (List) pars.get("Marker");
+ if (markerPosition != null) {
+ return new Point((Integer) markerPosition.get(0), (Integer) markerPosition.get(1));
+ }
+ return new Point(Integer.MIN_VALUE, Integer.MIN_VALUE);
+ }
+ return null;
+ }
+
+ void clearMarker() {
+ marker = null;
+ renderer.setMarker(marker);
+ }
+
+ void setInstanceConfigValue(String name, Object value) throws IOException {
+ if (server != null) {
+ Map map = server.getInstanceConfig();
+ map.put(name, value);
+ server.setInstanceConfig(map);
+ }
+ }
+
+ void updateZoom() {
+ try {
+ buttonZoomStretch.setSelected(renderer.getMode() == RendererMode.Stretch);
+ buttonZoomFit.setSelected(renderer.getMode() == RendererMode.Fit);
+ if (renderer.getMode() == RendererMode.Fixed) {
+ buttonZoomNormal.setSelected(true);
+ } else if (renderer.getMode() == RendererMode.Zoom) {
+ if (renderer.getZoom() == 1) {
+ buttonZoomNormal.setSelected(true);
+ } else if (renderer.getZoom() == 0.5) {
+ buttonZoom05.setSelected(true);
+ } else if (renderer.getZoom() == 0.25) {
+ buttonZoom025.setSelected(true);
+ } else if (renderer.getZoom() == 2.0) {
+ buttonZoom2.setSelected(true);
+ } else {
+ buttonGroup1.clearSelection();
+ }
+ }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+
+ boolean updatingColormap;
+
+ void updateColormap() {
+ updatingColormap = true;
+ try {
+ if ((camera != null) && (camera instanceof ColormapSource)) {
+ ColormapSourceConfig config = ((ColormapSource) camera).getConfig();
+ comboColormap.setSelectedItem(config.colormap);
+ if (config.isDefaultColormap()) {
+ buttonFullRange.setSelected(true);
+ } else if (config.colormapAutomatic) {
+ buttonAutomatic.setSelected(true);
+ } else {
+ buttonManual.setSelected(true);
+ }
+ btFixColormapRange.setVisible(buttonAutomatic.isSelected());
+ spinnerMin.setEnabled(buttonManual.isSelected());
+ spinnerMax.setEnabled(buttonManual.isSelected());
+
+ boolean signed = spinnerBackground.isVisible() && "signed".equals(spinnerBackground.getValue());
+ Integer min = signed ? -65535: 0;
+ if (!min.equals(((SpinnerNumberModel)spinnerMin.getModel()).getMinimum())){
+ spinnerMin.setModel(new SpinnerNumberModel(0, min.intValue(), 65535, 1));
+ spinnerMax.setModel(new SpinnerNumberModel(255, min.intValue(), 65535, 1));
+ if ((Integer)((SpinnerNumberModel)spinnerMin.getModel()).getValue() < min){
+ spinnerMin.setValue(min);
+ }
+ if ((Integer)((SpinnerNumberModel)spinnerMax.getModel()).getValue() < min){
+ spinnerMax.setValue(min);
+ }
+ }
+
+ if (!Double.isNaN(config.colormapMin)) {
+ Integer value = Math.min(Math.max((int) config.colormapMin, min), 65535);
+ if (spinnerMin.getModel().getValue()!= value){
+ spinnerMin.setValue(value);
+ }
+ }
+ if (!Double.isNaN(config.colormapMax)) {
+ Integer value = Math.min(Math.max((int) config.colormapMax, min), 65535);
+ if (spinnerMax.getModel().getValue()!= value){
+ spinnerMax.setValue(value);
+ }
+ }
+ }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ updatingColormap = false;
+ }
+
+ void updatePipelineProperties() {
+ goodRegion = checkGoodRegion.isSelected();
+ spinnerBackground.setVisible(checkBackground.isSelected());
+ spinnerThreshold.setVisible(checkThreshold.isSelected());
+ setGoodRegionOptionsVisible(goodRegion);
+ slicing = goodRegion && checkSlicing.isSelected();
+ setSlicingOptionsVisible(slicing);
+ updatingServerControls = false;
+ boolean rotation = checkRotation.isSelected();
+ setRotationOptionsVisible(rotation);
+ boolean averaging = checkAveraging.isSelected();
+ setAveragingOptionsVisible(averaging);
+ }
+
+ boolean updatingServerControls;
+
+ void updatePipelineControls() {
+ if (server != null) {
+ updatingServerControls = true;
+ if (server.isStarted()) {
+ try {
+ checkBackground.setSelected(server.isBackgroundSubtractionEnabled());
+ setBackgoundControl(server.getBackgroundSubtraction());
+ Object bg = server.getBackgroundSubtraction();
+ if (bg.equals("signed") || bg.equals("passive")){
+ spinnerBackground.setValue(bg);
+ } else {
+ spinnerBackground.setValue("normal");
+ }
+ Double threshold = (server.getThreshold());
+ checkThreshold.setSelected(threshold != null);
+ spinnerThreshold.setValue((threshold == null) ? 0 : threshold);
+ Map gr = (server.getGoodRegion());
+ checkGoodRegion.setSelected(gr != null);
+ if (gr != null) {
+ spinnerGrThreshold.setValue(((Number) gr.get("threshold")).doubleValue());
+ spinnerGrScale.setValue(((Number) gr.get("gfscale")).doubleValue());
+ }
+ Map rotation = server.getRotation();
+ checkRotation.setSelected(rotation != null);
+ if (rotation!=null){
+ spinnerRotationAngle.setValue(((Number) rotation.get("angle")).doubleValue());
+ spinnerRotationOrder.setValue(((Number) rotation.get("order")).intValue());
+ String mode = (String) rotation.get("mode");
+ try{
+ spinnerRotationConstant.setValue(Double.valueOf(mode));
+ spinnerRotationMode.setValue("constant");
+ } catch (Exception ex){
+ spinnerRotationConstant.setValue(0);
+ spinnerRotationMode.setValue(mode);
+ }
+ }
+
+ Number averaging = (Number) server.getInstanceConfig().get("averaging");
+ checkAveraging.setSelected(averaging != null);
+ if (averaging!=null){
+ spinnerAvFrames.setValue(Math.abs(averaging.intValue()));
+ spinnerAvMode.setValue(averaging.intValue()<0 ? "window" : "single");
+ }
+
+
+ Map slicing = (server.getSlicing());
+ checkSlicing.setSelected(slicing != null);
+ if (slicing != null) {
+ spinnerSlNumber.setValue(((Number) slicing.get("number_of_slices")).intValue());
+ spinnerSlScale.setValue(((Number) slicing.get("scale")).doubleValue());
+ spinnerSlOrientation.setValue((String) slicing.get("orientation"));
+ }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ updatePipelineProperties();
+ }
+ }
+
+ boolean changedPipelinePars(Map pars1, Map pars2) {
+ String[] keys = new String[]{"image_background_enable", "image_threshold", "image_good_region",
+ "threshold", "gfscale", "image_slices", "number_of_slices", "scale", "orientation", "image_background_ok"};
+ for (String key : keys) {
+ Object o1 = pars1.get(key);
+ Object o2 = pars2.get(key);
+ if (o1 == null) {
+ if (o2 != null) {
+ return true;
+ }
+ } else if (!o1.equals(o2)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ void setBackgoundControl(Object background){
+ spinnerBackground.setValue((background.equals("signed") || background.equals("passive")) ? background : "normal");
+ }
+
+ void updatePipelineControls(Map pars) {
+ if (pars != null) {
+ updatingServerControls = true;
+ try {
+ Object background = pars.get("image_background_enable");
+ checkBackground.setSelected(!background.equals("") && !background.equals(false) && !background.equals("false"));
+ setBackgoundControl(background);
+
+ manageOverlayErrorOverlay(Boolean.FALSE.equals(pars.get("image_background_ok")));
+
+ Double threshold = (Double) (pars.get("image_threshold"));
+ checkThreshold.setSelected(threshold != null);
+ spinnerThreshold.setValue((threshold == null) ? 0 : threshold);
+ Map gr = (Map) pars.get("image_good_region");
+ checkGoodRegion.setSelected(gr != null);
+ if (gr != null) {
+ Double value = ((Number) gr.get("threshold")).doubleValue();
+ spinnerGrThreshold.setValue(value);
+ Double scale = ((Number) gr.get("gfscale")).doubleValue();
+ spinnerGrScale.setValue(scale);
+ }
+ Map slicing = (Map) (pars.get("image_slices"));
+ checkSlicing.setSelected(slicing != null);
+ if (slicing != null) {
+ int slices = ((Number) slicing.get("number_of_slices")).intValue();
+ spinnerSlNumber.setValue(slices);
+ double scale = ((Number) slicing.get("scale")).doubleValue();
+ spinnerSlScale.setValue(scale);
+ String orientation = (String) slicing.get("orientation");
+ spinnerSlOrientation.setValue(orientation);
+ }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ updatePipelineProperties();
+ }
+ }
+
+ void setGoodRegionOptionsVisible(boolean visible) {
+ spinnerGrThreshold.setVisible(visible);
+ labelGrThreshold.setVisible(visible);
+ spinnerGrScale.setVisible(visible);
+ labelGrScale.setVisible(visible);
+ panelSlicing.setVisible(visible);
+ }
+
+ void setSlicingOptionsVisible(boolean visible) {
+ spinnerSlNumber.setVisible(visible);
+ labelSlNumber.setVisible(visible);
+ spinnerSlScale.setVisible(visible);
+ labelSlScale.setVisible(visible);
+ spinnerSlOrientation.setVisible(visible);
+ labelSlOrientation.setVisible(visible);
+ }
+
+ void setAveragingOptionsVisible(boolean visible) {
+ labelAvMode.setVisible(visible);
+ labelAvFrames.setVisible(visible);
+ spinnerAvMode.setVisible(visible);
+ spinnerAvFrames.setVisible(visible);
+ }
+
+ void setRotationOptionsVisible(boolean visible) {
+ labelAngle.setVisible(visible);
+ labelOrder.setVisible(visible);
+ labelMode.setVisible(visible);
+ labelConstant.setVisible(visible);
+ spinnerRotationAngle.setVisible(visible);
+ spinnerRotationOrder.setVisible(visible);
+ spinnerRotationMode.setVisible(visible);
+ spinnerRotationConstant.setVisible(visible);
+ }
+
+ boolean isCameraStopped() {
+ if ((server != null) && !server.isStarted()) {
+ return true;
+ }
+ return ((camera == null) || camera.isClosed());
+ }
+
+ boolean updatingButtons;
+
+ void updateButtons() {
+ updatingButtons = true;
+ try {
+ boolean active = !isCameraStopped();//(camera != null);
+ buttonSave.setEnabled(active);
+ buttonGrabBackground.setEnabled(active);
+ buttonMarker.setEnabled(active);
+ buttonProfile.setEnabled(active);
+ buttonFit.setEnabled(active);
+ buttonReticle.setEnabled(active && camera.getConfig().isCalibrated());
+ buttonStreamData.setEnabled(active && (server != null));
+ buttonPause.setEnabled(active);
+
+ if (renderer.isPaused() != buttonPause.isSelected()) {
+ buttonPause.setSelected(renderer.isPaused());
+ buttonPauseActionPerformed(null);
+ }
+ if (renderer.getShowReticle() != buttonReticle.isSelected()) {
+ //buttonReticle.setSelected(renderer.getShowReticle());
+ }
+ if ((renderer.getMarker() == null) && buttonMarker.isSelected()) {
+ buttonMarker.setSelected(false);
+ }
+ buttonSave.setSelected(renderer.isSnapshotDialogVisible());
+
+ } finally {
+ updatingButtons = false;
+ }
+ }
+
+ Frame lastFrame = null;
+ Map lastPipelinePars = null;
+
+ @Override
+ protected void onTimer() {
+ for (Device dev : new Device[]{screen, filter}) {
+ if (dev != null) {
+ dev.request();
+ }
+ }
+
+ textState.setText((camera == null) ? "" : camera.getState().toString());
+ if (App.hasArgument("s")) {
+ try {
+ ((Source) getDevice("image")).initialize();
+ } catch (IOException ex) {
+ logger.log(Level.SEVERE, null, ex);
+ } catch (InterruptedException ex) {
+ logger.log(Level.SEVERE, null, ex);
+ }
+ }
+ updateZoom();
+ updateColormap();
+ updateButtons();
+ checkHistogram.setSelected((histogramDialog != null) && (histogramDialog.isShowing()));
+ buttonScale.setSelected(renderer.getShowColormapScale());
+ try {
+ Frame frame = getCurrentFrame();
+ if (frame != lastFrame) {
+ lastFrame = frame;
+ if (frame != null) {
+ Map pars = getProcessingParameters(frame.cache);
+ if ((lastPipelinePars == null) || changedPipelinePars(pars, lastPipelinePars)) {
+ //System.out.println("Update pipeline: " + pars);
+ lastPipelinePars = pars;
+ updatePipelineControls(pars);
+ }
+ }
+ }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+
+ Pen penFit = new Pen(new Color(192, 105, 0), 0);
+ Pen penCross = new Pen(new Color(192, 105, 0), 0);
+ Pen penSlices = new Pen(Color.CYAN.darker(), 1);
+
+ Frame getCurrentFrame() {
+ if ((imageBufferLenght > 1) && (renderer.isPaused())) {
+ int index = ((int) pauseSelection.getValue()) - 1;
+ synchronized (imageBuffer) {
+ return (index < imageBuffer.size()) ? imageBuffer.get(index) : null;
+ }
+ }
+ return currentFrame;
+ }
+
+ Frame getFrame(Data data) {
+ synchronized (imageBuffer) {
+ for (Frame f : imageBuffer) {
+ if (f.data == data) {
+ return f;
+ }
+ }
+ }
+ return null;
+ }
+
+ void setImageBufferSize(int size) {
+ if (renderer.isPaused()) {
+ throw new RuntimeException("Cannot change buffer size whn paused");
+ }
+ synchronized (imageBuffer) {
+ imageBufferLenght = size;
+ imageBuffer.clear();
+ }
+
+ }
+
+ Overlay[][] getFitOverlays(Data data) {
+ Overlays.Polyline hgaussian = null;
+ Overlays.Polyline vgaussian = null;
+ Overlays.Polyline hprofile = null;
+ Overlays.Polyline vprofile = null;
+ Double xMean = null, xSigma = null, xNorm = null, xCom = null, xRms = null;
+ Double yMean = null, ySigma = null, yNorm = null, yCom = null, yRms = null;
+ double[] pX = null, pY = null, gX = null, gY = null;
+ PointDouble[] sliceCenters = null;
+ if (data != null) {
+ int height = data.getHeight();
+ int width = data.getWidth();
+ int profileSize = renderer.getProfileSize();
+ ImageData id = null;
+ if ((useServerStats) && (server != null)) {
+ try {
+ id = getFrame(data);
+ if (id == null) {
+ return null;
+ }
+ xMean = id.x_fit_mean;
+ xSigma = id.x_fit_standard_deviation;
+ yMean = id.y_fit_mean;
+ ySigma = id.y_fit_standard_deviation;
+ gX = id.x_fit_gauss_function;
+ gY = id.y_fit_gauss_function;
+ pX = id.x_profile;
+ pY = id.y_profile;
+ xCom = id.x_center_of_mass;
+ xRms = id.x_rms;
+ yCom = id.y_center_of_mass;
+ yRms = id.y_rms;
+ sliceCenters = id.sliceCenters;
+
+ profileSize /= 4;
+ if (pX != null) {
+ int[] xp = Arr.indexesInt(pX.length);
+ int[] xg = xp;
+ int[] yp = new int[pX.length];
+ int[] yg = new int[pX.length];
+
+ List l = Arrays.asList((Double[]) Convert.toWrapperArray(pX));
+ double minProfile = Collections.min(l);
+ double maxProfile = Collections.max(l);
+ double rangeProfile = maxProfile - minProfile;
+ double minGauss = minProfile;
+ double rangeGauss = rangeProfile;
+ //If not good region, range of profile and fit are similar so save this calcultion
+ if (goodRegion && id.gr_size_x > 0) {
+ l = Arrays.asList((Double[]) Convert.toWrapperArray(Arrays.copyOfRange(gX, id.gr_pos_x, id.gr_pos_x + id.gr_size_x)));
+ minGauss = Collections.min(l);
+ rangeGauss = Collections.max(l) - minGauss;
+ }
+
+ for (int i = 0; i < xp.length; i++) {
+ if (gX != null) {
+ yg[i] = (int) (height - 1 - (((gX[i] - minGauss) / rangeGauss) * profileSize));
+ }
+ yp[i] = (int) (height - 1 - (((pX[i] - minProfile) / rangeProfile) * profileSize));
+ }
+
+ if (goodRegion && id.gr_size_x > 0) {
+ xg = Arrays.copyOfRange(xg, id.gr_pos_x, id.gr_pos_x + id.gr_size_x);
+ yg = Arrays.copyOfRange(yg, id.gr_pos_x, id.gr_pos_x + id.gr_size_x);
+ }
+
+ vgaussian = new Overlays.Polyline(penFit, xg, yg);
+ vprofile = new Overlays.Polyline(renderer.getPenProfile(), xp, yp);
+ }
+
+ if (pY != null) {
+ int[] xp = new int[pY.length];
+ int[] xg = new int[pY.length];
+ int[] yp = Arr.indexesInt(pY.length);
+ int[] yg = yp;
+
+ List l = Arrays.asList((Double[]) Convert.toWrapperArray(pY));
+ double minProfile = Collections.min(l);
+ double maxProfile = Collections.max(l);
+ double rangeProfile = maxProfile - minProfile;
+ double minGauss = minProfile;
+ double rangeGauss = rangeProfile;
+ //If not good region, range of profile and fit are similar so save this calcultion
+ if (goodRegion && id.gr_size_y > 0) {
+ l = Arrays.asList((Double[]) Convert.toWrapperArray(Arrays.copyOfRange(gY, id.gr_pos_y, id.gr_pos_y + id.gr_size_y)));
+ minGauss = Collections.min(l);
+ rangeGauss = Collections.max(l) - minGauss;
+ }
+
+ for (int i = 0; i < xp.length; i++) {
+ if (gY != null) {
+ xg[i] = (int) (((gY[i] - minGauss) / rangeGauss) * profileSize);
+ }
+ xp[i] = (int) (((pY[i] - minProfile) / rangeProfile) * profileSize);
+ }
+
+ if (goodRegion && id.gr_size_y > 0) {
+ xg = Arrays.copyOfRange(xg, id.gr_pos_y, id.gr_pos_y + id.gr_size_y);
+ yg = Arrays.copyOfRange(yg, id.gr_pos_y, id.gr_pos_y + id.gr_size_y);
+ }
+ hgaussian = new Overlays.Polyline(penFit, xg, yg);
+ hprofile = new Overlays.Polyline(renderer.getPenProfile(), xp, yp);
+ }
+ } catch (Exception ex) {
+ System.err.println(ex.getMessage());
+ return null;
+ }
+ } else {
+ ArrayProperties properties = data.getProperties();
+ double maxPlot = properties.max;
+ double minPlot = properties.min;
+ double rangePlot = maxPlot - minPlot;
+
+ if (rangePlot <= 0) {
+ return null;
+ }
+ if (renderer.getCalibration() != null) {
+ try {
+ double[] sum = data.integrateVertically(true);
+ double[] saux = new double[sum.length];
+ int[] p = new int[sum.length];
+ double[] x_egu = renderer.getCalibration().getAxisX(sum.length);
+ double[] comRms = getComRms(sum, x_egu);
+ xCom = comRms[0];
+ xRms = comRms[1];
+ int[] x = Arr.indexesInt(sum.length);
+ DescriptiveStatistics stats = new DescriptiveStatistics(sum);
+ double min = stats.getMin();
+ for (int i = 0; i < sum.length; i++) {
+ saux[i] = sum[i] - min;
+ }
+ if (showFit) {
+ double[] gaussian = fitGaussian(saux, x);
+ if (gaussian != null) {
+ if ((gaussian[2] < sum.length * 0.45)
+ && (gaussian[2] > 2)
+ && (gaussian[0] > min * 0.03)) {
+ xNorm = gaussian[0];
+ xMean = gaussian[1];
+ xSigma = gaussian[2];
+ double[] fit = getFitFunction(gaussian, x);
+ int[] y = new int[x.length];
+ for (int i = 0; i < x.length; i++) {
+ y[i] = (int) (height - 1 - ((((fit[i] + min) / height - minPlot) / rangePlot) * profileSize));
+ }
+ vgaussian = new Overlays.Polyline(penFit, x, y);
+ }
+ }
+ }
+ if (showProfile) {
+ for (int i = 0; i < x.length; i++) {
+ p[i] = (int) (height - 1 - (((sum[i] / height - minPlot) / rangePlot) * profileSize));
+ }
+ vprofile = new Overlays.Polyline(renderer.getPenProfile(), x, p);
+ }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+
+ try {
+ double[] sum = data.integrateHorizontally(true);
+ double[] saux = new double[sum.length];
+ int[] p = new int[sum.length];
+ double[] y_egu = renderer.getCalibration().getAxisY(sum.length);
+ double[] comRms = getComRms(sum, y_egu);
+ yCom = comRms[0];
+ yRms = comRms[1];
+ int[] x = Arr.indexesInt(sum.length);
+ DescriptiveStatistics stats = new DescriptiveStatistics(sum);
+ double min = stats.getMin();
+ for (int i = 0; i < sum.length; i++) {
+ saux[i] = sum[i] - min;
+ }
+
+ if (showFit) {
+ double[] gaussian = fitGaussian(saux, x);
+ if (gaussian != null) {
+ //Only aknowledge beam fully inside the image and peak over 3% of min
+ if ((gaussian[2] < sum.length * 0.45)
+ && (gaussian[2] > 2)
+ && (gaussian[0] > min * 0.03)) {
+ yNorm = gaussian[0];
+ yMean = gaussian[1];
+ ySigma = gaussian[2];
+ double[] fit = getFitFunction(gaussian, x);
+
+ int[] y = new int[x.length];
+ for (int i = 0; i < x.length; i++) {
+ y[i] = (int) ((((fit[i] + min) / width - minPlot) / rangePlot) * profileSize);
+ }
+ hgaussian = new Overlays.Polyline(penFit, y, x);
+ }
+ }
+ }
+ if (showProfile) {
+ for (int i = 0; i < x.length; i++) {
+ p[i] = (int) (((sum[i] / width - minPlot) / rangePlot) * profileSize);
+ }
+ hprofile = new Overlays.Polyline(renderer.getPenProfile(), p, x);
+ }
+
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ if (xSigma != null) {
+ xSigma *= renderer.getCalibration().getScaleX();
+ }
+ if (ySigma != null) {
+ ySigma *= renderer.getCalibration().getScaleY();
+ }
+ if (xMean != null) {
+ xMean = data.getX((int) Math.round(xMean));
+ }
+ if (yMean != null) {
+ yMean = data.getY((int) Math.round(yMean));
+ }
+ }
+ }
+ final String units = (renderer.getCalibration() != null) ? "\u00B5m" : "px";
+ final String fmt = "%7.1f" + units;
+ Overlays.Text textCom = null;
+ Overlay[] pOv = null, fOv = null;
+ Font fontInfoText = new Font(Font.MONOSPACED, 0, 14);
+ Point textPosition = new Point(12, 20);
+ if (showProfile) {
+ if ((xCom != null) && (yCom != null)) {
+ String text = String.format("com x: m=" + fmt + " \u03C3=" + fmt + "\ncom y: m=" + fmt + " \u03C3=" + fmt, xCom, xRms, yCom, yRms);
+ textCom = new Overlays.Text(renderer.getPenProfile(), text, fontInfoText, textPosition);
+ textCom.setFixed(true);
+ textCom.setAnchor(Overlay.ANCHOR_VIEWPORT_TOP_LEFT);
+ }
+ pOv = new Overlay[]{hprofile, vprofile, textCom};
+ textPosition = new Point(textPosition.x, textPosition.y + 34);
+ }
+ if (showFit) {
+ Overlays.Crosshairs cross = null;
+ Overlays.Text textFit = null;
+ if ((xMean != null) && (yMean != null)) {
+ String text = String.format("fit x: m=" + fmt + " \u03C3=" + fmt + "\nfit y: m=" + fmt + " \u03C3=" + fmt, xMean, xSigma, yMean, ySigma);
+ textFit = new Overlays.Text(penFit, text, fontInfoText, textPosition);
+ textFit.setFixed(true);
+ textFit.setAnchor(Overlay.ANCHOR_VIEWPORT_TOP_LEFT);
+ Point center = new Point(xMean.intValue(), yMean.intValue());
+ if (renderer.getCalibration() != null) {
+ center = renderer.getCalibration().convertToImagePosition(new PointDouble(xMean, yMean));
+ xSigma /= renderer.getCalibration().getScaleX();
+ ySigma /= renderer.getCalibration().getScaleY();
+ }
+ cross = new Overlays.Crosshairs(penCross, center, new Dimension(Math.abs(2 * xSigma.intValue()), 2 * Math.abs(ySigma.intValue())));
+ }
+ textPosition = new Point(textPosition.x, textPosition.y + 34);
+ fOv = new Overlay[]{hgaussian, vgaussian, cross, textFit};
+
+ if (goodRegion && (id != null)) {
+ try {
+ double[] x = id.gr_x_axis;
+ double[] y = id.gr_y_axis;
+ Overlays.Rect goodRegionOv = new Overlays.Rect(new Pen(penFit.getColor(), 0, Pen.LineStyle.dotted));
+ goodRegionOv.setCalibration(renderer.getCalibration());
+ goodRegionOv.setPosition(new Point(id.gr_pos_x, id.gr_pos_y));
+ goodRegionOv.setSize(new Dimension(id.gr_x_axis.length, id.gr_y_axis.length));
+ fOv = Arr.append(fOv, goodRegionOv);
+
+ if (slicing) {
+ if (sliceCenters != null) {
+ for (PointDouble sliceCenter : sliceCenters) {
+ Overlays.Crosshairs center = new Overlays.Crosshairs(penSlices);
+ center.setCalibration(renderer.getCalibration());
+ center.setAbsolutePosition(sliceCenter);
+ center.setSize(new Dimension(10, 10));
+ fOv = Arr.append(fOv, center);
+ }
+ if (sliceCenters.length > 1) {
+ double[] fit = fitPolynomial(sliceCenters, 1);
+ double angle = Math.toDegrees(Math.atan(fit[1]));
+ Overlays.Text text = new Overlays.Text(penSlices, String.format("slice: \u03B8= %5.1fdeg", angle), fontInfoText, textPosition);
+ text.setFixed(true);
+ text.setAnchor(Overlay.ANCHOR_VIEWPORT_TOP_LEFT);
+ fOv = Arr.append(fOv, text);
+ }
+ }
+ }
+ } catch (Exception ex) {
+ }
+ }
+
+ }
+ return new Overlay[][]{pOv, fOv};
+ }
+ return null;
+ }
+
+ class UserOverlay {
+
+ String name;
+ Overlay obj;
+ String[] channels;
+ }
+ ArrayList userOverlayConfig;
+
+ void parseUserOverlays() {
+ Properties userOverlays = new Properties();
+ userOverlayConfig = new ArrayList<>();
+ if (userOverlaysConfigFile != null) {
+ try {
+ try (FileInputStream in = new FileInputStream(getContext().getSetup().expandPath(userOverlaysConfigFile))) {
+ userOverlays.load(in);
+
+ for (String name : userOverlays.stringPropertyNames()) {
+ String val = userOverlays.getProperty(name);
+ try {
+ UserOverlay uo = new UserOverlay();
+ uo.name = name;
+ String type = val.substring(0, val.indexOf("(")).trim();
+ String pars = val.substring(val.indexOf("(") + 1, val.lastIndexOf(")")).trim();
+ String[] tokens = pars.split(",");
+ for (int i = 0; i < tokens.length; i++) {
+ tokens[i] = tokens[i].trim();
+ }
+ Color color = Color.GRAY;
+ try {
+ color = (Color) Color.class.getField(tokens[tokens.length - 1].toUpperCase()).get(null);
+ } catch (Exception ex) {
+ }
+ Pen pen = new Pen(color);
+ try {
+ String[] penTokens = tokens[tokens.length - 1].split(":");
+ color = (Color) Color.class.getField(penTokens[0].toUpperCase()).get(null);
+ int width = Integer.valueOf(penTokens[1]);
+ Pen.LineStyle style = Pen.LineStyle.valueOf(penTokens[2]);
+ pen = new Pen(color, width, style);
+ } catch (Exception ex) {
+ }
+ switch (type) {
+ case "Point":
+ uo.obj = new Overlays.Crosshairs();
+ uo.obj.setSize(new Dimension(Integer.valueOf(tokens[2]), Integer.valueOf(tokens[3])));
+ break;
+ case "Line":
+ uo.obj = new Overlays.Line();
+ break;
+ case "Arrow":
+ uo.obj = new Overlays.Arrow();
+ break;
+ case "Rect":
+ uo.obj = new Overlays.Rect();
+ break;
+ case "Ellipse":
+ uo.obj = new Overlays.Ellipse();
+ break;
+ case "Polyline":
+ uo.obj = new Overlays.Polyline();
+ break;
+ }
+ if (type.equals("Polyline") || type.equals("Point")) {
+ uo.channels = new String[]{tokens[0], tokens[1]};
+ } else {
+ uo.channels = new String[]{tokens[0], tokens[1], tokens[2], tokens[3]};
+ }
+ uo.obj.setPen(pen);
+ userOverlayConfig.add(uo);
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ }
+
+ Overlay[] getUserOverlays(Data data) {
+ ArrayList ret = new ArrayList<>();
+ if (server != null) {
+ ImageData id = getFrame(data);
+ for (UserOverlay uo : userOverlayConfig) {
+ try {
+ Overlay ov = uo.obj;
+ //Overlay ov = (Overlay)uo.cls.newInstance();
+ ov.setCalibration(renderer.getCalibration());
+ boolean valid = false;
+ if (ov instanceof Overlays.Polyline) {
+ double[] x = (uo.channels[0].equals("null")) ? null : id.getDoubleArray(uo.channels[0]);
+ double[] y = (uo.channels[1].equals("null")) ? null : id.getDoubleArray(uo.channels[1]);
+ if ((x != null) || (y != null)) {
+ if (x == null) {
+ x = (renderer.getCalibration() == null) ? Arr.indexesDouble(y.length) : renderer.getCalibration().getAxisX(y.length);
+ }
+ if (y == null) {
+ y = (renderer.getCalibration() == null) ? Arr.indexesDouble(x.length) : renderer.getCalibration().getAxisY(x.length);
+ }
+ ((Overlays.Polyline) ov).updateAbsolute(x, y);
+ valid = true;
+ }
+ } else {
+ Double x = id.getDouble(uo.channels[0]);
+ Double y = id.getDouble(uo.channels[1]);
+ if ((x != null) && (y != null)) {
+ PointDouble position = new PointDouble(x, y);
+ ov.setAbsolutePosition(position);
+ if (!(ov instanceof Overlays.Crosshairs)) {
+ Double x2 = id.getDouble(uo.channels[2]);
+ Double y2 = id.getDouble(uo.channels[3]);
+ if ((x != null) && (y != null)) {
+ DimensionDouble size = new DimensionDouble(x2 - position.x, y2 - position.y);
+ ov.setAbsoluteSize(size);
+ valid = true;
+ }
+ } else {
+ valid = true;
+ }
+ }
+ }
+ if (valid) {
+ ret.add(ov);
+ }
+ } catch (Exception ex) {
+ //ex.printStackTrace();
+ }
+ }
+ }
+ return ret.toArray(new Overlay[0]);
+ }
+
+ double[] getComRms(double[] arr, double[] x) {
+ if (arr != null) {
+ double xmd = 0;
+ double xmd2 = 0;
+ double total = 0;
+ for (int i = 0; i < arr.length; i++) {
+ double v = (arr[i] * x[i]);
+ xmd += v;
+ xmd2 += (v * x[i]);
+ total += arr[i];
+ }
+ if (total > 0) {
+ double com = xmd / total;
+ double com2 = xmd2 / total;
+ double rms = Math.sqrt(Math.abs(com2 - com * com));
+ return new double[]{com, rms};
+ }
+ }
+ return new double[]{Double.NaN, Double.NaN};
+ }
+
+ double[] fitGaussianScript(int[] y, int[] x) {
+ ScriptManager sm = Context.getInstance().getScriptManager();
+ ArrayProperties pY = ArrayProperties.get(y);
+ sm.setVar("y", y);
+ sm.setVar("x", x);
+ InterpreterResult r = sm.eval("r = fit_gaussians(y, x, [" + pY.maxIndex + ",])");
+ if (r.exception != null) {
+ r.exception.printStackTrace();
+ } else {
+ List ret = (List) sm.getVar("r");
+ if ((ret != null) && (ret.size() == 1) && (ret.get(0) instanceof List) && (((List) (ret.get(0))).size() == 3)) {
+ double norm = (Double) ((List) ret.get(0)).get(0);
+ double mean = (Double) ((List) ret.get(0)).get(1);
+ double sigma = (Double) ((List) ret.get(0)).get(2);
+ return new double[]{norm, mean, sigma};
+ }
+ }
+ return null;
+ }
+
+ double[] fitGaussian(double[] y, int[] x) {
+ try {
+ ArrayProperties pY = ArrayProperties.get(y);
+ GaussianCurveFitter fitter = GaussianCurveFitter.create().withStartPoint(new double[]{(pY.max - pY.min) / 2, x[pY.maxIndex], 1.0}).withMaxIterations(1000);
+ ArrayList values = new ArrayList<>();
+ for (int i = 0; i < y.length; i++) {
+ values.add(new WeightedObservedPoint(1.0, x[i], y[i]));
+ }
+ return fitter.fit(values);
+ } catch (Exception ex) {
+ return null;
+ }
+
+ }
+
+ double[] fitPolynomial(PointDouble[] points, int order) {
+ double[] y = new double[points.length];
+ double[] x = new double[points.length];
+ for (int i = 0; i < points.length; i++) {
+ x[i] = points[i].x;
+ y[i] = points[i].y;
+ }
+ return fitPolynomial(y, x, order);
+ }
+
+ double[] fitPolynomial(double[] y, double[] x, int order) {
+ try {
+ ArrayProperties pY = ArrayProperties.get(y);
+ PolynomialCurveFitter fitter = PolynomialCurveFitter.create(order).withMaxIterations(1000);
+ ArrayList values = new ArrayList<>();
+ for (int i = 0; i < y.length; i++) {
+ values.add(new WeightedObservedPoint(1.0, x[i], y[i]));
+ }
+ return fitter.fit(values);
+ } catch (Exception ex) {
+ return null;
+ }
+
+ }
+
+ double[] getFitFunction(double[] pars, int[] x) {
+ double[] fit = new double[x.length];
+ Gaussian g = new Gaussian(pars[0], pars[1], pars[2]);
+ for (int i = 0; i < x.length; i++) {
+ fit[i] = g.value(x[i]);
+ }
+ return fit;
+ }
+
+ void setHistogramVisible(boolean value) {
+ if (value) {
+ if ((histogramDialog == null) || (!histogramDialog.isShowing())) {
+ Histogram histogram = new Histogram(true);
+ histogram.setRenderer(renderer);
+ histogramDialog = SwingUtils.showDialog(SwingUtils.getWindow(renderer), "Histogram", null, histogram);
+ renderer.refresh();
+ }
+ } else {
+ if (histogramDialog != null) {
+ histogramDialog.setVisible(false);
+ histogramDialog = null;
+ }
+ }
+ }
+
+ void setLaserState(int bunch, boolean value) throws Exception {
+ System.out.println("Setting laser state: " + value + " - bunch" + bunch);
+ //Epics.putq("SIN-TIMAST-TMA:Beam-Las-Delay-Sel", value ? 0 : 1);
+ if ((bunch<=0) || (bunch==1)){
+ Epics.putq("SWISSFEL-STATUS:Bunch-1-OnDelay-Sel", value ? 0 : 1);
+ }
+ if ((bunch<=0) || (bunch==2)){
+ Epics.putq("SWISSFEL-STATUS:Bunch-2-OnDelay-Sel", value ? 0 : 1);
+ }
+
+ Epics.putq("SIN-TIMAST-TMA:Beam-Apply-Cmd.PROC", 1);
+ Thread.sleep(3000);
+ }
+
+ boolean getLaserState(int bunch) throws Exception {
+ //return (Epics.get("SIN-TIMAST-TMA:Beam-Las-Delay-Sel", Integer.class) == 0);
+ try{
+ if (bunch<=0){
+ return getLaserState(1) && getLaserState(2);
+ }
+ if (bunch==2){
+ return (Epics.get("SWISSFEL-STATUS:Bunch-2-OnDelay-Sel", Integer.class) == 0);
+ }
+ return (Epics.get("SWISSFEL-STATUS:Bunch-1-OnDelay-Sel", Integer.class) == 0);
+ } catch (Exception ex){
+ return false;
+ }
+ }
+
+ void elog(String logbook, String title, String message, String[] attachments) throws Exception {
+ String domain = "";
+ String category = "Info";
+ String entry = "";
+ StringBuffer cmd = new StringBuffer();
+
+ cmd.append("G_CS_ELOG_add -l \"").append(logbook).append("\" ");
+ cmd.append("-a \"Author=ScreenPanel\" ");
+ cmd.append("-a \"Type=pshell\" ");
+ cmd.append("-a \"Entry=").append(entry).append("\" ");
+ cmd.append("-a \"Title=").append(title).append("\" ");
+ cmd.append("-a \"Category=").append(category).append("\" ");
+ cmd.append("-a \"Domain=").append(domain).append("\" ");
+ for (String attachment : attachments) {
+ cmd.append("-f \"").append(attachment).append("\" ");
+ }
+ cmd.append("-n 1 ");
+ cmd.append("\"").append(message).append("\" ");
+ System.out.println(cmd.toString());
+
+ final Process process = Runtime.getRuntime().exec(new String[]{"bash", "-c", cmd.toString()});
+ new Thread(() -> {
+ try {
+ process.waitFor();
+ int bytes = process.getInputStream().available();
+ byte[] arr = new byte[bytes];
+ process.getInputStream().read(arr, 0, bytes);
+ System.out.println(new String(arr));
+ bytes = process.getErrorStream().available();
+ arr = new byte[bytes];
+ process.getErrorStream().read(arr, 0, bytes);
+ System.err.println(new String(arr));
+ } catch (Exception ex) {
+ System.err.println(ex);
+ }
+ }).start();
+ }
+
+ void centralizeRenderer() {
+ Point center = null;
+ Dimension size = renderer.getImageSize();
+ double zoom = (renderer.getMode() == RendererMode.Fixed) ? 1.0 : renderer.getZoom();
+ if (renderer.getCalibration() != null) {
+ center = renderer.getCalibration().getCenter();
+ } else if (size != null) {
+ center = new Point(size.width / 2, size.height / 2);
+ }
+ if (center != null) {
+ Point topleft = new Point(Math.max((int) (center.x - renderer.getWidth() / 2 / zoom), 0),
+ Math.max((int) (center.y - renderer.getHeight() / 2 / zoom), 0));
+ renderer.setViewPosition(topleft);
+ }
+ }
+
+ void updatePause() {
+ int index = ((int) pauseSelection.getValue()) - 1;
+ synchronized (imageBuffer) {
+ if (index < imageBuffer.size()) {
+ Data data = imageBuffer.get(index).data;
+ long pid = imageBuffer.get(index).cache.getPulseId();
+ BufferedImage image = camera.generateImage(data);
+ renderer.setImage(renderer.getOrigin(), image, data);
+
+ String text = "PID: " + pid;
+ if (imagePauseOverlay == null) {
+ Font font = new Font("Verdana", Font.PLAIN, 12);
+ Dimension d = SwingUtils.getTextSize(text, renderer.getFontMetrics(font));
+ imagePauseOverlay = new Text(renderer.getPenErrorText(), "", font, new Point(-20 - d.width, 42));
+ imagePauseOverlay.setFixed(true);
+ imagePauseOverlay.setAnchor(Overlay.ANCHOR_VIEWPORT_OR_IMAGE_TOP_RIGHT);
+ renderer.addOverlay(imagePauseOverlay);
+ }
+ //imagePauseOverlay.update(Chrono.getTimeStr(data.getTimestamp(), "HH:mm:ss.SSS"));
+ imagePauseOverlay.update(text);
+ manageFit(image, data);
+ manageUserOverlays(image, data);
+ }
+ }
+ updateStreamData();
+ }
+
+ void removePauseOverlay() {
+ renderer.removeOverlay(imagePauseOverlay);
+ imagePauseOverlay = null;
+ }
+
+ void saveSnapshot() throws Exception {
+ boolean paused = isPaused();
+ try{
+ if (!paused){
+ setPaused(true);
+ }
+ String snapshotFile = null;
+ synchronized (imageBuffer) {
+ Frame frame = getCurrentFrame();
+ if (frame == null) {
+ throw new Exception("No current image");
+ }
+ ArrayList frames = new ArrayList<>();
+ frames.add(frame);
+ this.saveFrames(cameraAlias + "_camera_snapshot", frames);
+
+ //Enforce the same timestamp to data & image files.
+ snapshotFile = getContext().getExecutionPars().getPath() + ".png";
+ //renderer.saveSnapshot(snapshotFile, "png", true);
+ ImageBuffer.saveImage(SwingUtils.createImage(renderer), snapshotFile, "png");
+ }
+
+ JPanel panel = new JPanel();
+ GridBagLayout layout = new GridBagLayout();
+ layout.columnWidths = new int[]{0, 180}; //Minimum width
+ layout.rowHeights = new int[]{30, 30, 30}; //Minimum height
+ panel.setLayout(layout);
+ JComboBox comboLogbook = new JComboBox(new String[]{"SwissFEL commissioning data", "SwissFEL commissioning"});
+ JTextField textComment = new JTextField();
+ GridBagConstraints c = new GridBagConstraints();
+ c.gridx = 0;
+ c.gridy = 0;
+ panel.add(new JLabel("Data file:"), c);
+ c.gridy = 1;
+ panel.add(new JLabel("Logbook:"), c);
+ c.gridy = 2;
+ panel.add(new JLabel("Comment:"), c);
+ c.fill = GridBagConstraints.HORIZONTAL;
+ c.gridx = 1;
+ panel.add(textComment, c);
+ c.gridy = 1;
+ panel.add(comboLogbook, c);
+ c.gridy = 0;
+ panel.add(new JLabel(getContext().getExecutionPars().getPath()), c);
+
+ if (SwingUtils.showOption(getTopLevel(), "Success", panel, OptionType.OkCancel) == OptionResult.Yes) {
+ StringBuilder message = new StringBuilder();
+ message.append("Camera: ").append(cameraAlias).append(" (").
+ append((server != null) ? "server" : "direct").append(")").append("\n");
+ message.append("Screen: ").append(String.valueOf(valueScreen.getLabel().getText())).append("\n");
+ message.append("Filter: ").append(String.valueOf(valueFilter.getLabel().getText())).append("\n");
+ message.append("Data file: ").append(getContext().getExecutionPars().getPath()).append("\n");
+ message.append("Comment: ").append(textComment.getText()).append("\n");
+ //Add slicing message
+ if ((fitOv != null) && (fitOv.length > 5) && (fitOv[fitOv.length - 1] instanceof Overlays.Text)) {
+ Overlays.Text text = (Overlays.Text) fitOv[fitOv.length - 1];
+ message.append(text.getText()).append("\n");
+ }
+ elog((String) comboLogbook.getSelectedItem(), "ScreenPanel Snapshot", message.toString(), new String[]{snapshotFile});
+ }
+ } finally{
+ if (!paused){
+ setPaused(false);
+ }
+ }
+ }
+
+ void saveStack() throws Exception {
+ synchronized (imageBuffer) {
+ saveFrames(cameraAlias + "_camera_stack", imageBuffer);
+ }
+ SwingUtils.showMessage(getTopLevel(), "Success", "Generated data file:\n" + getContext().getExecutionPars().getPath());
+ }
+
+ public List getCameraTypes(String name) {
+ if (name == null) {
+ return null;
+ }
+ if (App.hasArgument(ARG_ALIAS) && (aliases!=null)){
+ name = aliases.getOrDefault(name, name);
+ }
+
+ List ret = new ArrayList();
+ if (groups!=null){
+ for (String group: Arr.sort(groups.keySet().toArray(new String[0]))){
+ if (groups.get(group).contains(name)){
+ ret.add(group);
+ }
+ }
+ } else {
+ for (String s : new String[]{"LCAM"}) {
+ if (name.contains(s)) {
+ ret.add(LASER_TYPE);
+ }
+ }
+ for (String s : new String[]{"DSCR", "DSRM", "DLAC"}) {
+ if (name.contains(s)) {
+ ret.add(ELECTRONS_TYPE);
+ }
+ }
+ for (String s : new String[]{"PROF", "PPRM", "PSSS", "PSCR", "PSRD"}) {
+ if (name.contains(s)) {
+ ret.add(PHOTONICS_TYPE);
+ }
+ }
+ }
+ ret.add("Unknown");
+ return ret;
+ }
+
+ public Map getProcessingParameters(StreamValue value) throws IOException {
+ return (Map) JsonSerializer.decode(value.getValue("processing_parameters").toString(), Map.class);
+ }
+
+ void saveFrames(String name, ArrayList frames) throws IOException {
+ ArrayList values = new ArrayList<>();
+ for (Frame frame : frames) {
+ values.add(frame.cache);
+ }
+ saveImages(name, values);
+ }
+
+ void saveImages(String name, ArrayList images) throws IOException {
+ int depth = images.size();
+ if (depth == 0) {
+ return;
+ }
+ StreamValue first = images.get(0);
+ String pathRoot = "/camera1/";
+ String pathImage = pathRoot + "image";
+ String pathPid = pathRoot + "pulse_id";
+ String pathTimestampStr = pathRoot + "timestamp_str";
+ Map processingPars = getProcessingParameters(first);
+ String camera = (String) processingPars.get("camera_name");
+ List types = getCameraTypes(camera);
+
+ int width = ((Number) first.getValue("width")).intValue();
+ int height = ((Number) first.getValue("height")).intValue();
+ Class dataType = first.getValue("image").getClass().getComponentType();
+
+ getContext().setExecutionPars(name);
+ DataManager dm = getContext().getDataManager();
+
+ //Create tables
+ dm.createDataset(pathImage, dataType, new int[]{depth, height, width});
+ dm.createDataset(pathPid, Long.class, new int[]{depth});
+ dm.createDataset(pathTimestampStr, String.class, new int[]{depth});
+ for (String id : first.getIdentifiers()) {
+ Object val = first.getValue(id);
+ if (id.equals("image")) {
+ } else if (id.equals("processing_parameters")) {
+ Map pars = getProcessingParameters(first);
+ for (String key : pars.keySet()) {
+ if ((pars.get(key) != null) && (pars.get(key) instanceof Map)) {
+ for (String k : ((Map) pars.get(key)).keySet()) {
+ Object v = ((Map) pars.get(key)).get(k);
+ k = key + " " + k;
+ v = (v == null) ? "" : v;
+ try{
+ dm.setAttribute(pathImage, k, v);
+ } catch (Exception ex){
+ logger.info("Cannot set attribute " + pathImage + ": "+ k + " = " + v + " - " + ex.getMessage());
+ }
+
+ }
+ } else {
+ Object value = pars.get(key);
+ try{
+ if (value == null) {
+ value = "";
+ } else if (value instanceof List) {
+ if (((List) value).size() > 0){
+ Class cls = ((List) value).get(0).getClass() ;
+ if (cls == String.class){
+ value = ((List) value).toArray(new String[0]);
+ } else {
+ value = Convert.toPrimitiveArray(value, cls);
+ }
+ } else {
+ value = "";
+ }
+ }
+ dm.setAttribute(pathImage, key, value);
+ } catch (Exception ex){
+ logger.info("Cannot set attribute " + pathImage + ": "+ key + " = " + value + " - " + ex.getMessage());
+ }
+ }
+ }
+ } else if (val.getClass().isArray()) {
+ dm.createDataset(pathRoot + id, Double.class, new int[]{depth, Array.getLength(val)});
+ } else {
+ dm.createDataset(pathRoot + id, val.getClass(), new int[]{depth});
+ }
+ }
+
+ //Add metadata
+ dm.setAttribute(pathRoot, "Camera", camera);
+ dm.setAttribute(pathRoot, "Images", depth);
+ dm.setAttribute(pathRoot, "Interval", -1);
+ dm.setAttribute(pathRoot, "Type", types.toArray(new String[0]));
+ if (types.contains(ELECTRONS_TYPE)) {
+ dm.setAttribute(pathRoot, "Screen", String.valueOf(valueScreen.getLabel().getText()));
+ dm.setAttribute(pathRoot, "Filter", String.valueOf(valueFilter.getLabel().getText()));
+ }
+
+ //Save data
+ for (int index = 0; index < depth; index++) {
+ StreamValue streamValue = images.get(index);
+ dm.setItem(pathImage, streamValue.getValue("image"), new long[]{index, 0, 0}, new int[]{1, height, width});
+ dm.setItem(pathPid, streamValue.getPulseId(), index);
+ dm.setItem(pathTimestampStr, Chrono.getTimeStr(streamValue.getTimestamp(), "YYYY-MM-dd HH:mm:ss.SSS"), index);
+
+ for (String id : streamValue.getIdentifiers()) {
+ Object val = streamValue.getValue(id);
+ if (id.equals("image")) {
+ } else if (id.equals("processing_parameters")) {
+ } else if (val.getClass().isArray()) {
+ dm.setItem(pathRoot + id, val, index);
+ } else {
+ dm.setItem(pathRoot + id, val, index);
+ }
+ }
+ }
+ getContext().getDataManager().closeOutput();
+ }
+
+ StandardDialog calibrationDialolg;
+
+ void calibrate() throws Exception {
+ if (server != null) {
+ server.resetRoi();
+ calibrationDialolg = (StandardDialog) getContext().getClassByName("CameraCalibrationDialog").getConstructors()[0].newInstance(new Object[]{getTopLevel(), server.getCurrentCamera(), renderer});
+ SwingUtils.centerComponent(getTopLevel(), calibrationDialolg);
+ calibrationDialolg.setVisible(true);
+ calibrationDialolg.setListener(new StandardDialogListener() {
+ @Override
+ public void onWindowOpened(StandardDialog dlg) {
+ }
+
+ @Override
+ public void onWindowClosed(StandardDialog dlg, boolean accepted) {
+ if (accepted) {
+ //comboCamerasActionPerformed(null);
+ }
+ }
+ });
+ }
+ }
+
+ StandardDialog dataTableDialog;
+ DefaultTableModel dataTableModel;
+ JTable dataTable;
+
+ void showStreamData() {
+ dataTableModel = null;
+ if (server != null) {
+
+ if ((dataTableDialog != null) && (dataTableDialog.isShowing())) {
+ SwingUtils.centerComponent(getTopLevel(), dataTableDialog);
+ dataTableDialog.requestFocus();
+ return;
+ }
+ dataTableModel = new DefaultTableModel(new Object[0][2], new String[]{"Name", "Value"}) {
+ public Class getColumnClass(int columnIndex) {
+ return String.class;
+ }
+
+ public boolean isCellEditable(int rowIndex, int columnIndex) {
+ return false;
+ }
+ };
+ updateStreamData();
+ StreamValue val = server.getStream().take();
+ dataTable = new JTable(dataTableModel);
+ dataTable.setSelectionMode(ListSelectionModel.SINGLE_INTERVAL_SELECTION);
+ dataTable.setCellSelectionEnabled(true);
+ dataTable.getTableHeader().setReorderingAllowed(false);
+ dataTable.getTableHeader().setResizingAllowed(true);
+ dataTableDialog = new StandardDialog(getTopLevel(), "Image Data", false);
+ dataTableDialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+ JScrollPane scrollPane = new JScrollPane();
+ scrollPane.setViewportView(dataTable);
+ scrollPane.setPreferredSize(new Dimension(300, 400));
+ dataTableDialog.setContentPane(scrollPane);
+ dataTableDialog.pack();
+ dataTableDialog.setVisible(true);
+ dataTableDialog.addWindowListener(new WindowAdapter() {
+ @Override
+ public void windowClosing(WindowEvent e) {
+ dataTableModel = null;
+ }
+ });
+ dataTable.addMouseListener(new MouseAdapter() {
+ @Override
+ public void mouseClicked(MouseEvent e) {
+ try {
+ int row = dataTable.getSelectedRow();
+ int col = dataTable.getSelectedColumn();
+ dataTable.setToolTipText(null);
+ if (row > 1) {
+ String id = String.valueOf(dataTable.getModel().getValueAt(row, 0));
+ String locator = String.valueOf(dataTable.getModel().getValueAt(0, 1));
+ String channelId = locator + " " + id;
+ dataTable.setToolTipText(channelId);
+ if ((e.getClickCount() == 2) && (!e.isPopupTrigger())) {
+ if (col == 0) {
+ SwingUtils.showMessage(dataTableDialog, "Channel Identifier", "Copied to clipboard: " + channelId);
+ Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
+ clipboard.setContents(new StringSelection(channelId), (Clipboard clipboard1, Transferable contents) -> {
+ });
+ } else {
+ Object obj = getCurrentFrame().cache.getValue(id);
+ if (id.equals("image")) {
+ } else if (id.equals("processing_parameters")) {
+ Map pars = getProcessingParameters(getCurrentFrame().cache);
+ StringBuilder sb = new StringBuilder();
+ for (String key : pars.keySet()) {
+ sb.append(key).append(" = ").append(Str.toString(pars.get(key), 10)).append("\n");
+ }
+ SwingUtils.showMessage(dataTableDialog, "Processing Parameters", sb.toString());
+ } else if ((obj != null) && (obj.getClass().isArray() || (obj instanceof Number))) {
+ DeviceValueChart chart = new DeviceValueChart();
+ Device dev = null;
+ if (obj.getClass().isArray()) {
+ dev = new ReadableRegisterArray(new ReadableArray() {
+ @Override
+ public Object read() throws IOException, InterruptedException {
+ return Convert.toDouble(getCurrentFrame().cache.getValue(id));
+ }
+
+ @Override
+ public int getSize() {
+ return Array.getLength(getCurrentFrame().cache.getValue(id));
+ }
+ });
+ } else {
+ dev = new ReadableRegisterNumber(new ReadableNumber() {
+ @Override
+ public Object read() throws IOException, InterruptedException {
+ return Convert.toDouble(getCurrentFrame().cache.getValue(id));
+ }
+ });
+ }
+ dev.setPolling(1000);
+ chart.setDevice(dev);
+ JDialog dlg = SwingUtils.showDialog(dataTableDialog, cameraAlias + " " + id, null, chart);
+ //TODO:
+ //PlotBase plot = chart.getPlot();
+ //if (plot!=null){
+ // plot.setPlotBackgroundColor(Color.BLACK);
+ //}
+ }
+ }
+ }
+ }
+ } catch (Exception ex) {
+ showException(ex);
+ }
+ }
+ });
+ SwingUtils.centerComponent(getTopLevel(), dataTableDialog);
+ updateStreamData();
+ }
+ }
+
+ volatile boolean updatingStreamData = false;
+
+ void updateStreamData() {
+ if ((dataTableDialog == null) || !dataTableDialog.isShowing() || updatingStreamData) {
+ return;
+ }
+ updatingStreamData = true;
+ SwingUtilities.invokeLater(() -> {
+ updatingStreamData = false;
+ if ((dataTableModel != null) && (server != null)) {
+ StreamValue value = server.getValue();
+ Frame frame = getCurrentFrame();
+ int[] sel_rows = (dataTable == null) ? null : dataTable.getSelectedRows();
+ int[] sel_cols = (dataTable == null) ? null : dataTable.getSelectedColumns();
+ List ids = (value == null) ? new ArrayList<>() : new ArrayList(value.getIdentifiers());
+ if (ids.size() + 4 != dataTableModel.getRowCount()) {
+ dataTableModel.setNumRows(0);
+ try {
+ dataTableModel.addRow(new Object[]{"Locator", server.getUrl() + "/" + ((value == null) ? instanceName : server.getCurrentInstance())});
+ } catch (Exception ex) {
+ dataTableModel.addRow(new Object[]{"Locator", ex.getMessage()});
+ }
+ try {
+ dataTableModel.addRow(new Object[]{"Stream", server.getStreamAddress()});
+ } catch (Exception ex) {
+ dataTableModel.addRow(new Object[]{"Stream", ex.getMessage()});
+ }
+ dataTableModel.addRow(new Object[]{"PID", ""});
+ dataTableModel.addRow(new Object[]{"Timestamp", ""});
+ Collections.sort(ids);
+ for (String id : ids) {
+ dataTableModel.addRow(new Object[]{id, ""});
+ }
+ }
+
+ if ((frame != null) && (frame.cache != null)) {
+ dataTableModel.setValueAt(frame.cache.getPulseId(), 2, 1); //PID
+ dataTableModel.setValueAt(frame.cache.getTimestamp(), 3, 1); //Timestamp
+ for (int i = 4; i < dataTableModel.getRowCount(); i++) {
+ String id = String.valueOf(dataTableModel.getValueAt(i, 0));
+ //Object obj = server.getValue(id);
+ Object obj = frame.cache.getValue(id);
+ if (obj != null) {
+ if (obj.getClass().isArray()) {
+ obj = obj.getClass().getComponentType().getSimpleName() + "[" + Array.getLength(obj) + "]";
+ } else if (obj instanceof Double) {
+ obj = Convert.roundDouble((Double) obj, 1);
+ } else if (obj instanceof Float) {
+ obj = Convert.roundDouble((Float) obj, 1);
+ }
+ }
+ dataTableModel.setValueAt(String.valueOf(obj), i, 1);
+ }
+ }
+ if ((sel_rows != null) && (sel_rows.length > 0)) {
+ //dataTable.setRowSelectionInterval((Integer)Arr.getMin(sel_rows), (Integer)Arr.getMax(sel_rows));
+ dataTable.setRowSelectionInterval(sel_rows[0], sel_rows[sel_rows.length - 1]);
+ }
+ if ((sel_cols != null) && (sel_cols.length > 0)) {
+ //dataTable.setColumnSelectionInterval((Integer)Arr.getMin(sel_cols), (Integer)Arr.getMax(sel_cols));
+ dataTable.setColumnSelectionInterval(sel_cols[0], sel_cols[sel_cols.length - 1]);
+ }
+ }
+ });
+ }
+
+ ImageIcon getIcon(String name) {
+ ImageIcon ret = null;
+ try {
+ //Path path = Paths.get(getClass().getProtectionDomain().getCodeSource().getLocation().getPath(),"resources", name + ".png");
+ String dir = getClass().getProtectionDomain().getCodeSource().getLocation().getPath() + "resources/";
+ if (new File(dir + name + ".png").exists()) {
+ ret = new javax.swing.ImageIcon(dir + name + ".png");
+ } else {
+ ret = new ImageIcon(ch.psi.pshell.ui.App.class.getResource("/ch/psi/pshell/ui/" + name + ".png"));
+ if (MainFrame.isDark()) {
+ try {
+ ret = new ImageIcon(ch.psi.pshell.ui.App.class.getResource("/ch/psi/pshell/ui/dark/" + name + ".png"));
+ } catch (Exception e) {
+ }
+ }
+ }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ return ret;
+ }
+
+ String getIconName(JButton button) {
+ String ret = button.getIcon().toString();
+ if (ret.indexOf(".") > 0) {
+ ret = ret.substring(0, ret.indexOf("."));
+ }
+ return ret;
+ }
+
+ void setPaused(boolean paused){
+ removePauseOverlay();
+ if (camera != null) {
+ synchronized (imageBuffer) {
+ if (paused) {
+ renderer.pause();
+ panelCameraSelection.setVisible(false);
+ pauseSelection.setVisible(true);
+ if (imageBuffer.size() > 0) {
+ pauseSelection.setEnabled(true);
+ pauseSelection.setMaxValue(imageBuffer.size());
+ pauseSelection.setValue(imageBuffer.size());
+ updatePause();
+ } else {
+ pauseSelection.setEnabled(false);
+ pauseSelection.setMaxValue(1);
+ pauseSelection.setValue(1);
+ }
+ } else {
+ imageBuffer.clear();
+ renderer.resume();
+ //renderer.clear();
+ pauseSelection.setVisible(false);
+ panelCameraSelection.setVisible(true);
+ }
+ }
+ updateStreamData();
+ }
+ }
+
+ boolean isPaused(){
+ return renderer.isPaused();
+ }
+
+ ////////
+ @SuppressWarnings("unchecked")
+ // //GEN-BEGIN:initComponents
+ private void initComponents() {
+
+ buttonGroup1 = new javax.swing.ButtonGroup();
+ buttonGroup2 = new javax.swing.ButtonGroup();
+ buttonGroup3 = new javax.swing.ButtonGroup();
+ buttonGroup4 = new javax.swing.ButtonGroup();
+ jProgressBar1 = new javax.swing.JProgressBar();
+ sidePanel = new javax.swing.JPanel();
+ jPanel3 = new javax.swing.JPanel();
+ buttonZoomFit = new javax.swing.JRadioButton();
+ buttonZoomStretch = new javax.swing.JRadioButton();
+ buttonZoomNormal = new javax.swing.JRadioButton();
+ buttonZoom025 = new javax.swing.JRadioButton();
+ buttonZoom05 = new javax.swing.JRadioButton();
+ buttonZoom2 = new javax.swing.JRadioButton();
+ jPanel2 = new javax.swing.JPanel();
+ checkHistogram = new javax.swing.JCheckBox();
+ comboColormap = new javax.swing.JComboBox();
+ jLabel3 = new javax.swing.JLabel();
+ jLabel4 = new javax.swing.JLabel();
+ buttonFullRange = new javax.swing.JRadioButton();
+ buttonManual = new javax.swing.JRadioButton();
+ buttonAutomatic = new javax.swing.JRadioButton();
+ labelMin = new javax.swing.JLabel();
+ spinnerMin = new javax.swing.JSpinner();
+ spinnerMax = new javax.swing.JSpinner();
+ labelMax = new javax.swing.JLabel();
+ btFixColormapRange = new javax.swing.JButton();
+ jPanel5 = new javax.swing.JPanel();
+ buttonServer = new javax.swing.JRadioButton();
+ buttonDirect = new javax.swing.JRadioButton();
+ textState = new javax.swing.JTextField();
+ filler1 = new javax.swing.Box.Filler(new java.awt.Dimension(0, 0), new java.awt.Dimension(0, 0), new java.awt.Dimension(0, 32767));
+ panelScreen = new javax.swing.JPanel();
+ valueScreen = new ch.psi.pshell.swing.DeviceValuePanel();
+ comboScreen = new javax.swing.JComboBox();
+ panelFilter = new javax.swing.JPanel();
+ valueFilter = new ch.psi.pshell.swing.DeviceValuePanel();
+ comboFilter = new javax.swing.JComboBox();
+ panelScreen2 = new javax.swing.JPanel();
+ checkThreshold = new javax.swing.JCheckBox();
+ spinnerThreshold = new javax.swing.JSpinner();
+ checkBackground = new javax.swing.JCheckBox();
+ checkGoodRegion = new javax.swing.JCheckBox();
+ spinnerGrScale = new javax.swing.JSpinner();
+ spinnerGrThreshold = new javax.swing.JSpinner();
+ labelGrThreshold = new javax.swing.JLabel();
+ labelGrScale = new javax.swing.JLabel();
+ panelSlicing = new javax.swing.JPanel();
+ checkSlicing = new javax.swing.JCheckBox();
+ labelSlScale = new javax.swing.JLabel();
+ spinnerSlScale = new javax.swing.JSpinner();
+ labelSlNumber = new javax.swing.JLabel();
+ spinnerSlNumber = new javax.swing.JSpinner();
+ labelSlOrientation = new javax.swing.JLabel();
+ spinnerSlOrientation = new javax.swing.JSpinner();
+ checkRotation = new javax.swing.JCheckBox();
+ spinnerRotationAngle = new javax.swing.JSpinner();
+ spinnerRotationOrder = new javax.swing.JSpinner();
+ labelOrder = new javax.swing.JLabel();
+ labelMode = new javax.swing.JLabel();
+ spinnerRotationMode = new javax.swing.JSpinner();
+ labelAngle = new javax.swing.JLabel();
+ labelConstant = new javax.swing.JLabel();
+ spinnerRotationConstant = new javax.swing.JSpinner();
+ checkAveraging = new javax.swing.JCheckBox();
+ spinnerAvFrames = new javax.swing.JSpinner();
+ labelAvFrames = new javax.swing.JLabel();
+ labelAvMode = new javax.swing.JLabel();
+ spinnerAvMode = new javax.swing.JSpinner();
+ spinnerBackground = new javax.swing.JSpinner();
+ topPanel = new javax.swing.JPanel();
+ toolBar = new javax.swing.JToolBar();
+ buttonSidePanel = new javax.swing.JToggleButton();
+ buttonStreamData = new javax.swing.JButton();
+ buttonSave = new javax.swing.JToggleButton();
+ buttonGrabBackground = new javax.swing.JButton();
+ buttonPause = new javax.swing.JToggleButton();
+ jSeparator6 = new javax.swing.JToolBar.Separator();
+ buttonMarker = new javax.swing.JToggleButton();
+ buttonProfile = new javax.swing.JToggleButton();
+ buttonFit = new javax.swing.JToggleButton();
+ buttonReticle = new javax.swing.JToggleButton();
+ buttonScale = new javax.swing.JToggleButton();
+ buttonTitle = new javax.swing.JToggleButton();
+ pauseSelection = new ch.psi.pshell.swing.ValueSelection();
+ panelCameraSelection = new javax.swing.JPanel();
+ jLabel1 = new javax.swing.JLabel();
+ comboCameras = new javax.swing.JComboBox();
+ labelType = new javax.swing.JLabel();
+ comboType = new javax.swing.JComboBox();
+ renderer = new ch.psi.pshell.imaging.Renderer();
+
+ setPreferredSize(new java.awt.Dimension(873, 600));
+
+ jPanel3.setBorder(javax.swing.BorderFactory.createTitledBorder("Zoom"));
+
+ buttonGroup1.add(buttonZoomFit);
+ buttonZoomFit.setText("Fit");
+ buttonZoomFit.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ buttonZoomFitActionPerformed(evt);
+ }
+ });
+
+ buttonGroup1.add(buttonZoomStretch);
+ buttonZoomStretch.setText("Stretch");
+ buttonZoomStretch.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ buttonZoomStretchActionPerformed(evt);
+ }
+ });
+
+ buttonGroup1.add(buttonZoomNormal);
+ buttonZoomNormal.setText("Normal");
+ buttonZoomNormal.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ buttonZoomNormalActionPerformed(evt);
+ }
+ });
+
+ buttonGroup1.add(buttonZoom025);
+ buttonZoom025.setText("1/4");
+ buttonZoom025.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ buttonZoom025ActionPerformed(evt);
+ }
+ });
+
+ buttonGroup1.add(buttonZoom05);
+ buttonZoom05.setText("1/2");
+ buttonZoom05.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ buttonZoom05ActionPerformed(evt);
+ }
+ });
+
+ buttonGroup1.add(buttonZoom2);
+ buttonZoom2.setText("2");
+ buttonZoom2.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ buttonZoom2ActionPerformed(evt);
+ }
+ });
+
+ javax.swing.GroupLayout jPanel3Layout = new javax.swing.GroupLayout(jPanel3);
+ jPanel3.setLayout(jPanel3Layout);
+ jPanel3Layout.setHorizontalGroup(
+ jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(jPanel3Layout.createSequentialGroup()
+ .addContainerGap()
+ .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(buttonZoomFit)
+ .addComponent(buttonZoomNormal)
+ .addComponent(buttonZoomStretch))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(buttonZoom025)
+ .addComponent(buttonZoom05)
+ .addComponent(buttonZoom2))
+ .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ );
+ jPanel3Layout.setVerticalGroup(
+ jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(jPanel3Layout.createSequentialGroup()
+ .addGap(4, 4, 4)
+ .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
+ .addComponent(buttonZoomNormal)
+ .addComponent(buttonZoom025))
+ .addGap(0, 0, 0)
+ .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
+ .addComponent(buttonZoomFit)
+ .addComponent(buttonZoom05))
+ .addGap(0, 0, 0)
+ .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
+ .addComponent(buttonZoomStretch)
+ .addComponent(buttonZoom2))
+ .addContainerGap())
+ );
+
+ jPanel2.setBorder(javax.swing.BorderFactory.createTitledBorder("Colormap"));
+
+ checkHistogram.setText("Histogram");
+ checkHistogram.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ checkHistogramActionPerformed(evt);
+ }
+ });
+
+ comboColormap.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ onChangeColormap(evt);
+ }
+ });
+
+ jLabel3.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
+ jLabel3.setText("Type:");
+
+ jLabel4.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
+ jLabel4.setText("Range:");
+
+ buttonGroup3.add(buttonFullRange);
+ buttonFullRange.setText("Full");
+ buttonFullRange.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ onChangeColormap(evt);
+ }
+ });
+
+ buttonGroup3.add(buttonManual);
+ buttonManual.setText("Manual");
+ buttonManual.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ onChangeColormap(evt);
+ }
+ });
+
+ buttonGroup3.add(buttonAutomatic);
+ buttonAutomatic.setText("Automatic");
+ buttonAutomatic.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ onChangeColormap(evt);
+ }
+ });
+
+ labelMin.setText("Min:");
+
+ spinnerMin.setModel(new javax.swing.SpinnerNumberModel(0, 0, 65535, 1));
+ spinnerMin.setEnabled(false);
+ spinnerMin.setPreferredSize(new java.awt.Dimension(77, 20));
+ spinnerMin.addChangeListener(new javax.swing.event.ChangeListener() {
+ public void stateChanged(javax.swing.event.ChangeEvent evt) {
+ onChangeColormapRange(evt);
+ }
+ });
+
+ spinnerMax.setModel(new javax.swing.SpinnerNumberModel(255, 0, 65535, 1));
+ spinnerMax.setEnabled(false);
+ spinnerMax.setPreferredSize(new java.awt.Dimension(77, 20));
+ spinnerMax.addChangeListener(new javax.swing.event.ChangeListener() {
+ public void stateChanged(javax.swing.event.ChangeEvent evt) {
+ onChangeColormapRange(evt);
+ }
+ });
+
+ labelMax.setText("Max:");
+
+ btFixColormapRange.setText("Fix");
+ btFixColormapRange.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ btFixColormapRangeActionPerformed(evt);
+ }
+ });
+
+ javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(jPanel2);
+ jPanel2.setLayout(jPanel2Layout);
+ jPanel2Layout.setHorizontalGroup(
+ jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(jPanel2Layout.createSequentialGroup()
+ .addGap(4, 4, 4)
+ .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(jLabel3)
+ .addComponent(jLabel4))
+ .addGap(4, 4, 4)
+ .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(buttonAutomatic)
+ .addComponent(buttonFullRange)
+ .addComponent(buttonManual)
+ .addComponent(comboColormap, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel2Layout.createSequentialGroup()
+ .addComponent(labelMax)
+ .addGap(2, 2, 2)
+ .addComponent(spinnerMax, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addComponent(checkHistogram, javax.swing.GroupLayout.Alignment.TRAILING)
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel2Layout.createSequentialGroup()
+ .addComponent(labelMin)
+ .addGap(2, 2, 2)
+ .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+ .addComponent(btFixColormapRange, javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(spinnerMin, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))))
+ .addContainerGap())
+ );
+
+ jPanel2Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {btFixColormapRange, spinnerMax, spinnerMin});
+
+ jPanel2Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {jLabel3, jLabel4});
+
+ jPanel2Layout.setVerticalGroup(
+ jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel2Layout.createSequentialGroup()
+ .addGap(4, 4, 4)
+ .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(comboColormap, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(jLabel3)
+ .addComponent(checkHistogram))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(buttonAutomatic)
+ .addComponent(jLabel4)
+ .addComponent(btFixColormapRange, javax.swing.GroupLayout.PREFERRED_SIZE, 26, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addGap(0, 0, 0)
+ .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
+ .addComponent(labelMin)
+ .addComponent(spinnerMin, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(buttonFullRange))
+ .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
+ .addComponent(buttonManual)
+ .addComponent(labelMax)
+ .addComponent(spinnerMax, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addContainerGap())
+ );
+
+ jPanel5.setBorder(javax.swing.BorderFactory.createTitledBorder("Source"));
+
+ buttonGroup4.add(buttonServer);
+ buttonServer.setSelected(true);
+ buttonServer.setText("Server");
+ buttonServer.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ buttonServerActionPerformed(evt);
+ }
+ });
+
+ buttonGroup4.add(buttonDirect);
+ buttonDirect.setText("Direct");
+ buttonDirect.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ buttonDirectActionPerformed(evt);
+ }
+ });
+
+ textState.setEditable(false);
+ textState.setHorizontalAlignment(javax.swing.JTextField.CENTER);
+ textState.setDisabledTextColor(new java.awt.Color(0, 0, 0));
+ textState.setEnabled(false);
+
+ javax.swing.GroupLayout jPanel5Layout = new javax.swing.GroupLayout(jPanel5);
+ jPanel5.setLayout(jPanel5Layout);
+ jPanel5Layout.setHorizontalGroup(
+ jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(jPanel5Layout.createSequentialGroup()
+ .addContainerGap()
+ .addComponent(buttonServer)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(buttonDirect)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(textState, javax.swing.GroupLayout.PREFERRED_SIZE, 80, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addContainerGap())
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel5Layout.createSequentialGroup()
+ .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(filler1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGap(56, 56, 56))
+ );
+ jPanel5Layout.setVerticalGroup(
+ jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(jPanel5Layout.createSequentialGroup()
+ .addGap(4, 4, 4)
+ .addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(jPanel5Layout.createSequentialGroup()
+ .addComponent(textState, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(filler1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(buttonServer)
+ .addComponent(buttonDirect)))
+ .addContainerGap())
+ );
+
+ panelScreen.setBorder(javax.swing.BorderFactory.createTitledBorder("Screen"));
+
+ comboScreen.setEnabled(false);
+ comboScreen.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ comboScreenActionPerformed(evt);
+ }
+ });
+
+ javax.swing.GroupLayout panelScreenLayout = new javax.swing.GroupLayout(panelScreen);
+ panelScreen.setLayout(panelScreenLayout);
+ panelScreenLayout.setHorizontalGroup(
+ panelScreenLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(panelScreenLayout.createSequentialGroup()
+ .addContainerGap()
+ .addGroup(panelScreenLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(valueScreen, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(comboScreen, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addContainerGap())
+ );
+ panelScreenLayout.setVerticalGroup(
+ panelScreenLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelScreenLayout.createSequentialGroup()
+ .addGap(4, 4, 4)
+ .addComponent(comboScreen, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(valueScreen, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addContainerGap())
+ );
+
+ panelFilter.setBorder(javax.swing.BorderFactory.createTitledBorder("Filter"));
+
+ comboFilter.setEnabled(false);
+ comboFilter.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ comboFilterActionPerformed(evt);
+ }
+ });
+
+ javax.swing.GroupLayout panelFilterLayout = new javax.swing.GroupLayout(panelFilter);
+ panelFilter.setLayout(panelFilterLayout);
+ panelFilterLayout.setHorizontalGroup(
+ panelFilterLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(panelFilterLayout.createSequentialGroup()
+ .addContainerGap()
+ .addGroup(panelFilterLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(valueFilter, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(comboFilter, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addContainerGap())
+ );
+ panelFilterLayout.setVerticalGroup(
+ panelFilterLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelFilterLayout.createSequentialGroup()
+ .addGap(4, 4, 4)
+ .addComponent(comboFilter, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(valueFilter, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ );
+
+ panelScreen2.setBorder(javax.swing.BorderFactory.createTitledBorder("Pipeline"));
+
+ checkThreshold.setText("Threshold");
+ checkThreshold.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ checkThresholdActionPerformed(evt);
+ }
+ });
+
+ spinnerThreshold.setModel(new javax.swing.SpinnerNumberModel(0.0d, 0.0d, 99999.0d, 1.0d));
+ spinnerThreshold.addChangeListener(new javax.swing.event.ChangeListener() {
+ public void stateChanged(javax.swing.event.ChangeEvent evt) {
+ spinnerThresholdonChange(evt);
+ }
+ });
+
+ checkBackground.setText("Subtract Background");
+ checkBackground.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ checkBackgroundActionPerformed(evt);
+ }
+ });
+
+ checkGoodRegion.setText("Good Region");
+ checkGoodRegion.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ checkGoodRegionActionPerformed(evt);
+ }
+ });
+
+ spinnerGrScale.setModel(new javax.swing.SpinnerNumberModel(3.0d, 0.01d, 99999.0d, 1.0d));
+ spinnerGrScale.addChangeListener(new javax.swing.event.ChangeListener() {
+ public void stateChanged(javax.swing.event.ChangeEvent evt) {
+ spinnerGrThresholdonChange(evt);
+ }
+ });
+
+ spinnerGrThreshold.setModel(new javax.swing.SpinnerNumberModel(0.5d, 0.04d, 1.0d, 0.1d));
+ spinnerGrThreshold.setPreferredSize(new java.awt.Dimension(92, 20));
+ spinnerGrThreshold.addChangeListener(new javax.swing.event.ChangeListener() {
+ public void stateChanged(javax.swing.event.ChangeEvent evt) {
+ spinnerGrThresholdonChange(evt);
+ }
+ });
+
+ labelGrThreshold.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
+ labelGrThreshold.setText("Threshold:");
+
+ labelGrScale.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
+ labelGrScale.setText("Scale:");
+
+ checkSlicing.setText("Slicing");
+ checkSlicing.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ checkSlicingActionPerformed(evt);
+ }
+ });
+
+ labelSlScale.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
+ labelSlScale.setText("Scale:");
+
+ spinnerSlScale.setModel(new javax.swing.SpinnerNumberModel(3.0d, 0.01d, 99999.0d, 1.0d));
+ spinnerSlScale.addChangeListener(new javax.swing.event.ChangeListener() {
+ public void stateChanged(javax.swing.event.ChangeEvent evt) {
+ spinnerSlicingChange(evt);
+ }
+ });
+
+ labelSlNumber.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
+ labelSlNumber.setText("Slices:");
+
+ spinnerSlNumber.setModel(new javax.swing.SpinnerNumberModel(2, 0, 1000, 1));
+ spinnerSlNumber.setPreferredSize(new java.awt.Dimension(92, 20));
+ spinnerSlNumber.addChangeListener(new javax.swing.event.ChangeListener() {
+ public void stateChanged(javax.swing.event.ChangeEvent evt) {
+ spinnerSlicingChange(evt);
+ }
+ });
+
+ labelSlOrientation.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
+ labelSlOrientation.setText("Orientation:");
+
+ spinnerSlOrientation.setModel(new javax.swing.SpinnerListModel(new String[] {"vertical", "horizontal"}));
+ spinnerSlOrientation.setPreferredSize(new java.awt.Dimension(92, 20));
+ spinnerSlOrientation.addChangeListener(new javax.swing.event.ChangeListener() {
+ public void stateChanged(javax.swing.event.ChangeEvent evt) {
+ spinnerSlicingChange(evt);
+ }
+ });
+
+ javax.swing.GroupLayout panelSlicingLayout = new javax.swing.GroupLayout(panelSlicing);
+ panelSlicing.setLayout(panelSlicingLayout);
+ panelSlicingLayout.setHorizontalGroup(
+ panelSlicingLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(panelSlicingLayout.createSequentialGroup()
+ .addContainerGap()
+ .addGroup(panelSlicingLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(panelSlicingLayout.createSequentialGroup()
+ .addComponent(checkSlicing)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addGroup(panelSlicingLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelSlicingLayout.createSequentialGroup()
+ .addComponent(labelSlNumber)
+ .addGap(2, 2, 2)
+ .addComponent(spinnerSlNumber, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelSlicingLayout.createSequentialGroup()
+ .addComponent(labelSlScale)
+ .addGap(2, 2, 2)
+ .addComponent(spinnerSlScale, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))))
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelSlicingLayout.createSequentialGroup()
+ .addGap(0, 0, Short.MAX_VALUE)
+ .addComponent(labelSlOrientation)
+ .addGap(2, 2, 2)
+ .addComponent(spinnerSlOrientation, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
+ .addContainerGap())
+ );
+
+ panelSlicingLayout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {spinnerSlNumber, spinnerSlOrientation, spinnerSlScale});
+
+ panelSlicingLayout.setVerticalGroup(
+ panelSlicingLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(panelSlicingLayout.createSequentialGroup()
+ .addGroup(panelSlicingLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(checkSlicing)
+ .addGroup(panelSlicingLayout.createSequentialGroup()
+ .addGroup(panelSlicingLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(spinnerSlNumber, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(labelSlNumber))
+ .addGap(0, 0, 0)
+ .addGroup(panelSlicingLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(spinnerSlScale, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(labelSlScale))))
+ .addGap(0, 0, 0)
+ .addGroup(panelSlicingLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(spinnerSlOrientation, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(labelSlOrientation)))
+ );
+
+ panelSlicingLayout.linkSize(javax.swing.SwingConstants.VERTICAL, new java.awt.Component[] {spinnerSlNumber, spinnerSlOrientation, spinnerSlScale});
+
+ checkRotation.setText("Rotation");
+ checkRotation.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ checkRotationActionPerformed(evt);
+ }
+ });
+
+ spinnerRotationAngle.setModel(new javax.swing.SpinnerNumberModel(0.0d, -360.0d, 360.0d, 1.0d));
+ spinnerRotationAngle.addChangeListener(new javax.swing.event.ChangeListener() {
+ public void stateChanged(javax.swing.event.ChangeEvent evt) {
+ spinnerRotationAngleStateChanged(evt);
+ }
+ });
+
+ spinnerRotationOrder.setModel(new javax.swing.SpinnerNumberModel(1, 1, 5, 1));
+ spinnerRotationOrder.addChangeListener(new javax.swing.event.ChangeListener() {
+ public void stateChanged(javax.swing.event.ChangeEvent evt) {
+ spinnerRotationAngleStateChanged(evt);
+ }
+ });
+
+ labelOrder.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
+ labelOrder.setText("Order:");
+
+ labelMode.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
+ labelMode.setText("Mode:");
+
+ spinnerRotationMode.setModel(new javax.swing.SpinnerListModel(new String[] {"constant", "reflect", "nearest", "mirror", "wrap", "ortho"}));
+ spinnerRotationMode.addChangeListener(new javax.swing.event.ChangeListener() {
+ public void stateChanged(javax.swing.event.ChangeEvent evt) {
+ spinnerRotationAngleStateChanged(evt);
+ }
+ });
+
+ labelAngle.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
+ labelAngle.setText("Angle:");
+
+ labelConstant.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
+ labelConstant.setText("Constant:");
+
+ spinnerRotationConstant.setModel(new javax.swing.SpinnerNumberModel(0, 0, 99999, 1));
+ spinnerRotationConstant.addChangeListener(new javax.swing.event.ChangeListener() {
+ public void stateChanged(javax.swing.event.ChangeEvent evt) {
+ spinnerRotationAngleStateChanged(evt);
+ }
+ });
+
+ checkAveraging.setText("Averaging");
+ checkAveraging.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ checkAveragingActionPerformed(evt);
+ }
+ });
+
+ spinnerAvFrames.setModel(new javax.swing.SpinnerNumberModel(1, 1, 1000, 1));
+ spinnerAvFrames.addChangeListener(new javax.swing.event.ChangeListener() {
+ public void stateChanged(javax.swing.event.ChangeEvent evt) {
+ spinnerAvFramesStateChanged(evt);
+ }
+ });
+
+ labelAvFrames.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
+ labelAvFrames.setText("Frames:");
+
+ labelAvMode.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
+ labelAvMode.setText("Mode:");
+
+ spinnerAvMode.setModel(new javax.swing.SpinnerListModel(new String[] {"single", "window"}));
+ spinnerAvMode.addChangeListener(new javax.swing.event.ChangeListener() {
+ public void stateChanged(javax.swing.event.ChangeEvent evt) {
+ spinnerAvModeonChange(evt);
+ }
+ });
+
+ spinnerBackground.setModel(new javax.swing.SpinnerListModel(new String[] {"normal", "signed", "passive"}));
+ spinnerBackground.addChangeListener(new javax.swing.event.ChangeListener() {
+ public void stateChanged(javax.swing.event.ChangeEvent evt) {
+ spinnerBackgroundStateChanged(evt);
+ }
+ });
+
+ javax.swing.GroupLayout panelScreen2Layout = new javax.swing.GroupLayout(panelScreen2);
+ panelScreen2.setLayout(panelScreen2Layout);
+ panelScreen2Layout.setHorizontalGroup(
+ panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(panelSlicing, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addGroup(panelScreen2Layout.createSequentialGroup()
+ .addContainerGap()
+ .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(panelScreen2Layout.createSequentialGroup()
+ .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(panelScreen2Layout.createSequentialGroup()
+ .addComponent(checkAveraging)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(labelAvFrames, javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(labelAvMode, javax.swing.GroupLayout.Alignment.TRAILING)))
+ .addGroup(panelScreen2Layout.createSequentialGroup()
+ .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(checkGoodRegion)
+ .addComponent(checkRotation)
+ .addComponent(checkThreshold))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(labelOrder, javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(labelAngle, javax.swing.GroupLayout.Alignment.TRAILING))
+ .addComponent(labelGrScale, javax.swing.GroupLayout.Alignment.TRAILING)))
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelScreen2Layout.createSequentialGroup()
+ .addGap(0, 0, Short.MAX_VALUE)
+ .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(labelConstant, javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(labelMode, javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(labelGrThreshold, javax.swing.GroupLayout.Alignment.TRAILING))))
+ .addGap(2, 2, 2))
+ .addGroup(panelScreen2Layout.createSequentialGroup()
+ .addComponent(checkBackground)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
+ .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+ .addComponent(spinnerGrThreshold, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(spinnerGrScale, javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(spinnerThreshold, javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(spinnerRotationOrder, javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(spinnerRotationMode, javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(spinnerRotationAngle, javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(spinnerRotationConstant, javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(spinnerAvFrames, javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(spinnerAvMode, javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(spinnerBackground, javax.swing.GroupLayout.Alignment.TRAILING))
+ .addContainerGap())
+ );
+
+ panelScreen2Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {spinnerAvFrames, spinnerAvMode, spinnerBackground, spinnerGrScale, spinnerGrThreshold, spinnerRotationAngle, spinnerRotationConstant, spinnerRotationMode, spinnerRotationOrder, spinnerThreshold});
+
+ panelScreen2Layout.setVerticalGroup(
+ panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(panelScreen2Layout.createSequentialGroup()
+ .addContainerGap()
+ .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(checkBackground)
+ .addComponent(spinnerBackground, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addGap(2, 2, 2)
+ .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(checkThreshold)
+ .addComponent(spinnerThreshold, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addGap(2, 2, 2)
+ .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(checkAveraging)
+ .addComponent(spinnerAvFrames, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(labelAvFrames))
+ .addGap(2, 2, 2)
+ .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(spinnerAvMode, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(labelAvMode))
+ .addGap(2, 2, 2)
+ .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(checkRotation)
+ .addComponent(spinnerRotationAngle, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(labelAngle))
+ .addGap(0, 0, 0)
+ .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(spinnerRotationOrder, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(labelOrder))
+ .addGap(0, 0, 0)
+ .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(spinnerRotationMode, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(labelMode))
+ .addGap(0, 0, 0)
+ .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(spinnerRotationConstant, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(labelConstant))
+ .addGap(2, 2, 2)
+ .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(checkGoodRegion)
+ .addComponent(spinnerGrScale, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(labelGrScale))
+ .addGap(0, 0, 0)
+ .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(spinnerGrThreshold, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(labelGrThreshold))
+ .addGap(2, 2, 2)
+ .addComponent(panelSlicing, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addContainerGap())
+ );
+
+ panelScreen2Layout.linkSize(javax.swing.SwingConstants.VERTICAL, new java.awt.Component[] {spinnerAvFrames, spinnerAvMode, spinnerBackground, spinnerGrScale, spinnerGrThreshold, spinnerRotationAngle, spinnerRotationConstant, spinnerRotationMode, spinnerRotationOrder, spinnerThreshold});
+
+ javax.swing.GroupLayout sidePanelLayout = new javax.swing.GroupLayout(sidePanel);
+ sidePanel.setLayout(sidePanelLayout);
+ sidePanelLayout.setHorizontalGroup(
+ sidePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(sidePanelLayout.createSequentialGroup()
+ .addContainerGap()
+ .addGroup(sidePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
+ .addComponent(jPanel5, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(jPanel3, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(jPanel2, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(panelScreen2, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(panelScreen, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(panelFilter, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ );
+ sidePanelLayout.setVerticalGroup(
+ sidePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(sidePanelLayout.createSequentialGroup()
+ .addGap(0, 0, 0)
+ .addComponent(jPanel5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(panelScreen2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(jPanel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(jPanel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(panelScreen, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(panelFilter, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ );
+
+ toolBar.setFloatable(false);
+ toolBar.setRollover(true);
+
+ buttonSidePanel.setIcon(getIcon("List"));
+ buttonSidePanel.setSelected(true);
+ buttonSidePanel.setText(" ");
+ buttonSidePanel.setToolTipText("Show Side Panel");
+ buttonSidePanel.setFocusable(false);
+ buttonSidePanel.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+ buttonSidePanel.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ buttonSidePanelActionPerformed(evt);
+ }
+ });
+ toolBar.add(buttonSidePanel);
+
+ buttonStreamData.setIcon(getIcon("Details"));
+ buttonStreamData.setText(" ");
+ buttonStreamData.setToolTipText("Show Data Window");
+ buttonStreamData.setFocusable(false);
+ buttonStreamData.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+ buttonStreamData.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ buttonStreamDataActionPerformed(evt);
+ }
+ });
+ toolBar.add(buttonStreamData);
+
+ buttonSave.setIcon(getIcon("Save"));
+ buttonSave.setText(" ");
+ buttonSave.setToolTipText("Save Snapshot");
+ buttonSave.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+ buttonSave.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ buttonSaveActionPerformed(evt);
+ }
+ });
+ toolBar.add(buttonSave);
+
+ buttonGrabBackground.setIcon(getIcon("Background"));
+ buttonGrabBackground.setText(" ");
+ buttonGrabBackground.setToolTipText("Grab Background");
+ buttonGrabBackground.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+ buttonGrabBackground.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ buttonGrabBackgroundActionPerformed(evt);
+ }
+ });
+ toolBar.add(buttonGrabBackground);
+
+ buttonPause.setIcon(getIcon("Pause"));
+ buttonPause.setText(" ");
+ buttonPause.setToolTipText("Pause");
+ buttonPause.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+ buttonPause.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ buttonPauseActionPerformed(evt);
+ }
+ });
+ toolBar.add(buttonPause);
+
+ jSeparator6.setMaximumSize(new java.awt.Dimension(20, 32767));
+ jSeparator6.setPreferredSize(new java.awt.Dimension(20, 0));
+ jSeparator6.setRequestFocusEnabled(false);
+ toolBar.add(jSeparator6);
+
+ buttonMarker.setIcon(getIcon("Marker"));
+ buttonMarker.setText(" ");
+ buttonMarker.setToolTipText("Show Marker");
+ buttonMarker.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+ buttonMarker.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ buttonMarkerActionPerformed(evt);
+ }
+ });
+ toolBar.add(buttonMarker);
+
+ buttonProfile.setIcon(getIcon("Profile"
+ + ""));
+ buttonProfile.setSelected(true);
+ buttonProfile.setText(" ");
+ buttonProfile.setToolTipText("Show Image Profile");
+ buttonProfile.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+ buttonProfile.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ buttonProfileActionPerformed(evt);
+ }
+ });
+ toolBar.add(buttonProfile);
+
+ buttonFit.setIcon(getIcon("Fit"));
+ buttonFit.setSelected(true);
+ buttonFit.setText(" ");
+ buttonFit.setToolTipText("Show Fit");
+ buttonFit.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+ buttonFit.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ buttonFitActionPerformed(evt);
+ }
+ });
+ toolBar.add(buttonFit);
+
+ buttonReticle.setIcon(getIcon("Reticule"));
+ buttonReticle.setSelected(true);
+ buttonReticle.setText(" ");
+ buttonReticle.setToolTipText("Show Reticle");
+ buttonReticle.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+ buttonReticle.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ buttonReticleActionPerformed(evt);
+ }
+ });
+ toolBar.add(buttonReticle);
+
+ buttonScale.setIcon(getIcon("Scale"));
+ buttonScale.setSelected(true);
+ buttonScale.setText(" ");
+ buttonScale.setToolTipText("Show Colormap Scale");
+ buttonScale.setFocusable(false);
+ buttonScale.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+ buttonScale.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ buttonScaleActionPerformed(evt);
+ }
+ });
+ toolBar.add(buttonScale);
+
+ buttonTitle.setIcon(getIcon("Title"));
+ buttonTitle.setSelected(true);
+ buttonTitle.setText(" ");
+ buttonTitle.setToolTipText("Show Camera Name");
+ buttonTitle.setFocusable(false);
+ buttonTitle.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+ buttonTitle.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ buttonTitleActionPerformed(evt);
+ }
+ });
+ toolBar.add(buttonTitle);
+
+ pauseSelection.setDecimals(0);
+
+ jLabel1.setText("Camera:");
+
+ comboCameras.setFont(new java.awt.Font("Dialog", 1, 14)); // NOI18N
+ comboCameras.setMaximumRowCount(30);
+ comboCameras.setMinimumSize(new java.awt.Dimension(127, 27));
+ comboCameras.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ comboCamerasActionPerformed(evt);
+ }
+ });
+
+ labelType.setText("Type:");
+
+ comboType.setFont(new java.awt.Font("Dialog", 1, 14)); // NOI18N
+ comboType.setMaximumRowCount(30);
+ comboType.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "All", "Laser", "Electrons", "Photonics" }));
+ comboType.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ comboTypeActionPerformed(evt);
+ }
+ });
+
+ javax.swing.GroupLayout panelCameraSelectionLayout = new javax.swing.GroupLayout(panelCameraSelection);
+ panelCameraSelection.setLayout(panelCameraSelectionLayout);
+ panelCameraSelectionLayout.setHorizontalGroup(
+ panelCameraSelectionLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(panelCameraSelectionLayout.createSequentialGroup()
+ .addContainerGap()
+ .addComponent(jLabel1)
+ .addGap(0, 0, 0)
+ .addComponent(comboCameras, javax.swing.GroupLayout.PREFERRED_SIZE, 222, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(labelType)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(comboType, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGap(0, 0, 0))
+ );
+ panelCameraSelectionLayout.setVerticalGroup(
+ panelCameraSelectionLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(panelCameraSelectionLayout.createSequentialGroup()
+ .addGap(0, 0, 0)
+ .addGroup(panelCameraSelectionLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
+ .addComponent(comboType, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(labelType)
+ .addComponent(jLabel1)
+ .addComponent(comboCameras, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addGap(0, 0, 0))
+ );
+
+ javax.swing.GroupLayout topPanelLayout = new javax.swing.GroupLayout(topPanel);
+ topPanel.setLayout(topPanelLayout);
+ topPanelLayout.setHorizontalGroup(
+ topPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, topPanelLayout.createSequentialGroup()
+ .addComponent(toolBar, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGap(18, 18, 18)
+ .addComponent(panelCameraSelection, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addGap(18, 18, 18)
+ .addComponent(pauseSelection, javax.swing.GroupLayout.PREFERRED_SIZE, 334, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addContainerGap())
+ );
+ topPanelLayout.setVerticalGroup(
+ topPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+ .addGroup(topPanelLayout.createSequentialGroup()
+ .addGap(1, 1, 1)
+ .addGroup(topPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
+ .addComponent(pauseSelection, javax.swing.GroupLayout.PREFERRED_SIZE, 29, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(toolBar, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(panelCameraSelection, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
+ );
+
+ javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
+ this.setLayout(layout);
+ layout.setHorizontalGroup(
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+ .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
+ .addComponent(sidePanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(renderer, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
+ .addContainerGap()
+ .addComponent(topPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
+ .addContainerGap())
+ );
+ layout.setVerticalGroup(
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
+ .addComponent(topPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(sidePanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(renderer, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
+ );
+ }// //GEN-END:initComponents
+
+ private void buttonZoomFitActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonZoomFitActionPerformed
+ try {
+ renderer.setMode(RendererMode.Fit);
+ } catch (Exception ex) {
+ showException(ex);
+ }
+ }//GEN-LAST:event_buttonZoomFitActionPerformed
+
+ private void buttonZoomStretchActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonZoomStretchActionPerformed
+ try {
+ renderer.setMode(RendererMode.Stretch);
+ } catch (Exception ex) {
+ showException(ex);
+ }
+ }//GEN-LAST:event_buttonZoomStretchActionPerformed
+
+ private void buttonZoomNormalActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonZoomNormalActionPerformed
+ try {
+ renderer.setMode(RendererMode.Fixed);
+ centralizeRenderer();
+ } catch (Exception ex) {
+ showException(ex);
+ }
+ }//GEN-LAST:event_buttonZoomNormalActionPerformed
+
+ private void onChangeColormap(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_onChangeColormap
+ try {
+ if ((camera != null) && (camera instanceof ColormapSource) && !updatingColormap) {
+ ColormapSource source = (ColormapSource) camera;
+ Color colorReticule = new Color(16, 16, 16);
+ Color colorMarker = new Color(128, 128, 128);
+ Colormap colormap = (Colormap) comboColormap.getSelectedItem();
+ source.getConfig().colormap = (colormap == null) ? Colormap.Flame : colormap;
+ switch (source.getConfig().colormap) {
+ case Grayscale:
+ case Inverted:
+ case Red:
+ case Green:
+ case Blue:
+ colorReticule = new Color(0, 192, 0);
+ colorMarker = new Color(64, 255, 64);
+ break;
+ case Flame:
+ colorReticule = new Color(0, 192, 0);
+ colorMarker = new Color(64, 255, 64);
+ break;
+ }
+
+ renderer.setPenReticle(new Pen(colorReticule));
+ renderer.setPenProfile(new Pen(colorReticule, 0));
+ renderer.setPenMarker(new Pen(colorMarker, 2));
+ renderer.setShowReticle(false);
+ checkReticle();
+ source.getConfig().colormapAutomatic = buttonAutomatic.isSelected();
+ source.getConfig().colormapMin = buttonFullRange.isSelected() ? Double.NaN : (Integer) spinnerMin.getValue();
+ source.getConfig().colormapMax = buttonFullRange.isSelected() ? Double.NaN : (Integer) spinnerMax.getValue();
+ try {
+ source.getConfig().save();
+ } catch (Exception ex) {
+ logger.log(Level.WARNING, null, ex);
+ }
+ source.refresh();
+ if (buttonPause.isSelected()) {
+ updatePause();
+ }
+ updateColormap();
+ }
+ } catch (Exception ex) {
+ showException(ex);
+ }
+ }//GEN-LAST:event_onChangeColormap
+
+ private void onChangeColormapRange(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_onChangeColormapRange
+ onChangeColormap(null);
+ }//GEN-LAST:event_onChangeColormapRange
+
+ private void buttonZoom025ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonZoom025ActionPerformed
+ renderer.setZoom(0.25);
+ renderer.setMode(RendererMode.Zoom);
+ centralizeRenderer();
+ }//GEN-LAST:event_buttonZoom025ActionPerformed
+
+ private void buttonZoom05ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonZoom05ActionPerformed
+ renderer.setZoom(0.5);
+ renderer.setMode(RendererMode.Zoom);
+ centralizeRenderer();
+ }//GEN-LAST:event_buttonZoom05ActionPerformed
+
+ private void buttonServerActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonServerActionPerformed
+ if (!usingServer) {
+ usingServer = true;
+ requestCameraListUpdate = true;
+ }
+ comboCamerasActionPerformed(null);
+ }//GEN-LAST:event_buttonServerActionPerformed
+
+ private void buttonDirectActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonDirectActionPerformed
+ if (usingServer) {
+ usingServer = false;
+ requestCameraListUpdate = true;
+ }
+ comboCamerasActionPerformed(null);
+ }//GEN-LAST:event_buttonDirectActionPerformed
+
+ private void comboScreenActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_comboScreenActionPerformed
+
+ comboScreen.setEnabled(false);
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ ChannelInteger setpoint = null;
+ try {
+ int index = comboScreen.getSelectedIndex();
+ if (index >= 0) {
+ if (cameraName.contains("DSRM")) {
+ setpoint = new ChannelInteger(null, cameraName + ":POSITION_SP");
+ } else {
+ setpoint = new ChannelInteger(null, cameraName + ":SET_SCREEN1_POS");
+ }
+ setpoint.initialize();
+ Integer readback = setpoint.read();
+ if ((readback == null) || (setpoint.read() != index)) {
+ setpoint.write(index);
+ //Must be threaded to control the laser because of sleep in setLaserState
+ /*
+ boolean laserOn = getLaserState();
+ if (laserOn) {
+ setLaserState(false);
+ }
+ try {
+ setpoint.write(index);
+ } finally {
+ if (laserOn) {
+ setLaserState(true);
+ }
+ }
+ */
+ }
+ screen.read();
+ }
+ } catch (Exception ex) {
+ showException(ex);
+ } finally {
+ comboScreen.setEnabled(true);
+ if (setpoint != null) {
+ setpoint.close();
+ }
+ }
+ }
+ }).start();
+ }//GEN-LAST:event_comboScreenActionPerformed
+
+ private void comboFilterActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_comboFilterActionPerformed
+ try {
+ String setpoint = (String) comboFilter.getSelectedItem();
+ if (setpoint != null) {
+ if (!setpoint.equals(filter.read())) {
+ filter.write(setpoint);
+ }
+ }
+ } catch (Exception ex) {
+ showException(ex);
+ }
+ }//GEN-LAST:event_comboFilterActionPerformed
+
+ private void checkHistogramActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_checkHistogramActionPerformed
+ try {
+ setHistogramVisible(checkHistogram.isSelected());
+ } catch (Exception ex) {
+ showException(ex);
+ }
+ }//GEN-LAST:event_checkHistogramActionPerformed
+
+ private void buttonZoom2ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonZoom2ActionPerformed
+ renderer.setZoom(2.0);
+ renderer.setMode(RendererMode.Zoom);
+ centralizeRenderer();
+ }//GEN-LAST:event_buttonZoom2ActionPerformed
+
+ private void spinnerThresholdonChange(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_spinnerThresholdonChange
+ if (!updatingServerControls) {
+ try {
+ if ((server != null) && (server.isStarted())) {
+ server.setThreshold((Double) spinnerThreshold.getValue());
+ }
+ } catch (Exception ex) {
+ showException(ex);
+ updatePipelineControls();
+ }
+ }
+ }//GEN-LAST:event_spinnerThresholdonChange
+
+ private void checkBackgroundActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_checkBackgroundActionPerformed
+ if (server != null) {
+ if (!updatingServerControls) {
+ try {
+ if (server.isStarted()) {
+ spinnerBackground.setVisible(checkBackground.isSelected());
+ Object bg_mode = checkBackground.isSelected() ? String.valueOf(spinnerBackground.getValue()) : false;
+ server.setBackgroundSubtraction(bg_mode.equals("normal") ? true : bg_mode);
+ }
+ } catch (Exception ex) {
+ showException(ex);
+ updatePipelineControls();
+ updatingServerControls = true;
+ checkBackground.setSelected(false);
+ updatingServerControls = false;
+
+ }
+ }
+ } else {
+ camera.setBackgroundEnabled(checkBackground.isSelected());
+ }
+ }//GEN-LAST:event_checkBackgroundActionPerformed
+
+ private void checkThresholdActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_checkThresholdActionPerformed
+ if (!updatingServerControls) {
+ try {
+ if ((server != null) && (server.isStarted())) {
+ spinnerThreshold.setVisible(checkThreshold.isSelected());
+ server.setThreshold(checkThreshold.isSelected() ? (Double) spinnerThreshold.getValue() : null);
+ }
+ } catch (Exception ex) {
+ showException(ex);
+ updatePipelineControls();
+ }
+ }
+ }//GEN-LAST:event_checkThresholdActionPerformed
+
+ private void checkGoodRegionActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_checkGoodRegionActionPerformed
+ if (!updatingServerControls) {
+ try {
+ if ((server != null) && (server.isStarted())) {
+ goodRegion = checkGoodRegion.isSelected();
+ setGoodRegionOptionsVisible(goodRegion);
+ if (goodRegion) {
+ server.setGoodRegion(((Number) spinnerGrThreshold.getValue()).doubleValue(), ((Number) spinnerGrScale.getValue()).doubleValue());
+ } else {
+ server.setGoodRegion(null);
+ }
+ }
+ } catch (Exception ex) {
+ showException(ex);
+ updatePipelineControls();
+ }
+ }
+ }//GEN-LAST:event_checkGoodRegionActionPerformed
+
+ private void spinnerGrThresholdonChange(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_spinnerGrThresholdonChange
+ if (!updatingServerControls) {
+ try {
+ if ((server != null) && (server.isStarted())) {
+ server.setGoodRegion((Double) spinnerGrThreshold.getValue(), (Double) spinnerGrScale.getValue());
+ }
+ } catch (Exception ex) {
+ showException(ex);
+ updatePipelineControls();
+ }
+ }
+ }//GEN-LAST:event_spinnerGrThresholdonChange
+
+ private void btFixColormapRangeActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btFixColormapRangeActionPerformed
+ try {
+ updatingColormap = true;
+ ArrayProperties properties = currentFrame.data.getProperties();
+ spinnerMax.setValue(properties.max.intValue());
+ spinnerMin.setValue(properties.min.intValue());
+ buttonManual.setSelected(true);
+ } catch (Exception ex) {
+ showException(ex);
+ } finally {
+ updatingColormap = false;
+ onChangeColormap(null);
+ }
+ }//GEN-LAST:event_btFixColormapRangeActionPerformed
+
+ private void checkSlicingActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_checkSlicingActionPerformed
+ if (!updatingServerControls) {
+ try {
+ if ((server != null) && (server.isStarted())) {
+ slicing = checkSlicing.isSelected();
+ setSlicingOptionsVisible(slicing);
+ if (slicing) {
+ server.setSlicing((Integer) spinnerSlNumber.getValue(), (Double) spinnerSlScale.getValue(), spinnerSlOrientation.getValue().toString());
+ } else {
+ server.setSlicing(null);
+ }
+ }
+ } catch (Exception ex) {
+ showException(ex);
+ updatePipelineControls();
+ }
+ }
+ }//GEN-LAST:event_checkSlicingActionPerformed
+
+ private void spinnerSlicingChange(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_spinnerSlicingChange
+ if (!updatingServerControls) {
+ try {
+ if ((server != null) && (server.isStarted())) {
+ server.setSlicing((Integer) spinnerSlNumber.getValue(), (Double) spinnerSlScale.getValue(), spinnerSlOrientation.getValue().toString());
+ }
+ } catch (Exception ex) {
+ showException(ex);
+ updatePipelineControls();
+ }
+ }
+ }//GEN-LAST:event_spinnerSlicingChange
+
+ private void buttonReticleActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonReticleActionPerformed
+ try {
+ checkReticle();
+ } catch (Exception ex) {
+ showException(ex);
+ }
+ }//GEN-LAST:event_buttonReticleActionPerformed
+
+ private void buttonFitActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonFitActionPerformed
+ try {
+ showFit = buttonFit.isSelected();
+ if (showFit) {
+ renderer.setProfile(Renderer.Profile.None);
+ } else {
+ renderer.removeOverlays(fitOv);
+ fitOv = null;
+ }
+ } catch (Exception ex) {
+ showException(ex);
+ }
+ }//GEN-LAST:event_buttonFitActionPerformed
+
+ private void buttonProfileActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonProfileActionPerformed
+ try {
+ showProfile = buttonProfile.isSelected();
+ if (showProfile) {
+ renderer.setProfile(Renderer.Profile.None);
+ } else {
+ renderer.removeOverlays(profileOv);
+ profileOv = null;
+ }
+ } catch (Exception ex) {
+ showException(ex);
+ }
+ }//GEN-LAST:event_buttonProfileActionPerformed
+
+ private void buttonMarkerActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonMarkerActionPerformed
+ try {
+ checkMarker(null);
+ } catch (Exception ex) {
+ showException(ex);
+ }
+ }//GEN-LAST:event_buttonMarkerActionPerformed
+
+ private void buttonPauseActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonPauseActionPerformed
+ try {
+ if (!updatingButtons) {
+ setPaused(buttonPause.isSelected());
+ }
+ } catch (Exception ex) {
+ showException(ex);
+ }
+ }//GEN-LAST:event_buttonPauseActionPerformed
+
+ private void buttonGrabBackgroundActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonGrabBackgroundActionPerformed
+ try {
+ if (camera != null) {
+ boolean laserOn1 = getLaserState(1);
+ boolean laserOn2 = getLaserState(2);
+ OptionResult ret = null;
+ if (laserOn1 || laserOn2) {
+ if (laserOn1){
+ ret = SwingUtils.showOption(getTopLevel(), "Capture Background", "Do you want to put Bunch 1 laser on delay for capturing background?", OptionType.YesNoCancel);
+ if (ret == OptionResult.No) {
+ laserOn1 = false;
+ }
+ if (ret == OptionResult.Cancel) {
+ return;
+ }
+ }
+ if (laserOn2){
+ ret = SwingUtils.showOption(getTopLevel(), "Capture Background", "Do you want to put Bunch 2 laser on delay for capturing background?", OptionType.YesNoCancel);
+ if (ret == OptionResult.No) {
+ laserOn2= false;
+ }
+ }
+ } else {
+ ret = SwingUtils.showOption(getTopLevel(), "Capture Background", "Do you want to capture background now?", OptionType.OkCancel);
+ }
+
+ if (ret == OptionResult.Cancel) {
+ return;
+ }
+
+ if (laserOn1) {
+ setLaserState(1,false);
+ }
+ if (laserOn2) {
+ setLaserState(2,false);
+ }
+ try {
+ System.out.println("Grabbing background for: " + cameraAlias);
+ if (server != null) {
+ server.captureBackground(5);
+ } else {
+ camera.captureBackground(5, 0);
+ }
+ } finally {
+ if (laserOn1) {
+ setLaserState(1,true);
+ }
+ if (laserOn2) {
+ setLaserState(2,true);
+ }
+ }
+ SwingUtils.showMessage(getTopLevel(), "Success", "Success capturing background", 5000);
+ }
+ } catch (Exception ex) {
+ showException(ex);
+ }
+ }//GEN-LAST:event_buttonGrabBackgroundActionPerformed
+
+ private void buttonSaveActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonSaveActionPerformed
+ try {
+ saveSnapshot();
+ } catch (Exception ex) {
+ logger.log(Level.WARNING, null, ex);
+ showException(ex);
+ }
+ }//GEN-LAST:event_buttonSaveActionPerformed
+
+ private void buttonStreamDataActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonStreamDataActionPerformed
+ try {
+ showStreamData();
+ } catch (Exception ex) {
+ showException(ex);
+ }
+ }//GEN-LAST:event_buttonStreamDataActionPerformed
+
+ private void buttonSidePanelActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonSidePanelActionPerformed
+ sidePanel.setVisible(buttonSidePanel.isSelected());
+ }//GEN-LAST:event_buttonSidePanelActionPerformed
+
+ private void comboTypeActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_comboTypeActionPerformed
+ try {
+ if (!updatingCameraSelection) {
+ updateCameraList();
+ if ((cameraAlias != null) && (!cameraAlias.equals(comboCameras.getSelectedItem()))) {
+ setCamera(null);
+ }
+ }
+
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ } finally {
+ updateButtons();
+ }
+ }//GEN-LAST:event_comboTypeActionPerformed
+
+ private void comboCamerasActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_comboCamerasActionPerformed
+ try {
+ if (!updatingCameraSelection) {
+ if (!comboCameras.isEnabled()) {
+ throw new Exception("Invalid state");
+ }
+ comboCameras.setEnabled(false);
+ comboType.setEnabled(false);
+ buttonServer.setEnabled(false);
+ buttonDirect.setEnabled(false);
+ final String cameraName = (String) comboCameras.getSelectedItem();
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ if (requestCameraListUpdate) {
+ requestCameraListUpdate = false;
+ try {
+ updateCameraList();
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ try {
+ setCamera(cameraName.trim().isEmpty() ? null : cameraName);
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ } finally {
+ updateButtons();
+ comboCameras.setEnabled(true);
+ comboType.setEnabled(true);
+ buttonServer.setEnabled(true);
+ buttonDirect.setEnabled(true);
+ }
+ }
+ }).start();
+ }
+ } catch (Exception ex) {
+ showException(ex);
+ }
+ }//GEN-LAST:event_comboCamerasActionPerformed
+
+ private void buttonTitleActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonTitleActionPerformed
+ try {
+ manageTitleOverlay();
+ } catch (Exception ex) {
+ showException(ex);
+ } finally {
+ }
+ }//GEN-LAST:event_buttonTitleActionPerformed
+
+ private void buttonScaleActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonScaleActionPerformed
+ try {
+ renderer.setShowColormapScale(buttonScale.isSelected());
+ } catch (Exception ex) {
+ showException(ex);
+ }
+ }//GEN-LAST:event_buttonScaleActionPerformed
+
+ private void checkRotationActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_checkRotationActionPerformed
+ if (!updatingServerControls) {
+ try {
+ if ((server != null) && (server.isStarted())) {
+ boolean rotation = checkRotation.isSelected();
+ setRotationOptionsVisible(rotation);
+ if (rotation) {
+ spinnerRotationAngleStateChanged(null);
+ } else {
+ server.setRotation(null);
+ }
+ }
+ } catch (Exception ex) {
+ showException(ex);
+ updatePipelineControls();
+ }
+ }
+ }//GEN-LAST:event_checkRotationActionPerformed
+
+ private void spinnerRotationAngleStateChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_spinnerRotationAngleStateChanged
+ try {
+ String mode = String.valueOf(spinnerRotationMode.getValue());
+ server.setRotation(((Number) spinnerRotationAngle.getValue()).doubleValue(),
+ ((Number) spinnerRotationOrder.getValue()).intValue(),
+ mode.equals("constant") ? String.valueOf(spinnerRotationConstant.getValue()): mode);
+ } catch (Exception ex) {
+ showException(ex);
+ updatePipelineControls();
+ }
+ }//GEN-LAST:event_spinnerRotationAngleStateChanged
+
+ private void checkAveragingActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_checkAveragingActionPerformed
+ if (!updatingServerControls) {
+ try {
+ if ((server != null) && (server.isStarted())) {
+ setAveragingOptionsVisible(checkAveraging.isSelected());
+ Integer av = spinnerAvMode.getValue().equals("window") ? - (Integer)spinnerAvFrames.getValue() : (Integer)spinnerAvFrames.getValue();
+ setInstanceConfigValue("averaging", checkAveraging.isSelected() ? av : null);
+ }
+ } catch (Exception ex) {
+ showException(ex);
+ updatePipelineControls();
+ }
+ }
+ }//GEN-LAST:event_checkAveragingActionPerformed
+
+ private void spinnerAvModeonChange(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_spinnerAvModeonChange
+ checkAveragingActionPerformed(null);
+ }//GEN-LAST:event_spinnerAvModeonChange
+
+ private void spinnerAvFramesStateChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_spinnerAvFramesStateChanged
+ checkAveragingActionPerformed(null);
+ }//GEN-LAST:event_spinnerAvFramesStateChanged
+
+ private void spinnerBackgroundStateChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_spinnerBackgroundStateChanged
+ if (!updatingServerControls) {
+ try {
+ Object bg_mode = String.valueOf(spinnerBackground.getValue());
+ server.setBackgroundSubtraction((bg_mode=="normal") ? true : bg_mode);
+ } catch (Exception ex) {
+ showException(ex);
+ updatePipelineControls();
+ }
+ }
+ }//GEN-LAST:event_spinnerBackgroundStateChanged
+
+ // Variables declaration - do not modify//GEN-BEGIN:variables
+ private javax.swing.JButton btFixColormapRange;
+ private javax.swing.JRadioButton buttonAutomatic;
+ private javax.swing.JRadioButton buttonDirect;
+ private javax.swing.JToggleButton buttonFit;
+ private javax.swing.JRadioButton buttonFullRange;
+ private javax.swing.JButton buttonGrabBackground;
+ private javax.swing.ButtonGroup buttonGroup1;
+ private javax.swing.ButtonGroup buttonGroup2;
+ private javax.swing.ButtonGroup buttonGroup3;
+ private javax.swing.ButtonGroup buttonGroup4;
+ private javax.swing.JRadioButton buttonManual;
+ private javax.swing.JToggleButton buttonMarker;
+ private javax.swing.JToggleButton buttonPause;
+ private javax.swing.JToggleButton buttonProfile;
+ private javax.swing.JToggleButton buttonReticle;
+ private javax.swing.JToggleButton buttonSave;
+ private javax.swing.JToggleButton buttonScale;
+ private javax.swing.JRadioButton buttonServer;
+ private javax.swing.JToggleButton buttonSidePanel;
+ private javax.swing.JButton buttonStreamData;
+ private javax.swing.JToggleButton buttonTitle;
+ private javax.swing.JRadioButton buttonZoom025;
+ private javax.swing.JRadioButton buttonZoom05;
+ private javax.swing.JRadioButton buttonZoom2;
+ private javax.swing.JRadioButton buttonZoomFit;
+ private javax.swing.JRadioButton buttonZoomNormal;
+ private javax.swing.JRadioButton buttonZoomStretch;
+ private javax.swing.JCheckBox checkAveraging;
+ private javax.swing.JCheckBox checkBackground;
+ private javax.swing.JCheckBox checkGoodRegion;
+ private javax.swing.JCheckBox checkHistogram;
+ private javax.swing.JCheckBox checkRotation;
+ private javax.swing.JCheckBox checkSlicing;
+ private javax.swing.JCheckBox checkThreshold;
+ private javax.swing.JComboBox comboCameras;
+ private javax.swing.JComboBox comboColormap;
+ private javax.swing.JComboBox comboFilter;
+ private javax.swing.JComboBox comboScreen;
+ private javax.swing.JComboBox comboType;
+ private javax.swing.Box.Filler filler1;
+ private javax.swing.JLabel jLabel1;
+ private javax.swing.JLabel jLabel3;
+ private javax.swing.JLabel jLabel4;
+ private javax.swing.JPanel jPanel2;
+ private javax.swing.JPanel jPanel3;
+ private javax.swing.JPanel jPanel5;
+ private javax.swing.JProgressBar jProgressBar1;
+ private javax.swing.JToolBar.Separator jSeparator6;
+ private javax.swing.JLabel labelAngle;
+ private javax.swing.JLabel labelAvFrames;
+ private javax.swing.JLabel labelAvMode;
+ private javax.swing.JLabel labelConstant;
+ private javax.swing.JLabel labelGrScale;
+ private javax.swing.JLabel labelGrThreshold;
+ private javax.swing.JLabel labelMax;
+ private javax.swing.JLabel labelMin;
+ private javax.swing.JLabel labelMode;
+ private javax.swing.JLabel labelOrder;
+ private javax.swing.JLabel labelSlNumber;
+ private javax.swing.JLabel labelSlOrientation;
+ private javax.swing.JLabel labelSlScale;
+ private javax.swing.JLabel labelType;
+ private javax.swing.JPanel panelCameraSelection;
+ private javax.swing.JPanel panelFilter;
+ private javax.swing.JPanel panelScreen;
+ private javax.swing.JPanel panelScreen2;
+ private javax.swing.JPanel panelSlicing;
+ private ch.psi.pshell.swing.ValueSelection pauseSelection;
+ private ch.psi.pshell.imaging.Renderer renderer;
+ private javax.swing.JPanel sidePanel;
+ private javax.swing.JSpinner spinnerAvFrames;
+ private javax.swing.JSpinner spinnerAvMode;
+ private javax.swing.JSpinner spinnerBackground;
+ private javax.swing.JSpinner spinnerGrScale;
+ private javax.swing.JSpinner spinnerGrThreshold;
+ private javax.swing.JSpinner spinnerMax;
+ private javax.swing.JSpinner spinnerMin;
+ private javax.swing.JSpinner spinnerRotationAngle;
+ private javax.swing.JSpinner spinnerRotationConstant;
+ private javax.swing.JSpinner spinnerRotationMode;
+ private javax.swing.JSpinner spinnerRotationOrder;
+ private javax.swing.JSpinner spinnerSlNumber;
+ private javax.swing.JSpinner spinnerSlOrientation;
+ private javax.swing.JSpinner spinnerSlScale;
+ private javax.swing.JSpinner spinnerThreshold;
+ private javax.swing.JTextField textState;
+ private javax.swing.JToolBar toolBar;
+ private javax.swing.JPanel topPanel;
+ private ch.psi.pshell.swing.DeviceValuePanel valueFilter;
+ private ch.psi.pshell.swing.DeviceValuePanel valueScreen;
+ // End of variables declaration//GEN-END:variables
+}
diff --git a/plugins/ScreenPanel9.form b/plugins/ScreenPanel9.form
new file mode 100644
index 0000000..0f11c92
--- /dev/null
+++ b/plugins/ScreenPanel9.form
@@ -0,0 +1,1444 @@
+
+
+
diff --git a/plugins/ScreenPanel9.java b/plugins/ScreenPanel9.java
new file mode 100644
index 0000000..cf7a6e2
--- /dev/null
+++ b/plugins/ScreenPanel9.java
@@ -0,0 +1,4898 @@
+/*
+ * Copyright (c) 2014 Paul Scherrer Institute. All rights reserved.
+ */
+
+import ch.psi.pshell.bs.CameraServer;
+import ch.psi.pshell.core.Context;
+import java.io.IOException;
+import java.nio.file.Paths;
+import javax.swing.DefaultComboBoxModel;
+import ch.psi.pshell.ui.Panel;
+import ch.psi.pshell.imaging.ImageListener;
+import ch.psi.utils.State;
+import ch.psi.utils.Chrono;
+import ch.psi.utils.swing.SwingUtils;
+import ch.psi.utils.swing.TextEditor;
+import ch.psi.pshell.bs.PipelineServer;
+import ch.psi.pshell.bs.StreamValue;
+import ch.psi.pshell.core.JsonSerializer;
+import ch.psi.pshell.data.DataManager;
+import ch.psi.pshell.device.Device;
+import ch.psi.pshell.device.Readable.ReadableArray;
+import ch.psi.pshell.device.Readable.ReadableNumber;
+import ch.psi.pshell.device.ReadableRegister.ReadableRegisterArray;
+import ch.psi.pshell.device.ReadableRegister.ReadableRegisterNumber;
+import ch.psi.pshell.epics.ChannelInteger;
+import ch.psi.pshell.epics.DiscretePositioner;
+import ch.psi.pshell.epics.Epics;
+import ch.psi.pshell.imaging.Colormap;
+import ch.psi.pshell.imaging.ColormapSource;
+import ch.psi.pshell.imaging.ColormapSource.ColormapSourceConfig;
+import ch.psi.pshell.ui.App;
+import ch.psi.pshell.imaging.Data;
+import ch.psi.pshell.imaging.DimensionDouble;
+import ch.psi.pshell.imaging.Histogram;
+import ch.psi.pshell.imaging.ImageBuffer;
+import ch.psi.pshell.imaging.Overlay;
+import ch.psi.pshell.imaging.Overlays;
+import ch.psi.pshell.imaging.Overlays.Text;
+import ch.psi.pshell.imaging.Pen;
+import ch.psi.pshell.imaging.PointDouble;
+import ch.psi.pshell.imaging.Renderer;
+import ch.psi.pshell.imaging.RendererListener;
+import ch.psi.pshell.imaging.RendererMode;
+import ch.psi.pshell.imaging.Source;
+import ch.psi.pshell.scripting.InterpreterResult;
+import ch.psi.pshell.scripting.ScriptManager;
+import ch.psi.pshell.swing.DeviceValueChart;
+import ch.psi.pshell.swing.ValueSelection;
+import ch.psi.pshell.swing.ValueSelection.ValueSelectionListener;
+import ch.psi.pshell.ui.Console;
+import ch.psi.utils.Arr;
+import ch.psi.utils.ArrayProperties;
+import ch.psi.utils.Config;
+import ch.psi.utils.Convert;
+import ch.psi.utils.Str;
+import ch.psi.utils.swing.Editor.EditorDialog;
+import ch.psi.utils.swing.MainFrame;
+import ch.psi.utils.swing.StandardDialog;
+import ch.psi.utils.swing.StandardDialog.StandardDialogListener;
+import ch.psi.utils.swing.SwingUtils.OptionResult;
+import ch.psi.utils.swing.SwingUtils.OptionType;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.Toolkit;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.StringSelection;
+import java.awt.datatransfer.Transferable;
+import java.awt.event.ActionEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.FileInputStream;
+import java.lang.reflect.Array;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JComponent;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JMenuItem;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JSpinner;
+import javax.swing.JTable;
+import javax.swing.JTextField;
+import javax.swing.ListSelectionModel;
+import javax.swing.SpinnerNumberModel;
+import javax.swing.SwingUtilities;
+import javax.swing.event.PopupMenuEvent;
+import javax.swing.event.PopupMenuListener;
+import javax.swing.table.DefaultTableModel;
+import org.apache.commons.math3.analysis.function.Gaussian;
+import org.apache.commons.math3.fitting.GaussianCurveFitter;
+import org.apache.commons.math3.fitting.PolynomialCurveFitter;
+import org.apache.commons.math3.fitting.WeightedObservedPoint;
+import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
+
+/**
+ *
+ */
+public class ScreenPanel9 extends Panel {
+
+ public static final String ARG_TYPE = "cam_type";
+ public static final String ARG_LIST = "cam_list";
+ public static final String ARG_ALIAS = "alias";
+
+ public static final String LASER_TYPE = "Laser";
+ public static final String ELECTRONS_TYPE = "Electrons";
+ public static final String PHOTONICS_TYPE = "Photonics";
+ public static final String TWO_PULSES_TYPE = "2Pulses";
+
+ public static final int STACK_RETRIES = 10;
+
+ final String CAMERA_DEVICE_NAME = "CurrentCamera";
+ boolean useServerStats = true;
+ String userOverlaysConfigFile;
+ ColormapSource camera;
+ PipelineServer server;
+ String cameraName;
+ String cameraAlias;
+ int polling = 1000;
+ Overlay marker = null;
+ JDialog histogramDialog;
+ DiscretePositioner screen;
+ DiscretePositioner filter;
+ boolean showFit;
+ boolean showProfile;
+ Overlay[] userOv;
+ Overlay[] fitOv;
+ Overlay[] profileOv;
+ Overlay errorOverlay;
+ boolean requestCameraListUpdate;
+ boolean goodRegion;
+ boolean slicing;
+ String serverUrl;
+ String camServerUrl;
+ String instanceName;
+ Overlay titleOv = null;
+ Overlay backgOv = null;
+ //int integration = 0;
+ boolean persistCameraState;
+ Map> groups;
+ Map aliases;
+ final Logger logger;
+ List types;
+
+ public class CameraState extends Config {
+
+ public boolean valid;
+ public boolean showSidePanel;
+ //public boolean showMarker; Saved in the stream instance config
+ public boolean showProfile;
+ public boolean showFit;
+ public boolean showReticle;
+ public boolean showScale;
+ public boolean showTitle;
+ public double zoom;
+ public RendererMode mode;
+ public boolean colormapAutomatic;
+ public double colormapMin;
+ public double colormapMax;
+ public Colormap colormap;
+ public boolean colormapLogarithmic;
+
+ String getFile() {
+ if (camera == null) {
+ return null;
+ }
+ return getContext().getSetup().expandPath("{context}/screen_panel/" + cameraName + ".properties");
+ }
+ }
+
+ void loadCameraState() {
+ if (persistCameraState) {
+ try {
+ CameraState state = new CameraState();
+ state.load(state.getFile());
+ if (state.valid) {
+ buttonSidePanel.setSelected(state.showSidePanel);
+ buttonSidePanelActionPerformed(null);
+ buttonProfile.setSelected(state.showProfile);
+ buttonProfileActionPerformed(null);
+ buttonFit.setSelected(state.showFit);
+ buttonFitActionPerformed(null);
+ buttonReticle.setSelected(state.showReticle);
+ buttonReticleActionPerformed(null);
+ buttonScale.setSelected(state.showScale);
+ buttonScaleActionPerformed(null);
+ buttonTitle.setSelected(state.showTitle);
+ buttonTitleActionPerformed(null);
+ renderer.setMode(state.mode);
+ renderer.setZoom(state.zoom);
+ if (camera instanceof ColormapSource) {
+ camera.getConfig().colormap = state.colormap;
+ camera.getConfig().colormapAutomatic = state.colormapAutomatic;
+ camera.getConfig().colormapLogarithmic = state.colormapLogarithmic;
+ camera.getConfig().colormapMax = state.colormapMax;
+ camera.getConfig().colormapMin = state.colormapMin;
+ updateColormap();
+ }
+ }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ }
+
+ void saveCameraState() {
+ if (persistCameraState) {
+ try {
+ CameraState state = new CameraState();
+ state.valid = true;
+ if (camera instanceof ColormapSource) {
+ state.colormap = camera.getConfig().colormap;
+ state.colormapAutomatic = camera.getConfig().colormapAutomatic;
+ state.colormapLogarithmic = camera.getConfig().colormapLogarithmic;
+ state.colormapMax = camera.getConfig().colormapMax;
+ state.colormapMin = camera.getConfig().colormapMin;
+ }
+ state.mode = renderer.getMode();
+ state.zoom = renderer.getZoom();
+
+ state.showSidePanel = buttonSidePanel.isSelected();
+ state.showProfile = buttonProfile.isSelected();
+ state.showFit = buttonFit.isSelected();
+ state.showReticle = buttonReticle.isSelected();
+ state.showScale = buttonScale.isSelected();
+ state.showTitle = buttonTitle.isSelected();
+
+ state.save(state.getFile());
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ }
+
+ String pipelineSuffix = "_sp";
+
+ Double getServerDouble(String name) {
+ return (Double) Convert.toDouble(server.getValue(name));
+ }
+
+ double[] getServerDoubleArray(String name) {
+ return (double[]) Convert.toDouble(server.getValue(name));
+ }
+
+ class ImageData {
+
+ ImageData() {
+ if (server != null) {
+ cache = server.getStream().take();
+ String prefix = goodRegion ? "gr_" : "";
+ x_fit_mean = getDouble(prefix + "x_fit_mean");
+ y_fit_mean = getDouble(prefix + "y_fit_mean");
+ x_fit_standard_deviation = getDouble(prefix + "x_fit_standard_deviation");
+ y_fit_standard_deviation = getDouble(prefix + "y_fit_standard_deviation");
+ x_fit_gauss_function = getDoubleArray(prefix + "x_fit_gauss_function");
+ y_fit_gauss_function = getDoubleArray(prefix + "y_fit_gauss_function");
+ x_profile = getDoubleArray("x_profile");
+ y_profile = getDoubleArray("y_profile");
+ x_center_of_mass = getDouble("x_center_of_mass");
+ y_center_of_mass = getDouble("y_center_of_mass");
+ x_rms = getDouble("x_rms");
+ y_rms = getDouble("y_rms");
+ if (goodRegion) {
+ double[] gX2 = new double[x_profile.length];
+ Arrays.fill(gX2, Double.NaN);
+ try {
+ double[] axis = getDoubleArray("x_axis");
+ gr_x_axis = getDoubleArray("gr_x_axis");
+ double x = gr_x_axis[0];
+ gr_size_x = x_fit_gauss_function.length;
+ //If gr axis values are not identical, calculate the index...
+ gr_pos_x = (int) ((renderer.getCalibration() != null) ? renderer.getCalibration().convertToImageX(x) : x);
+ //But prefer checking the value to avoid raounding errors
+ for (int i=0;i imageBuffer = new ArrayList();
+ Frame currentFrame;
+ int imageBufferLenght = 1;
+ Text imagePauseOverlay;
+ final Console console;
+
+ public ScreenPanel9() {
+ logger = Logger.getLogger(getClass().getName());
+ try {
+ initComponents();
+ panelPulse.setVisible(false);
+ panelScreen.setVisible(false);
+ panelFilter.setVisible(false);
+ spinnerBackground.setVisible(false);
+ spinnerThreshold.setVisible(false);
+ btFixColormapRange.setVisible(false);
+ setGoodRegionOptionsVisible(false);
+ setSlicingOptionsVisible(false);
+ setRotationOptionsVisible(false);
+ setAveragingOptionsVisible(false);
+ JComponent editor = spinnerSlOrientation.getEditor();
+ if (editor instanceof JSpinner.DefaultEditor) {
+ ((JSpinner.DefaultEditor) editor).getTextField().setHorizontalAlignment(JTextField.RIGHT);
+ }
+ renderer.setPersistenceFile(Paths.get(getContext().getSetup().getContextPath(), "Renderer_Cameras.bin"));
+ //setPersistedComponents(new Component[]{buttonServer, buttonDirect});
+ setPersistedComponents(new Component[]{buttonTitle});
+ comboCameras.setEnabled(false);
+ comboType.setEnabled(false);
+ if (App.hasArgument(ARG_LIST)){
+ comboType.setVisible(false);
+ labelType.setVisible(false);
+ }
+ if (App.hasArgument(ARG_TYPE)){
+ types = new ArrayList<>();
+ for (String token : App.getArgumentValue(ARG_TYPE).split(",")){
+ if (!token.isBlank()){
+ types.add(token.trim());
+ }
+ }
+ }
+
+ SwingUtils.setEnumCombo(comboColormap, Colormap.class);
+ if (App.hasArgument("poll")) {
+ try {
+ polling = Integer.valueOf(App.getArgumentValue("poll"));
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ if (App.hasArgument("zoom")) {
+ try {
+ renderer.setDefaultZoom(Double.valueOf(App.getArgumentValue("zoom")));
+ renderer.resetZoom();
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ if (App.hasArgument("buf")) {
+ try {
+ imageBufferLenght = Integer.valueOf(App.getArgumentValue("buf"));
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+
+ if (App.hasArgument("usr_ov")) {
+ try {
+ userOverlaysConfigFile = App.getArgumentValue("usr_ov");
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+
+ if (App.hasArgument("srv_url")) {
+ serverUrl = App.getArgumentValue("srv_url");
+ }
+
+ if (App.hasArgument("cam_srv_url")) {
+ camServerUrl = App.getArgumentValue("cam_srv_url");
+ }
+
+ if (App.hasArgument("calc")) {
+ useServerStats = false;
+ }
+
+ if (App.hasArgument("persist")) {
+ persistCameraState = true;
+ }
+
+ if (App.hasArgument("suffix")) {
+ pipelineSuffix = App.getArgumentValue("suffix");
+ }
+ /*
+ if (App.hasArgument("integration")) {
+ try {
+ setIntegration(Integer.valueOf(App.getArgumentValue("integration")));
+ if (integration != 0) {
+ buttonFit.setSelected(false);
+ buttonProfile.setSelected(false);
+ }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ */
+
+ renderer.setProfileNormalized(true);
+ renderer.setShowProfileLimits(false);
+
+ JMenuItem menuCalibrate = new JMenuItem("Calibrate...");
+ menuCalibrate.addActionListener((ActionEvent e) -> {
+ try {
+ calibrate();
+ } catch (Exception ex) {
+ showException(ex);
+ }
+ });
+
+ JMenuItem menuRendererConfig = new JMenuItem("Renderer Parameters");
+ menuRendererConfig.addActionListener((ActionEvent e) -> {
+ try {
+ if (camera != null) {
+ this.showDeviceConfigDialog(camera, false);
+ }
+ } catch (Exception ex) {
+ showException(ex);
+ }
+ });
+
+ JMenuItem menuCameraConfig = new JMenuItem("Camera Configurarion");
+ menuCameraConfig.addActionListener((ActionEvent e) -> {
+ try {
+ if (camera != null) {
+ String cameraConfigJson = null;
+ if (usingServer) {
+ String cameraServerUrl = (camServerUrl == null) ? server.getUrl().substring(0, server.getUrl().length() - 1) + "8" : camServerUrl;
+ try (CameraServer srv = newCameraServer()) {
+ //TODO: replace into encodeMultiline
+ cameraConfigJson = JsonSerializer.encode(srv.getConfig(cameraName), true);
+ }
+ } else {
+ String configFolder = (String) getContext().getClassByName("SfCamera").getMethod("getConfigFolder", new Class[]{}).invoke(null);
+ Path configFile = Paths.get(configFolder, cameraName + ".json");
+ cameraConfigJson = configFile.toFile().exists() ? new String(Files.readAllBytes(configFile)) : null;
+ }
+ TextEditor configEditor = new TextEditor();
+ configEditor.setText(cameraConfigJson);
+ configEditor.setReadOnly(true);
+ configEditor.setTitle(cameraName);
+ EditorDialog dlg = configEditor.getDialog(getTopLevel(), false);
+ dlg.setSize(480, 640);
+ dlg.setVisible(true);
+ SwingUtils.centerComponent(getTopLevel(), dlg);
+ }
+ } catch (Exception ex) {
+ showException(ex);
+ }
+ });
+
+ JMenuItem menuSetImageBufferSize = new JMenuItem("Set Stack Size...");
+ menuSetImageBufferSize.addActionListener((ActionEvent e) -> {
+ try {
+ String ret = SwingUtils.getString(getTopLevel(), "Enter size of image buffer: ", String.valueOf(imageBufferLenght));
+ if (ret != null) {
+ this.setImageBufferSize(Integer.valueOf(ret));
+ }
+ } catch (Exception ex) {
+ showException(ex);
+ }
+ });
+
+ JMenuItem menuSaveStack = new JMenuItem("Save Stack");
+ menuSaveStack.addActionListener((ActionEvent e) -> {
+ try {
+ boolean completeOnly = true;
+ boolean badFormat = false;
+ boolean incomplete = false;
+
+ while ((incomplete=((imageBuffer.size() < imageBufferLenght) && completeOnly)) || (badFormat = !hasSameFormat(imageBuffer))){
+ if (incomplete){
+ OptionResult ret = SwingUtils.showOption(getTopLevel(), "Save Stack", String.format("Stack is not complete (%d/%d images). Wait for completion?", imageBuffer.size(), imageBufferLenght), OptionType.YesNoCancel);
+ if (ret == OptionResult.Cancel){
+ return;
+ }
+ if (ret == OptionResult.Yes){
+ for (int i=0; i {
+ renderer.abortSelection();
+ if (server != null) {
+ final Overlays.Rect selection = new Overlays.Rect(renderer.getPenMovingOverlay());
+ renderer.addListener(new RendererListener() {
+ @Override
+ public void onSelectionFinished(Renderer renderer, Overlay overlay) {
+ try {
+ renderer.setShowReticle(false);
+ Rectangle roi = overlay.isFixed() ? renderer.toImageCoord(overlay.getBounds()) : overlay.getBounds();
+ if (server.isRoiEnabled()) {
+ int[] cur = server.getRoi();
+ server.setRoi(new int[]{roi.x + cur[0], roi.y + cur[1], roi.width, roi.height});
+ } else {
+ server.setRoi(new int[]{roi.x, roi.y, roi.width, roi.height});
+ }
+ } catch (Exception ex) {
+ } finally {
+ renderer.removeListener(this);
+ }
+ }
+
+ @Override
+ public void onSelectionAborted(Renderer renderer, Overlay overlay) {
+ renderer.removeListener(this);
+ }
+ });
+ selection.setFixed(true);
+ renderer.startSelection(selection);
+ }
+ });
+
+ JMenuItem menuResetROI = new JMenuItem("Reset ROI");
+ menuResetROI.addActionListener((ActionEvent e) -> {
+ renderer.abortSelection();
+ if (server != null) {
+ try {
+ renderer.setShowReticle(false);
+ server.resetRoi();
+ } catch (IOException ex) {
+ showException(ex);
+ }
+ }
+ });
+ /*
+ JCheckBoxMenuItem menuFrameIntegration = new JCheckBoxMenuItem("Multi-Frame", (integration != 0));
+ menuFrameIntegration.addActionListener((ActionEvent e) -> {
+ if (integration == 0) {
+ JPanel panel = new JPanel();
+ GridBagLayout layout = new GridBagLayout();
+ layout.columnWidths = new int[]{150, 50}; //Minimum width
+ layout.rowHeights = new int[]{30, 30}; //Minimum height
+ panel.setLayout(layout);
+ JCheckBox checkContinuous = new JCheckBox("");
+ checkContinuous.setSelected(true);
+ JTextField textFrames = new JTextField();
+ GridBagConstraints c = new GridBagConstraints();
+ c.gridx = 0;
+ c.gridy = 0;
+ panel.add(new JLabel("Number of frames:"), c);
+ c.gridy = 1;
+ panel.add(new JLabel("Continuous:"), c);
+ c.fill = GridBagConstraints.HORIZONTAL;
+ c.gridx = 1;
+ panel.add(checkContinuous, c);
+ c.gridy = 0;
+ panel.add(textFrames, c);
+ if (SwingUtils.showOption(getTopLevel(), "Multi-Frame Integration", panel, OptionType.OkCancel) == OptionResult.Yes) {
+ setIntegration(checkContinuous.isSelected() ? -(Integer.valueOf(textFrames.getText())) : (Integer.valueOf(textFrames.getText())));
+ }
+ } else {
+ if (SwingUtils.showOption(getTopLevel(), "Multi-Frame Integration",
+ "Do you want to disable " + ((integration < 0) ? "continuous " : "") + "multi-frame integration (" + Math.abs(integration) + ")?", OptionType.YesNo) == OptionResult.Yes) {
+ setIntegration(0);
+ }
+ }
+ });
+
+ for (Component cmp : SwingUtils.getComponentsByType(renderer.getPopupMenu(), JMenu.class)) {
+ JMenu menu = (JMenu) cmp;
+ if (menu.getText().equals("Integration")) {
+ menu.addSeparator();
+ menu.add(menuFrameIntegration);
+ }
+ }
+ */
+ renderer.getPopupMenu().addSeparator();
+ renderer.getPopupMenu().add(menuRendererConfig);
+ renderer.getPopupMenu().add(menuCameraConfig);
+ renderer.getPopupMenu().add(menuSetImageBufferSize);
+ renderer.getPopupMenu().add(menuSaveStack);
+ renderer.getPopupMenu().addSeparator();
+ renderer.getPopupMenu().add(menuCalibrate);
+ renderer.getPopupMenu().addSeparator();
+ renderer.getPopupMenu().add(menuSetROI);
+ renderer.getPopupMenu().add(menuResetROI);
+ renderer.getPopupMenu().addPopupMenuListener(new PopupMenuListener() {
+ @Override
+ public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
+ menuResetROI.setEnabled(server != null);
+ menuSetROI.setEnabled(server != null);
+ menuCalibrate.setVisible(server != null);
+ menuCalibrate.setEnabled((calibrationDialolg == null) || (!calibrationDialolg.isShowing()));
+ menuSaveStack.setEnabled(imageBufferLenght > 0);
+ menuSetImageBufferSize.setEnabled(!renderer.isPaused());
+ //menuFrameIntegration.setSelected(integration != 0);
+ }
+
+ @Override
+ public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
+ }
+
+ @Override
+ public void popupMenuCanceled(PopupMenuEvent e) {
+ }
+ });
+ renderer.getPopupMenu().setVisible(false);
+ buttonScale.setSelected(renderer.getShowColormapScale());
+ clearMarker();
+
+ showFit = buttonFit.isSelected();
+ showProfile = buttonProfile.isSelected();
+
+ pauseSelection.setVisible(false);
+ pauseSelection.setMinValue(1);
+ pauseSelection.addListener(new ValueSelectionListener() {
+ @Override
+ public void onValueChanged(ValueSelection origin, double value, boolean editing) {
+ if (editing && (value >= 1) && (value <= imageBuffer.size())) {
+ updatePause();
+ }
+ }
+ });
+ renderer.addListener(new RendererListener() {
+ @Override
+ public void onMoveFinished(Renderer renderer, Overlay overlay) {
+ if (overlay == marker) {
+ try {
+ onMarkerChanged();
+ } catch (IOException ex) {
+ logger.log(Level.WARNING, null, ex);
+ }
+ }
+ }
+ });
+ if (MainFrame.isDark()) {
+ textState.setDisabledTextColor(textState.getForeground());
+ }
+
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+
+ console = (!App.hasArgument("console")) ? null : new Console() {
+ /*
+ protected void onConsoleCommand(String name, String[] pars, String trimming) throws Exception {
+ switch (name) {
+ case "cam":
+ comboCameras.setSelectedItem(tokens[1]);
+ break;
+ }
+ }*/
+ @Override
+ protected void onConsoleCommand(String command) {
+ String[] tokens = command.split(" ");
+ if ((tokens.length > 1) && tokens[0].equals("cam")) {
+ try {
+ if (!tokens[1].equals(comboCameras.getSelectedItem())) {
+ setComboTypeSelection("All");
+ updateCameraList();
+ comboCameras.setSelectedItem(tokens[1]);
+ if (!tokens[1].equals(comboCameras.getSelectedItem())) {
+ comboCameras.setSelectedItem("");
+ throw new Exception("Invalid camera name : " + tokens[1]);
+ }
+ System.out.println("Console set camera: " + tokens[1]);
+ }
+ } catch (Exception ex) {
+ System.err.println(ex);
+ }
+ } else {
+ System.err.println("Invalid command: " + command);
+ }
+ }
+ };
+ }
+
+ /*
+ void setIntegration(int frames) {
+ try {
+ if (integration != frames) {
+ integration = frames;
+ if (camera != null) {
+ if (Math.abs(integration) > 1) {
+ renderer.setDevice(new ImageIntegrator(integration));
+ } else {
+ renderer.setDevice(camera);
+ }
+ synchronized (imageBuffer) {
+ currentFrame = null;
+ imageBuffer.clear();
+ }
+ }
+ }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ */
+
+ @Override
+ public void onStart() {
+ super.onStart();
+ updateDialogTitle();
+ if (App.hasArgument("ct")) {
+ boolean direct = App.getArgumentValue("ct").equals("0") || App.getArgumentValue("ct").equalsIgnoreCase("false");
+ buttonServer.setSelected(!direct);
+ buttonDirect.setSelected(direct);
+ }
+ if (App.hasArgument("console")) {
+ console.start();
+ }
+ }
+
+ @Override
+ public void onStop() {
+ try {
+ if (camera != null) {
+ saveCameraState();
+ camera.close();
+ camera = null;
+ server = null;
+ updateButtons();
+ }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ try {
+ if (console != null) {
+ console.stop();
+ }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ super.onStop();
+ }
+
+ //Overridable callbacks
+ @Override
+ public void onInitialize(int runCount) {
+ comboCameras.setEnabled(false);
+ comboType.setEnabled(false);
+ if (App.hasArgument("s")) {
+ renderer.setDevice((Source) getDevice("image"));
+ renderer.setAutoScroll(true);
+ ((Source) getDevice("image")).addListener(new ImageListener() {
+ @Override
+ public void onImage(Object o, BufferedImage bi, Data data) {
+ manageFit(bi, data);
+ manageUserOverlays(bi, data);
+ }
+
+ @Override
+ public void onError(Object o, Exception ex) {
+ }
+ }
+ );
+
+ } else {
+ String[] types = new String[]{"All"};
+ try (CameraServer srv = newCameraServer()) {
+ groups = srv.getCameraGroups();
+ types = Arr.insert(Arr.sort(groups.keySet().toArray(new String[0])), "All", 0);
+ aliases = srv.getCameraAliases();
+ } catch (Exception ex){
+ groups = null;
+ aliases = null;
+ }
+ if (this.types!=null){
+ types = this.types.toArray(new String[0]);
+ }
+ comboType.setModel(new javax.swing.DefaultComboBoxModel(types));
+
+ usingServer = buttonServer.isSelected();
+ comboCameras.setEnabled(true);
+ comboType.setEnabled(true);
+ setComboCameraSelection(null);
+ if (Arr.containsEqual(types, "All")){
+ setComboTypeSelection("All");
+ }
+ updateCameraList();
+
+ if (comboCameras.getModel().getSize() > 0) {
+ try {
+ if (App.hasArgument("cam")) {
+ setComboCameraSelection(App.getArgumentValue("cam"));
+ comboCamerasActionPerformed(null);
+ }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ }
+ updateButtons();
+ startTimer(1000);
+ }
+
+
+ boolean isVisible(String camera) {
+ return ((comboType.getSelectedItem().toString().toLowerCase().equals("all")) || (getCameraTypes(camera).contains(comboType.getSelectedItem())));
+ }
+
+ DefaultComboBoxModel getCameraList(boolean fromServer) throws Exception {
+ DefaultComboBoxModel model = new DefaultComboBoxModel();
+ if (App.hasArgument(ARG_LIST)){
+ List lists = App.getArgumentValues(ARG_LIST);
+ for (String list: lists){
+ String[] tokens = list.split(",");
+ for (String token : tokens){
+ if (!token.isBlank()){
+ model.addElement(token.trim());
+ }
+ }
+ }
+ } else {
+ if (fromServer) {
+ try (CameraServer srv = newCameraServer()) {
+ List cameras = srv.getCameras();
+ Collections.sort(cameras);
+ if (App.hasArgument(ARG_ALIAS) && (aliases!=null)){
+ if ("only".equals(App.getArgumentValue(ARG_ALIAS))){
+ cameras = new ArrayList();
+ }
+ cameras.addAll(0, aliases.keySet());
+ }
+ for (String camera : cameras) {
+ if (isVisible(camera)) {
+ model.addElement(camera);
+ }
+ }
+ }
+
+ } else {
+ ArrayList cameras = (ArrayList) getContext().getClassByName("SfCamera").getMethod("getCameras", new Class[]{}).invoke(null);
+ for (String camera : cameras) {
+ if (isVisible(camera)) {
+ model.addElement(camera);
+ }
+ }
+ }
+ }
+ if (App.hasArgument("cam")) {
+ String camera = App.getArgumentValue("cam");
+ if (model.getIndexOf(camera) < 0) {
+ if (isVisible(camera)) {
+ model.addElement(camera);
+ }
+ }
+ }
+ model.addElement("");
+
+ return model;
+ }
+
+ PipelineServer newServer() throws IOException {
+ if (serverUrl != null) {
+ System.out.println("Connecting to server: " + serverUrl);
+ server = new PipelineServer(CAMERA_DEVICE_NAME, serverUrl);
+ } else {
+ System.out.println("Connecting to server");
+ server = new PipelineServer(CAMERA_DEVICE_NAME);
+ }
+ updateButtons();
+ return server;
+ }
+
+ CameraServer newCameraServer() throws IOException, InterruptedException {
+ String cameraServerUrl = (camServerUrl == null) ? server.getUrl().substring(0, server.getUrl().length() - 1) + "8" : camServerUrl;
+ CameraServer srv = new CameraServer("CamServer", cameraServerUrl);
+ srv.initialize();
+ return srv;
+ }
+
+ boolean updatingCameraSelection;
+
+ void setComboCameraSelection(Object selection) {
+ updatingCameraSelection = true;
+ try {
+ comboCameras.setSelectedItem(selection);
+ } finally {
+ updatingCameraSelection = false;
+ }
+ }
+
+ void setComboTypeSelection(Object selection) {
+ updatingCameraSelection = true;
+ try {
+ comboType.setSelectedItem(selection);
+ } finally {
+ updatingCameraSelection = false;
+ }
+ }
+ boolean usingServer;
+
+ void updateCameraList() {
+ try {
+ String selected = (String) comboCameras.getSelectedItem();
+ comboCameras.setModel(getCameraList(usingServer));
+ if ((selected != null) && (((DefaultComboBoxModel) comboCameras.getModel()).getIndexOf(selected) > 0)){
+ setComboCameraSelection(selected);
+ } else{
+ setComboCameraSelection("");
+ }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ } finally {
+ updateButtons();
+ }
+ }
+
+ final Object lockOverlays = new Object();
+
+ void manageFit(BufferedImage bi, Data data) {
+ Overlay[][] fo = null;
+ if ((showFit || showProfile)) {
+ try {
+ fo = getFitOverlays(data);
+ } catch (Exception ex) {
+ System.err.println(ex);
+ }
+ }
+ synchronized (lockOverlays) {
+ fo = (fo == null) ? new Overlay[][]{null, null} : fo;
+ renderer.updateOverlays(fo[0], profileOv);
+ profileOv = fo[0];
+ renderer.updateOverlays(fo[1], fitOv);
+ fitOv = fo[1];
+ }
+ }
+
+ void manageUserOverlays(BufferedImage bi, Data data) {
+ Overlay[] fo = (bi == null) ? null : getUserOverlays(data);
+ synchronized (lockOverlays) {
+ renderer.updateOverlays(fo, userOv);
+ userOv = fo;
+ }
+ }
+
+ void updateDialogTitle() {
+ if (App.isDetached()) {
+ getTopLevel().setTitle(cameraName == null ? "ScreenPanel" : cameraName);
+ }
+ }
+
+ void manageTitleOverlay() {
+ Overlay to = null;
+ String text = cameraAlias;
+ if ((buttonTitle.isSelected()) && (text != null)) {
+ Font font = new Font("Arial", Font.PLAIN, 28);
+ to = new Text(renderer.getPenErrorText(), text, font, new Point(-SwingUtils.getTextSize(text, renderer.getGraphics().getFontMetrics(font)).width - 14, 26));
+ to.setFixed(true);
+ to.setAnchor(Overlay.ANCHOR_VIEWPORT_OR_IMAGE_TOP_RIGHT);
+ }
+
+ synchronized (lockOverlays) {
+ renderer.updateOverlays(to, titleOv);
+ titleOv = to;
+ }
+ }
+
+
+ void manageOverlayErrorOverlay(boolean error) {
+ if ((error) != (backgOv != null)){
+
+ Overlay bo = null;
+ if (error){
+ String text = "Invalid image background";
+ Font font = new Font("Arial", Font.PLAIN, 14);
+ bo = new Text(renderer.getPenErrorText(), text, font, new Point(-SwingUtils.getTextSize(text, renderer.getGraphics().getFontMetrics(font)).width - 14, 46));
+ bo.setFixed(true);
+ bo.setAnchor(Overlay.ANCHOR_VIEWPORT_OR_IMAGE_TOP_RIGHT);
+ }
+ synchronized (lockOverlays) {
+ renderer.updateOverlays(bo,backgOv);
+ backgOv = bo;
+ }
+ }
+ }
+
+
+ @Override
+ public void onStateChange(State state, State former) {
+
+ }
+
+ @Override
+ public void onExecutedFile(String fileName, Object result) {
+ }
+
+ //Callback to perform update - in event thread
+ @Override
+ protected void doUpdate() {
+ }
+
+ Thread devicesInitTask;
+
+ void setCamera(String cameraName) throws IOException, InterruptedException {
+ System.out.println("Initializing: " + cameraName);
+ parseUserOverlays();
+ errorOverlay = null;
+ lastMarkerPos = null;
+ lastFrame = null;
+ lastPipelinePars = null;
+
+ if (dataTableDialog != null) {
+ dataTableDialog.dispose();
+ dataTableDialog = null;
+ }
+ dataTableModel = null;
+
+ if (calibrationDialolg != null) {
+ calibrationDialolg.dispose();
+ calibrationDialolg = null;
+ }
+
+ boolean was_server = false;
+ if (camera != null) {
+ saveCameraState();
+ //camera.removeAllListeners();
+ was_server = (server != null);
+ camera.close();
+ camera = null;
+ server = null;
+ }
+ updateButtons();
+ instanceName = null;
+ renderer.setDevice(null);
+ renderer.setShowReticle(false);
+ renderer.removeOverlays(fitOv);
+ renderer.removeOverlays(profileOv);
+ renderer.removeOverlays(userOv);
+ renderer.clear();
+ renderer.resetZoom();
+
+ cameraAlias = cameraName;
+ if ((aliases!=null) && (cameraName!=null) && (aliases.containsKey(cameraName))){
+
+ cameraName = aliases.get(cameraName);
+ System.out.println("Camera name is alias to: " + cameraName);
+ }
+
+ boolean changed = !String.valueOf(cameraName).equals(this.cameraName);
+ this.cameraName = cameraName;
+
+ if (changed || buttonDirect.isSelected()) {
+ spinnerBackground.setVisible(false);
+ spinnerThreshold.setVisible(false);
+ checkThreshold.setEnabled(false);
+ checkRotation.setEnabled(false);
+ checkAveraging.setEnabled(false);
+ checkGoodRegion.setEnabled(false);
+ setGoodRegionOptionsVisible(false);
+ setSlicingOptionsVisible(false);
+ setRotationOptionsVisible(false);
+ setAveragingOptionsVisible(false);
+ }
+ synchronized (imageBuffer) {
+ currentFrame = null;
+ imageBuffer.clear();
+ }
+ if (changed) {
+ checkBackground.setEnabled(false);
+ if ((devicesInitTask != null) && (devicesInitTask.isAlive())) {
+ devicesInitTask.interrupt();
+ }
+ if (screen != null) {
+ screen.close();
+ screen = null;
+ }
+ if (filter != null) {
+ filter.close();
+ filter = null;
+ }
+ if (renderer.isPaused()) {
+ renderer.resume();
+ removePauseOverlay();
+ pauseSelection.setVisible(false);
+ panelCameraSelection.setVisible(true);
+ }
+ }
+ manageTitleOverlay();
+ updateDialogTitle();
+
+ if (cameraName == null) {
+ return;
+ }
+
+ System.out.println("Setting camera: " + cameraName + " [" + (buttonServer.isSelected() ? "server" : "direct") + "]");
+ try {
+ if (buttonServer.isSelected()) {
+ camera = newServer();
+ camera.getConfig().flipHorizontally = false;
+ camera.getConfig().flipVertically = false;
+ camera.getConfig().rotation = 0.0;
+ camera.getConfig().roiX = 0;
+ camera.getConfig().roiY = 0;
+ camera.getConfig().roiWidth = -1;
+ camera.getConfig().roiHeight = -1;
+ } else {
+ //camera = new SfCamera(CAMERA_DEVICE_NAME, cameraName);
+ camera = (ColormapSource) getContext().getClassByName("SfCamera").getConstructor(new Class[]{String.class, String.class}).newInstance(new Object[]{CAMERA_DEVICE_NAME, cameraName});
+ }
+ camera.initialize();
+ camera.assertInitialized();
+ System.out.println("Camera initialization OK");
+ loadCameraState();
+ if (server != null) {
+ //server.start(cameraName, false);
+ String pipelineName = cameraName + pipelineSuffix;
+ instanceName = cameraName + pipelineSuffix + "1";
+ if (!server.getPipelines().contains(pipelineName)) {
+ System.out.println("Creating pipeline: " + pipelineName);
+ HashMap config = new HashMap<>();
+ config.put("camera_name", cameraName);
+ //server.createFromConfig(config, pipelineName);
+ server.savePipelineConfig(pipelineName, config);
+ }
+ server.start(pipelineName, instanceName);
+
+ updatePipelineControls();
+ checkThreshold.setEnabled(true);
+ checkRotation.setEnabled(true);
+ checkAveraging.setEnabled(true);
+ checkGoodRegion.setEnabled(true);
+ } else {
+ checkThreshold.setSelected(false);
+ checkRotation.setSelected(false);
+ checkAveraging.setSelected(false);
+ checkGoodRegion.setSelected(false);
+ if (polling <= 0) {
+ camera.setMonitored(true);
+ } else {
+ camera.setPolling(polling);
+ }
+ camera.setBackgroundEnabled(checkBackground.isSelected());
+ }
+ updateButtons();
+ camera.getConfig().save();
+
+ //if (Math.abs(integration) > 1) {
+ // renderer.setDevice(new ImageIntegrator(integration));
+ //} else {
+ renderer.setDevice(camera);
+ //}
+
+ renderer.setAutoScroll(true);
+ //renderer.setMarker(marker);
+ clearMarker();
+ imageSize = null;
+
+ camera.addListener(new ImageListener() {
+ @Override
+ public void onImage(Object o, BufferedImage bi, Data data) {
+ if (bi != null) {
+ if ((imageSize == null) || imageSize.width != bi.getWidth() || imageSize.height != bi.getHeight()) {
+ SwingUtilities.invokeLater(new Runnable() {
+ @Override
+ public void run() {
+ if ((renderer.getMode() == RendererMode.Zoom) || (renderer.getMode() == RendererMode.Fixed)) {
+ centralizeRenderer();
+ }
+ checkReticle();
+ }
+ });
+ imageSize = new Dimension(bi.getWidth(), bi.getHeight());
+ }
+ renderer.setProfileSize(Math.min(bi.getWidth(), bi.getHeight()));
+ }
+ //renderer.setCalibration(camera.getCalibration());
+ if (!renderer.isPaused()) {
+ if (data != null) {
+ synchronized (imageBuffer) {
+ currentFrame = new Frame(data);
+ if (imageBufferLenght >= 1) {
+ imageBuffer.add(currentFrame);
+ if (imageBuffer.size() > imageBufferLenght) {
+ imageBuffer.remove(0);
+ setBufferFull(true);
+ } else {
+ setBufferFull(false);
+ }
+ } else {
+ setBufferFull(true);
+ }
+ //Update data
+ if (!renderer.isPaused()) {
+ updateStreamData();
+ }
+ updateMarker();
+ }
+ }
+ manageFit(bi, data);
+ manageUserOverlays(bi, data);
+ }
+ //updateImageData();
+ }
+
+ @Override
+ public void onError(Object o, Exception ex) {
+ //System.err.println(ex);
+ }
+ });
+
+ } catch (Exception ex) {
+ showException(ex);
+ renderer.clearOverlays();
+ updatePipelineControls();
+ if (renderer.getDevice() == null) {
+ //renderer.setZoom(1.0);
+ //renderer.setMode(RendererMode.Zoom);
+ errorOverlay = new Text(renderer.getPenErrorText(), ex.toString(), new Font("Verdana", Font.PLAIN, 12), new Point(20, 20));
+ errorOverlay.setFixed(true);
+ errorOverlay.setAnchor(Overlay.ANCHOR_VIEWPORT_TOP_LEFT);
+ renderer.addOverlay(errorOverlay);
+ }
+ } finally {
+ //checkReticle();
+ onTimer();
+ }
+ onChangeColormap(null);
+ checkBackground.setEnabled(true);
+ if (changed) {
+ boolean electrons = getCameraTypes(this.cameraName).contains(ELECTRONS_TYPE);
+ boolean twoPulses = getCameraTypes(this.cameraName).contains(TWO_PULSES_TYPE);
+ comboScreen.setModel(new DefaultComboBoxModel());
+ comboScreen.setEnabled(false);
+ comboFilter.setModel(new DefaultComboBoxModel());
+ comboFilter.setEnabled(false);
+ panelFilter.setVisible(electrons);
+ panelScreen.setVisible(electrons);
+ panelPulse.setVisible(twoPulses);
+ textPulse.setText("");
+ if (electrons) {
+ //Parallelizing initialization
+ devicesInitTask = new Thread(() -> {
+ try {
+ if (this.cameraName.contains("DSRM")) {
+ screen = new DiscretePositioner("CurrentScreen", this.cameraName + ":POSITION_SP", this.cameraName + ":POSITION");
+ } else {
+ screen = new DiscretePositioner("CurrentScreen", this.cameraName + ":SET_SCREEN1_POS", this.cameraName + ":GET_SCREEN1_POS");
+ }
+ screen.setMonitored(true);
+ screen.initialize();
+ DefaultComboBoxModel model = new DefaultComboBoxModel();
+ for (String pos : screen.getPositions()) {
+ model.addElement(pos);
+ }
+ comboScreen.setModel(model);
+ comboScreen.setSelectedItem(screen.read());
+
+ } catch (Exception ex) {
+ comboScreen.setModel(new DefaultComboBoxModel());
+ System.err.println(ex.getMessage());
+ screen = null;
+ }
+ comboScreen.setEnabled(screen != null);
+ valueScreen.setDevice(screen);
+
+ try {
+ filter = new DiscretePositioner("CurrentFilter", this.cameraName + ":SET_FILTER", this.cameraName + ":GET_FILTER");
+ filter.setMonitored(true);
+ filter.initialize();
+ DefaultComboBoxModel model = new DefaultComboBoxModel();
+ for (String pos : filter.getPositions()) {
+ model.addElement(pos);
+ }
+ comboFilter.setModel(model);
+ comboFilter.setSelectedItem(filter.read());
+ } catch (Exception ex) {
+ System.err.println(ex.getMessage());
+ filter = null;
+ }
+ comboFilter.setEnabled(filter != null);
+ valueFilter.setDevice(filter);
+ });
+ devicesInitTask.start();
+ }
+ }
+ }
+ /*
+ class ImageIntegrator extends ColormapSource {
+
+ ImageIntegrator(int num) {
+ super("Image Averager", camera.getConfig());
+ boolean continuous = (num < 0);
+ final int numImages = Math.abs(num);
+
+ camera.addListener(new ImageListener() {
+ final ArrayList buffer = new ArrayList();
+ Data integration = null;
+
+ @Override
+ public void onImage(Object o, BufferedImage bi, Data data) {
+ try {
+ if (continuous) {
+ buffer.add(data);
+ if (buffer.size() >= numImages) {
+ for (Data d : buffer) {
+ process(d);
+ }
+ }
+ } else {
+ buffer.add(null); //Just to count
+ process(data);
+ }
+ } catch (Exception ex) {
+ buffer.clear();
+ integration = null;
+ ImageIntegrator.this.pushData(null);
+ ex.printStackTrace();
+ return;
+ }
+ if (buffer.size() >= numImages) {
+ if (continuous) {
+ buffer.remove(0);
+ } else {
+ buffer.clear();
+ }
+ if (integration != null) {
+ //integration.div(numImages);
+ ImageIntegrator.this.pushData(integration);
+ }
+ integration = null;
+ }
+ }
+
+ void process(Data data) {
+ if (integration == null) {
+ integration = new Data(data);
+ } else {
+ integration.sum(data);
+ }
+ }
+
+ @Override
+ public void onError(Object origin, Exception ex) {
+ }
+ });
+
+ }
+ }
+ */
+
+ boolean bufferFull = true;
+
+ void setBufferFull(boolean value) {
+ if (value != bufferFull) {
+ SwingUtilities.invokeLater(() -> {
+ buttonPause.setBackground(value ? buttonSave.getBackground() : buttonSave.getBackground().brighter());
+ });
+ bufferFull = value;
+ }
+ }
+
+ volatile Dimension imageSize;
+
+ void checkReticle() {
+ if ((renderer.getDevice() != null) && (camera != null) && (camera.getConfig().isCalibrated()) && buttonReticle.isSelected()) {
+ //renderer.setCalibration(camera.getCalibration());
+ renderer.configureReticle(new Dimension(800, 800), 200);
+ renderer.setShowReticle(true);
+ } else {
+ //renderer.setCalibration(null);
+ renderer.setShowReticle(false);
+ }
+ renderer.refresh();
+ }
+
+ void checkMarker(Point p) throws IOException {
+ if (camera != null) {
+ if (buttonMarker.isSelected()) {
+ Dimension d = renderer.getImageSize();
+ if (p == null) {
+ p = (d == null) ? new Point(renderer.getWidth() / 2, renderer.getHeight() / 2) : new Point(d.width / 2, d.height / 2);
+ }
+ Overlay ov = null;
+ marker = new Overlays.Crosshairs(renderer.getPenMarker(), p, new Dimension(100, 100));
+ marker.setMovable(true);
+ marker.setPassive(false);
+ } else {
+ marker = null;
+ }
+ renderer.setMarker(marker);
+ onMarkerChanged();
+ }
+ }
+
+ Point lastMarkerPos;
+
+ void onMarkerChanged() throws IOException {
+ lastMarkerPos = getStreamMarkerPos();
+ if (marker == null) {
+ setInstanceConfigValue("Marker", null);
+ } else {
+ setInstanceConfigValue("Marker", new int[]{marker.getPosition().x, marker.getPosition().y});
+ }
+ }
+
+ void updateMarker() {
+ try {
+ if (server != null) {
+ Point p = getStreamMarkerPos();
+ if (p != null) {
+ //To prevent a local change being overriden by a message having the old settings.
+ //TODO: This is not bullet-proof, as one can have 2 changes between 2 frames...
+ if (!p.equals(lastMarkerPos)) {
+ if (p.x == Integer.MIN_VALUE) {
+ if (buttonMarker.isSelected()) {
+ buttonMarker.setSelected(false);
+ checkMarker(null);
+ }
+ } else {
+ if (!buttonMarker.isSelected()) {
+ buttonMarker.setSelected(true);
+ checkMarker(p);
+ } else {
+ if (!p.equals(marker.getPosition())) {
+ marker.setPosition(p);
+ }
+ }
+ }
+ }
+ }
+ }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+
+ Point getStreamMarkerPos() throws IOException {
+ //System.out.println(server.getInstanceConfig().get("Marker"));
+ Map pars = server.getProcessingParameters();
+ if (pars != null) {
+ List markerPosition = (List) pars.get("Marker");
+ if (markerPosition != null) {
+ return new Point((Integer) markerPosition.get(0), (Integer) markerPosition.get(1));
+ }
+ return new Point(Integer.MIN_VALUE, Integer.MIN_VALUE);
+ }
+ return null;
+ }
+
+ void clearMarker() {
+ marker = null;
+ renderer.setMarker(marker);
+ }
+
+ void setInstanceConfigValue(String name, Object value) throws IOException {
+ if (server != null) {
+ Map map = server.getInstanceConfig();
+ map.put(name, value);
+ server.setInstanceConfig(map);
+ }
+ }
+
+ void updateZoom() {
+ try {
+ buttonZoomStretch.setSelected(renderer.getMode() == RendererMode.Stretch);
+ buttonZoomFit.setSelected(renderer.getMode() == RendererMode.Fit);
+ if (renderer.getMode() == RendererMode.Fixed) {
+ buttonZoomNormal.setSelected(true);
+ } else if (renderer.getMode() == RendererMode.Zoom) {
+ if (renderer.getZoom() == 1) {
+ buttonZoomNormal.setSelected(true);
+ } else if (renderer.getZoom() == 0.5) {
+ buttonZoom05.setSelected(true);
+ } else if (renderer.getZoom() == 0.25) {
+ buttonZoom025.setSelected(true);
+ } else if (renderer.getZoom() == 2.0) {
+ buttonZoom2.setSelected(true);
+ } else {
+ buttonGroup1.clearSelection();
+ }
+ }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+
+ boolean updatingColormap;
+
+ void updateColormap() {
+ updatingColormap = true;
+ try {
+ if ((camera != null) && (camera instanceof ColormapSource)) {
+ ColormapSourceConfig config = ((ColormapSource) camera).getConfig();
+ comboColormap.setSelectedItem(config.colormap);
+ if (config.isDefaultColormap()) {
+ buttonFullRange.setSelected(true);
+ } else if (config.colormapAutomatic) {
+ buttonAutomatic.setSelected(true);
+ } else {
+ buttonManual.setSelected(true);
+ }
+ btFixColormapRange.setVisible(buttonAutomatic.isSelected());
+ spinnerMin.setEnabled(buttonManual.isSelected());
+ spinnerMax.setEnabled(buttonManual.isSelected());
+
+ boolean signed = spinnerBackground.isVisible() && "signed".equals(spinnerBackground.getValue());
+ Integer min = signed ? -65535: 0;
+ if (!min.equals(((SpinnerNumberModel)spinnerMin.getModel()).getMinimum())){
+ spinnerMin.setModel(new SpinnerNumberModel(0, min.intValue(), 65535, 1));
+ spinnerMax.setModel(new SpinnerNumberModel(255, min.intValue(), 65535, 1));
+ if ((Integer)((SpinnerNumberModel)spinnerMin.getModel()).getValue() < min){
+ spinnerMin.setValue(min);
+ }
+ if ((Integer)((SpinnerNumberModel)spinnerMax.getModel()).getValue() < min){
+ spinnerMax.setValue(min);
+ }
+ }
+
+ if (!Double.isNaN(config.colormapMin)) {
+ Integer value = Math.min(Math.max((int) config.colormapMin, min), 65535);
+ if (spinnerMin.getModel().getValue()!= value){
+ spinnerMin.setValue(value);
+ }
+ }
+ if (!Double.isNaN(config.colormapMax)) {
+ Integer value = Math.min(Math.max((int) config.colormapMax, min), 65535);
+ if (spinnerMax.getModel().getValue()!= value){
+ spinnerMax.setValue(value);
+ }
+ }
+ }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ updatingColormap = false;
+ }
+
+ void updatePipelineProperties() {
+ goodRegion = checkGoodRegion.isSelected();
+ spinnerBackground.setVisible(checkBackground.isSelected());
+ spinnerThreshold.setVisible(checkThreshold.isSelected());
+ setGoodRegionOptionsVisible(goodRegion);
+ slicing = goodRegion && checkSlicing.isSelected();
+ setSlicingOptionsVisible(slicing);
+ updatingServerControls = false;
+ boolean rotation = checkRotation.isSelected();
+ setRotationOptionsVisible(rotation);
+ boolean averaging = checkAveraging.isSelected();
+ setAveragingOptionsVisible(averaging);
+ }
+
+ boolean updatingServerControls;
+
+ void updatePipelineControls() {
+ if (server != null) {
+ updatingServerControls = true;
+ if (server.isStarted()) {
+ try {
+ checkBackground.setSelected(server.isBackgroundSubtractionEnabled());
+ setBackgoundControl(server.getBackgroundSubtraction());
+ Object bg = server.getBackgroundSubtraction();
+ if (bg.equals("signed") || bg.equals("passive")){
+ spinnerBackground.setValue(bg);
+ } else {
+ spinnerBackground.setValue("normal");
+ }
+ Double threshold = (server.getThreshold());
+ checkThreshold.setSelected(threshold != null);
+ spinnerThreshold.setValue((threshold == null) ? 0 : threshold);
+ Map gr = (server.getGoodRegion());
+ checkGoodRegion.setSelected(gr != null);
+ if (gr != null) {
+ spinnerGrThreshold.setValue(((Number) gr.get("threshold")).doubleValue());
+ spinnerGrScale.setValue(((Number) gr.get("gfscale")).doubleValue());
+ }
+ Map rotation = server.getRotation();
+ checkRotation.setSelected(rotation != null);
+ if (rotation!=null){
+ spinnerRotationAngle.setValue(((Number) rotation.get("angle")).doubleValue());
+ spinnerRotationOrder.setValue(((Number) rotation.get("order")).intValue());
+ String mode = (String) rotation.get("mode");
+ try{
+ spinnerRotationConstant.setValue(Double.valueOf(mode));
+ spinnerRotationMode.setValue("constant");
+ } catch (Exception ex){
+ spinnerRotationConstant.setValue(0);
+ spinnerRotationMode.setValue(mode);
+ }
+ }
+
+ Number averaging = (Number) server.getInstanceConfig().get("averaging");
+ checkAveraging.setSelected(averaging != null);
+ if (averaging!=null){
+ spinnerAvFrames.setValue(Math.abs(averaging.intValue()));
+ spinnerAvMode.setValue(averaging.intValue()<0 ? "window" : "single");
+ }
+
+
+ Map slicing = (server.getSlicing());
+ checkSlicing.setSelected(slicing != null);
+ if (slicing != null) {
+ spinnerSlNumber.setValue(((Number) slicing.get("number_of_slices")).intValue());
+ spinnerSlScale.setValue(((Number) slicing.get("scale")).doubleValue());
+ spinnerSlOrientation.setValue((String) slicing.get("orientation"));
+ }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ updatePipelineProperties();
+ }
+ }
+
+ boolean changedPipelinePars(Map pars1, Map pars2) {
+ String[] keys = new String[]{"image_background_enable", "image_threshold", "image_good_region",
+ "threshold", "gfscale", "image_slices", "number_of_slices", "scale", "orientation", "image_background_ok"};
+ for (String key : keys) {
+ Object o1 = pars1.get(key);
+ Object o2 = pars2.get(key);
+ if (o1 == null) {
+ if (o2 != null) {
+ return true;
+ }
+ } else if (!o1.equals(o2)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ void setBackgoundControl(Object background){
+ spinnerBackground.setValue((background.equals("signed") || background.equals("passive")) ? background : "normal");
+ }
+
+ void updatePipelineControls(Map pars) {
+ if (pars != null) {
+ updatingServerControls = true;
+ try {
+ Object background = pars.get("image_background_enable");
+ checkBackground.setSelected(!background.equals("") && !background.equals(false) && !background.equals("false"));
+ setBackgoundControl(background);
+
+ manageOverlayErrorOverlay(Boolean.FALSE.equals(pars.get("image_background_ok")));
+
+ Double threshold = (Double) (pars.get("image_threshold"));
+ checkThreshold.setSelected(threshold != null);
+ spinnerThreshold.setValue((threshold == null) ? 0 : threshold);
+ Map gr = (Map) pars.get("image_good_region");
+ checkGoodRegion.setSelected(gr != null);
+ if (gr != null) {
+ Double value = ((Number) gr.get("threshold")).doubleValue();
+ spinnerGrThreshold.setValue(value);
+ Double scale = ((Number) gr.get("gfscale")).doubleValue();
+ spinnerGrScale.setValue(scale);
+ }
+ Map slicing = (Map) (pars.get("image_slices"));
+ checkSlicing.setSelected(slicing != null);
+ if (slicing != null) {
+ int slices = ((Number) slicing.get("number_of_slices")).intValue();
+ spinnerSlNumber.setValue(slices);
+ double scale = ((Number) slicing.get("scale")).doubleValue();
+ spinnerSlScale.setValue(scale);
+ String orientation = (String) slicing.get("orientation");
+ spinnerSlOrientation.setValue(orientation);
+ }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ updatePipelineProperties();
+ }
+ }
+
+ void setGoodRegionOptionsVisible(boolean visible) {
+ spinnerGrThreshold.setVisible(visible);
+ labelGrThreshold.setVisible(visible);
+ spinnerGrScale.setVisible(visible);
+ labelGrScale.setVisible(visible);
+ panelSlicing.setVisible(visible);
+ }
+
+ void setSlicingOptionsVisible(boolean visible) {
+ spinnerSlNumber.setVisible(visible);
+ labelSlNumber.setVisible(visible);
+ spinnerSlScale.setVisible(visible);
+ labelSlScale.setVisible(visible);
+ spinnerSlOrientation.setVisible(visible);
+ labelSlOrientation.setVisible(visible);
+ }
+
+ void setAveragingOptionsVisible(boolean visible) {
+ labelAvMode.setVisible(visible);
+ labelAvFrames.setVisible(visible);
+ spinnerAvMode.setVisible(visible);
+ spinnerAvFrames.setVisible(visible);
+ }
+
+ void setRotationOptionsVisible(boolean visible) {
+ labelAngle.setVisible(visible);
+ labelOrder.setVisible(visible);
+ labelMode.setVisible(visible);
+ labelConstant.setVisible(visible);
+ spinnerRotationAngle.setVisible(visible);
+ spinnerRotationOrder.setVisible(visible);
+ spinnerRotationMode.setVisible(visible);
+ spinnerRotationConstant.setVisible(visible);
+ }
+
+ boolean isCameraStopped() {
+ if ((server != null) && !server.isStarted()) {
+ return true;
+ }
+ return ((camera == null) || camera.isClosed());
+ }
+
+ boolean updatingButtons;
+
+ void updateButtons() {
+ updatingButtons = true;
+ try {
+ boolean active = !isCameraStopped();//(camera != null);
+ buttonSave.setEnabled(active);
+ buttonGrabBackground.setEnabled(active);
+ buttonMarker.setEnabled(active);
+ buttonProfile.setEnabled(active);
+ buttonFit.setEnabled(active);
+ buttonReticle.setEnabled(active && camera.getConfig().isCalibrated());
+ buttonStreamData.setEnabled(active && (server != null));
+ buttonPause.setEnabled(active);
+
+ if (renderer.isPaused() != buttonPause.isSelected()) {
+ buttonPause.setSelected(renderer.isPaused());
+ buttonPauseActionPerformed(null);
+ }
+ if (renderer.getShowReticle() != buttonReticle.isSelected()) {
+ //buttonReticle.setSelected(renderer.getShowReticle());
+ }
+ if ((renderer.getMarker() == null) && buttonMarker.isSelected()) {
+ buttonMarker.setSelected(false);
+ }
+ buttonSave.setSelected(renderer.isSnapshotDialogVisible());
+
+ } finally {
+ updatingButtons = false;
+ }
+ }
+
+ Frame lastFrame = null;
+ Map lastPipelinePars = null;
+
+ @Override
+ protected void onTimer() {
+ for (Device dev : new Device[]{screen, filter}) {
+ if (dev != null) {
+ dev.request();
+ }
+ }
+
+ textState.setText((camera == null) ? "" : camera.getState().toString());
+ if (App.hasArgument("s")) {
+ try {
+ ((Source) getDevice("image")).initialize();
+ } catch (IOException ex) {
+ logger.log(Level.SEVERE, null, ex);
+ } catch (InterruptedException ex) {
+ logger.log(Level.SEVERE, null, ex);
+ }
+ }
+ updateZoom();
+ updateColormap();
+ updateButtons();
+ checkHistogram.setSelected((histogramDialog != null) && (histogramDialog.isShowing()));
+ buttonScale.setSelected(renderer.getShowColormapScale());
+ try {
+ Frame frame = getCurrentFrame();
+ if (frame != lastFrame) {
+ lastFrame = frame;
+ if (frame != null) {
+ Map pars = getProcessingParameters(frame.cache);
+ if ((lastPipelinePars == null) || changedPipelinePars(pars, lastPipelinePars)) {
+ //System.out.println("Update pipeline: " + pars);
+ lastPipelinePars = pars;
+ updatePipelineControls(pars);
+ }
+ if (panelPulse.isVisible()){
+ Object pulse = null;
+ try{
+ pulse = frame.cache.getValue("pulse");
+ } catch (Exception ex) {
+ }
+ textPulse.setText((pulse==null) ? "" : Str.toString(pulse));
+ }
+ }
+ }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+
+ Pen penFit = new Pen(new Color(192, 105, 0), 0);
+ Pen penCross = new Pen(new Color(192, 105, 0), 0);
+ Pen penSlices = new Pen(Color.CYAN.darker(), 1);
+
+ Frame getCurrentFrame() {
+ if ((imageBufferLenght > 1) && (renderer.isPaused())) {
+ int index = ((int) pauseSelection.getValue()) - 1;
+ synchronized (imageBuffer) {
+ return ((index>=0) && (index < imageBuffer.size())) ? imageBuffer.get(index) : null;
+ }
+ }
+ return currentFrame;
+ }
+
+ Frame getFrame(Data data) {
+ synchronized (imageBuffer) {
+ for (Frame f : imageBuffer) {
+ if (f.data == data) {
+ return f;
+ }
+ }
+ }
+ return null;
+ }
+
+ void setImageBufferSize(int size) {
+ if (renderer.isPaused()) {
+ throw new RuntimeException("Cannot change buffer size whn paused");
+ }
+ synchronized (imageBuffer) {
+ imageBufferLenght = size;
+ imageBuffer.clear();
+ }
+
+ }
+
+ Overlay[][] getFitOverlays(Data data) {
+ Overlays.Polyline hgaussian = null;
+ Overlays.Polyline vgaussian = null;
+ Overlays.Polyline hprofile = null;
+ Overlays.Polyline vprofile = null;
+ Double xMean = null, xSigma = null, xNorm = null, xCom = null, xRms = null;
+ Double yMean = null, ySigma = null, yNorm = null, yCom = null, yRms = null;
+ double[] pX = null, pY = null, gX = null, gY = null;
+ PointDouble[] sliceCenters = null;
+ if (data != null) {
+ int height = data.getHeight();
+ int width = data.getWidth();
+ int profileSize = renderer.getProfileSize();
+ ImageData id = null;
+ if ((useServerStats) && (server != null)) {
+ try {
+ id = getFrame(data);
+ if (id == null) {
+ return null;
+ }
+ xMean = id.x_fit_mean;
+ xSigma = id.x_fit_standard_deviation;
+ yMean = id.y_fit_mean;
+ ySigma = id.y_fit_standard_deviation;
+ gX = id.x_fit_gauss_function;
+ gY = id.y_fit_gauss_function;
+ pX = id.x_profile;
+ pY = id.y_profile;
+ xCom = id.x_center_of_mass;
+ xRms = id.x_rms;
+ yCom = id.y_center_of_mass;
+ yRms = id.y_rms;
+ sliceCenters = id.sliceCenters;
+
+ profileSize /= 4;
+ if (pX != null) {
+ int[] xp = Arr.indexesInt(pX.length);
+ int[] xg = xp;
+ int[] yp = new int[pX.length];
+ int[] yg = new int[pX.length];
+
+ List l = Arrays.asList((Double[]) Convert.toWrapperArray(pX));
+ double minProfile = Collections.min(l);
+ double maxProfile = Collections.max(l);
+ double rangeProfile = maxProfile - minProfile;
+ double minGauss = minProfile;
+ double rangeGauss = rangeProfile;
+ //If not good region, range of profile and fit are similar so save this calcultion
+ if (goodRegion && id.gr_size_x > 0) {
+ l = Arrays.asList((Double[]) Convert.toWrapperArray(Arrays.copyOfRange(gX, id.gr_pos_x, id.gr_pos_x + id.gr_size_x)));
+ minGauss = Collections.min(l);
+ rangeGauss = Collections.max(l) - minGauss;
+ }
+
+ for (int i = 0; i < xp.length; i++) {
+ if (gX != null) {
+ yg[i] = (int) (height - 1 - (((gX[i] - minGauss) / rangeGauss) * profileSize));
+ }
+ yp[i] = (int) (height - 1 - (((pX[i] - minProfile) / rangeProfile) * profileSize));
+ }
+
+ if (goodRegion && id.gr_size_x > 0) {
+ xg = Arrays.copyOfRange(xg, id.gr_pos_x, id.gr_pos_x + id.gr_size_x);
+ yg = Arrays.copyOfRange(yg, id.gr_pos_x, id.gr_pos_x + id.gr_size_x);
+ }
+
+ vgaussian = new Overlays.Polyline(penFit, xg, yg);
+ vprofile = new Overlays.Polyline(renderer.getPenProfile(), xp, yp);
+ }
+
+ if (pY != null) {
+ int[] xp = new int[pY.length];
+ int[] xg = new int[pY.length];
+ int[] yp = Arr.indexesInt(pY.length);
+ int[] yg = yp;
+
+ List l = Arrays.asList((Double[]) Convert.toWrapperArray(pY));
+ double minProfile = Collections.min(l);
+ double maxProfile = Collections.max(l);
+ double rangeProfile = maxProfile - minProfile;
+ double minGauss = minProfile;
+ double rangeGauss = rangeProfile;
+ //If not good region, range of profile and fit are similar so save this calcultion
+ if (goodRegion && id.gr_size_y > 0) {
+ l = Arrays.asList((Double[]) Convert.toWrapperArray(Arrays.copyOfRange(gY, id.gr_pos_y, id.gr_pos_y + id.gr_size_y)));
+ minGauss = Collections.min(l);
+ rangeGauss = Collections.max(l) - minGauss;
+ }
+
+ for (int i = 0; i < xp.length; i++) {
+ if (gY != null) {
+ xg[i] = (int) (((gY[i] - minGauss) / rangeGauss) * profileSize);
+ }
+ xp[i] = (int) (((pY[i] - minProfile) / rangeProfile) * profileSize);
+ }
+
+ if (goodRegion && id.gr_size_y > 0) {
+ xg = Arrays.copyOfRange(xg, id.gr_pos_y, id.gr_pos_y + id.gr_size_y);
+ yg = Arrays.copyOfRange(yg, id.gr_pos_y, id.gr_pos_y + id.gr_size_y);
+ }
+ hgaussian = new Overlays.Polyline(penFit, xg, yg);
+ hprofile = new Overlays.Polyline(renderer.getPenProfile(), xp, yp);
+ }
+ } catch (Exception ex) {
+ System.err.println(ex.getMessage());
+ return null;
+ }
+ } else {
+ ArrayProperties properties = data.getProperties();
+ double maxPlot = properties.max;
+ double minPlot = properties.min;
+ double rangePlot = maxPlot - minPlot;
+
+ if (rangePlot <= 0) {
+ return null;
+ }
+ if (renderer.getCalibration() != null) {
+ try {
+ double[] sum = data.integrateVertically(true);
+ double[] saux = new double[sum.length];
+ int[] p = new int[sum.length];
+ double[] x_egu = renderer.getCalibration().getAxisX(sum.length);
+ double[] comRms = getComRms(sum, x_egu);
+ xCom = comRms[0];
+ xRms = comRms[1];
+ int[] x = Arr.indexesInt(sum.length);
+ DescriptiveStatistics stats = new DescriptiveStatistics(sum);
+ double min = stats.getMin();
+ for (int i = 0; i < sum.length; i++) {
+ saux[i] = sum[i] - min;
+ }
+ if (showFit) {
+ double[] gaussian = fitGaussian(saux, x);
+ if (gaussian != null) {
+ if ((gaussian[2] < sum.length * 0.45)
+ && (gaussian[2] > 2)
+ && (gaussian[0] > min * 0.03)) {
+ xNorm = gaussian[0];
+ xMean = gaussian[1];
+ xSigma = gaussian[2];
+ double[] fit = getFitFunction(gaussian, x);
+ int[] y = new int[x.length];
+ for (int i = 0; i < x.length; i++) {
+ y[i] = (int) (height - 1 - ((((fit[i] + min) / height - minPlot) / rangePlot) * profileSize));
+ }
+ vgaussian = new Overlays.Polyline(penFit, x, y);
+ }
+ }
+ }
+ if (showProfile) {
+ for (int i = 0; i < x.length; i++) {
+ p[i] = (int) (height - 1 - (((sum[i] / height - minPlot) / rangePlot) * profileSize));
+ }
+ vprofile = new Overlays.Polyline(renderer.getPenProfile(), x, p);
+ }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+
+ try {
+ double[] sum = data.integrateHorizontally(true);
+ double[] saux = new double[sum.length];
+ int[] p = new int[sum.length];
+ double[] y_egu = renderer.getCalibration().getAxisY(sum.length);
+ double[] comRms = getComRms(sum, y_egu);
+ yCom = comRms[0];
+ yRms = comRms[1];
+ int[] x = Arr.indexesInt(sum.length);
+ DescriptiveStatistics stats = new DescriptiveStatistics(sum);
+ double min = stats.getMin();
+ for (int i = 0; i < sum.length; i++) {
+ saux[i] = sum[i] - min;
+ }
+
+ if (showFit) {
+ double[] gaussian = fitGaussian(saux, x);
+ if (gaussian != null) {
+ //Only aknowledge beam fully inside the image and peak over 3% of min
+ if ((gaussian[2] < sum.length * 0.45)
+ && (gaussian[2] > 2)
+ && (gaussian[0] > min * 0.03)) {
+ yNorm = gaussian[0];
+ yMean = gaussian[1];
+ ySigma = gaussian[2];
+ double[] fit = getFitFunction(gaussian, x);
+
+ int[] y = new int[x.length];
+ for (int i = 0; i < x.length; i++) {
+ y[i] = (int) ((((fit[i] + min) / width - minPlot) / rangePlot) * profileSize);
+ }
+ hgaussian = new Overlays.Polyline(penFit, y, x);
+ }
+ }
+ }
+ if (showProfile) {
+ for (int i = 0; i < x.length; i++) {
+ p[i] = (int) (((sum[i] / width - minPlot) / rangePlot) * profileSize);
+ }
+ hprofile = new Overlays.Polyline(renderer.getPenProfile(), p, x);
+ }
+
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ if (xSigma != null) {
+ xSigma *= renderer.getCalibration().getScaleX();
+ }
+ if (ySigma != null) {
+ ySigma *= renderer.getCalibration().getScaleY();
+ }
+ if (xMean != null) {
+ xMean = data.getX((int) Math.round(xMean));
+ }
+ if (yMean != null) {
+ yMean = data.getY((int) Math.round(yMean));
+ }
+ }
+ }
+ final String units = (renderer.getCalibration() != null) ? "\u00B5m" : "px";
+ final String fmt = "%7.1f" + units;
+ Overlays.Text textCom = null;
+ Overlay[] pOv = null, fOv = null;
+ Font fontInfoText = new Font(Font.MONOSPACED, 0, 14);
+ Point textPosition = new Point(12, 20);
+ if (showProfile) {
+ if ((xCom != null) && (yCom != null)) {
+ String text = String.format("com x: m=" + fmt + " \u03C3=" + fmt + "\ncom y: m=" + fmt + " \u03C3=" + fmt, xCom, xRms, yCom, yRms);
+ textCom = new Overlays.Text(renderer.getPenProfile(), text, fontInfoText, textPosition);
+ textCom.setFixed(true);
+ textCom.setAnchor(Overlay.ANCHOR_VIEWPORT_TOP_LEFT);
+ }
+ pOv = new Overlay[]{hprofile, vprofile, textCom};
+ textPosition = new Point(textPosition.x, textPosition.y + 34);
+ }
+ if (showFit) {
+ Overlays.Crosshairs cross = null;
+ Overlays.Text textFit = null;
+ if ((xMean != null) && (yMean != null)) {
+ String text = String.format("fit x: m=" + fmt + " \u03C3=" + fmt + "\nfit y: m=" + fmt + " \u03C3=" + fmt, xMean, xSigma, yMean, ySigma);
+ textFit = new Overlays.Text(penFit, text, fontInfoText, textPosition);
+ textFit.setFixed(true);
+ textFit.setAnchor(Overlay.ANCHOR_VIEWPORT_TOP_LEFT);
+ Point center = new Point(xMean.intValue(), yMean.intValue());
+ if (renderer.getCalibration() != null) {
+ center = renderer.getCalibration().convertToImagePosition(new PointDouble(xMean, yMean));
+ xSigma /= renderer.getCalibration().getScaleX();
+ ySigma /= renderer.getCalibration().getScaleY();
+ }
+ cross = new Overlays.Crosshairs(penCross, center, new Dimension(Math.abs(2 * xSigma.intValue()), 2 * Math.abs(ySigma.intValue())));
+ }
+ textPosition = new Point(textPosition.x, textPosition.y + 34);
+ fOv = new Overlay[]{hgaussian, vgaussian, cross, textFit};
+
+ if (goodRegion && (id != null)) {
+ try {
+ double[] x = id.gr_x_axis;
+ double[] y = id.gr_y_axis;
+ Overlays.Rect goodRegionOv = new Overlays.Rect(new Pen(penFit.getColor(), 0, Pen.LineStyle.dotted));
+ goodRegionOv.setCalibration(renderer.getCalibration());
+ goodRegionOv.setPosition(new Point(id.gr_pos_x, id.gr_pos_y));
+ goodRegionOv.setSize(new Dimension(id.gr_x_axis.length, id.gr_y_axis.length));
+ fOv = Arr.append(fOv, goodRegionOv);
+
+ if (slicing) {
+ if (sliceCenters != null) {
+ for (PointDouble sliceCenter : sliceCenters) {
+ Overlays.Crosshairs center = new Overlays.Crosshairs(penSlices);
+ center.setCalibration(renderer.getCalibration());
+ center.setAbsolutePosition(sliceCenter);
+ center.setSize(new Dimension(10, 10));
+ fOv = Arr.append(fOv, center);
+ }
+ if (sliceCenters.length > 1) {
+ double[] fit = fitPolynomial(sliceCenters, 1);
+ double angle = Math.toDegrees(Math.atan(fit[1]));
+ Overlays.Text text = new Overlays.Text(penSlices, String.format("slice: \u03B8= %5.1fdeg", angle), fontInfoText, textPosition);
+ text.setFixed(true);
+ text.setAnchor(Overlay.ANCHOR_VIEWPORT_TOP_LEFT);
+ fOv = Arr.append(fOv, text);
+ }
+ }
+ }
+ } catch (Exception ex) {
+ }
+ }
+
+ }
+ return new Overlay[][]{pOv, fOv};
+ }
+ return null;
+ }
+
+ class UserOverlay {
+
+ String name;
+ Overlay obj;
+ String[] channels;
+ }
+ ArrayList userOverlayConfig;
+
+ void parseUserOverlays() {
+ Properties userOverlays = new Properties();
+ userOverlayConfig = new ArrayList<>();
+ if (userOverlaysConfigFile != null) {
+ try {
+ try (FileInputStream in = new FileInputStream(getContext().getSetup().expandPath(userOverlaysConfigFile))) {
+ userOverlays.load(in);
+
+ for (String name : userOverlays.stringPropertyNames()) {
+ String val = userOverlays.getProperty(name);
+ try {
+ UserOverlay uo = new UserOverlay();
+ uo.name = name;
+ String type = val.substring(0, val.indexOf("(")).trim();
+ String pars = val.substring(val.indexOf("(") + 1, val.lastIndexOf(")")).trim();
+ String[] tokens = pars.split(",");
+ for (int i = 0; i < tokens.length; i++) {
+ tokens[i] = tokens[i].trim();
+ }
+ Color color = Color.GRAY;
+ try {
+ color = (Color) Color.class.getField(tokens[tokens.length - 1].toUpperCase()).get(null);
+ } catch (Exception ex) {
+ }
+ Pen pen = new Pen(color);
+ try {
+ String[] penTokens = tokens[tokens.length - 1].split(":");
+ color = (Color) Color.class.getField(penTokens[0].toUpperCase()).get(null);
+ int width = Integer.valueOf(penTokens[1]);
+ Pen.LineStyle style = Pen.LineStyle.valueOf(penTokens[2]);
+ pen = new Pen(color, width, style);
+ } catch (Exception ex) {
+ }
+ switch (type) {
+ case "Point":
+ uo.obj = new Overlays.Crosshairs();
+ uo.obj.setSize(new Dimension(Integer.valueOf(tokens[2]), Integer.valueOf(tokens[3])));
+ break;
+ case "Line":
+ uo.obj = new Overlays.Line();
+ break;
+ case "Arrow":
+ uo.obj = new Overlays.Arrow();
+ break;
+ case "Rect":
+ uo.obj = new Overlays.Rect();
+ break;
+ case "Ellipse":
+ uo.obj = new Overlays.Ellipse();
+ break;
+ case "Polyline":
+ uo.obj = new Overlays.Polyline();
+ break;
+ }
+ if (type.equals("Polyline") || type.equals("Point")) {
+ uo.channels = new String[]{tokens[0], tokens[1]};
+ } else {
+ uo.channels = new String[]{tokens[0], tokens[1], tokens[2], tokens[3]};
+ }
+ uo.obj.setPen(pen);
+ userOverlayConfig.add(uo);
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ }
+
+ Overlay[] getUserOverlays(Data data) {
+ ArrayList ret = new ArrayList<>();
+ if (server != null) {
+ ImageData id = getFrame(data);
+ for (UserOverlay uo : userOverlayConfig) {
+ try {
+ Overlay ov = uo.obj;
+ //Overlay ov = (Overlay)uo.cls.newInstance();
+ ov.setCalibration(renderer.getCalibration());
+ boolean valid = false;
+ if (ov instanceof Overlays.Polyline) {
+ double[] x = (uo.channels[0].equals("null")) ? null : id.getDoubleArray(uo.channels[0]);
+ double[] y = (uo.channels[1].equals("null")) ? null : id.getDoubleArray(uo.channels[1]);
+ if ((x != null) || (y != null)) {
+ if (x == null) {
+ x = (renderer.getCalibration() == null) ? Arr.indexesDouble(y.length) : renderer.getCalibration().getAxisX(y.length);
+ }
+ if (y == null) {
+ y = (renderer.getCalibration() == null) ? Arr.indexesDouble(x.length) : renderer.getCalibration().getAxisY(x.length);
+ }
+ ((Overlays.Polyline) ov).updateAbsolute(x, y);
+ valid = true;
+ }
+ } else {
+ Double x = id.getDouble(uo.channels[0]);
+ Double y = id.getDouble(uo.channels[1]);
+ if ((x != null) && (y != null)) {
+ PointDouble position = new PointDouble(x, y);
+ ov.setAbsolutePosition(position);
+ if (!(ov instanceof Overlays.Crosshairs)) {
+ Double x2 = id.getDouble(uo.channels[2]);
+ Double y2 = id.getDouble(uo.channels[3]);
+ if ((x != null) && (y != null)) {
+ DimensionDouble size = new DimensionDouble(x2 - position.x, y2 - position.y);
+ ov.setAbsoluteSize(size);
+ valid = true;
+ }
+ } else {
+ valid = true;
+ }
+ }
+ }
+ if (valid) {
+ ret.add(ov);
+ }
+ } catch (Exception ex) {
+ //ex.printStackTrace();
+ }
+ }
+ }
+ return ret.toArray(new Overlay[0]);
+ }
+
+ double[] getComRms(double[] arr, double[] x) {
+ if (arr != null) {
+ double xmd = 0;
+ double xmd2 = 0;
+ double total = 0;
+ for (int i = 0; i < arr.length; i++) {
+ double v = (arr[i] * x[i]);
+ xmd += v;
+ xmd2 += (v * x[i]);
+ total += arr[i];
+ }
+ if (total > 0) {
+ double com = xmd / total;
+ double com2 = xmd2 / total;
+ double rms = Math.sqrt(Math.abs(com2 - com * com));
+ return new double[]{com, rms};
+ }
+ }
+ return new double[]{Double.NaN, Double.NaN};
+ }
+
+ double[] fitGaussianScript(int[] y, int[] x) {
+ ScriptManager sm = Context.getInstance().getScriptManager();
+ ArrayProperties pY = ArrayProperties.get(y);
+ sm.setVar("y", y);
+ sm.setVar("x", x);
+ InterpreterResult r = sm.eval("r = fit_gaussians(y, x, [" + pY.maxIndex + ",])");
+ if (r.exception != null) {
+ r.exception.printStackTrace();
+ } else {
+ List ret = (List) sm.getVar("r");
+ if ((ret != null) && (ret.size() == 1) && (ret.get(0) instanceof List) && (((List) (ret.get(0))).size() == 3)) {
+ double norm = (Double) ((List) ret.get(0)).get(0);
+ double mean = (Double) ((List) ret.get(0)).get(1);
+ double sigma = (Double) ((List) ret.get(0)).get(2);
+ return new double[]{norm, mean, sigma};
+ }
+ }
+ return null;
+ }
+
+ double[] fitGaussian(double[] y, int[] x) {
+ try {
+ ArrayProperties pY = ArrayProperties.get(y);
+ GaussianCurveFitter fitter = GaussianCurveFitter.create().withStartPoint(new double[]{(pY.max - pY.min) / 2, x[pY.maxIndex], 1.0}).withMaxIterations(1000);
+ ArrayList values = new ArrayList<>();
+ for (int i = 0; i < y.length; i++) {
+ values.add(new WeightedObservedPoint(1.0, x[i], y[i]));
+ }
+ return fitter.fit(values);
+ } catch (Exception ex) {
+ return null;
+ }
+
+ }
+
+ double[] fitPolynomial(PointDouble[] points, int order) {
+ double[] y = new double[points.length];
+ double[] x = new double[points.length];
+ for (int i = 0; i < points.length; i++) {
+ x[i] = points[i].x;
+ y[i] = points[i].y;
+ }
+ return fitPolynomial(y, x, order);
+ }
+
+ double[] fitPolynomial(double[] y, double[] x, int order) {
+ try {
+ ArrayProperties pY = ArrayProperties.get(y);
+ PolynomialCurveFitter fitter = PolynomialCurveFitter.create(order).withMaxIterations(1000);
+ ArrayList values = new ArrayList<>();
+ for (int i = 0; i < y.length; i++) {
+ values.add(new WeightedObservedPoint(1.0, x[i], y[i]));
+ }
+ return fitter.fit(values);
+ } catch (Exception ex) {
+ return null;
+ }
+
+ }
+
+ double[] getFitFunction(double[] pars, int[] x) {
+ double[] fit = new double[x.length];
+ Gaussian g = new Gaussian(pars[0], pars[1], pars[2]);
+ for (int i = 0; i < x.length; i++) {
+ fit[i] = g.value(x[i]);
+ }
+ return fit;
+ }
+
+ void setHistogramVisible(boolean value) {
+ if (value) {
+ if ((histogramDialog == null) || (!histogramDialog.isShowing())) {
+ Histogram histogram = new Histogram(true);
+ histogram.setRenderer(renderer);
+ histogramDialog = SwingUtils.showDialog(SwingUtils.getWindow(renderer), "Histogram", null, histogram);
+ renderer.refresh();
+ }
+ } else {
+ if (histogramDialog != null) {
+ histogramDialog.setVisible(false);
+ histogramDialog = null;
+ }
+ }
+ }
+
+ void setLaserState(int bunch, boolean value) throws Exception {
+ System.out.println("Setting laser state: " + value + " - bunch" + bunch);
+ //Epics.putq("SIN-TIMAST-TMA:Beam-Las-Delay-Sel", value ? 0 : 1);
+ if ((bunch<=0) || (bunch==1)){
+ Epics.putq("SWISSFEL-STATUS:Bunch-1-OnDelay-Sel", value ? 0 : 1);
+ }
+ if ((bunch<=0) || (bunch==2)){
+ Epics.putq("SWISSFEL-STATUS:Bunch-2-OnDelay-Sel", value ? 0 : 1);
+ }
+
+ Epics.putq("SIN-TIMAST-TMA:Beam-Apply-Cmd.PROC", 1);
+ Thread.sleep(3000);
+ }
+
+ boolean getLaserState(int bunch) throws Exception {
+ //return (Epics.get("SIN-TIMAST-TMA:Beam-Las-Delay-Sel", Integer.class) == 0);
+ try{
+ if (bunch<=0){
+ return getLaserState(1) && getLaserState(2);
+ }
+ if (bunch==2){
+ return (Epics.get("SWISSFEL-STATUS:Bunch-2-OnDelay-Sel", Integer.class) == 0);
+ }
+ return (Epics.get("SWISSFEL-STATUS:Bunch-1-OnDelay-Sel", Integer.class) == 0);
+ } catch (Exception ex){
+ return false;
+ }
+ }
+
+ void elog(String logbook, String title, String message, String[] attachments) throws Exception {
+ String domain = "";
+ String category = "Info";
+ String entry = "";
+ StringBuffer cmd = new StringBuffer();
+
+ cmd.append("G_CS_ELOG_add -l \"").append(logbook).append("\" ");
+ cmd.append("-a \"Author=ScreenPanel\" ");
+ cmd.append("-a \"Type=pshell\" ");
+ cmd.append("-a \"Entry=").append(entry).append("\" ");
+ cmd.append("-a \"Title=").append(title).append("\" ");
+ cmd.append("-a \"Category=").append(category).append("\" ");
+ cmd.append("-a \"Domain=").append(domain).append("\" ");
+ for (String attachment : attachments) {
+ cmd.append("-f \"").append(attachment).append("\" ");
+ }
+ cmd.append("-n 1 ");
+ cmd.append("\"").append(message).append("\" ");
+ System.out.println(cmd.toString());
+
+ final Process process = Runtime.getRuntime().exec(new String[]{"bash", "-c", cmd.toString()});
+ new Thread(() -> {
+ try {
+ process.waitFor();
+ int bytes = process.getInputStream().available();
+ byte[] arr = new byte[bytes];
+ process.getInputStream().read(arr, 0, bytes);
+ System.out.println(new String(arr));
+ bytes = process.getErrorStream().available();
+ arr = new byte[bytes];
+ process.getErrorStream().read(arr, 0, bytes);
+ System.err.println(new String(arr));
+ } catch (Exception ex) {
+ System.err.println(ex);
+ }
+ }).start();
+ }
+
+ void centralizeRenderer() {
+ Point center = null;
+ Dimension size = renderer.getImageSize();
+ double zoom = (renderer.getMode() == RendererMode.Fixed) ? 1.0 : renderer.getZoom();
+ if (renderer.getCalibration() != null) {
+ center = renderer.getCalibration().getCenter();
+ } else if (size != null) {
+ center = new Point(size.width / 2, size.height / 2);
+ }
+ if (center != null) {
+ Point topleft = new Point(Math.max((int) (center.x - renderer.getWidth() / 2 / zoom), 0),
+ Math.max((int) (center.y - renderer.getHeight() / 2 / zoom), 0));
+ renderer.setViewPosition(topleft);
+ }
+ }
+
+ void updatePause() {
+ int index = ((int) pauseSelection.getValue()) - 1;
+ synchronized (imageBuffer) {
+ if (index < imageBuffer.size()) {
+ Data data = imageBuffer.get(index).data;
+ long pid = imageBuffer.get(index).cache.getPulseId();
+ BufferedImage image = camera.generateImage(data);
+ renderer.setImage(renderer.getOrigin(), image, data);
+
+ String text = "PID: " + pid;
+ if (imagePauseOverlay == null) {
+ Font font = new Font("Verdana", Font.PLAIN, 12);
+ Dimension d = SwingUtils.getTextSize(text, renderer.getFontMetrics(font));
+ imagePauseOverlay = new Text(renderer.getPenErrorText(), "", font, new Point(-20 - d.width, 42));
+ imagePauseOverlay.setFixed(true);
+ imagePauseOverlay.setAnchor(Overlay.ANCHOR_VIEWPORT_OR_IMAGE_TOP_RIGHT);
+ renderer.addOverlay(imagePauseOverlay);
+ }
+ //imagePauseOverlay.update(Chrono.getTimeStr(data.getTimestamp(), "HH:mm:ss.SSS"));
+ imagePauseOverlay.update(text);
+ manageFit(image, data);
+ manageUserOverlays(image, data);
+ }
+ }
+ updateStreamData();
+ }
+
+ void removePauseOverlay() {
+ renderer.removeOverlay(imagePauseOverlay);
+ imagePauseOverlay = null;
+ }
+
+ void saveSnapshot() throws Exception {
+ boolean paused = isPaused();
+ try{
+ if (!paused){
+ setPaused(true);
+ }
+ String snapshotFile = null;
+ synchronized (imageBuffer) {
+ Frame frame = getCurrentFrame();
+ if (frame == null) {
+ throw new Exception("No current image");
+ }
+ ArrayList frames = new ArrayList<>();
+ frames.add(frame);
+ this.saveFrames(cameraAlias + "_camera_snapshot", frames);
+
+ //Enforce the same timestamp to data & image files.
+ snapshotFile = getContext().getExecutionPars().getPath() + ".png";
+ //renderer.saveSnapshot(snapshotFile, "png", true);
+ ImageBuffer.saveImage(SwingUtils.createImage(renderer), snapshotFile, "png");
+ }
+
+ JPanel panel = new JPanel();
+ GridBagLayout layout = new GridBagLayout();
+ layout.columnWidths = new int[]{0, 180}; //Minimum width
+ layout.rowHeights = new int[]{30, 30, 30}; //Minimum height
+ panel.setLayout(layout);
+ JComboBox comboLogbook = new JComboBox(new String[]{"SwissFEL commissioning data", "SwissFEL commissioning"});
+ JTextField textComment = new JTextField();
+ GridBagConstraints c = new GridBagConstraints();
+ c.gridx = 0;
+ c.gridy = 0;
+ panel.add(new JLabel("Data file:"), c);
+ c.gridy = 1;
+ panel.add(new JLabel("Logbook:"), c);
+ c.gridy = 2;
+ panel.add(new JLabel("Comment:"), c);
+ c.fill = GridBagConstraints.HORIZONTAL;
+ c.gridx = 1;
+ panel.add(textComment, c);
+ c.gridy = 1;
+ panel.add(comboLogbook, c);
+ c.gridy = 0;
+ panel.add(new JLabel(getContext().getExecutionPars().getPath()), c);
+
+ if (SwingUtils.showOption(getTopLevel(), "Success", panel, OptionType.OkCancel) == OptionResult.Yes) {
+ StringBuilder message = new StringBuilder();
+ message.append("Camera: ").append(cameraAlias).append(" (").
+ append((server != null) ? "server" : "direct").append(")").append("\n");
+ message.append("Screen: ").append(String.valueOf(valueScreen.getLabel().getText())).append("\n");
+ message.append("Filter: ").append(String.valueOf(valueFilter.getLabel().getText())).append("\n");
+ message.append("Data file: ").append(getContext().getExecutionPars().getPath()).append("\n");
+ message.append("Comment: ").append(textComment.getText()).append("\n");
+ //Add slicing message
+ if ((fitOv != null) && (fitOv.length > 5) && (fitOv[fitOv.length - 1] instanceof Overlays.Text)) {
+ Overlays.Text text = (Overlays.Text) fitOv[fitOv.length - 1];
+ message.append(text.getText()).append("\n");
+ }
+ elog((String) comboLogbook.getSelectedItem(), "ScreenPanel Snapshot", message.toString(), new String[]{snapshotFile});
+ }
+ } finally{
+ if (!paused){
+ setPaused(false);
+ }
+ }
+ }
+
+ void saveStack() throws Exception {
+ synchronized (imageBuffer) {
+ saveFrames(cameraAlias + "_camera_stack", imageBuffer);
+ }
+ SwingUtils.showMessage(getTopLevel(), "Success", "Generated data file:\n" + getContext().getExecutionPars().getPath());
+ }
+
+ public List getCameraTypes(String name) {
+ if (name == null) {
+ return null;
+ }
+ if (App.hasArgument(ARG_ALIAS) && (aliases!=null)){
+ name = aliases.getOrDefault(name, name);
+ }
+
+ List ret = new ArrayList();
+ if (groups!=null){
+ for (String group: Arr.sort(groups.keySet().toArray(new String[0]))){
+ if (groups.get(group).contains(name)){
+ ret.add(group);
+ }
+ }
+ } else {
+ for (String s : new String[]{"LCAM"}) {
+ if (name.contains(s)) {
+ ret.add(LASER_TYPE);
+ }
+ }
+ for (String s : new String[]{"DSCR", "DSRM", "DLAC"}) {
+ if (name.contains(s)) {
+ ret.add(ELECTRONS_TYPE);
+ }
+ }
+ for (String s : new String[]{"PROF", "PPRM", "PSSS", "PSCR", "PSRD"}) {
+ if (name.contains(s)) {
+ ret.add(PHOTONICS_TYPE);
+ }
+ }
+ }
+ ret.add("Unknown");
+ return ret;
+ }
+
+ public Map getProcessingParameters(StreamValue value) throws IOException {
+ return (Map) JsonSerializer.decode(value.getValue("processing_parameters").toString(), Map.class);
+ }
+
+ void saveFrames(String name, ArrayList frames) throws IOException {
+ ArrayList values = new ArrayList<>();
+ for (Frame frame : frames) {
+ values.add(frame.cache);
+ }
+ saveImages(name, values);
+ }
+
+ class DifferentFormatException extends IOException{
+ DifferentFormatException(){
+ super("Images in stack have different formats");
+ }
+ }
+
+ boolean hasSameFormat(ArrayList frames){
+ if (frames.size()>0){
+ StreamValue first = frames.get(0).cache;
+ int width = ((Number) first.getValue("width")).intValue();
+ int height = ((Number) first.getValue("height")).intValue();
+ Class dataType = first.getValue("image").getClass().getComponentType();
+
+ for (Frame frame : frames){
+ StreamValue image = frame.cache;
+ if ( (width != ((Number) image.getValue("width")).intValue()) ||
+ (height != ((Number) image.getValue("height")).intValue()) ||
+ (dataType != (image.getValue("image").getClass().getComponentType()))){
+ return false;
+ }
+ }
+ }
+ return true;
+ }
+
+ void saveImages(String name, ArrayList images) throws IOException {
+ int depth = images.size();
+ if (depth == 0) {
+ return;
+ }
+
+ StreamValue first = images.get(0);
+ String pathRoot = "/camera1/";
+ String pathImage = pathRoot + "image";
+ String pathPid = pathRoot + "pulse_id";
+ String pathTimestampStr = pathRoot + "timestamp_str";
+ Map processingPars = getProcessingParameters(first);
+ String camera = (String) processingPars.get("camera_name");
+ List types = getCameraTypes(camera);
+
+ int width = ((Number) first.getValue("width")).intValue();
+ int height = ((Number) first.getValue("height")).intValue();
+ Class dataType = first.getValue("image").getClass().getComponentType();
+
+ for (StreamValue image : images){
+ if ( (width != ((Number) image.getValue("width")).intValue()) ||
+ (height != ((Number) image.getValue("height")).intValue()) ||
+ (dataType != (image.getValue("image").getClass().getComponentType()))){
+ throw new DifferentFormatException();
+ }
+ }
+
+
+ getContext().setExecutionPars(name);
+ DataManager dm = getContext().getDataManager();
+
+ //Create tables
+ dm.createDataset(pathImage, dataType, new int[]{depth, height, width});
+ dm.createDataset(pathPid, Long.class, new int[]{depth});
+ dm.createDataset(pathTimestampStr, String.class, new int[]{depth});
+ for (String id : first.getIdentifiers()) {
+ Object val = first.getValue(id);
+ if (id.equals("image")) {
+ } else if (id.equals("processing_parameters")) {
+ Map pars = getProcessingParameters(first);
+ for (String key : pars.keySet()) {
+ if ((pars.get(key) != null) && (pars.get(key) instanceof Map)) {
+ for (String k : ((Map) pars.get(key)).keySet()) {
+ Object v = ((Map) pars.get(key)).get(k);
+ k = key + " " + k;
+ v = (v == null) ? "" : v;
+ try{
+ dm.setAttribute(pathImage, k, v);
+ } catch (Exception ex){
+ logger.info("Cannot set attribute " + pathImage + ": "+ k + " = " + v + " - " + ex.getMessage());
+ }
+
+ }
+ } else {
+ Object value = pars.get(key);
+ try{
+ if (value == null) {
+ value = "";
+ } else if (value instanceof List) {
+ if (((List) value).size() > 0){
+ Class cls = ((List) value).get(0).getClass() ;
+ if (cls == String.class){
+ value = ((List) value).toArray(new String[0]);
+ } else {
+ value = Convert.toPrimitiveArray(value, cls);
+ }
+ } else {
+ value = "";
+ }
+ }
+ dm.setAttribute(pathImage, key, value);
+ } catch (Exception ex){
+ logger.info("Cannot set attribute " + pathImage + ": "+ key + " = " + value + " - " + ex.getMessage());
+ }
+ }
+ }
+ } else if (val.getClass().isArray()) {
+ dm.createDataset(pathRoot + id, Double.class, new int[]{depth, Array.getLength(val)});
+ } else {
+ dm.createDataset(pathRoot + id, val.getClass(), new int[]{depth});
+ }
+ }
+
+ //Add metadata
+ dm.setAttribute(pathRoot, "Camera", camera);
+ dm.setAttribute(pathRoot, "Images", depth);
+ dm.setAttribute(pathRoot, "Interval", -1);
+ dm.setAttribute(pathRoot, "Type", types.toArray(new String[0]));
+ if (types.contains(ELECTRONS_TYPE)) {
+ dm.setAttribute(pathRoot, "Screen", String.valueOf(valueScreen.getLabel().getText()));
+ dm.setAttribute(pathRoot, "Filter", String.valueOf(valueFilter.getLabel().getText()));
+ }
+
+ //Save data
+ for (int index = 0; index < depth; index++) {
+ StreamValue streamValue = images.get(index);
+ dm.setItem(pathImage, streamValue.getValue("image"), new long[]{index, 0, 0}, new int[]{1, height, width});
+ dm.setItem(pathPid, streamValue.getPulseId(), index);
+ dm.setItem(pathTimestampStr, Chrono.getTimeStr(streamValue.getTimestamp(), "YYYY-MM-dd HH:mm:ss.SSS"), index);
+
+ for (String id : streamValue.getIdentifiers()) {
+ Object val = streamValue.getValue(id);
+ if (id.equals("image")) {
+ } else if (id.equals("processing_parameters")) {
+ } else if (val.getClass().isArray()) {
+ dm.setItem(pathRoot + id, val, index);
+ } else {
+ dm.setItem(pathRoot + id, val, index);
+ }
+ }
+ }
+ getContext().getDataManager().closeOutput();
+ }
+
+ StandardDialog calibrationDialolg;
+
+ void calibrate() throws Exception {
+ if (server != null) {
+ server.resetRoi();
+ calibrationDialolg = (StandardDialog) getContext().getClassByName("CameraCalibrationDialog").getConstructors()[0].newInstance(new Object[]{getTopLevel(), server.getCurrentCamera(), renderer});
+ SwingUtils.centerComponent(getTopLevel(), calibrationDialolg);
+ calibrationDialolg.setVisible(true);
+ calibrationDialolg.setListener(new StandardDialogListener() {
+ @Override
+ public void onWindowOpened(StandardDialog dlg) {
+ }
+
+ @Override
+ public void onWindowClosed(StandardDialog dlg, boolean accepted) {
+ if (accepted) {
+ //comboCamerasActionPerformed(null);
+ }
+ }
+ });
+ }
+ }
+
+ StandardDialog dataTableDialog;
+ DefaultTableModel dataTableModel;
+ JTable dataTable;
+
+ void showStreamData() {
+ dataTableModel = null;
+ if (server != null) {
+
+ if ((dataTableDialog != null) && (dataTableDialog.isShowing())) {
+ SwingUtils.centerComponent(getTopLevel(), dataTableDialog);
+ dataTableDialog.requestFocus();
+ return;
+ }
+ dataTableModel = new DefaultTableModel(new Object[0][2], new String[]{"Name", "Value"}) {
+ public Class getColumnClass(int columnIndex) {
+ return String.class;
+ }
+
+ public boolean isCellEditable(int rowIndex, int columnIndex) {
+ return false;
+ }
+ };
+ updateStreamData();
+ StreamValue val = server.getStream().take();
+ dataTable = new JTable(dataTableModel);
+ dataTable.setSelectionMode(ListSelectionModel.SINGLE_INTERVAL_SELECTION);
+ dataTable.setCellSelectionEnabled(true);
+ dataTable.getTableHeader().setReorderingAllowed(false);
+ dataTable.getTableHeader().setResizingAllowed(true);
+ dataTableDialog = new StandardDialog(getTopLevel(), "Image Data", false);
+ dataTableDialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+ JScrollPane scrollPane = new JScrollPane();
+ scrollPane.setViewportView(dataTable);
+ scrollPane.setPreferredSize(new Dimension(300, 400));
+ dataTableDialog.setContentPane(scrollPane);
+ dataTableDialog.pack();
+ dataTableDialog.setVisible(true);
+ dataTableDialog.addWindowListener(new WindowAdapter() {
+ @Override
+ public void windowClosing(WindowEvent e) {
+ dataTableModel = null;
+ }
+ });
+ dataTable.addMouseListener(new MouseAdapter() {
+ @Override
+ public void mouseClicked(MouseEvent e) {
+ try {
+ int row = dataTable.getSelectedRow();
+ int col = dataTable.getSelectedColumn();
+ dataTable.setToolTipText(null);
+ if (row > 1) {
+ String id = String.valueOf(dataTable.getModel().getValueAt(row, 0));
+ String locator = String.valueOf(dataTable.getModel().getValueAt(0, 1));
+ String channelId = locator + " " + id;
+ dataTable.setToolTipText(channelId);
+ if ((e.getClickCount() == 2) && (!e.isPopupTrigger())) {
+ if (col == 0) {
+ SwingUtils.showMessage(dataTableDialog, "Channel Identifier", "Copied to clipboard: " + channelId);
+ Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
+ clipboard.setContents(new StringSelection(channelId), (Clipboard clipboard1, Transferable contents) -> {
+ });
+ } else {
+ Object obj = getCurrentFrame().cache.getValue(id);
+ if (id.equals("image")) {
+ } else if (id.equals("processing_parameters")) {
+ Map pars = getProcessingParameters(getCurrentFrame().cache);
+ StringBuilder sb = new StringBuilder();
+ for (String key : pars.keySet()) {
+ sb.append(key).append(" = ").append(Str.toString(pars.get(key), 10)).append("\n");
+ }
+ SwingUtils.showMessage(dataTableDialog, "Processing Parameters", sb.toString());
+ } else if ((obj != null) && (obj.getClass().isArray() || (obj instanceof Number))) {
+ DeviceValueChart chart = new DeviceValueChart();
+ Device dev = null;
+ if (obj.getClass().isArray()) {
+ dev = new ReadableRegisterArray(new ReadableArray() {
+ @Override
+ public Object read() throws IOException, InterruptedException {
+ return Convert.toDouble(getCurrentFrame().cache.getValue(id));
+ }
+
+ @Override
+ public int getSize() {
+ return Array.getLength(getCurrentFrame().cache.getValue(id));
+ }
+ });
+ } else {
+ dev = new ReadableRegisterNumber(new ReadableNumber() {
+ @Override
+ public Object read() throws IOException, InterruptedException {
+ return Convert.toDouble(getCurrentFrame().cache.getValue(id));
+ }
+ });
+ }
+ dev.setPolling(1000);
+ chart.setDevice(dev);
+ JDialog dlg = SwingUtils.showDialog(dataTableDialog, cameraAlias + " " + id, null, chart);
+ //TODO:
+ //PlotBase plot = chart.getPlot();
+ //if (plot!=null){
+ // plot.setPlotBackgroundColor(Color.BLACK);
+ //}
+ }
+ }
+ }
+ }
+ } catch (Exception ex) {
+ showException(ex);
+ }
+ }
+ });
+ SwingUtils.centerComponent(getTopLevel(), dataTableDialog);
+ updateStreamData();
+ }
+ }
+
+ volatile boolean updatingStreamData = false;
+
+ void updateStreamData() {
+ if ((dataTableDialog == null) || !dataTableDialog.isShowing() || updatingStreamData) {
+ return;
+ }
+ updatingStreamData = true;
+ SwingUtilities.invokeLater(() -> {
+ updatingStreamData = false;
+ if ((dataTableModel != null) && (server != null)) {
+ StreamValue value = server.getValue();
+ Frame frame = getCurrentFrame();
+ int[] sel_rows = (dataTable == null) ? null : dataTable.getSelectedRows();
+ int[] sel_cols = (dataTable == null) ? null : dataTable.getSelectedColumns();
+ List ids = (value == null) ? new ArrayList<>() : new ArrayList(value.getIdentifiers());
+ if (ids.size() + 4 != dataTableModel.getRowCount()) {
+ dataTableModel.setNumRows(0);
+ try {
+ dataTableModel.addRow(new Object[]{"Locator", server.getUrl() + "/" + ((value == null) ? instanceName : server.getCurrentInstance())});
+ } catch (Exception ex) {
+ dataTableModel.addRow(new Object[]{"Locator", ex.getMessage()});
+ }
+ try {
+ dataTableModel.addRow(new Object[]{"Stream", server.getStreamAddress()});
+ } catch (Exception ex) {
+ dataTableModel.addRow(new Object[]{"Stream", ex.getMessage()});
+ }
+ dataTableModel.addRow(new Object[]{"PID", ""});
+ dataTableModel.addRow(new Object[]{"Timestamp", ""});
+ Collections.sort(ids);
+ for (String id : ids) {
+ dataTableModel.addRow(new Object[]{id, ""});
+ }
+ }
+
+ if ((frame != null) && (frame.cache != null)) {
+ dataTableModel.setValueAt(frame.cache.getPulseId(), 2, 1); //PID
+ dataTableModel.setValueAt(frame.cache.getTimestamp(), 3, 1); //Timestamp
+ for (int i = 4; i < dataTableModel.getRowCount(); i++) {
+ String id = String.valueOf(dataTableModel.getValueAt(i, 0));
+ //Object obj = server.getValue(id);
+ Object obj = frame.cache.getValue(id);
+ if (obj != null) {
+ if (obj.getClass().isArray()) {
+ obj = obj.getClass().getComponentType().getSimpleName() + "[" + Array.getLength(obj) + "]";
+ } else if (obj instanceof Double) {
+ obj = Convert.roundDouble((Double) obj, 1);
+ } else if (obj instanceof Float) {
+ obj = Convert.roundDouble((Float) obj, 1);
+ }
+ }
+ dataTableModel.setValueAt(String.valueOf(obj), i, 1);
+ }
+ }
+ if ((sel_rows != null) && (sel_rows.length > 0)) {
+ //dataTable.setRowSelectionInterval((Integer)Arr.getMin(sel_rows), (Integer)Arr.getMax(sel_rows));
+ dataTable.setRowSelectionInterval(sel_rows[0], sel_rows[sel_rows.length - 1]);
+ }
+ if ((sel_cols != null) && (sel_cols.length > 0)) {
+ //dataTable.setColumnSelectionInterval((Integer)Arr.getMin(sel_cols), (Integer)Arr.getMax(sel_cols));
+ dataTable.setColumnSelectionInterval(sel_cols[0], sel_cols[sel_cols.length - 1]);
+ }
+ }
+ });
+ }
+
+ ImageIcon getIcon(String name) {
+ ImageIcon ret = null;
+ try {
+ //Path path = Paths.get(getClass().getProtectionDomain().getCodeSource().getLocation().getPath(),"resources", name + ".png");
+ String dir = getClass().getProtectionDomain().getCodeSource().getLocation().getPath() + "resources/";
+ if (new File(dir + name + ".png").exists()) {
+ ret = new javax.swing.ImageIcon(dir + name + ".png");
+ } else {
+ ret = new ImageIcon(ch.psi.pshell.ui.App.class.getResource("/ch/psi/pshell/ui/" + name + ".png"));
+ if (MainFrame.isDark()) {
+ try {
+ ret = new ImageIcon(ch.psi.pshell.ui.App.class.getResource("/ch/psi/pshell/ui/dark/" + name + ".png"));
+ } catch (Exception e) {
+ }
+ }
+ }
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ return ret;
+ }
+
+ String getIconName(JButton button) {
+ String ret = button.getIcon().toString();
+ if (ret.indexOf(".") > 0) {
+ ret = ret.substring(0, ret.indexOf("."));
+ }
+ return ret;
+ }
+
+ void setPaused(boolean paused){
+ removePauseOverlay();
+ if (camera != null) {
+ synchronized (imageBuffer) {
+ if (paused) {
+ renderer.pause();
+ panelCameraSelection.setVisible(false);
+ pauseSelection.setVisible(true);
+ if (imageBuffer.size() > 0) {
+ pauseSelection.setEnabled(true);
+ pauseSelection.setMaxValue(imageBuffer.size());
+ pauseSelection.setValue(imageBuffer.size());
+ updatePause();
+ } else {
+ pauseSelection.setEnabled(false);
+ pauseSelection.setMaxValue(1);
+ pauseSelection.setValue(1);
+ }
+ } else {
+ imageBuffer.clear();
+ renderer.resume();
+ //renderer.clear();
+ pauseSelection.setVisible(false);
+ panelCameraSelection.setVisible(true);
+ }
+ }
+ updateStreamData();
+ }
+ }
+
+ boolean isPaused(){
+ return renderer.isPaused();
+ }
+
+ ////////
+ @SuppressWarnings("unchecked")
+ // //GEN-BEGIN:initComponents
+ private void initComponents() {
+
+ buttonGroup1 = new javax.swing.ButtonGroup();
+ buttonGroup2 = new javax.swing.ButtonGroup();
+ buttonGroup3 = new javax.swing.ButtonGroup();
+ buttonGroup4 = new javax.swing.ButtonGroup();
+ jProgressBar1 = new javax.swing.JProgressBar();
+ sidePanel = new javax.swing.JPanel();
+ jPanel3 = new javax.swing.JPanel();
+ buttonZoomFit = new javax.swing.JRadioButton();
+ buttonZoomStretch = new javax.swing.JRadioButton();
+ buttonZoomNormal = new javax.swing.JRadioButton();
+ buttonZoom025 = new javax.swing.JRadioButton();
+ buttonZoom05 = new javax.swing.JRadioButton();
+ buttonZoom2 = new javax.swing.JRadioButton();
+ jPanel2 = new javax.swing.JPanel();
+ checkHistogram = new javax.swing.JCheckBox();
+ comboColormap = new javax.swing.JComboBox();
+ jLabel3 = new javax.swing.JLabel();
+ jLabel4 = new javax.swing.JLabel();
+ buttonFullRange = new javax.swing.JRadioButton();
+ buttonManual = new javax.swing.JRadioButton();
+ buttonAutomatic = new javax.swing.JRadioButton();
+ labelMin = new javax.swing.JLabel();
+ spinnerMin = new javax.swing.JSpinner();
+ spinnerMax = new javax.swing.JSpinner();
+ labelMax = new javax.swing.JLabel();
+ btFixColormapRange = new javax.swing.JButton();
+ jPanel5 = new javax.swing.JPanel();
+ buttonServer = new javax.swing.JRadioButton();
+ buttonDirect = new javax.swing.JRadioButton();
+ textState = new javax.swing.JTextField();
+ filler1 = new javax.swing.Box.Filler(new java.awt.Dimension(0, 0), new java.awt.Dimension(0, 0), new java.awt.Dimension(0, 32767));
+ panelScreen = new javax.swing.JPanel();
+ valueScreen = new ch.psi.pshell.swing.DeviceValuePanel();
+ comboScreen = new javax.swing.JComboBox();
+ panelFilter = new javax.swing.JPanel();
+ valueFilter = new ch.psi.pshell.swing.DeviceValuePanel();
+ comboFilter = new javax.swing.JComboBox();
+ panelScreen2 = new javax.swing.JPanel();
+ checkThreshold = new javax.swing.JCheckBox();
+ spinnerThreshold = new javax.swing.JSpinner();
+ checkBackground = new javax.swing.JCheckBox();
+ checkGoodRegion = new javax.swing.JCheckBox();
+ spinnerGrScale = new javax.swing.JSpinner();
+ spinnerGrThreshold = new javax.swing.JSpinner();
+ labelGrThreshold = new javax.swing.JLabel();
+ labelGrScale = new javax.swing.JLabel();
+ panelSlicing = new javax.swing.JPanel();
+ checkSlicing = new javax.swing.JCheckBox();
+ labelSlScale = new javax.swing.JLabel();
+ spinnerSlScale = new javax.swing.JSpinner();
+ labelSlNumber = new javax.swing.JLabel();
+ spinnerSlNumber = new javax.swing.JSpinner();
+ labelSlOrientation = new javax.swing.JLabel();
+ spinnerSlOrientation = new javax.swing.JSpinner();
+ checkRotation = new javax.swing.JCheckBox();
+ spinnerRotationAngle = new javax.swing.JSpinner();
+ spinnerRotationOrder = new javax.swing.JSpinner();
+ labelOrder = new javax.swing.JLabel();
+ labelMode = new javax.swing.JLabel();
+ spinnerRotationMode = new javax.swing.JSpinner();
+ labelAngle = new javax.swing.JLabel();
+ labelConstant = new javax.swing.JLabel();
+ spinnerRotationConstant = new javax.swing.JSpinner();
+ checkAveraging = new javax.swing.JCheckBox();
+ spinnerAvFrames = new javax.swing.JSpinner();
+ labelAvFrames = new javax.swing.JLabel();
+ labelAvMode = new javax.swing.JLabel();
+ spinnerAvMode = new javax.swing.JSpinner();
+ spinnerBackground = new javax.swing.JSpinner();
+ panelPulse = new javax.swing.JPanel();
+ buttonPulse1 = new javax.swing.JButton();
+ buttonPulse2 = new javax.swing.JButton();
+ textPulse = new javax.swing.JTextField();
+ topPanel = new javax.swing.JPanel();
+ toolBar = new javax.swing.JToolBar();
+ buttonSidePanel = new javax.swing.JToggleButton();
+ buttonStreamData = new javax.swing.JButton();
+ buttonSave = new javax.swing.JToggleButton();
+ buttonGrabBackground = new javax.swing.JButton();
+ buttonPause = new javax.swing.JToggleButton();
+ jSeparator6 = new javax.swing.JToolBar.Separator();
+ buttonMarker = new javax.swing.JToggleButton();
+ buttonProfile = new javax.swing.JToggleButton();
+ buttonFit = new javax.swing.JToggleButton();
+ buttonReticle = new javax.swing.JToggleButton();
+ buttonScale = new javax.swing.JToggleButton();
+ buttonTitle = new javax.swing.JToggleButton();
+ pauseSelection = new ch.psi.pshell.swing.ValueSelection();
+ panelCameraSelection = new javax.swing.JPanel();
+ jLabel1 = new javax.swing.JLabel();
+ comboCameras = new javax.swing.JComboBox();
+ labelType = new javax.swing.JLabel();
+ comboType = new javax.swing.JComboBox();
+ renderer = new ch.psi.pshell.imaging.Renderer();
+
+ setPreferredSize(new java.awt.Dimension(873, 600));
+
+ jPanel3.setBorder(javax.swing.BorderFactory.createTitledBorder("Zoom"));
+
+ buttonGroup1.add(buttonZoomFit);
+ buttonZoomFit.setText("Fit");
+ buttonZoomFit.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ buttonZoomFitActionPerformed(evt);
+ }
+ });
+
+ buttonGroup1.add(buttonZoomStretch);
+ buttonZoomStretch.setText("Stretch");
+ buttonZoomStretch.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ buttonZoomStretchActionPerformed(evt);
+ }
+ });
+
+ buttonGroup1.add(buttonZoomNormal);
+ buttonZoomNormal.setText("Normal");
+ buttonZoomNormal.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ buttonZoomNormalActionPerformed(evt);
+ }
+ });
+
+ buttonGroup1.add(buttonZoom025);
+ buttonZoom025.setText("1/4");
+ buttonZoom025.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ buttonZoom025ActionPerformed(evt);
+ }
+ });
+
+ buttonGroup1.add(buttonZoom05);
+ buttonZoom05.setText("1/2");
+ buttonZoom05.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ buttonZoom05ActionPerformed(evt);
+ }
+ });
+
+ buttonGroup1.add(buttonZoom2);
+ buttonZoom2.setText("2");
+ buttonZoom2.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ buttonZoom2ActionPerformed(evt);
+ }
+ });
+
+ javax.swing.GroupLayout jPanel3Layout = new javax.swing.GroupLayout(jPanel3);
+ jPanel3.setLayout(jPanel3Layout);
+ jPanel3Layout.setHorizontalGroup(
+ jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(jPanel3Layout.createSequentialGroup()
+ .addContainerGap()
+ .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(buttonZoomFit)
+ .addComponent(buttonZoomNormal)
+ .addComponent(buttonZoomStretch))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(buttonZoom025)
+ .addComponent(buttonZoom05)
+ .addComponent(buttonZoom2))
+ .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ );
+ jPanel3Layout.setVerticalGroup(
+ jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(jPanel3Layout.createSequentialGroup()
+ .addGap(4, 4, 4)
+ .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
+ .addComponent(buttonZoomNormal)
+ .addComponent(buttonZoom025))
+ .addGap(0, 0, 0)
+ .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
+ .addComponent(buttonZoomFit)
+ .addComponent(buttonZoom05))
+ .addGap(0, 0, 0)
+ .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
+ .addComponent(buttonZoomStretch)
+ .addComponent(buttonZoom2))
+ .addContainerGap())
+ );
+
+ jPanel2.setBorder(javax.swing.BorderFactory.createTitledBorder("Colormap"));
+
+ checkHistogram.setText("Histogram");
+ checkHistogram.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ checkHistogramActionPerformed(evt);
+ }
+ });
+
+ comboColormap.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ onChangeColormap(evt);
+ }
+ });
+
+ jLabel3.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
+ jLabel3.setText("Type:");
+
+ jLabel4.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
+ jLabel4.setText("Range:");
+
+ buttonGroup3.add(buttonFullRange);
+ buttonFullRange.setText("Full");
+ buttonFullRange.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ onChangeColormap(evt);
+ }
+ });
+
+ buttonGroup3.add(buttonManual);
+ buttonManual.setText("Manual");
+ buttonManual.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ onChangeColormap(evt);
+ }
+ });
+
+ buttonGroup3.add(buttonAutomatic);
+ buttonAutomatic.setText("Automatic");
+ buttonAutomatic.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ onChangeColormap(evt);
+ }
+ });
+
+ labelMin.setText("Min:");
+
+ spinnerMin.setModel(new javax.swing.SpinnerNumberModel(0, 0, 65535, 1));
+ spinnerMin.setEnabled(false);
+ spinnerMin.setPreferredSize(new java.awt.Dimension(77, 20));
+ spinnerMin.addChangeListener(new javax.swing.event.ChangeListener() {
+ public void stateChanged(javax.swing.event.ChangeEvent evt) {
+ onChangeColormapRange(evt);
+ }
+ });
+
+ spinnerMax.setModel(new javax.swing.SpinnerNumberModel(255, 0, 65535, 1));
+ spinnerMax.setEnabled(false);
+ spinnerMax.setPreferredSize(new java.awt.Dimension(77, 20));
+ spinnerMax.addChangeListener(new javax.swing.event.ChangeListener() {
+ public void stateChanged(javax.swing.event.ChangeEvent evt) {
+ onChangeColormapRange(evt);
+ }
+ });
+
+ labelMax.setText("Max:");
+
+ btFixColormapRange.setText("Fix");
+ btFixColormapRange.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ btFixColormapRangeActionPerformed(evt);
+ }
+ });
+
+ javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(jPanel2);
+ jPanel2.setLayout(jPanel2Layout);
+ jPanel2Layout.setHorizontalGroup(
+ jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(jPanel2Layout.createSequentialGroup()
+ .addGap(4, 4, 4)
+ .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(jLabel3)
+ .addComponent(jLabel4))
+ .addGap(4, 4, 4)
+ .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(buttonAutomatic)
+ .addComponent(buttonFullRange)
+ .addComponent(buttonManual)
+ .addComponent(comboColormap, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel2Layout.createSequentialGroup()
+ .addComponent(labelMax)
+ .addGap(2, 2, 2)
+ .addComponent(spinnerMax, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addComponent(checkHistogram, javax.swing.GroupLayout.Alignment.TRAILING)
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel2Layout.createSequentialGroup()
+ .addComponent(labelMin)
+ .addGap(2, 2, 2)
+ .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+ .addComponent(btFixColormapRange, javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(spinnerMin, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))))
+ .addContainerGap())
+ );
+
+ jPanel2Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {btFixColormapRange, spinnerMax, spinnerMin});
+
+ jPanel2Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {jLabel3, jLabel4});
+
+ jPanel2Layout.setVerticalGroup(
+ jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel2Layout.createSequentialGroup()
+ .addGap(4, 4, 4)
+ .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(comboColormap, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(jLabel3)
+ .addComponent(checkHistogram))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(buttonAutomatic)
+ .addComponent(jLabel4)
+ .addComponent(btFixColormapRange, javax.swing.GroupLayout.PREFERRED_SIZE, 26, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addGap(0, 0, 0)
+ .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
+ .addComponent(labelMin)
+ .addComponent(spinnerMin, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(buttonFullRange))
+ .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
+ .addComponent(buttonManual)
+ .addComponent(labelMax)
+ .addComponent(spinnerMax, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addContainerGap())
+ );
+
+ jPanel5.setBorder(javax.swing.BorderFactory.createTitledBorder("Source"));
+
+ buttonGroup4.add(buttonServer);
+ buttonServer.setSelected(true);
+ buttonServer.setText("Server");
+ buttonServer.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ buttonServerActionPerformed(evt);
+ }
+ });
+
+ buttonGroup4.add(buttonDirect);
+ buttonDirect.setText("Direct");
+ buttonDirect.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ buttonDirectActionPerformed(evt);
+ }
+ });
+
+ textState.setEditable(false);
+ textState.setHorizontalAlignment(javax.swing.JTextField.CENTER);
+ textState.setDisabledTextColor(new java.awt.Color(0, 0, 0));
+ textState.setEnabled(false);
+
+ javax.swing.GroupLayout jPanel5Layout = new javax.swing.GroupLayout(jPanel5);
+ jPanel5.setLayout(jPanel5Layout);
+ jPanel5Layout.setHorizontalGroup(
+ jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(jPanel5Layout.createSequentialGroup()
+ .addContainerGap()
+ .addComponent(buttonServer)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(buttonDirect)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(textState, javax.swing.GroupLayout.PREFERRED_SIZE, 80, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addContainerGap())
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel5Layout.createSequentialGroup()
+ .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(filler1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGap(56, 56, 56))
+ );
+ jPanel5Layout.setVerticalGroup(
+ jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(jPanel5Layout.createSequentialGroup()
+ .addGap(4, 4, 4)
+ .addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(jPanel5Layout.createSequentialGroup()
+ .addComponent(textState, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(filler1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addGroup(jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(buttonServer)
+ .addComponent(buttonDirect)))
+ .addContainerGap())
+ );
+
+ panelScreen.setBorder(javax.swing.BorderFactory.createTitledBorder("Screen"));
+
+ comboScreen.setEnabled(false);
+ comboScreen.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ comboScreenActionPerformed(evt);
+ }
+ });
+
+ javax.swing.GroupLayout panelScreenLayout = new javax.swing.GroupLayout(panelScreen);
+ panelScreen.setLayout(panelScreenLayout);
+ panelScreenLayout.setHorizontalGroup(
+ panelScreenLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(panelScreenLayout.createSequentialGroup()
+ .addContainerGap()
+ .addGroup(panelScreenLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(valueScreen, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(comboScreen, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addContainerGap())
+ );
+ panelScreenLayout.setVerticalGroup(
+ panelScreenLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelScreenLayout.createSequentialGroup()
+ .addGap(4, 4, 4)
+ .addComponent(comboScreen, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(valueScreen, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addContainerGap())
+ );
+
+ panelFilter.setBorder(javax.swing.BorderFactory.createTitledBorder("Filter"));
+
+ comboFilter.setEnabled(false);
+ comboFilter.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ comboFilterActionPerformed(evt);
+ }
+ });
+
+ javax.swing.GroupLayout panelFilterLayout = new javax.swing.GroupLayout(panelFilter);
+ panelFilter.setLayout(panelFilterLayout);
+ panelFilterLayout.setHorizontalGroup(
+ panelFilterLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(panelFilterLayout.createSequentialGroup()
+ .addContainerGap()
+ .addGroup(panelFilterLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(valueFilter, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(comboFilter, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addContainerGap())
+ );
+ panelFilterLayout.setVerticalGroup(
+ panelFilterLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelFilterLayout.createSequentialGroup()
+ .addGap(4, 4, 4)
+ .addComponent(comboFilter, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(valueFilter, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ );
+
+ panelScreen2.setBorder(javax.swing.BorderFactory.createTitledBorder("Pipeline"));
+
+ checkThreshold.setText("Threshold");
+ checkThreshold.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ checkThresholdActionPerformed(evt);
+ }
+ });
+
+ spinnerThreshold.setModel(new javax.swing.SpinnerNumberModel(0.0d, 0.0d, 99999.0d, 1.0d));
+ spinnerThreshold.addChangeListener(new javax.swing.event.ChangeListener() {
+ public void stateChanged(javax.swing.event.ChangeEvent evt) {
+ spinnerThresholdonChange(evt);
+ }
+ });
+
+ checkBackground.setText("Subtract Background");
+ checkBackground.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ checkBackgroundActionPerformed(evt);
+ }
+ });
+
+ checkGoodRegion.setText("Good Region");
+ checkGoodRegion.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ checkGoodRegionActionPerformed(evt);
+ }
+ });
+
+ spinnerGrScale.setModel(new javax.swing.SpinnerNumberModel(3.0d, 0.01d, 99999.0d, 1.0d));
+ spinnerGrScale.addChangeListener(new javax.swing.event.ChangeListener() {
+ public void stateChanged(javax.swing.event.ChangeEvent evt) {
+ spinnerGrThresholdonChange(evt);
+ }
+ });
+
+ spinnerGrThreshold.setModel(new javax.swing.SpinnerNumberModel(0.5d, 0.04d, 1.0d, 0.1d));
+ spinnerGrThreshold.setPreferredSize(new java.awt.Dimension(92, 20));
+ spinnerGrThreshold.addChangeListener(new javax.swing.event.ChangeListener() {
+ public void stateChanged(javax.swing.event.ChangeEvent evt) {
+ spinnerGrThresholdonChange(evt);
+ }
+ });
+
+ labelGrThreshold.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
+ labelGrThreshold.setText("Threshold:");
+
+ labelGrScale.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
+ labelGrScale.setText("Scale:");
+
+ checkSlicing.setText("Slicing");
+ checkSlicing.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ checkSlicingActionPerformed(evt);
+ }
+ });
+
+ labelSlScale.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
+ labelSlScale.setText("Scale:");
+
+ spinnerSlScale.setModel(new javax.swing.SpinnerNumberModel(3.0d, 0.01d, 99999.0d, 1.0d));
+ spinnerSlScale.addChangeListener(new javax.swing.event.ChangeListener() {
+ public void stateChanged(javax.swing.event.ChangeEvent evt) {
+ spinnerSlicingChange(evt);
+ }
+ });
+
+ labelSlNumber.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
+ labelSlNumber.setText("Slices:");
+
+ spinnerSlNumber.setModel(new javax.swing.SpinnerNumberModel(2, 0, 1000, 1));
+ spinnerSlNumber.setPreferredSize(new java.awt.Dimension(92, 20));
+ spinnerSlNumber.addChangeListener(new javax.swing.event.ChangeListener() {
+ public void stateChanged(javax.swing.event.ChangeEvent evt) {
+ spinnerSlicingChange(evt);
+ }
+ });
+
+ labelSlOrientation.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
+ labelSlOrientation.setText("Orientation:");
+
+ spinnerSlOrientation.setModel(new javax.swing.SpinnerListModel(new String[] {"vertical", "horizontal"}));
+ spinnerSlOrientation.setPreferredSize(new java.awt.Dimension(92, 20));
+ spinnerSlOrientation.addChangeListener(new javax.swing.event.ChangeListener() {
+ public void stateChanged(javax.swing.event.ChangeEvent evt) {
+ spinnerSlicingChange(evt);
+ }
+ });
+
+ javax.swing.GroupLayout panelSlicingLayout = new javax.swing.GroupLayout(panelSlicing);
+ panelSlicing.setLayout(panelSlicingLayout);
+ panelSlicingLayout.setHorizontalGroup(
+ panelSlicingLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(panelSlicingLayout.createSequentialGroup()
+ .addContainerGap()
+ .addGroup(panelSlicingLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(panelSlicingLayout.createSequentialGroup()
+ .addComponent(checkSlicing)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addGroup(panelSlicingLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelSlicingLayout.createSequentialGroup()
+ .addComponent(labelSlNumber)
+ .addGap(2, 2, 2)
+ .addComponent(spinnerSlNumber, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelSlicingLayout.createSequentialGroup()
+ .addComponent(labelSlScale)
+ .addGap(2, 2, 2)
+ .addComponent(spinnerSlScale, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))))
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelSlicingLayout.createSequentialGroup()
+ .addGap(0, 0, Short.MAX_VALUE)
+ .addComponent(labelSlOrientation)
+ .addGap(2, 2, 2)
+ .addComponent(spinnerSlOrientation, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
+ .addContainerGap())
+ );
+
+ panelSlicingLayout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {spinnerSlNumber, spinnerSlOrientation, spinnerSlScale});
+
+ panelSlicingLayout.setVerticalGroup(
+ panelSlicingLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(panelSlicingLayout.createSequentialGroup()
+ .addGroup(panelSlicingLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(checkSlicing)
+ .addGroup(panelSlicingLayout.createSequentialGroup()
+ .addGroup(panelSlicingLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(spinnerSlNumber, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(labelSlNumber))
+ .addGap(0, 0, 0)
+ .addGroup(panelSlicingLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(spinnerSlScale, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(labelSlScale))))
+ .addGap(0, 0, 0)
+ .addGroup(panelSlicingLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(spinnerSlOrientation, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(labelSlOrientation)))
+ );
+
+ panelSlicingLayout.linkSize(javax.swing.SwingConstants.VERTICAL, new java.awt.Component[] {spinnerSlNumber, spinnerSlOrientation, spinnerSlScale});
+
+ checkRotation.setText("Rotation");
+ checkRotation.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ checkRotationActionPerformed(evt);
+ }
+ });
+
+ spinnerRotationAngle.setModel(new javax.swing.SpinnerNumberModel(0.0d, -360.0d, 360.0d, 1.0d));
+ spinnerRotationAngle.addChangeListener(new javax.swing.event.ChangeListener() {
+ public void stateChanged(javax.swing.event.ChangeEvent evt) {
+ spinnerRotationAngleStateChanged(evt);
+ }
+ });
+
+ spinnerRotationOrder.setModel(new javax.swing.SpinnerNumberModel(1, 1, 5, 1));
+ spinnerRotationOrder.addChangeListener(new javax.swing.event.ChangeListener() {
+ public void stateChanged(javax.swing.event.ChangeEvent evt) {
+ spinnerRotationAngleStateChanged(evt);
+ }
+ });
+
+ labelOrder.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
+ labelOrder.setText("Order:");
+
+ labelMode.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
+ labelMode.setText("Mode:");
+
+ spinnerRotationMode.setModel(new javax.swing.SpinnerListModel(new String[] {"constant", "reflect", "nearest", "mirror", "wrap", "ortho"}));
+ spinnerRotationMode.addChangeListener(new javax.swing.event.ChangeListener() {
+ public void stateChanged(javax.swing.event.ChangeEvent evt) {
+ spinnerRotationAngleStateChanged(evt);
+ }
+ });
+
+ labelAngle.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
+ labelAngle.setText("Angle:");
+
+ labelConstant.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
+ labelConstant.setText("Constant:");
+
+ spinnerRotationConstant.setModel(new javax.swing.SpinnerNumberModel(0, 0, 99999, 1));
+ spinnerRotationConstant.addChangeListener(new javax.swing.event.ChangeListener() {
+ public void stateChanged(javax.swing.event.ChangeEvent evt) {
+ spinnerRotationAngleStateChanged(evt);
+ }
+ });
+
+ checkAveraging.setText("Averaging");
+ checkAveraging.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ checkAveragingActionPerformed(evt);
+ }
+ });
+
+ spinnerAvFrames.setModel(new javax.swing.SpinnerNumberModel(1, 1, 1000, 1));
+ spinnerAvFrames.addChangeListener(new javax.swing.event.ChangeListener() {
+ public void stateChanged(javax.swing.event.ChangeEvent evt) {
+ spinnerAvFramesStateChanged(evt);
+ }
+ });
+
+ labelAvFrames.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
+ labelAvFrames.setText("Frames:");
+
+ labelAvMode.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
+ labelAvMode.setText("Mode:");
+
+ spinnerAvMode.setModel(new javax.swing.SpinnerListModel(new String[] {"single", "window"}));
+ spinnerAvMode.addChangeListener(new javax.swing.event.ChangeListener() {
+ public void stateChanged(javax.swing.event.ChangeEvent evt) {
+ spinnerAvModeonChange(evt);
+ }
+ });
+
+ spinnerBackground.setModel(new javax.swing.SpinnerListModel(new String[] {"normal", "signed", "passive"}));
+ spinnerBackground.addChangeListener(new javax.swing.event.ChangeListener() {
+ public void stateChanged(javax.swing.event.ChangeEvent evt) {
+ spinnerBackgroundStateChanged(evt);
+ }
+ });
+
+ javax.swing.GroupLayout panelScreen2Layout = new javax.swing.GroupLayout(panelScreen2);
+ panelScreen2.setLayout(panelScreen2Layout);
+ panelScreen2Layout.setHorizontalGroup(
+ panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(panelSlicing, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addGroup(panelScreen2Layout.createSequentialGroup()
+ .addContainerGap()
+ .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(panelScreen2Layout.createSequentialGroup()
+ .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(panelScreen2Layout.createSequentialGroup()
+ .addComponent(checkAveraging)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(labelAvFrames, javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(labelAvMode, javax.swing.GroupLayout.Alignment.TRAILING)))
+ .addGroup(panelScreen2Layout.createSequentialGroup()
+ .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(checkGoodRegion)
+ .addComponent(checkRotation)
+ .addComponent(checkThreshold))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(labelOrder, javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(labelAngle, javax.swing.GroupLayout.Alignment.TRAILING))
+ .addComponent(labelGrScale, javax.swing.GroupLayout.Alignment.TRAILING)))
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelScreen2Layout.createSequentialGroup()
+ .addGap(0, 0, Short.MAX_VALUE)
+ .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(labelConstant, javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(labelMode, javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(labelGrThreshold, javax.swing.GroupLayout.Alignment.TRAILING))))
+ .addGap(2, 2, 2))
+ .addGroup(panelScreen2Layout.createSequentialGroup()
+ .addComponent(checkBackground)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
+ .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+ .addComponent(spinnerGrThreshold, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(spinnerGrScale, javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(spinnerThreshold, javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(spinnerRotationOrder, javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(spinnerRotationMode, javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(spinnerRotationAngle, javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(spinnerRotationConstant, javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(spinnerAvFrames, javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(spinnerAvMode, javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(spinnerBackground, javax.swing.GroupLayout.Alignment.TRAILING))
+ .addContainerGap())
+ );
+
+ panelScreen2Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {spinnerAvFrames, spinnerAvMode, spinnerBackground, spinnerGrScale, spinnerGrThreshold, spinnerRotationAngle, spinnerRotationConstant, spinnerRotationMode, spinnerRotationOrder, spinnerThreshold});
+
+ panelScreen2Layout.setVerticalGroup(
+ panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(panelScreen2Layout.createSequentialGroup()
+ .addContainerGap()
+ .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(checkBackground)
+ .addComponent(spinnerBackground, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addGap(2, 2, 2)
+ .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(checkThreshold)
+ .addComponent(spinnerThreshold, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addGap(2, 2, 2)
+ .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(checkAveraging)
+ .addComponent(spinnerAvFrames, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(labelAvFrames))
+ .addGap(2, 2, 2)
+ .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(spinnerAvMode, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(labelAvMode))
+ .addGap(2, 2, 2)
+ .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(checkRotation)
+ .addComponent(spinnerRotationAngle, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(labelAngle))
+ .addGap(0, 0, 0)
+ .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(spinnerRotationOrder, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(labelOrder))
+ .addGap(0, 0, 0)
+ .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(spinnerRotationMode, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(labelMode))
+ .addGap(0, 0, 0)
+ .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(spinnerRotationConstant, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(labelConstant))
+ .addGap(2, 2, 2)
+ .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(checkGoodRegion)
+ .addComponent(spinnerGrScale, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(labelGrScale))
+ .addGap(0, 0, 0)
+ .addGroup(panelScreen2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(spinnerGrThreshold, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(labelGrThreshold))
+ .addGap(2, 2, 2)
+ .addComponent(panelSlicing, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addContainerGap())
+ );
+
+ panelScreen2Layout.linkSize(javax.swing.SwingConstants.VERTICAL, new java.awt.Component[] {spinnerAvFrames, spinnerAvMode, spinnerBackground, spinnerGrScale, spinnerGrThreshold, spinnerRotationAngle, spinnerRotationConstant, spinnerRotationMode, spinnerRotationOrder, spinnerThreshold});
+
+ panelPulse.setBorder(javax.swing.BorderFactory.createTitledBorder("Pulse"));
+
+ buttonPulse1.setText("Pulse 1");
+ buttonPulse1.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ buttonPulse1ActionPerformed(evt);
+ }
+ });
+
+ buttonPulse2.setText("Pulse 2");
+ buttonPulse2.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ buttonPulse2ActionPerformed(evt);
+ }
+ });
+
+ textPulse.setEditable(false);
+ textPulse.setHorizontalAlignment(javax.swing.JTextField.CENTER);
+
+ javax.swing.GroupLayout panelPulseLayout = new javax.swing.GroupLayout(panelPulse);
+ panelPulse.setLayout(panelPulseLayout);
+ panelPulseLayout.setHorizontalGroup(
+ panelPulseLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(panelPulseLayout.createSequentialGroup()
+ .addContainerGap()
+ .addComponent(buttonPulse1)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(buttonPulse2)
+ .addGap(18, 18, Short.MAX_VALUE)
+ .addComponent(textPulse, javax.swing.GroupLayout.PREFERRED_SIZE, 63, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addContainerGap())
+ );
+
+ panelPulseLayout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {buttonPulse1, buttonPulse2});
+
+ panelPulseLayout.setVerticalGroup(
+ panelPulseLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(panelPulseLayout.createSequentialGroup()
+ .addGroup(panelPulseLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(buttonPulse1, javax.swing.GroupLayout.PREFERRED_SIZE, 26, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(buttonPulse2, javax.swing.GroupLayout.PREFERRED_SIZE, 26, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(textPulse, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addContainerGap())
+ );
+
+ javax.swing.GroupLayout sidePanelLayout = new javax.swing.GroupLayout(sidePanel);
+ sidePanel.setLayout(sidePanelLayout);
+ sidePanelLayout.setHorizontalGroup(
+ sidePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(sidePanelLayout.createSequentialGroup()
+ .addContainerGap()
+ .addGroup(sidePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
+ .addComponent(jPanel5, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(jPanel3, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(jPanel2, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(panelScreen2, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(panelScreen, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(panelFilter, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(panelPulse, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ );
+ sidePanelLayout.setVerticalGroup(
+ sidePanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(sidePanelLayout.createSequentialGroup()
+ .addGap(0, 0, 0)
+ .addComponent(jPanel5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(panelScreen2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(jPanel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(jPanel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(panelScreen, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(panelFilter, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(panelPulse, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ );
+
+ toolBar.setFloatable(false);
+ toolBar.setRollover(true);
+
+ buttonSidePanel.setIcon(getIcon("List"));
+ buttonSidePanel.setSelected(true);
+ buttonSidePanel.setText(" ");
+ buttonSidePanel.setToolTipText("Show Side Panel");
+ buttonSidePanel.setFocusable(false);
+ buttonSidePanel.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+ buttonSidePanel.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ buttonSidePanelActionPerformed(evt);
+ }
+ });
+ toolBar.add(buttonSidePanel);
+
+ buttonStreamData.setIcon(getIcon("Details"));
+ buttonStreamData.setText(" ");
+ buttonStreamData.setToolTipText("Show Data Window");
+ buttonStreamData.setFocusable(false);
+ buttonStreamData.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+ buttonStreamData.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ buttonStreamDataActionPerformed(evt);
+ }
+ });
+ toolBar.add(buttonStreamData);
+
+ buttonSave.setIcon(getIcon("Save"));
+ buttonSave.setText(" ");
+ buttonSave.setToolTipText("Save Snapshot");
+ buttonSave.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+ buttonSave.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ buttonSaveActionPerformed(evt);
+ }
+ });
+ toolBar.add(buttonSave);
+
+ buttonGrabBackground.setIcon(getIcon("Background"));
+ buttonGrabBackground.setText(" ");
+ buttonGrabBackground.setToolTipText("Grab Background");
+ buttonGrabBackground.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+ buttonGrabBackground.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ buttonGrabBackgroundActionPerformed(evt);
+ }
+ });
+ toolBar.add(buttonGrabBackground);
+
+ buttonPause.setIcon(getIcon("Pause"));
+ buttonPause.setText(" ");
+ buttonPause.setToolTipText("Pause");
+ buttonPause.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+ buttonPause.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ buttonPauseActionPerformed(evt);
+ }
+ });
+ toolBar.add(buttonPause);
+
+ jSeparator6.setMaximumSize(new java.awt.Dimension(20, 32767));
+ jSeparator6.setPreferredSize(new java.awt.Dimension(20, 0));
+ jSeparator6.setRequestFocusEnabled(false);
+ toolBar.add(jSeparator6);
+
+ buttonMarker.setIcon(getIcon("Marker"));
+ buttonMarker.setText(" ");
+ buttonMarker.setToolTipText("Show Marker");
+ buttonMarker.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+ buttonMarker.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ buttonMarkerActionPerformed(evt);
+ }
+ });
+ toolBar.add(buttonMarker);
+
+ buttonProfile.setIcon(getIcon("Profile"
+ + ""));
+ buttonProfile.setSelected(true);
+ buttonProfile.setText(" ");
+ buttonProfile.setToolTipText("Show Image Profile");
+ buttonProfile.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+ buttonProfile.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ buttonProfileActionPerformed(evt);
+ }
+ });
+ toolBar.add(buttonProfile);
+
+ buttonFit.setIcon(getIcon("Fit"));
+ buttonFit.setSelected(true);
+ buttonFit.setText(" ");
+ buttonFit.setToolTipText("Show Fit");
+ buttonFit.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+ buttonFit.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ buttonFitActionPerformed(evt);
+ }
+ });
+ toolBar.add(buttonFit);
+
+ buttonReticle.setIcon(getIcon("Reticule"));
+ buttonReticle.setSelected(true);
+ buttonReticle.setText(" ");
+ buttonReticle.setToolTipText("Show Reticle");
+ buttonReticle.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+ buttonReticle.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ buttonReticleActionPerformed(evt);
+ }
+ });
+ toolBar.add(buttonReticle);
+
+ buttonScale.setIcon(getIcon("Scale"));
+ buttonScale.setSelected(true);
+ buttonScale.setText(" ");
+ buttonScale.setToolTipText("Show Colormap Scale");
+ buttonScale.setFocusable(false);
+ buttonScale.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+ buttonScale.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ buttonScaleActionPerformed(evt);
+ }
+ });
+ toolBar.add(buttonScale);
+
+ buttonTitle.setIcon(getIcon("Title"));
+ buttonTitle.setSelected(true);
+ buttonTitle.setText(" ");
+ buttonTitle.setToolTipText("Show Camera Name");
+ buttonTitle.setFocusable(false);
+ buttonTitle.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
+ buttonTitle.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ buttonTitleActionPerformed(evt);
+ }
+ });
+ toolBar.add(buttonTitle);
+
+ pauseSelection.setDecimals(0);
+
+ jLabel1.setText("Camera:");
+
+ comboCameras.setFont(new java.awt.Font("Dialog", 1, 14)); // NOI18N
+ comboCameras.setMaximumRowCount(30);
+ comboCameras.setMinimumSize(new java.awt.Dimension(127, 27));
+ comboCameras.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ comboCamerasActionPerformed(evt);
+ }
+ });
+
+ labelType.setText("Type:");
+
+ comboType.setFont(new java.awt.Font("Dialog", 1, 14)); // NOI18N
+ comboType.setMaximumRowCount(30);
+ comboType.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "All", "Laser", "Electrons", "Photonics" }));
+ comboType.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ comboTypeActionPerformed(evt);
+ }
+ });
+
+ javax.swing.GroupLayout panelCameraSelectionLayout = new javax.swing.GroupLayout(panelCameraSelection);
+ panelCameraSelection.setLayout(panelCameraSelectionLayout);
+ panelCameraSelectionLayout.setHorizontalGroup(
+ panelCameraSelectionLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(panelCameraSelectionLayout.createSequentialGroup()
+ .addContainerGap()
+ .addComponent(jLabel1)
+ .addGap(0, 0, 0)
+ .addComponent(comboCameras, javax.swing.GroupLayout.PREFERRED_SIZE, 222, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(labelType)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(comboType, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGap(0, 0, 0))
+ );
+ panelCameraSelectionLayout.setVerticalGroup(
+ panelCameraSelectionLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(panelCameraSelectionLayout.createSequentialGroup()
+ .addGap(0, 0, 0)
+ .addGroup(panelCameraSelectionLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
+ .addComponent(comboType, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(labelType)
+ .addComponent(jLabel1)
+ .addComponent(comboCameras, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addGap(0, 0, 0))
+ );
+
+ javax.swing.GroupLayout topPanelLayout = new javax.swing.GroupLayout(topPanel);
+ topPanel.setLayout(topPanelLayout);
+ topPanelLayout.setHorizontalGroup(
+ topPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, topPanelLayout.createSequentialGroup()
+ .addComponent(toolBar, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGap(18, 18, 18)
+ .addComponent(panelCameraSelection, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addGap(18, 18, 18)
+ .addComponent(pauseSelection, javax.swing.GroupLayout.PREFERRED_SIZE, 334, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addContainerGap())
+ );
+ topPanelLayout.setVerticalGroup(
+ topPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+ .addGroup(topPanelLayout.createSequentialGroup()
+ .addGap(1, 1, 1)
+ .addGroup(topPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
+ .addComponent(pauseSelection, javax.swing.GroupLayout.PREFERRED_SIZE, 29, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(toolBar, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(panelCameraSelection, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
+ );
+
+ javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
+ this.setLayout(layout);
+ layout.setHorizontalGroup(
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+ .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
+ .addComponent(sidePanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(renderer, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
+ .addContainerGap()
+ .addComponent(topPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
+ .addContainerGap())
+ );
+ layout.setVerticalGroup(
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
+ .addComponent(topPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(sidePanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(renderer, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
+ );
+ }// //GEN-END:initComponents
+
+ private void buttonZoomFitActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonZoomFitActionPerformed
+ try {
+ renderer.setMode(RendererMode.Fit);
+ } catch (Exception ex) {
+ showException(ex);
+ }
+ }//GEN-LAST:event_buttonZoomFitActionPerformed
+
+ private void buttonZoomStretchActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonZoomStretchActionPerformed
+ try {
+ renderer.setMode(RendererMode.Stretch);
+ } catch (Exception ex) {
+ showException(ex);
+ }
+ }//GEN-LAST:event_buttonZoomStretchActionPerformed
+
+ private void buttonZoomNormalActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonZoomNormalActionPerformed
+ try {
+ renderer.setMode(RendererMode.Fixed);
+ centralizeRenderer();
+ } catch (Exception ex) {
+ showException(ex);
+ }
+ }//GEN-LAST:event_buttonZoomNormalActionPerformed
+
+ private void onChangeColormap(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_onChangeColormap
+ try {
+ if ((camera != null) && (camera instanceof ColormapSource) && !updatingColormap) {
+ ColormapSource source = (ColormapSource) camera;
+ Color colorReticule = new Color(16, 16, 16);
+ Color colorMarker = new Color(128, 128, 128);
+ Colormap colormap = (Colormap) comboColormap.getSelectedItem();
+ source.getConfig().colormap = (colormap == null) ? Colormap.Flame : colormap;
+ switch (source.getConfig().colormap) {
+ case Grayscale:
+ case Inverted:
+ case Red:
+ case Green:
+ case Blue:
+ colorReticule = new Color(0, 192, 0);
+ colorMarker = new Color(64, 255, 64);
+ break;
+ case Flame:
+ colorReticule = new Color(0, 192, 0);
+ colorMarker = new Color(64, 255, 64);
+ break;
+ }
+
+ renderer.setPenReticle(new Pen(colorReticule));
+ renderer.setPenProfile(new Pen(colorReticule, 0));
+ renderer.setPenMarker(new Pen(colorMarker, 2));
+ renderer.setShowReticle(false);
+ checkReticle();
+ source.getConfig().colormapAutomatic = buttonAutomatic.isSelected();
+ source.getConfig().colormapMin = buttonFullRange.isSelected() ? Double.NaN : (Integer) spinnerMin.getValue();
+ source.getConfig().colormapMax = buttonFullRange.isSelected() ? Double.NaN : (Integer) spinnerMax.getValue();
+ try {
+ source.getConfig().save();
+ } catch (Exception ex) {
+ logger.log(Level.WARNING, null, ex);
+ }
+ source.refresh();
+ if (buttonPause.isSelected()) {
+ updatePause();
+ }
+ updateColormap();
+ }
+ } catch (Exception ex) {
+ showException(ex);
+ }
+ }//GEN-LAST:event_onChangeColormap
+
+ private void onChangeColormapRange(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_onChangeColormapRange
+ onChangeColormap(null);
+ }//GEN-LAST:event_onChangeColormapRange
+
+ private void buttonZoom025ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonZoom025ActionPerformed
+ renderer.setZoom(0.25);
+ renderer.setMode(RendererMode.Zoom);
+ centralizeRenderer();
+ }//GEN-LAST:event_buttonZoom025ActionPerformed
+
+ private void buttonZoom05ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonZoom05ActionPerformed
+ renderer.setZoom(0.5);
+ renderer.setMode(RendererMode.Zoom);
+ centralizeRenderer();
+ }//GEN-LAST:event_buttonZoom05ActionPerformed
+
+ private void buttonServerActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonServerActionPerformed
+ if (!usingServer) {
+ usingServer = true;
+ requestCameraListUpdate = true;
+ }
+ comboCamerasActionPerformed(null);
+ }//GEN-LAST:event_buttonServerActionPerformed
+
+ private void buttonDirectActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonDirectActionPerformed
+ if (usingServer) {
+ usingServer = false;
+ requestCameraListUpdate = true;
+ }
+ comboCamerasActionPerformed(null);
+ }//GEN-LAST:event_buttonDirectActionPerformed
+
+ private void comboScreenActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_comboScreenActionPerformed
+
+ comboScreen.setEnabled(false);
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ ChannelInteger setpoint = null;
+ try {
+ int index = comboScreen.getSelectedIndex();
+ if (index >= 0) {
+ if (cameraName.contains("DSRM")) {
+ setpoint = new ChannelInteger(null, cameraName + ":POSITION_SP");
+ } else {
+ setpoint = new ChannelInteger(null, cameraName + ":SET_SCREEN1_POS");
+ }
+ setpoint.initialize();
+ Integer readback = setpoint.read();
+ if ((readback == null) || (setpoint.read() != index)) {
+ setpoint.write(index);
+ //Must be threaded to control the laser because of sleep in setLaserState
+ /*
+ boolean laserOn = getLaserState();
+ if (laserOn) {
+ setLaserState(false);
+ }
+ try {
+ setpoint.write(index);
+ } finally {
+ if (laserOn) {
+ setLaserState(true);
+ }
+ }
+ */
+ }
+ screen.read();
+ }
+ } catch (Exception ex) {
+ showException(ex);
+ } finally {
+ comboScreen.setEnabled(true);
+ if (setpoint != null) {
+ setpoint.close();
+ }
+ }
+ }
+ }).start();
+ }//GEN-LAST:event_comboScreenActionPerformed
+
+ private void comboFilterActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_comboFilterActionPerformed
+ try {
+ String setpoint = (String) comboFilter.getSelectedItem();
+ if (setpoint != null) {
+ if (!setpoint.equals(filter.read())) {
+ filter.write(setpoint);
+ }
+ }
+ } catch (Exception ex) {
+ showException(ex);
+ }
+ }//GEN-LAST:event_comboFilterActionPerformed
+
+ private void checkHistogramActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_checkHistogramActionPerformed
+ try {
+ setHistogramVisible(checkHistogram.isSelected());
+ } catch (Exception ex) {
+ showException(ex);
+ }
+ }//GEN-LAST:event_checkHistogramActionPerformed
+
+ private void buttonZoom2ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonZoom2ActionPerformed
+ renderer.setZoom(2.0);
+ renderer.setMode(RendererMode.Zoom);
+ centralizeRenderer();
+ }//GEN-LAST:event_buttonZoom2ActionPerformed
+
+ private void spinnerThresholdonChange(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_spinnerThresholdonChange
+ if (!updatingServerControls) {
+ try {
+ if ((server != null) && (server.isStarted())) {
+ server.setThreshold((Double) spinnerThreshold.getValue());
+ }
+ } catch (Exception ex) {
+ showException(ex);
+ updatePipelineControls();
+ }
+ }
+ }//GEN-LAST:event_spinnerThresholdonChange
+
+ private void checkBackgroundActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_checkBackgroundActionPerformed
+ if (server != null) {
+ if (!updatingServerControls) {
+ try {
+ if (server.isStarted()) {
+ spinnerBackground.setVisible(checkBackground.isSelected());
+ Object bg_mode = checkBackground.isSelected() ? String.valueOf(spinnerBackground.getValue()) : false;
+ server.setBackgroundSubtraction(bg_mode.equals("normal") ? true : bg_mode);
+ }
+ } catch (Exception ex) {
+ showException(ex);
+ updatePipelineControls();
+ updatingServerControls = true;
+ checkBackground.setSelected(false);
+ updatingServerControls = false;
+
+ }
+ }
+ } else {
+ camera.setBackgroundEnabled(checkBackground.isSelected());
+ }
+ }//GEN-LAST:event_checkBackgroundActionPerformed
+
+ private void checkThresholdActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_checkThresholdActionPerformed
+ if (!updatingServerControls) {
+ try {
+ if ((server != null) && (server.isStarted())) {
+ spinnerThreshold.setVisible(checkThreshold.isSelected());
+ server.setThreshold(checkThreshold.isSelected() ? (Double) spinnerThreshold.getValue() : null);
+ }
+ } catch (Exception ex) {
+ showException(ex);
+ updatePipelineControls();
+ }
+ }
+ }//GEN-LAST:event_checkThresholdActionPerformed
+
+ private void checkGoodRegionActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_checkGoodRegionActionPerformed
+ if (!updatingServerControls) {
+ try {
+ if ((server != null) && (server.isStarted())) {
+ goodRegion = checkGoodRegion.isSelected();
+ setGoodRegionOptionsVisible(goodRegion);
+ if (goodRegion) {
+ server.setGoodRegion(((Number) spinnerGrThreshold.getValue()).doubleValue(), ((Number) spinnerGrScale.getValue()).doubleValue());
+ } else {
+ server.setGoodRegion(null);
+ }
+ }
+ } catch (Exception ex) {
+ showException(ex);
+ updatePipelineControls();
+ }
+ }
+ }//GEN-LAST:event_checkGoodRegionActionPerformed
+
+ private void spinnerGrThresholdonChange(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_spinnerGrThresholdonChange
+ if (!updatingServerControls) {
+ try {
+ if ((server != null) && (server.isStarted())) {
+ server.setGoodRegion((Double) spinnerGrThreshold.getValue(), (Double) spinnerGrScale.getValue());
+ }
+ } catch (Exception ex) {
+ showException(ex);
+ updatePipelineControls();
+ }
+ }
+ }//GEN-LAST:event_spinnerGrThresholdonChange
+
+ private void btFixColormapRangeActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btFixColormapRangeActionPerformed
+ try {
+ updatingColormap = true;
+ ArrayProperties properties = currentFrame.data.getProperties();
+ spinnerMax.setValue(properties.max.intValue());
+ spinnerMin.setValue(properties.min.intValue());
+ buttonManual.setSelected(true);
+ } catch (Exception ex) {
+ showException(ex);
+ } finally {
+ updatingColormap = false;
+ onChangeColormap(null);
+ }
+ }//GEN-LAST:event_btFixColormapRangeActionPerformed
+
+ private void checkSlicingActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_checkSlicingActionPerformed
+ if (!updatingServerControls) {
+ try {
+ if ((server != null) && (server.isStarted())) {
+ slicing = checkSlicing.isSelected();
+ setSlicingOptionsVisible(slicing);
+ if (slicing) {
+ server.setSlicing((Integer) spinnerSlNumber.getValue(), (Double) spinnerSlScale.getValue(), spinnerSlOrientation.getValue().toString());
+ } else {
+ server.setSlicing(null);
+ }
+ }
+ } catch (Exception ex) {
+ showException(ex);
+ updatePipelineControls();
+ }
+ }
+ }//GEN-LAST:event_checkSlicingActionPerformed
+
+ private void spinnerSlicingChange(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_spinnerSlicingChange
+ if (!updatingServerControls) {
+ try {
+ if ((server != null) && (server.isStarted())) {
+ server.setSlicing((Integer) spinnerSlNumber.getValue(), (Double) spinnerSlScale.getValue(), spinnerSlOrientation.getValue().toString());
+ }
+ } catch (Exception ex) {
+ showException(ex);
+ updatePipelineControls();
+ }
+ }
+ }//GEN-LAST:event_spinnerSlicingChange
+
+ private void buttonReticleActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonReticleActionPerformed
+ try {
+ checkReticle();
+ } catch (Exception ex) {
+ showException(ex);
+ }
+ }//GEN-LAST:event_buttonReticleActionPerformed
+
+ private void buttonFitActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonFitActionPerformed
+ try {
+ showFit = buttonFit.isSelected();
+ if (showFit) {
+ renderer.setProfile(Renderer.Profile.None);
+ } else {
+ renderer.removeOverlays(fitOv);
+ fitOv = null;
+ }
+ } catch (Exception ex) {
+ showException(ex);
+ }
+ }//GEN-LAST:event_buttonFitActionPerformed
+
+ private void buttonProfileActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonProfileActionPerformed
+ try {
+ showProfile = buttonProfile.isSelected();
+ if (showProfile) {
+ renderer.setProfile(Renderer.Profile.None);
+ } else {
+ renderer.removeOverlays(profileOv);
+ profileOv = null;
+ }
+ } catch (Exception ex) {
+ showException(ex);
+ }
+ }//GEN-LAST:event_buttonProfileActionPerformed
+
+ private void buttonMarkerActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonMarkerActionPerformed
+ try {
+ checkMarker(null);
+ } catch (Exception ex) {
+ showException(ex);
+ }
+ }//GEN-LAST:event_buttonMarkerActionPerformed
+
+ private void buttonPauseActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonPauseActionPerformed
+ try {
+ if (!updatingButtons) {
+ setPaused(buttonPause.isSelected());
+ }
+ } catch (Exception ex) {
+ showException(ex);
+ }
+ }//GEN-LAST:event_buttonPauseActionPerformed
+
+ private void buttonGrabBackgroundActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonGrabBackgroundActionPerformed
+ try {
+ if (camera != null) {
+ boolean laserOn1 = getLaserState(1);
+ boolean laserOn2 = getLaserState(2);
+ OptionResult ret = null;
+ if (laserOn1 || laserOn2) {
+ if (laserOn1){
+ ret = SwingUtils.showOption(getTopLevel(), "Capture Background", "Do you want to put Bunch 1 laser on delay for capturing background?", OptionType.YesNoCancel);
+ if (ret == OptionResult.No) {
+ laserOn1 = false;
+ }
+ if (ret == OptionResult.Cancel) {
+ return;
+ }
+ }
+ if (laserOn2){
+ ret = SwingUtils.showOption(getTopLevel(), "Capture Background", "Do you want to put Bunch 2 laser on delay for capturing background?", OptionType.YesNoCancel);
+ if (ret == OptionResult.No) {
+ laserOn2= false;
+ }
+ }
+ } else {
+ ret = SwingUtils.showOption(getTopLevel(), "Capture Background", "Do you want to capture background now?", OptionType.OkCancel);
+ }
+
+ if (ret == OptionResult.Cancel) {
+ return;
+ }
+
+ if (laserOn1) {
+ setLaserState(1,false);
+ }
+ if (laserOn2) {
+ setLaserState(2,false);
+ }
+ try {
+ System.out.println("Grabbing background for: " + cameraAlias);
+ if (server != null) {
+ server.captureBackground(5);
+ } else {
+ camera.captureBackground(5, 0);
+ }
+ } finally {
+ if (laserOn1) {
+ setLaserState(1,true);
+ }
+ if (laserOn2) {
+ setLaserState(2,true);
+ }
+ }
+ SwingUtils.showMessage(getTopLevel(), "Success", "Success capturing background", 5000);
+ }
+ } catch (Exception ex) {
+ showException(ex);
+ }
+ }//GEN-LAST:event_buttonGrabBackgroundActionPerformed
+
+ private void buttonSaveActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonSaveActionPerformed
+ try {
+ saveSnapshot();
+ } catch (Exception ex) {
+ logger.log(Level.WARNING, null, ex);
+ showException(ex);
+ }
+ }//GEN-LAST:event_buttonSaveActionPerformed
+
+ private void buttonStreamDataActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonStreamDataActionPerformed
+ try {
+ showStreamData();
+ } catch (Exception ex) {
+ showException(ex);
+ }
+ }//GEN-LAST:event_buttonStreamDataActionPerformed
+
+ private void buttonSidePanelActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonSidePanelActionPerformed
+ sidePanel.setVisible(buttonSidePanel.isSelected());
+ }//GEN-LAST:event_buttonSidePanelActionPerformed
+
+ private void comboTypeActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_comboTypeActionPerformed
+ try {
+ if (!updatingCameraSelection) {
+ updateCameraList();
+ if ((cameraAlias != null) && (!cameraAlias.equals(comboCameras.getSelectedItem()))) {
+ setCamera(null);
+ }
+ }
+
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ } finally {
+ updateButtons();
+ }
+ }//GEN-LAST:event_comboTypeActionPerformed
+
+ private void comboCamerasActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_comboCamerasActionPerformed
+ try {
+ if (!updatingCameraSelection) {
+ if (!comboCameras.isEnabled()) {
+ throw new Exception("Invalid state");
+ }
+ comboCameras.setEnabled(false);
+ comboType.setEnabled(false);
+ buttonServer.setEnabled(false);
+ buttonDirect.setEnabled(false);
+ final String cameraName = (String) comboCameras.getSelectedItem();
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ if (requestCameraListUpdate) {
+ requestCameraListUpdate = false;
+ try {
+ updateCameraList();
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ try {
+ setCamera(cameraName.trim().isEmpty() ? null : cameraName);
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ } finally {
+ updateButtons();
+ comboCameras.setEnabled(true);
+ comboType.setEnabled(true);
+ buttonServer.setEnabled(true);
+ buttonDirect.setEnabled(true);
+ }
+ }
+ }).start();
+ }
+ } catch (Exception ex) {
+ showException(ex);
+ }
+ }//GEN-LAST:event_comboCamerasActionPerformed
+
+ private void buttonTitleActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonTitleActionPerformed
+ try {
+ manageTitleOverlay();
+ } catch (Exception ex) {
+ showException(ex);
+ } finally {
+ }
+ }//GEN-LAST:event_buttonTitleActionPerformed
+
+ private void buttonScaleActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonScaleActionPerformed
+ try {
+ renderer.setShowColormapScale(buttonScale.isSelected());
+ } catch (Exception ex) {
+ showException(ex);
+ }
+ }//GEN-LAST:event_buttonScaleActionPerformed
+
+ private void checkRotationActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_checkRotationActionPerformed
+ if (!updatingServerControls) {
+ try {
+ if ((server != null) && (server.isStarted())) {
+ boolean rotation = checkRotation.isSelected();
+ setRotationOptionsVisible(rotation);
+ if (rotation) {
+ spinnerRotationAngleStateChanged(null);
+ } else {
+ server.setRotation(null);
+ }
+ }
+ } catch (Exception ex) {
+ showException(ex);
+ updatePipelineControls();
+ }
+ }
+ }//GEN-LAST:event_checkRotationActionPerformed
+
+ private void spinnerRotationAngleStateChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_spinnerRotationAngleStateChanged
+ try {
+ String mode = String.valueOf(spinnerRotationMode.getValue());
+ server.setRotation(((Number) spinnerRotationAngle.getValue()).doubleValue(),
+ ((Number) spinnerRotationOrder.getValue()).intValue(),
+ mode.equals("constant") ? String.valueOf(spinnerRotationConstant.getValue()): mode);
+ } catch (Exception ex) {
+ showException(ex);
+ updatePipelineControls();
+ }
+ }//GEN-LAST:event_spinnerRotationAngleStateChanged
+
+ private void checkAveragingActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_checkAveragingActionPerformed
+ if (!updatingServerControls) {
+ try {
+ if ((server != null) && (server.isStarted())) {
+ setAveragingOptionsVisible(checkAveraging.isSelected());
+ Integer av = spinnerAvMode.getValue().equals("window") ? - (Integer)spinnerAvFrames.getValue() : (Integer)spinnerAvFrames.getValue();
+ setInstanceConfigValue("averaging", checkAveraging.isSelected() ? av : null);
+ }
+ } catch (Exception ex) {
+ showException(ex);
+ updatePipelineControls();
+ }
+ }
+ }//GEN-LAST:event_checkAveragingActionPerformed
+
+ private void spinnerAvModeonChange(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_spinnerAvModeonChange
+ checkAveragingActionPerformed(null);
+ }//GEN-LAST:event_spinnerAvModeonChange
+
+ private void spinnerAvFramesStateChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_spinnerAvFramesStateChanged
+ checkAveragingActionPerformed(null);
+ }//GEN-LAST:event_spinnerAvFramesStateChanged
+
+ private void spinnerBackgroundStateChanged(javax.swing.event.ChangeEvent evt) {//GEN-FIRST:event_spinnerBackgroundStateChanged
+ if (!updatingServerControls) {
+ try {
+ Object bg_mode = String.valueOf(spinnerBackground.getValue());
+ server.setBackgroundSubtraction((bg_mode=="normal") ? true : bg_mode);
+ } catch (Exception ex) {
+ showException(ex);
+ updatePipelineControls();
+ }
+ }
+ }//GEN-LAST:event_spinnerBackgroundStateChanged
+
+ private void buttonPulse1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonPulse1ActionPerformed
+ try {
+ if ((server != null) && (server.isStarted())) {
+ server.setInstanceConfigValue("pulse",1);
+ }
+ } catch (Exception ex) {
+ showException(ex);
+ }
+ }//GEN-LAST:event_buttonPulse1ActionPerformed
+
+ private void buttonPulse2ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonPulse2ActionPerformed
+ try {
+ if ((server != null) && (server.isStarted())) {
+ server.setInstanceConfigValue("pulse",2);
+ }
+ } catch (Exception ex) {
+ showException(ex);
+ }
+ }//GEN-LAST:event_buttonPulse2ActionPerformed
+
+ // Variables declaration - do not modify//GEN-BEGIN:variables
+ private javax.swing.JButton btFixColormapRange;
+ private javax.swing.JRadioButton buttonAutomatic;
+ private javax.swing.JRadioButton buttonDirect;
+ private javax.swing.JToggleButton buttonFit;
+ private javax.swing.JRadioButton buttonFullRange;
+ private javax.swing.JButton buttonGrabBackground;
+ private javax.swing.ButtonGroup buttonGroup1;
+ private javax.swing.ButtonGroup buttonGroup2;
+ private javax.swing.ButtonGroup buttonGroup3;
+ private javax.swing.ButtonGroup buttonGroup4;
+ private javax.swing.JRadioButton buttonManual;
+ private javax.swing.JToggleButton buttonMarker;
+ private javax.swing.JToggleButton buttonPause;
+ private javax.swing.JToggleButton buttonProfile;
+ private javax.swing.JButton buttonPulse1;
+ private javax.swing.JButton buttonPulse2;
+ private javax.swing.JToggleButton buttonReticle;
+ private javax.swing.JToggleButton buttonSave;
+ private javax.swing.JToggleButton buttonScale;
+ private javax.swing.JRadioButton buttonServer;
+ private javax.swing.JToggleButton buttonSidePanel;
+ private javax.swing.JButton buttonStreamData;
+ private javax.swing.JToggleButton buttonTitle;
+ private javax.swing.JRadioButton buttonZoom025;
+ private javax.swing.JRadioButton buttonZoom05;
+ private javax.swing.JRadioButton buttonZoom2;
+ private javax.swing.JRadioButton buttonZoomFit;
+ private javax.swing.JRadioButton buttonZoomNormal;
+ private javax.swing.JRadioButton buttonZoomStretch;
+ private javax.swing.JCheckBox checkAveraging;
+ private javax.swing.JCheckBox checkBackground;
+ private javax.swing.JCheckBox checkGoodRegion;
+ private javax.swing.JCheckBox checkHistogram;
+ private javax.swing.JCheckBox checkRotation;
+ private javax.swing.JCheckBox checkSlicing;
+ private javax.swing.JCheckBox checkThreshold;
+ private javax.swing.JComboBox comboCameras;
+ private javax.swing.JComboBox comboColormap;
+ private javax.swing.JComboBox comboFilter;
+ private javax.swing.JComboBox comboScreen;
+ private javax.swing.JComboBox comboType;
+ private javax.swing.Box.Filler filler1;
+ private javax.swing.JLabel jLabel1;
+ private javax.swing.JLabel jLabel3;
+ private javax.swing.JLabel jLabel4;
+ private javax.swing.JPanel jPanel2;
+ private javax.swing.JPanel jPanel3;
+ private javax.swing.JPanel jPanel5;
+ private javax.swing.JProgressBar jProgressBar1;
+ private javax.swing.JToolBar.Separator jSeparator6;
+ private javax.swing.JLabel labelAngle;
+ private javax.swing.JLabel labelAvFrames;
+ private javax.swing.JLabel labelAvMode;
+ private javax.swing.JLabel labelConstant;
+ private javax.swing.JLabel labelGrScale;
+ private javax.swing.JLabel labelGrThreshold;
+ private javax.swing.JLabel labelMax;
+ private javax.swing.JLabel labelMin;
+ private javax.swing.JLabel labelMode;
+ private javax.swing.JLabel labelOrder;
+ private javax.swing.JLabel labelSlNumber;
+ private javax.swing.JLabel labelSlOrientation;
+ private javax.swing.JLabel labelSlScale;
+ private javax.swing.JLabel labelType;
+ private javax.swing.JPanel panelCameraSelection;
+ private javax.swing.JPanel panelFilter;
+ private javax.swing.JPanel panelPulse;
+ private javax.swing.JPanel panelScreen;
+ private javax.swing.JPanel panelScreen2;
+ private javax.swing.JPanel panelSlicing;
+ private ch.psi.pshell.swing.ValueSelection pauseSelection;
+ private ch.psi.pshell.imaging.Renderer renderer;
+ private javax.swing.JPanel sidePanel;
+ private javax.swing.JSpinner spinnerAvFrames;
+ private javax.swing.JSpinner spinnerAvMode;
+ private javax.swing.JSpinner spinnerBackground;
+ private javax.swing.JSpinner spinnerGrScale;
+ private javax.swing.JSpinner spinnerGrThreshold;
+ private javax.swing.JSpinner spinnerMax;
+ private javax.swing.JSpinner spinnerMin;
+ private javax.swing.JSpinner spinnerRotationAngle;
+ private javax.swing.JSpinner spinnerRotationConstant;
+ private javax.swing.JSpinner spinnerRotationMode;
+ private javax.swing.JSpinner spinnerRotationOrder;
+ private javax.swing.JSpinner spinnerSlNumber;
+ private javax.swing.JSpinner spinnerSlOrientation;
+ private javax.swing.JSpinner spinnerSlScale;
+ private javax.swing.JSpinner spinnerThreshold;
+ private javax.swing.JTextField textPulse;
+ private javax.swing.JTextField textState;
+ private javax.swing.JToolBar toolBar;
+ private javax.swing.JPanel topPanel;
+ private ch.psi.pshell.swing.DeviceValuePanel valueFilter;
+ private ch.psi.pshell.swing.DeviceValuePanel valueScreen;
+ // End of variables declaration//GEN-END:variables
+}
diff --git a/plugins/filelisting.txt b/plugins/filelisting.txt
new file mode 100644
index 0000000..8c5352d
--- /dev/null
+++ b/plugins/filelisting.txt
@@ -0,0 +1,2 @@
+gobbo_a/0067_unnamed/20210126/20210126_101140_TestAddSession.h5
+test/out.h5
\ No newline at end of file
diff --git a/plugins/metadata.json b/plugins/metadata.json
new file mode 100644
index 0000000..baada20
--- /dev/null
+++ b/plugins/metadata.json
@@ -0,0 +1 @@
+{"sourceFolder":"/Users/gobbo_a/dev/pshell/config/home/data","isPublished":true,"dataFormat":"h5","ownerGroup":"p0001","datasetName":"67_unnamed","description":"unnamed","endTime":"2021-01-26T10:15:08.272Z","scientificMetadata":{"detectorParameters":{"Objective":20,"Scintillator":"LAG 20um","Exposure time":{"u":"s","v":0.4}},"scanParameters":{"Number of flats":120,"Rot Y min position":{"u":"deg","v":0},"Angular step":{"u":"deg","v":0.1},"Number of projections":1801,"File Prefix":"817b_B2_","Rot Y max position":{"u":"deg","v":180},"Flat frequency":0,"Number of darks":10,"Number of inter-flats":0,"Sample In":{"u":"m","v":0},"Inner scan flag":0,"Sample Out":{"u":"m","v":-0.005}},"beamlineParameters":{"Beam energy":{"u":"eV","v":22595},"Ring current":{"u":"A","v":0.402246},"Monostripe":"Ru/C"},"Bool":true,"Sample":"MySample","Authors":[],"Proposer":"Alex","Real":3.14,"beamlineState":{"inp":0.0,"sin":0.0},"beamlineState2":"{inp=0.0, sin=0.0}","scientificMetadata2":"{detectorParameters={Objective=20, Scintillator=LAG 20um, Exposure time={u=s, v=0.4}}, scanParameters={Number of flats=120, Rot Y min position={u=deg, v=0}, Angular step={u=deg, v=0.1}, Number of projections=1801, File Prefix=817b_B2_, Rot Y max position={u=deg, v=180}, Flat frequency=0, Number of darks=10, Number of inter-flats=0, Sample In={u=m, v=0}, Inner scan flag=0, Sample Out={u=m, v=-0.005}}, beamlineParameters={Beam energy={u=eV, v=22595}, Ring current={u=A, v=0.402246}, Monostripe=Ru/C}}","Map":{},"Int":3,"Proposal":"Test","P-group":"P001"},"type":"raw","creationLocation":"/PSI/SLS/SIM","principalInvestigator":"alexgobbo@gmail.com"}
\ No newline at end of file
diff --git a/script/2019_0227_023309_XAS_Fe_b_TST.xml b/script/2019_0227_023309_XAS_Fe_b_TST.xml
index ffee909..b438e06 100644
--- a/script/2019_0227_023309_XAS_Fe_b_TST.xml
+++ b/script/2019_0227_023309_XAS_Fe_b_TST.xml
@@ -1,6 +1,6 @@
-
+
@@ -48,7 +48,6 @@
0.05
-
+ return box
@@ -168,7 +167,7 @@ def process(a,b,c,d):
box = a * TrueICR / OCR / d
if (OCR*d) == 0:
box=0.0
- return box
+ return box
@@ -176,7 +175,7 @@ def process(a,b,c,d):
def process(D2_FeKa_corr):
SUM_DET = 0.
SUM_DET = SUM_DET + D2_FeKa_corr
- return SUM_DET
+ return SUM_DET
diff --git a/script/CamServerErrors.py b/script/CamServerErrors.py
new file mode 100644
index 0000000..b9ba5e1
--- /dev/null
+++ b/script/CamServerErrors.py
@@ -0,0 +1,514 @@
+l = """
+Nov 26 00:19:09 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13442833970 - received 13442833971: Pulse ID interval set to: 2 [SATES21-CAMS154-M1]
+Nov 26 00:19:09 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13442833973 - received 13442833972: Pulse ID interval set to: 1 [SATES21-CAMS154-M1]
+Nov 26 00:34:44 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13442927525 - received 13442927526: Pulse ID interval set to: 2 [SATES21-CAMS154-M1]
+Nov 26 00:34:44 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13442927528 - received 13442927527: Pulse ID interval set to: 1 [SATES21-CAMS154-M1]
+Nov 26 00:35:08 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13442929841 - received 13442929842: Pulse ID interval set to: 2 [SATES21-CAMS154-M1]
+Nov 26 00:35:08 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13442929844 - received 13442929843: Pulse ID interval set to: 1 [SATES21-CAMS154-M1]
+Nov 26 00:41:46 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13442969677 - received 13442969678: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 00:41:46 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13442969680 - received 13442969679: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 00:44:06 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13442983665 - received 13442983666: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 00:44:06 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13442983668 - received 13442983667: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 01:10:13 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13443140378 - received 13443140379: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 01:10:13 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13443140381 - received 13443140380: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 01:28:45 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13443251617 - received 13443251618: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 01:28:45 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13443251620 - received 13443251619: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 01:35:07 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13443289819 - received 13443289820: Pulse ID interval set to: 2 [SATES21-CAMS154-M1]
+Nov 26 01:35:07 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13443289822 - received 13443289821: Pulse ID interval set to: 1 [SATES21-CAMS154-M1]
+Nov 26 01:35:07 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13443289824 - received 13443289825: Pulse ID interval set to: 2 [SATES21-CAMS154-M1]
+Nov 26 01:35:07 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13443289827 - received 13443289826: Pulse ID interval set to: 1 [SATES21-CAMS154-M1]
+Nov 26 02:04:37 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13443466829 - received 13443466830: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 02:04:37 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13443466832 - received 13443466831: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 02:23:43 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13443581533 - received 13443581534: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 02:23:43 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13443581536 - received 13443581535: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 02:41:48 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13443690023 - received 13443690024: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 02:41:48 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13443690026 - received 13443690025: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 02:48:42 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13443731420 - received 13443731421: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 02:48:42 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13443731423 - received 13443731422: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 03:41:09 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13444046177 - received 13444046178: Pulse ID interval set to: 2 [SATES21-CAMS154-M1]
+Nov 26 03:41:09 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13444046180 - received 13444046179: Pulse ID interval set to: 1 [SATES21-CAMS154-M1]
+Nov 26 03:41:49 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13444050218 - received 13444050219: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 03:41:49 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13444050221 - received 13444050220: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 03:52:53 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13444116620 - received 13444116621: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 03:52:53 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13444116623 - received 13444116622: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 04:41:50 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13444410398 - received 13444410399: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 04:41:50 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13444410401 - received 13444410400: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 04:44:03 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13444423663 - received 13444423664: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 04:44:03 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13444423666 - received 13444423665: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 04:44:03 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13444423701 - received 13444423702: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 04:44:03 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13444423704 - received 13444423703: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 04:44:06 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13444423978 - received 13444423979: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 04:44:06 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13444423981 - received 13444423980: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 04:44:09 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13444424259 - received 13444424260: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 04:44:09 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13444424262 - received 13444424261: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 04:53:20 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13444479438 - received 13444479439: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 04:53:20 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13444479441 - received 13444479440: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 05:51:41 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13444829547 - received 13444829548: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 05:51:41 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13444829550 - received 13444829549: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 05:51:41 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13444829553 - received 13444829554: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 05:51:41 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13444829556 - received 13444829555: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 05:51:41 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13444829573 - received 13444829574: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 05:51:41 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13444829576 - received 13444829575: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 05:51:41 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13444829578 - received 13444829579: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 05:51:41 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13444829581 - received 13444829580: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 06:19:06 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13444994096 - received 13444994097: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 06:19:06 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13444994099 - received 13444994098: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 06:19:26 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13444996176 - received 13444996177: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 06:19:26 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13444996179 - received 13444996178: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 06:20:29 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445002415 - received 13445002416: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 06:20:29 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445002418 - received 13445002417: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 06:21:36 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445009171 - received 13445009172: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 06:21:36 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445009174 - received 13445009173: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 06:34:05 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445083996 - received 13445083997: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 06:34:05 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445083999 - received 13445083998: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 06:34:25 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445086072 - received 13445086073: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 06:34:25 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445086075 - received 13445086074: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 06:34:31 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445086593 - received 13445086594: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 06:34:31 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445086596 - received 13445086595: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 06:41:12 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445126701 - received 13445126702: Pulse ID interval set to: 2 [SATES21-CAMS154-M1]
+Nov 26 06:41:12 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445126704 - received 13445126703: Pulse ID interval set to: 1 [SATES21-CAMS154-M1]
+Nov 26 06:41:52 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445130728 - received 13445130729: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 06:41:52 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445130731 - received 13445130730: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 06:41:52 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445130746 - received 13445130747: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 06:41:52 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445130749 - received 13445130748: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 06:46:02 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445155745 - received 13445155746: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 06:46:02 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445155748 - received 13445155747: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 06:53:03 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445197768 - received 13445197769: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 06:53:03 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445197771 - received 13445197770: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 06:54:57 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445209194 - received 13445209195: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 06:54:57 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445209197 - received 13445209196: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 06:55:54 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445214907 - received 13445214908: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 06:55:54 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445214910 - received 13445214909: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 06:56:10 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445216464 - received 13445216465: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 06:56:10 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445216467 - received 13445216466: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 06:57:02 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445221657 - received 13445221658: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 06:57:02 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445221660 - received 13445221659: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 06:57:12 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445222697 - received 13445222698: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 06:57:12 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445222700 - received 13445222699: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 06:57:17 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445223215 - received 13445223216: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 06:57:17 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445223218 - received 13445223217: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 06:57:23 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445223736 - received 13445223737: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 06:57:23 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445223739 - received 13445223738: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 06:58:20 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445229449 - received 13445229450: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 06:58:20 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445229452 - received 13445229451: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 07:19:59 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445359431 - received 13445359432: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 07:19:59 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445359434 - received 13445359433: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 07:25:58 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445395295 - received 13445395296: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 07:25:58 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445395298 - received 13445395297: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 07:27:15 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445403092 - received 13445403093: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 07:27:16 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445403095 - received 13445403094: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 07:27:36 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445405172 - received 13445405173: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 07:27:36 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445405175 - received 13445405174: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 07:29:46 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445418162 - received 13445418163: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 07:29:46 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445418165 - received 13445418164: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 07:36:42 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445459728 - received 13445459729: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 07:36:42 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445459731 - received 13445459730: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 07:38:10 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445468540 - received 13445468541: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 07:38:10 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445468543 - received 13445468542: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 07:41:07 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445486181 - received 13445486182: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 07:41:07 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445486184 - received 13445486183: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 07:41:22 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445487742 - received 13445487743: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 07:41:22 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445487745 - received 13445487744: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 07:41:27 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445488259 - received 13445488260: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 07:41:27 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445488262 - received 13445488261: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 07:41:53 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445490835 - received 13445490836: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 07:41:53 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445490838 - received 13445490837: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 07:43:16 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445499168 - received 13445499169: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 07:43:16 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445499171 - received 13445499170: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 07:43:32 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445500722 - received 13445500723: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 07:43:32 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445500725 - received 13445500724: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 07:45:11 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445510586 - received 13445510587: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 07:45:11 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445510589 - received 13445510588: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 07:45:21 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445511623 - received 13445511624: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 07:45:21 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445511626 - received 13445511625: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 07:45:57 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445515257 - received 13445515258: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 07:45:57 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445515260 - received 13445515259: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 07:48:43 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445531854 - received 13445531855: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 07:48:43 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445531857 - received 13445531856: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 07:48:49 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445532375 - received 13445532376: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 07:48:49 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445532378 - received 13445532377: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 07:48:59 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445533412 - received 13445533413: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 07:48:59 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445533415 - received 13445533414: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 07:49:35 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445537044 - received 13445537045: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 07:49:35 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445537047 - received 13445537046: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 07:50:17 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445541189 - received 13445541190: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 07:50:17 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445541192 - received 13445541191: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 07:51:24 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445547928 - received 13445547929: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 07:51:24 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445547931 - received 13445547930: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 07:52:37 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445555199 - received 13445555200: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 07:52:37 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445555202 - received 13445555201: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 07:59:06 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445594102 - received 13445594101: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 07:59:16 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445595139 - received 13445595140: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 07:59:16 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445595142 - received 13445595141: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 08:00:39 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445603444 - received 13445603445: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 08:00:39 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445603447 - received 13445603446: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 08:02:34 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445614881 - received 13445614882: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 08:02:34 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445614884 - received 13445614883: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 08:15:23 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445691769 - received 13445691770: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 08:15:23 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445691772 - received 13445691771: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 08:21:27 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445728168 - received 13445728169: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 08:21:27 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445728171 - received 13445728170: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 08:25:51 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445754614 - received 13445754615: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 08:25:51 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445754617 - received 13445754616: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 08:26:53 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445760860 - received 13445760861: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 08:26:53 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445760863 - received 13445760862: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 08:27:35 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445765017 - received 13445765018: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 08:27:35 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445765020 - received 13445765019: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 08:32:05 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445792042 - received 13445792043: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 08:32:05 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445792045 - received 13445792044: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 08:32:21 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445793602 - received 13445793603: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 08:32:21 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445793605 - received 13445793604: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 08:33:08 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445798280 - received 13445798281: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 08:33:08 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445798283 - received 13445798282: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 08:33:34 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445800880 - received 13445800881: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 08:33:34 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445800883 - received 13445800882: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 08:35:04 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445809931 - received 13445809932: Pulse ID interval set to: 2 [SATES21-CAMS154-M1]
+Nov 26 08:35:04 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445809934 - received 13445809933: Pulse ID interval set to: 1 [SATES21-CAMS154-M1]
+Nov 26 08:35:54 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445814910 - received 13445814911: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 08:35:54 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445814913 - received 13445814912: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 08:35:59 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445815430 - received 13445815431: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 08:35:59 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445815433 - received 13445815432: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 08:37:22 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445823745 - received 13445823746: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 08:37:22 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445823748 - received 13445823747: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 08:37:43 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445825825 - received 13445825826: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 08:37:43 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445825828 - received 13445825827: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 08:37:53 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445826866 - received 13445826867: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 08:37:53 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445826869 - received 13445826868: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 08:38:35 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445831023 - received 13445831024: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 08:38:35 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445831026 - received 13445831025: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 08:41:14 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445846925 - received 13445846926: Pulse ID interval set to: 2 [SATES21-CAMS154-M1]
+Nov 26 08:41:14 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445846928 - received 13445846927: Pulse ID interval set to: 1 [SATES21-CAMS154-M1]
+Nov 26 08:41:54 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445850945 - received 13445850946: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 08:41:54 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445850948 - received 13445850947: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 08:43:52 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445862724 - received 13445862725: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 08:43:52 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13445862727 - received 13445862726: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 09:41:55 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446211109 - received 13446211110: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 09:41:55 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446211112 - received 13446211111: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 10:15:22 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446411749 - received 13446411750: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 10:15:22 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446411752 - received 13446411751: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 10:15:22 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446411756 - received 13446411757: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 10:15:22 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446411759 - received 13446411758: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 10:15:22 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446411760 - received 13446411761: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 10:15:22 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446411763 - received 13446411762: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 10:15:22 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446411763 - received 13446411764: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 10:15:22 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446411766 - received 13446411765: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 10:15:22 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446411767 - received 13446411768: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 10:15:22 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446411770 - received 13446411769: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 10:15:22 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446411773 - received 13446411774: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 10:15:22 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446411776 - received 13446411775: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 10:15:22 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446411779 - received 13446411780: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 10:15:22 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446411782 - received 13446411781: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 10:15:22 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446411782 - received 13446411783: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 10:15:22 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446411787 - received 13446411786: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 10:15:22 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446411789 - received 13446411790: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 10:15:22 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446411794 - received 13446411793: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 10:15:22 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446411794 - received 13446411795: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 10:15:22 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446411797 - received 13446411796: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 10:15:22 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446411799 - received 13446411800: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 10:15:22 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446411802 - received 13446411801: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 10:15:22 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446411804 - received 13446411805: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 10:15:22 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446411807 - received 13446411806: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 10:15:22 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446411808 - received 13446411809: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 10:15:22 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446411811 - received 13446411810: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 10:41:16 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446567196 - received 13446567197: Pulse ID interval set to: 2 [SATES21-CAMS154-M1]
+Nov 26 10:41:16 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446567199 - received 13446567198: Pulse ID interval set to: 1 [SATES21-CAMS154-M1]
+Nov 26 10:46:02 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446595803 - received 13446595804: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 10:46:02 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446595806 - received 13446595805: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 10:46:02 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446595807 - received 13446595808: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 10:46:02 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446595810 - received 13446595809: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 10:46:02 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446595815 - received 13446595816: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 10:46:02 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446595818 - received 13446595817: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 10:46:03 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446595883 - received 13446595884: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 10:46:03 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446595886 - received 13446595885: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 10:46:04 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446596021 - received 13446596022: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 10:46:04 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446596024 - received 13446596023: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 10:46:07 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446596329 - received 13446596330: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 10:46:07 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446596332 - received 13446596331: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 11:03:19 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446699508 - received 13446699509: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 11:03:19 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446699511 - received 13446699510: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 11:29:55 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446859061 - received 13446859062: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 11:29:55 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446859064 - received 13446859063: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 11:41:57 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446931289 - received 13446931290: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 11:41:57 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446931292 - received 13446931291: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 11:44:33 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446946849 - received 13446946850: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 11:44:33 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446946852 - received 13446946851: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 11:46:03 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446955820 - received 13446955821: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 11:46:03 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446955823 - received 13446955822: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 11:46:03 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446955826 - received 13446955827: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 11:46:03 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446955829 - received 13446955828: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 11:46:10 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446956529 - received 13446956530: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 11:46:10 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13446956532 - received 13446956531: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 12:08:27 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447090267 - received 13447090268: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 12:08:27 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447090270 - received 13447090269: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 12:16:51 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447140672 - received 13447140673: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 12:16:51 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447140675 - received 13447140674: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 12:17:28 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447144309 - received 13447144310: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 12:17:28 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447144312 - received 13447144311: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 12:19:38 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447157301 - received 13447157302: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 12:19:38 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447157304 - received 13447157303: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 12:21:01 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447165616 - received 13447165617: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 12:21:01 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447165619 - received 13447165618: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 12:30:22 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447221767 - received 13447221768: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 12:30:22 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447221770 - received 13447221769: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 12:33:55 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447243082 - received 13447243083: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 12:33:55 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447243085 - received 13447243084: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 12:39:12 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447274790 - received 13447274791: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 12:39:12 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447274793 - received 13447274792: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 12:41:58 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447291401 - received 13447291402: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 12:41:58 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447291404 - received 13447291403: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 12:43:06 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447298180 - received 13447298181: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 12:43:06 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447298183 - received 13447298182: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 12:44:02 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447303824 - received 13447303825: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 12:44:02 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447303827 - received 13447303826: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 12:44:02 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447303830 - received 13447303831: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 12:44:02 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447303833 - received 13447303832: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 12:44:03 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447303901 - received 13447303902: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 12:44:03 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447303904 - received 13447303903: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 12:44:09 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447304450 - received 13447304451: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 12:44:09 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447304453 - received 13447304452: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 12:46:03 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447315853 - received 13447315854: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 12:46:03 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447315856 - received 13447315855: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 12:47:05 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447322094 - received 13447322095: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 12:47:05 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447322097 - received 13447322096: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 12:47:10 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447322612 - received 13447322613: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 12:47:10 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447322615 - received 13447322614: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 12:47:41 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447325733 - received 13447325734: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 12:47:41 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447325736 - received 13447325735: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 12:47:52 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447326772 - received 13447326773: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 12:47:52 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447326775 - received 13447326774: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 12:49:20 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447335611 - received 13447335612: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 12:49:20 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447335614 - received 13447335613: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 12:49:36 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447337171 - received 13447337172: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 12:49:36 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447337174 - received 13447337173: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 12:49:51 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447338723 - received 13447338724: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 12:49:51 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447338726 - received 13447338725: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 12:51:35 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447349129 - received 13447349130: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 12:51:35 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447349132 - received 13447349131: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 12:51:51 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447350686 - received 13447350687: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 12:51:51 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447350689 - received 13447350688: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 12:52:12 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447352767 - received 13447352768: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 12:52:12 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447352770 - received 13447352769: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 12:53:14 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447359004 - received 13447359005: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 12:53:14 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447359007 - received 13447359006: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 12:54:11 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447364722 - received 13447364723: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 12:54:11 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447364725 - received 13447364724: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 12:54:48 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447368363 - received 13447368364: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 12:54:48 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447368366 - received 13447368365: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 12:54:53 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447368882 - received 13447368883: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 12:54:53 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447368885 - received 13447368884: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 12:54:58 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447369403 - received 13447369404: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 12:54:58 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447369406 - received 13447369405: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 12:55:40 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447373561 - received 13447373562: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 12:55:40 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447373564 - received 13447373563: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 12:57:08 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447382400 - received 13447382401: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 12:57:08 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447382403 - received 13447382402: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 12:58:15 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447389159 - received 13447389160: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 12:58:16 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447389162 - received 13447389161: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 12:59:59 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447399559 - received 13447399560: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 12:59:59 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447399562 - received 13447399561: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 13:04:35 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447427109 - received 13447427110: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 13:04:35 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447427112 - received 13447427111: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 13:12:54 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447477010 - received 13447477011: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 13:12:54 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447477013 - received 13447477012: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 13:12:59 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447477530 - received 13447477531: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 13:12:59 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447477533 - received 13447477532: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 13:13:30 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447480648 - received 13447480649: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 13:13:30 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447480651 - received 13447480650: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 13:14:07 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447484288 - received 13447484289: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 13:14:07 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447484291 - received 13447484290: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 13:21:44 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447530038 - received 13447530039: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 13:21:44 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447530041 - received 13447530040: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 13:23:49 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447542515 - received 13447542516: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 13:23:49 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447542518 - received 13447542517: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 13:24:20 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447545636 - received 13447545637: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 13:24:20 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447545639 - received 13447545638: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 13:24:51 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447548756 - received 13447548757: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 13:24:51 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447548759 - received 13447548758: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 13:34:54 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447609063 - received 13447609064: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 13:34:54 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447609066 - received 13447609065: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 13:35:15 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447611143 - received 13447611144: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 13:35:15 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447611146 - received 13447611145: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 13:36:33 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447618940 - received 13447618941: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 13:36:33 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447618943 - received 13447618942: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 13:36:59 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447621538 - received 13447621539: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 13:36:59 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447621541 - received 13447621540: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 13:37:35 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447625177 - received 13447625178: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 13:37:35 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447625180 - received 13447625179: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 13:37:40 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447625696 - received 13447625697: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 13:37:40 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447625699 - received 13447625698: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 13:42:31 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447654790 - received 13447654791: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 13:42:31 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447654793 - received 13447654792: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 13:44:36 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447667254 - received 13447667255: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 13:44:36 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447667257 - received 13447667256: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 13:47:17 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447683370 - received 13447683371: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 13:47:17 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447683373 - received 13447683372: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 13:47:32 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447684929 - received 13447684930: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 13:47:32 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447684932 - received 13447684931: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 13:47:48 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447686489 - received 13447686490: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 13:47:48 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447686492 - received 13447686491: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 13:48:04 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447688048 - received 13447688049: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 13:48:04 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447688051 - received 13447688050: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 13:50:29 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447702605 - received 13447702606: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 13:50:29 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447702608 - received 13447702607: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 13:50:50 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447704680 - received 13447704681: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 13:50:50 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447704683 - received 13447704682: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 13:57:35 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447745226 - received 13447745227: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 13:57:35 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447745229 - received 13447745228: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 13:58:43 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447751986 - received 13447751987: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 13:58:43 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447751989 - received 13447751988: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 14:02:26 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447774311 - received 13447774312: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 14:02:26 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447774314 - received 13447774313: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 14:02:52 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447776905 - received 13447776906: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 14:02:52 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447776908 - received 13447776907: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 14:03:07 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447778461 - received 13447778462: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 14:03:07 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447778464 - received 13447778463: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 14:03:59 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447783654 - received 13447783655: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 14:03:59 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447783657 - received 13447783656: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 14:04:10 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447784696 - received 13447784697: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 14:04:10 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447784699 - received 13447784698: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 14:05:38 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447793501 - received 13447793502: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 14:05:38 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447793504 - received 13447793503: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 14:06:19 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447797645 - received 13447797646: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 14:06:19 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447797648 - received 13447797647: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 14:06:24 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447798163 - received 13447798164: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 14:06:24 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447798166 - received 13447798165: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 14:08:13 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447809039 - received 13447809040: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 14:08:13 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447809042 - received 13447809041: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 14:10:49 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447824592 - received 13447824593: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 14:10:49 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447824595 - received 13447824594: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 14:14:53 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447848987 - received 13447848988: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 14:14:53 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447848990 - received 13447848989: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 14:15:45 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447854180 - received 13447854181: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 14:15:45 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447854183 - received 13447854182: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 14:19:12 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447874926 - received 13447874927: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 14:19:12 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447874929 - received 13447874928: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 14:20:14 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447881146 - received 13447881147: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 14:20:14 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447881149 - received 13447881148: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 14:20:46 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447884259 - received 13447884260: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 14:20:46 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447884262 - received 13447884261: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 14:21:01 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447885817 - received 13447885818: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 14:21:01 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447885820 - received 13447885819: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 14:22:24 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447894118 - received 13447894119: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 14:22:24 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447894121 - received 13447894120: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 14:23:53 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447902982 - received 13447902983: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 14:23:53 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447902985 - received 13447902984: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 14:25:00 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447909696 - received 13447909697: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 14:25:00 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447909699 - received 13447909698: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 14:25:26 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447912294 - received 13447912295: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 14:25:26 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447912297 - received 13447912296: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 14:26:13 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447916971 - received 13447916972: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 14:26:13 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447916974 - received 13447916973: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 14:26:18 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447917491 - received 13447917492: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 14:26:18 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447917494 - received 13447917493: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 14:26:28 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447918526 - received 13447918527: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 14:26:28 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447918529 - received 13447918528: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 14:29:09 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447934639 - received 13447934640: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 14:29:09 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447934642 - received 13447934641: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 14:29:15 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447935158 - received 13447935159: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 14:29:15 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447935161 - received 13447935160: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 14:36:08 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447976459 - received 13447976460: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 14:36:08 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13447976462 - received 13447976461: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 14:41:20 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448007720 - received 13448007721: Pulse ID interval set to: 2 [SATES21-CAMS154-M1]
+Nov 26 14:41:20 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448007723 - received 13448007722: Pulse ID interval set to: 1 [SATES21-CAMS154-M1]
+Nov 26 14:42:00 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448011720 - received 13448011721: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 14:42:00 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448011723 - received 13448011722: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 14:50:12 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448060914 - received 13448060915: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 14:50:12 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448060917 - received 13448060916: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 15:01:54 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448131072 - received 13448131073: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 15:01:54 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448131075 - received 13448131074: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 15:02:41 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448135752 - received 13448135753: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 15:02:41 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448135755 - received 13448135754: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 15:03:01 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448137833 - received 13448137834: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 15:03:01 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448137836 - received 13448137835: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 15:04:30 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448146671 - received 13448146672: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 15:04:30 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448146674 - received 13448146673: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 15:14:12 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448204881 - received 13448204882: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 15:14:12 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448204884 - received 13448204883: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 15:14:17 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448205400 - received 13448205401: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 15:14:17 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448205403 - received 13448205402: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 15:32:18 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448313490 - received 13448313491: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 15:32:18 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448313493 - received 13448313492: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 15:32:23 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448314010 - received 13448314011: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 15:32:23 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448314013 - received 13448314012: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 15:33:15 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448319207 - received 13448319208: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 15:33:15 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448319210 - received 13448319209: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 15:33:20 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448319726 - received 13448319727: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 15:33:20 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448319729 - received 13448319728: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 15:33:31 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448320766 - received 13448320767: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 15:33:31 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448320769 - received 13448320768: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 15:33:36 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448321287 - received 13448321288: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 15:33:36 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448321290 - received 13448321289: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 15:35:36 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448333236 - received 13448333237: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 15:35:36 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448333239 - received 13448333238: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 15:36:33 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448338952 - received 13448338953: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 15:36:33 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448338955 - received 13448338954: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 15:41:55 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448371162 - received 13448371163: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 15:41:55 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448371165 - received 13448371164: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 15:42:01 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448371805 - received 13448371806: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 15:42:01 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448371808 - received 13448371807: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 15:43:23 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448379995 - received 13448379996: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 15:43:23 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448379998 - received 13448379997: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 15:43:54 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448383112 - received 13448383113: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 15:43:54 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448383115 - received 13448383114: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 15:44:31 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448386749 - received 13448386750: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 15:44:31 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448386752 - received 13448386751: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 15:55:36 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448453263 - received 13448453264: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 15:55:36 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448453266 - received 13448453265: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 15:55:46 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448454303 - received 13448454304: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 15:55:46 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448454306 - received 13448454305: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 15:56:44 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448460020 - received 13448460021: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 15:56:44 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448460023 - received 13448460022: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 15:57:25 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448464177 - received 13448464178: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 15:57:25 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448464180 - received 13448464179: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 15:59:04 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448474050 - received 13448474051: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 15:59:04 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448474053 - received 13448474052: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 16:00:37 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448483408 - received 13448483409: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 16:00:37 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448483411 - received 13448483410: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 16:16:54 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448581122 - received 13448581123: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 16:16:54 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448581125 - received 13448581124: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 16:17:00 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448581645 - received 13448581646: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 16:17:00 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448581648 - received 13448581647: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 16:17:05 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448582163 - received 13448582164: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 16:17:05 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448582166 - received 13448582165: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 16:21:46 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448610219 - received 13448610220: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 16:21:46 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448610222 - received 13448610221: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 16:22:17 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448613336 - received 13448613337: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 16:22:17 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448613339 - received 13448613338: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 16:26:31 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448638793 - received 13448638794: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 16:26:31 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448638796 - received 13448638795: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 16:33:22 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448679835 - received 13448679836: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 16:33:22 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448679838 - received 13448679837: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+Nov 26 16:34:19 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448685551 - received 13448685552: Pulse ID interval set to: 2 [SARES11-SPEC125-M1]
+Nov 26 16:34:19 sf-daqsync-03.psi.ch docker[24727]: INFO:cam_server.camera.sender:Failed Pulse ID 13448685554 - received 13448685553: Pulse ID interval set to: 1 [SARES11-SPEC125-M1]
+
+"""
+
+tokens = l.split("\n")
+errors={}
+for t in tokens:
+ if "set to: 2" in t:
+ pid = long(t[97:109])
+ cam=t[163:181]
+ if cam not in errors.keys():
+ errors[cam]=[]
+ errors[cam].append(pid)
+
+
+
+for k in errors.keys():
+ print k
+ s=errors[k][0]
+ for i in range(len(errors[k])):
+ print k,i
+ errors[k][i] = errors[k][i] - s
+
+for k in errors.keys():
+ print k
+ print errors[k]
+
+for k in errors.keys():
+ y,x = histogram([errors[k]], range_min = None, range_max = None, bin = 1000)
+ p=plot(y, xdata=[v/100/60/60 for v in x], title=k)[0]
+ p.setStyle(p.Style.Step)
+ p.addText(3.0, 13.2, "Missing pulses: " + str(len(errors[k])), Color.BLACK)
+ ax=p.getAxis(p.AxisId.Y).max=14.0
\ No newline at end of file
diff --git a/script/EnvVAr.py b/script/EnvVAr.py
new file mode 100644
index 0000000..32a8eb8
--- /dev/null
+++ b/script/EnvVAr.py
@@ -0,0 +1,5 @@
+import java.lang.System as System
+env = System.getenv()
+for envName in env.keySet():
+ print(envName + " = " + env.get(envName))
+
\ No newline at end of file
diff --git a/script/Gaussians.py b/script/Gaussians.py
index 8f9ebac..3538ebd 100755
--- a/script/Gaussians.py
+++ b/script/Gaussians.py
@@ -13,7 +13,7 @@ step_size = 0.2
result= lscan(ao1,ai1,start,end,[step_size,])
readable = result.getReadable(0)
-positions = result.getPositions(0)
+positions = result.getPositions(0)
threshold = (min(readable) + max(readable))/2
min_peak_distance = 5.0
diff --git a/script/TestMscan.py b/script/TestMscan.py
new file mode 100644
index 0000000..5f605b5
--- /dev/null
+++ b/script/TestMscan.py
@@ -0,0 +1,18 @@
+class Time(Readable):
+ def __init__(self):
+ self.start = time.time()
+ def read(self):
+ return time.time()-self.start
+
+sensors = [sin, counter, inp, Time()]
+
+counter.alias="MCurr"
+inp.alias="Pol"
+
+print "Scanning...",
+
+try:
+ mscan(sin, sensors, -1, None, range="auto", domain_axis="sin" )
+finally:
+ counter.alias=None
+ inp.alias=None
diff --git a/script/TestPID.py b/script/TestPID.py
index e69de29..f910e98 100644
--- a/script/TestPID.py
+++ b/script/TestPID.py
@@ -0,0 +1,3 @@
+
+sensors = (sin, counter)
+mscan(counter, sensors, -1, None, range="auto", domain_axis="counter")
\ No newline at end of file
diff --git a/script/_Lib/epics/CaChannel.py b/script/_Lib/epics/CaChannel.py
deleted file mode 100644
index ac57a62..0000000
--- a/script/_Lib/epics/CaChannel.py
+++ /dev/null
@@ -1,988 +0,0 @@
-"""
-CaChannel class having identical API as of caPython/CaChannel class,
-based on PythonCA ( > 1.20.1beta2)
-
-Author: Xiaoqiang Wang
-Created: Sep. 22, 2008
-Changes:
-"""
-# python 2 -> 3 compatible layer
-import sys
-if sys.hexversion >= 0x03000000:
- long = int
-
-import ca
-
-ca.cs_never_search = 4
-
-# retrieve numeric waveforms as numpy arrays, default No
-USE_NUMPY = False
-
-class CaChannelException(Exception):
- def __init__(self, status):
- self.status = str(status)
- def __str__(self):
- return self.status
-
-class CaChannel:
- """CaChannel: A Python class with identical API as of caPython/CaChannel.
-
- This class implements the methods to operate on channel access so that you can find
- their C library counterparts ,
- http://www.aps.anl.gov/epics/base/R3-14/12-docs/CAref.html#Function.
- Therefore an understanding of C API helps much.
-
- To get started easily, convenient methods are created for often used operations,
-
- ========== ======
- Operation Method
- ========== ======
- connect :meth:`searchw`
- read :meth:`getw`
- write :meth:`putw`
- ========== ======
-
- They have shorter names and default arguments. It is recommended to start with these methods.
- Study the other C alike methods when necessary.
-
- >>> import CaChannel
- >>> chan = CaChannel.CaChannel('catest')
- >>> chan.searchw()
- >>> chan.putw(12.3)
- >>> chan.getw()
- 12.3
- """
-
- ca_timeout = 3.0
-
- dbr_d = {}
- dbr_d[ca.DBR_SHORT] = int
- dbr_d[ca.DBR_INT] = int
- dbr_d[ca.DBR_LONG] = int
- dbr_d[ca.DBR_FLOAT] = float
- dbr_d[ca.DBR_DOUBLE]= float
- dbr_d[ca.DBR_CHAR] = int
- dbr_d[ca.DBR_STRING]= str
- dbr_d[ca.DBR_ENUM] = int
-
- def __init__(self, pvName=None):
- self.pvname = pvName
- self.__chid = None
- self.__evid = None
- self.__timeout = None
- self._field_type = None
- self._element_count = None
- self._puser = None
- self._conn_state = None
- self._host_name = None
- self._raccess = None
- self._waccess = None
-
- self._callbacks={}
-
- def __del__(self):
- try:
- self.clear_event()
- self.clear_channel()
- self.flush_io()
- except:
- pass
-
- def version(self):
- return "CaChannel, version v28-03-12"
-#
-# Class helper methods
-#
- def setTimeout(self, timeout):
- """Set the timeout for this channel object. It overrides the class timeout.
-
- :param float timeout: timeout in seconds
-
- """
- if (timeout>=0 or timeout is None):
- self.__timeout = timeout
- else:
- raise ValueError
- def getTimeout(self):
- """Retrieve the timeout set for this channel object.
-
- :return: timeout in seconds for this channel instance
-
- """
- if self.__timeout is None:
- timeout = CaChannel.ca_timeout
- else:
- timeout = self.__timeout
-
- return timeout
-
-
-#
-# *************** Channel access medthod ***************
-#
-
-#
-# Connection methods
-# search_and_connect
-# search
-# clear_channel
-
- def search_and_connect(self, pvName, callback, *user_args):
- """Attempt to establish a connection to a process variable.
-
- :param str pvName: process variable name
- :param callable callback: function called when connection completes and connection status changes later on.
- :param user_args: user provided arguments that are passed to callback when it is invoked.
- :raises CaChannelException: if error happens
-
- The user arguments are returned to the user in a tuple in the callback function.
- The order of the arguments is preserved.
-
- Each Python callback function is required to have two arguments.
- The first argument is a tuple containing the results of the action.
- The second argument is a tuple containing any user arguments specified by ``user_args``.
- If no arguments were specified then the tuple is empty.
-
-
- .. note:: All remote operation requests such as the above are accumulated (buffered)
- and not forwarded to the IOC until one of execution methods (:meth:`pend_io`, :meth:`poll`, :meth:`pend_event`, :meth:`flush_io`)
- is called. This allows several requests to be efficiently sent over the network in one message.
-
- >>> chan = CaChannel('catest')
- >>> def connCB(epicsArgs, userArgs):
- ... chid = epicsArgs[0]
- ... connection_state = epicsArgs[1]
- ... if connection_state == ca.CA_OP_CONN_UP:
- ... print('%s is connected' % ca.name(chid))
- >>> chan.search_and_connect(None, connCB, chan)
- >>> status = chan.pend_event(2)
- catest is connected
- """
- if pvName is None:
- pvName = self.pvname
- else:
- self.pvname = pvName
- self._callbacks['connCB']=(callback, user_args)
- try:
- self.__chid = ca.search(pvName, self._conn_callback)
- except ca.error:
- msg = sys.exc_info()[1]
- raise CaChannelException(msg)
-
- def search(self, pvName=None):
- """Attempt to establish a connection to a process variable.
-
- :param str pvName: process variable name
- :raises CaChannelException: if error happens
-
- .. note:: All remote operation requests such as the above are accumulated (buffered)
- and not forwarded to the IOC until one of execution methods (:meth:`pend_io`, :meth:`poll`, :meth:`pend_event`, :meth:`flush_io`)
- is called. This allows several requests to be efficiently sent over the network in one message.
-
- >>> chan = CaChannel()
- >>> chan.search('catest')
- >>> status = chan.pend_io(1)
- >>> chan.state()
- 2
- """
- if pvName is None:
- pvName = self.pvname
- else:
- self.pvname = pvName
- try:
- self.__chid = ca.search(pvName, None)
- except ca.error:
- msg = sys.exc_info()[1]
- raise CaChannelException(msg)
-
- def clear_channel(self):
- """Close a channel created by one of the search functions.
-
- Clearing a channel does not cause its connection handler to be called.
- Clearing a channel does remove any monitors registered for that channel.
- If the channel is currently connected then resources are freed only some
- time after this request is flushed out to the server.
-
- .. note:: All remote operation requests such as the above are accumulated (buffered)
- and not forwarded to the IOC until one of execution methods (:meth:`pend_io`, :meth:`poll`, :meth:`pend_event`, :meth:`flush_io`)
- is called. This allows several requests to be efficiently sent over the network in one message.
-
- """
- if(self.__chid is not None):
- try:
- ca.clear(self.__chid)
- except ca.error:
- msg = sys.exc_info()[1]
- raise CaChannelException(msg)
-
-#
-# Write methods
-# array_put
-# array_put_callback
-#
-
- def _setup_put(self,value, req_type, count = None):
- if count is None:
- count = self.element_count()
- else:
- count = max(1, min(self.element_count(), count) )
-
- if req_type == -1:
- req_type = self.field_type()
-
- # single numeric value
- if (isinstance(value, int) or
- isinstance(value, long) or
- isinstance(value, float) or
- isinstance(value, bool)):
- pval = (CaChannel.dbr_d[req_type](value),)
- # single string value
- # if DBR_CHAR, split into chars
- # otherwise convert to field type
- elif isinstance(value, str):
- if req_type == ca.DBR_CHAR:
- if len(value) < count:
- count = len(value)
- pval = [ord(x) for x in value[:count]]
- else:
- pval = (CaChannel.dbr_d[req_type](value),)
- # assumes other sequence type
- else:
- if len(value) < count:
- count = len(value)
- pval = [CaChannel.dbr_d[req_type](x) for x in value[:count]]
-
- return pval
-
- def array_put(self, value, req_type=None, count=None):
- """Write a value or array of values to a channel
-
- :param value: data to be written. For multiple values use a list or tuple
- :param req_type: database request type (``ca.DBR_XXXX``). Defaults to be the native data type.
- :param int count: number of data values to write. Defaults to be the native count.
-
- >>> chan = CaChannel('catest')
- >>> chan.searchw()
- >>> chan.array_put(123)
- >>> chan.flush_io()
- >>> chan.getw()
- 123.0
- >>> chan = CaChannel('cabo')
- >>> chan.searchw()
- >>> chan.array_put('Busy', ca.DBR_STRING)
- >>> chan.flush_io()
- >>> chan.getw()
- 1
- >>> chan = CaChannel('cawave')
- >>> chan.searchw()
- >>> chan.array_put([1,2,3])
- >>> chan.flush_io()
- >>> chan.getw()
- [1.0, 2.0, 3.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0]
- >>> chan.getw(count=3, use_numpy=True)
- array([ 1., 2., 3.])
- >>> chan = CaChannel('cawavec')
- >>> chan.searchw()
- >>> chan.array_put('1234',count=3)
- >>> chan.flush_io()
- >>> chan.getw(count=4)
- [49, 50, 51, 0]
- """
- if req_type is None: req_type = -1
- val = self._setup_put(value, req_type, count)
- try:
- ca.put(self.__chid, val, None, None, req_type)
- except ca.error:
- msg = sys.exc_info()[1]
- raise CaChannelException(msg)
-
- def array_put_callback(self, value, req_type, count, callback, *user_args):
- """Write a value or array of values to a channel and execute the user
- supplied callback after the put has completed.
-
- :param value: data to be written. For multiple values use a list or tuple.
- :param req_type: database request type (``ca.DBR_XXXX``). Defaults to be the native data type.
- :param int count: number of data values to write, Defaults to be the native count.
- :param callable callback: function called when the write is completed.
- :param user_args: user provided arguments that are passed to callback when it is invoked.
- :raises CaChannelException: if error happens
-
- Each Python callback function is required to have two arguments.
- The first argument is a dictionary containing the results of the action.
-
- ======= ===== =======
- field type comment
- ======= ===== =======
- chid int channels id structure
- type int database request type (ca.DBR_XXXX)
- count int number of values to transfered
- status int CA status return code (ca.ECA_XXXX)
- ======= ===== =======
-
- The second argument is a tuple containing any user arguments specified by ``user_args``.
- If no arguments were specified then the tuple is empty.
-
-
- >>> def putCB(epicsArgs, userArgs):
- ... print('%s put completed' % ca.name(epicsArgs['chid']))
- >>> chan = CaChannel('catest')
- >>> chan.searchw()
- >>> chan.array_put_callback(145, None, None, putCB)
- >>> status = chan.pend_event(1)
- catest put completed
- >>> chan = CaChannel('cabo')
- >>> chan.searchw()
- >>> chan.array_put_callback('Busy', ca.DBR_STRING, None, putCB)
- >>> status = chan.pend_event(1)
- cabo put completed
- >>> chan = CaChannel('cawave')
- >>> chan.searchw()
- >>> chan.array_put_callback([1,2,3], None, None, putCB)
- >>> status = chan.pend_event(1)
- cawave put completed
- >>> chan = CaChannel('cawavec')
- >>> chan.searchw()
- >>> chan.array_put_callback('123', None, None, putCB)
- >>> status = chan.pend_event(1)
- cawavec put completed
- """
- if req_type is None: req_type = 0
- val = self._setup_put(value, req_type, count)
- self._callbacks['putCB']=(callback, user_args)
- try:
- ca.put(self.__chid, val, None, self._put_callback, req_type)
- except ca.error:
- msg = sys.exc_info()[1]
- raise CaChannelException(msg)
-#
-# Read methods
-# getValue
-# array_get
-# array_get_callback
-#
-
- # Obtain read value after ECA_NORMAL is returned on an array_get().
- def getValue(self):
- """Return the value(s) after array_get has completed"""
- return self.val
-
- # Simulate with a synchronous getw function call
- def array_get(self, req_type=None, count=None, **keywords):
- """Read a value or array of values from a channel. The new value is
- retrieved by a call to getValue method.
-
- :param req_type: database request type (``ca.DBR_XXXX``). Defaults to be the native data type.
- :param int count: number of data values to read, Defaults to be the native count.
- :param keywords: optional arguments assigned by keywords
-
- =========== =====
- keyword value
- =========== =====
- use_numpy True if waveform should be returned as numpy array. Default :data:`CaChannel.USE_NUMPY`.
- =========== =====
-
- :raises CaChannelException: if error happens
-
- .. note:: All remote operation requests such as the above are accumulated (buffered)
- and not forwarded to the IOC until one of execution methods (``pend_io``, ``poll``, ``pend_event``, ``flush_io``)
- is called. This allows several requests to be efficiently sent over the network in one message.
-
-
- >>> chan = CaChannel('catest')
- >>> chan.searchw()
- >>> chan.putw(123)
- >>> chan.array_get()
- >>> chan.getValue()
- 123.0
- """
- self.val = self.getw(req_type, count, **keywords)
-
- def array_get_callback(self, req_type, count, callback, *user_args, **keywords):
- """Read a value or array of values from a channel and execute the user
- supplied callback after the get has completed.
-
- :param req_type: database request type (``ca.DBR_XXXX``). Defaults to be the native data type.
- :param int count: number of data values to read, Defaults to be the native count.
- :param callable callback: function called when the get is completed.
- :param user_args: user provided arguments that are passed to callback when it is invoked.
- :param keywords: optional arguments assigned by keywords
-
- =========== =====
- keyword value
- =========== =====
- use_numpy True if waveform should be returned as numpy array. Default :data:`CaChannel.USE_NUMPY`.
- =========== =====
-
- :raises CaChannelException: if error happens
-
- Each Python callback function is required to have two arguments.
- The first argument is a dictionary containing the results of the action.
-
- +-----------------+---------------+------------------------------------+-------------------------+---------------+-------------+---------------+
- | field | type | comment | request type |
- | | | +----------+--------------+---------------+-------------+---------------+
- | | | | DBR_XXXX | DBR_STS_XXXX | DBR_TIME_XXXX | DBR_GR_XXXX | DBR_CTRL_XXXX |
- +=================+===============+====================================+==========+==============+===============+=============+===============+
- | chid | int | channels id number | X | X | X | X | X |
- +-----------------+---------------+------------------------------------+----------+--------------+---------------+-------------+---------------+
- | type | int | database request type | X | X | X | X | X |
- | | | (ca.DBR_XXXX) | | | | | |
- +-----------------+---------------+------------------------------------+----------+--------------+---------------+-------------+---------------+
- | count | int | number of values to transfered | X | X | X | X | X |
- +-----------------+---------------+------------------------------------+----------+--------------+---------------+-------------+---------------+
- | status | int | CA status return code | X | X | X | X | X |
- | | | (ca.ECA_XXXX) | | | | | |
- +-----------------+---------------+------------------------------------+----------+--------------+---------------+-------------+---------------+
- | pv_value | | PV value | X | X | X | X | X |
- +-----------------+---------------+------------------------------------+----------+--------------+---------------+-------------+---------------+
- | pv_status | int | PV alarm status | | X | X | X | X |
- +-----------------+---------------+------------------------------------+----------+--------------+---------------+-------------+---------------+
- | pv_severity | int | PV alarm severity | | X | X | X | X |
- +-----------------+---------------+------------------------------------+----------+--------------+---------------+-------------+---------------+
- | pv_seconds | float | timestamp | | | X | | |
- +-----------------+---------------+------------------------------------+----------+--------------+---------------+-------------+---------------+
- | pv_nostrings | int | ENUM PV's number of states | | | | X | X |
- +-----------------+---------------+------------------------------------+----------+--------------+---------------+-------------+---------------+
- | pv_statestrings | string list | ENUM PV's states string | | | | X | X |
- +-----------------+---------------+------------------------------------+----------+--------------+---------------+-------------+---------------+
- | pv_units | string | units | | | | X | X |
- +-----------------+---------------+------------------------------------+----------+--------------+---------------+-------------+---------------+
- | pv_precision | int | precision | | | | X | X |
- +-----------------+---------------+------------------------------------+----------+--------------+---------------+-------------+---------------+
- | pv_updislim | float | upper display limit | | | | X | X |
- +-----------------+---------------+------------------------------------+----------+--------------+---------------+-------------+---------------+
- | pv_lodislim | float | lower display limit | | | | X | X |
- +-----------------+---------------+------------------------------------+----------+--------------+---------------+-------------+---------------+
- | pv_upalarmlim | float | upper alarm limit | | | | X | X |
- +-----------------+---------------+------------------------------------+----------+--------------+---------------+-------------+---------------+
- | pv_upwarnlim | float | upper warning limit | | | | X | X |
- +-----------------+---------------+------------------------------------+----------+--------------+---------------+-------------+---------------+
- | pv_loalarmlim | float | lower alarm limit | | | | X | X |
- +-----------------+---------------+------------------------------------+----------+--------------+---------------+-------------+---------------+
- | pv_lowarnlim | float | lower warning limit | | | | X | X |
- +-----------------+---------------+------------------------------------+----------+--------------+---------------+-------------+---------------+
- | pv_upctrllim | float | upper control limit | | | | | X |
- +-----------------+---------------+------------------------------------+----------+--------------+---------------+-------------+---------------+
- | pv_loctrllim | float | lower control limit | | | | | X |
- +-----------------+---------------+------------------------------------+----------+--------------+---------------+-------------+---------------+
-
- The second argument is a tuple containing any user arguments specified by ``user_args``.
- If no arguments were specified then the tuple is empty.
-
- .. note:: All remote operation requests such as the above are accumulated (buffered)
- and not forwarded to the IOC until one of execution methods (``pend_io``, ``poll``, ``pend_event``, ``flush_io``)
- is called. This allows several requests to be efficiently sent over the network in one message.
-
- >>> def getCB(epicsArgs, userArgs):
- ... for item in sorted(epicsArgs.keys()):
- ... if item.startswith('pv_'):
- ... print('%s %s' % (item,epicsArgs[item]))
- >>> chan = CaChannel('catest')
- >>> chan.searchw()
- >>> chan.putw(145)
- >>> chan.array_get_callback(ca.DBR_CTRL_DOUBLE, 1, getCB)
- >>> status = chan.pend_event(1)
- pv_loalarmlim -20.0
- pv_loctrllim 0.0
- pv_lodislim 0.0
- pv_lowarnlim -10.0
- pv_precision 3
- pv_severity 2
- pv_status 3
- pv_units mm
- pv_upalarmlim 20.0
- pv_upctrllim 0.0
- pv_updislim 0.0
- pv_upwarnlim 10.0
- pv_value 145.0
- >>> chan = CaChannel('cabo')
- >>> chan.searchw()
- >>> chan.putw(0)
- >>> chan.array_get_callback(ca.DBR_CTRL_ENUM, 1, getCB)
- >>> status = chan.pend_event(1)
- pv_nostrings 2
- pv_severity 0
- pv_statestrings ('Done', 'Busy')
- pv_status 0
- pv_value 0
- """
- if req_type is None: req_type = ca.dbf_type_to_DBR(self.field_type())
- if count is None: count = self.element_count()
- self._callbacks['getCB']=(callback, user_args)
- try:
- ca.get(self.__chid, self._get_callback, req_type, count, keywords.get('use_numpy', USE_NUMPY))
- except ca.error:
- msg = sys.exc_info()[1]
- raise CaChannelException(msg)
-
-#
-# Monitor methods
-# add_masked_array_event
-# clear_event
-#
-
- # Creates a new event id and stores it on self.__evid. Only one event registered
- # per CaChannel object. If an event is already registered the event is cleared
- # before registering a new event.
- def add_masked_array_event(self, req_type, count, mask, callback, *user_args, **keywords):
- """Specify a callback function to be executed whenever changes occur to a PV.
-
- :param req_type: database request type (``ca.DBR_XXXX``). Defaults to be the native data type.
- :param int count: number of data values to read, Defaults to be the native count.
- :param mask: logical or of ``ca.DBE_VALUE``, ``ca.DBE_LOG``, ``ca.DBE_ALARM``.
- Defaults to be ``ca.DBE_VALUE|ca.DBE_ALARM``.
- :param callable callback: function called when the get is completed.
- :param user_args: user provided arguments that are passed to callback when
- it is invoked.
- :param keywords: optional arguments assigned by keywords
-
- =========== =====
- keyword value
- =========== =====
- use_numpy True if waveform should be returned as numpy array. Default :data:`CaChannel.USE_NUMPY`.
- =========== =====
-
- :raises CaChannelException: if error happens
-
- .. note:: All remote operation requests such as the above are accumulated (buffered)
- and not forwarded to the IOC until one of execution methods (:meth:`pend_io`, :meth:`poll`, :meth:`pend_event`, :meth:`flush_io`)
- is called. This allows several requests to be efficiently sent over the network in one message.
-
- >>> def eventCB(epicsArgs, userArgs):
- ... print('pv_value %s' % epicsArgs['pv_value'])
- ... print('pv_status %d %s' % (epicsArgs['pv_status'], ca.alarmStatusString(epicsArgs['pv_status'])))
- ... print('pv_severity %d %s' % (epicsArgs['pv_severity'], ca.alarmSeverityString(epicsArgs['pv_severity'])))
- >>> chan = CaChannel('cabo')
- >>> chan.searchw()
- >>> chan.putw(1)
- >>> chan.add_masked_array_event(ca.DBR_STS_ENUM, None, None, eventCB)
- >>> status = chan.pend_event(1)
- pv_value 1
- pv_status 7 STATE
- pv_severity 1 MINOR
- >>> chan.clear_event()
- >>> chan.add_masked_array_event(ca.DBR_STS_STRING, None, None, eventCB)
- >>> status = chan.pend_event(1)
- pv_value Busy
- pv_status 7 STATE
- pv_severity 1 MINOR
- >>> chan.clear_event()
- """
- if req_type is None: req_type = ca.dbf_type_to_DBR(self.field_type())
- if count is None: count = self.element_count()
- if mask is None: mask = ca.DBE_VALUE|ca.DBE_ALARM
- if self.__evid is not None:
- self.clear_event()
- self.flush_io()
- self._callbacks['eventCB']=(callback, user_args)
- try:
- self.__evid = ca.monitor(self.__chid, self._event_callback, count, mask, req_type, keywords.get('use_numpy', USE_NUMPY))
- except ca.error:
- msg = sys.exc_info()[1]
- raise CaChannelException(msg)
-
- def clear_event(self):
- """Remove previously installed callback function.
-
- .. note:: All remote operation requests such as the above are accumulated (buffered)
- and not forwarded to the IOC until one of execution methods (:meth:`pend_io`, :meth:`poll`, :meth:`pend_event`, :meth:`flush_io`)
- is called. This allows several requests to be efficiently sent over the network in one message.
- """
- if self.__evid is not None:
- try:
- ca.clear_monitor(self.__evid)
- self.__evid = None
- except ca.error:
- msg = sys.exc_info()[1]
- raise CaChannelException(msg)
-
-#
-# Execute methods
-# pend_io
-# pend_event
-# poll
-# flush_io
-#
-
- def pend_io(self,timeout=None):
- """Flush the send buffer and wait until outstanding queries (``search``, ``array_get``) complete
- or the specified timeout expires.
-
- :param float timeout: seconds to wait
- :raises CaChannelException: if timeout or other error happens
-
- """
- if timeout is None:
- timeout = self.getTimeout()
- status = ca.pend_io(float(timeout))
- if status != 0:
- raise CaChannelException(ca.caError._caErrorMsg[status])
-
- def pend_event(self,timeout=None):
- """Flush the send buffer and process background activity (connect/get/put/monitor callbacks) for ``timeout`` seconds.
-
- It will not return before the specified timeout expires and all unfinished channel access labor has been processed.
-
- :param float timeout: seconds to wait
-
- """
- if timeout is None:
- timeout = 0.1
- status = ca.pend_event(timeout)
- # status is always ECA_TIMEOUT
- return status
-
- def poll(self):
- """Flush the send buffer and execute any outstanding background activity.
-
- .. note:: It is an alias to ``pend_event(1e-12)``.
- """
- status = ca.poll()
- # status is always ECA_TIMEOUT
- return status
-
- def flush_io(self):
- """Flush the send buffer and does not execute outstanding background activity."""
- status = ca.flush()
- if status != 0:
- raise CaChannelException(ca.caError._caErrorMsg[status])
-
-#
-# Channel Access Macros
-# field_type
-# element_count
-# name
-# state
-# host_name
-# read_access
-# write_access
-#
- def get_info(self):
- try:
- info=(self._field_type, self._element_count, self._puser,
- self._conn_state, self._host_name, self._raccess,
- self._waccess) = ca.ch_info(self.__chid)
- except ca.error:
- msg = sys.exc_info()[1]
- raise CaChannelException(msg)
- return info
-
-
- def field_type(self):
- """Native type of the PV in the server (``ca.DBF_XXXX``).
-
- >>> chan = CaChannel('catest')
- >>> chan.searchw()
- >>> ftype = chan.field_type()
- >>> ftype
- 6
- >>> ca.dbf_text(ftype)
- 'DBF_DOUBLE'
- >>> ca.DBF_DOUBLE == ftype
- True
- """
- self.get_info()
- return self._field_type
-
- def element_count(self):
- """Maximum array element count of the PV in the server.
-
- >>> chan = CaChannel('catest')
- >>> chan.searchw()
- >>> chan.element_count()
- 1
- """
- self.get_info()
- return self._element_count
-
- def name(self):
- """Channel name specified when the channel was created.
-
- >>> chan = CaChannel('catest')
- >>> chan.searchw()
- >>> chan.name()
- 'catest'
- """
- return ca.name(self.__chid)
-
- def state(self):
- """Current state of the CA connection.
-
- ================== =============
- States Meaning
- ================== =============
- ca.cs_never_conn PV not found
- ca.cs_prev_conn PV was found but unavailable
- ca.cs_conn PV was found and available
- ca.cs_closed PV not closed
- ca.cs_never_search PV not searched yet
- ================== =============
-
- >>> chan = CaChannel('catest')
- >>> chan.searchw()
- >>> chan.state()
- 2
- """
- if self.__chid is None:
- return ca.cs_never_search
- else:
- self.get_info()
- return self._conn_state
-
- def host_name(self):
- """Host name that hosts the process variable."""
- self.get_info()
- return self._host_name
-
- def read_access(self):
- """Access right to read the channel.
-
- :return: True if the channel can be read, False otherwise.
-
- """
- self.get_info()
- return self._raccess
-
- def write_access(self):
- """Access right to write the channel.
-
- :return: True if the channel can be written, False otherwise.
-
- """
- self.get_info()
- return self._waccess
-#
-# Wait functions
-#
-# These functions wait for completion of the requested action.
- def searchw(self, pvName=None):
- """Attempt to establish a connection to a process variable.
-
- :param str pvName: process variable name
- :raises CaChannelException: if timeout or error happens
-
- .. note:: This method waits for connection to be established or fail with exception.
-
- >>> chan = CaChannel('non-exist-channel')
- >>> chan.searchw()
- Traceback (most recent call last):
- ...
- CaChannelException: User specified timeout on IO operation expired
- """
- if pvName is None:
- pvName = self.pvname
- else:
- self.pvname = pvName
- self.__chid = ca.search(pvName, None)
- timeout = self.getTimeout()
- status = ca.pend_io(timeout)
- if status != 0:
- raise CaChannelException(ca.caError._caErrorMsg[status])
-
- def putw(self, value, req_type=None):
- """Write a value or array of values to a channel
-
- If the request type is omitted the data is written as the Python type corresponding to the native format.
- Multi-element data is specified as a tuple or a list.
- Internally the sequence is converted to a list before inserting the values into a C array.
- Access using non-numerical types is restricted to the first element in the data field.
- Mixing character types with numerical types writes bogus results but is not prohibited at this time.
- DBF_ENUM fields can be written using DBR_ENUM and DBR_STRING types.
- DBR_STRING writes of a field of type DBF_ENUM must be accompanied by a valid string out of the possible enumerated values.
-
- :param value: data to be written. For multiple values use a list or tuple
- :param req_type: database request type (``ca.DBR_XXXX``). Defaults to be the native data type.
- :raises CaChannelException: if timeout or error happens
-
- .. note:: This method does flush the request to the channel access server.
-
- >>> chan = CaChannel('catest')
- >>> chan.searchw()
- >>> chan.putw(145)
- >>> chan.getw()
- 145.0
- >>> chan = CaChannel('cabo')
- >>> chan.searchw()
- >>> chan.putw('Busy', ca.DBR_STRING)
- >>> chan.getw()
- 1
- >>> chan.getw(ca.DBR_STRING)
- 'Busy'
- >>> chan = CaChannel('cawave')
- >>> chan.searchw()
- >>> chan.putw([1,2,3])
- >>> chan.getw(req_type=ca.DBR_LONG,count=4)
- [1, 2, 3, 0]
- >>> chan = CaChannel('cawavec')
- >>> chan.searchw()
- >>> chan.putw('123')
- >>> chan.getw(count=4)
- [49, 50, 51, 0]
- >>> chan = CaChannel('cawaves')
- >>> chan.searchw()
- >>> chan.putw(['string 1','string 2'])
- >>> chan.getw()
- ['string 1', 'string 2', '']
- """
- if req_type is None: req_type = -1
- val = self._setup_put(value, req_type)
- try:
- ca.put(self.__chid, val, None, None, req_type)
- except ca.error:
- msg = sys.exc_info()[1]
- raise CaChannelException(msg)
- self.flush_io()
-
- def getw(self, req_type=None, count=None, **keywords):
- """Read the value from a channel.
-
- :param req_type: database request type. Defaults to be the native data type.
- :param int count: number of data values to read, Defaults to be the native count.
- :param keywords: optional arguments assigned by keywords
-
- =========== =====
- keyword value
- =========== =====
- use_numpy True if waveform should be returned as numpy array. Default :data:`CaChannel.USE_NUMPY`.
- =========== =====
- :return: If req_type is plain request type, only the value is returned. Otherwise a dict returns
- with information depending on the request type, same as the first argument passed to user's callback.
- See :meth:`array_get_callback`.
-
- :raises CaChannelException: if timeout error happens
-
- If the request type is omitted the data is returned to the user as the Python type corresponding to the native format.
- Multi-element data has all the elements returned as items in a list and must be accessed using a numerical type.
- Access using non-numerical types is restricted to the first element in the data field.
- DBF_ENUM fields can be read using DBR_ENUM and DBR_STRING types.
- DBR_STRING reads of a field of type DBF_ENUM returns the string corresponding to the current enumerated value.
-
- """
- updated = [False]
- value = [0]
- def update_value(args):
- if args is None:
- return
- try:
- value[0] = self._format_cb_args(args)
- finally:
- updated[0] = True
- if req_type is None: req_type = ca.dbf_type_to_DBR(self.field_type())
- if count is None: count = self.element_count()
- try:
- ca.get(self.__chid, update_value, req_type, count, keywords.get('use_numpy', USE_NUMPY))
- except ca.error:
- msg = sys.exc_info()[1]
- raise CaChannelException(msg)
- timeout = self.getTimeout()
- self.flush_io()
- n = timeout / 0.001
- while n > 0 and not updated[0]:
- ca.pend_event(0.001)
- n-=1
- if not updated[0]:
- raise CaChannelException(ca.caError._caErrorMsg[10]) # ECA_TIMEOUT
- if ca.dbr_type_is_plain(req_type):
- return value[0]['pv_value']
- else:
- return value[0]
-
-#
-# Callback functions
-#
-# These functions hook user supplied callback functions to CA extension
-
- def _conn_callback(self):
- callback = self._callbacks.get('connCB')
- if callback is None:
- return
- callbackFunc, userArgs = callback
- if self.state() == 2: OP = 6
- else: OP = 7
- epicsArgs = (self.__chid, OP)
- try:
- callbackFunc(epicsArgs, userArgs)
- except:
- pass
-
- def _put_callback(self, args):
- callback = self._callbacks.get('putCB')
- if callback is None:
- return
- callbackFunc, userArgs = callback
- epicsArgs={}
- epicsArgs['chid']=self.__chid
- epicsArgs['type']=self.field_type()
- epicsArgs['count']=self.element_count()
- epicsArgs['status']=args[1]
- try:
- callbackFunc(epicsArgs, userArgs)
- except:
- pass
-
- def _get_callback(self, args):
- callback = self._callbacks.get('getCB')
- if callback is None:
- return
- callbackFunc, userArgs = callback
- epicsArgs = self._format_cb_args(args)
- try:
- callbackFunc(epicsArgs, userArgs)
- except:
- pass
-
- def _event_callback(self, args):
- callback = self._callbacks.get('eventCB')
- if callback is None:
- return
- callbackFunc, userArgs = callback
- epicsArgs = self._format_cb_args(args)
- try:
- callbackFunc(epicsArgs, userArgs)
- except:
- pass
-
- def _format_cb_args(self, args):
- epicsArgs={}
- epicsArgs['chid'] = self.__chid
- # dbr_type is not returned
- # use dbf_type instead
- epicsArgs['type'] = self.field_type()
- epicsArgs['count'] = self.element_count()
- # status flag is not returned,
- # args[1] is alarm status
- # assume ECA_NORMAL
- epicsArgs['status'] = 1
- if len(args)==2: # Error
- epicsArgs['pv_value'] = args[0] # always None
- epicsArgs['status'] = args[1]
- if len(args)>=3: # DBR_Plain
- epicsArgs['pv_value'] = args[0]
- epicsArgs['pv_severity']= args[1]
- epicsArgs['pv_status'] = args[2]
- if len(args)==4: # DBR_TIME, 0.0 for others
- epicsArgs['pv_seconds'] = args[3]
- if len(args)==5:
- if len(args[4])==2: # DBR_CTRL_ENUM
- epicsArgs['pv_nostrings'] = args[4][0]
- epicsArgs['pv_statestrings']= args[4][1]
- if len(args[4])>=7: # DBR_GR
- epicsArgs['pv_units'] = args[4][0]
- epicsArgs['pv_updislim'] = args[4][1]
- epicsArgs['pv_lodislim'] = args[4][2]
- epicsArgs['pv_upalarmlim'] = args[4][3]
- epicsArgs['pv_upwarnlim'] = args[4][4]
- epicsArgs['pv_loalarmlim'] = args[4][5]
- epicsArgs['pv_lowarnlim'] = args[4][6]
- if len(args[4])==8: # DBR_GR_FLOAT or DBR_GR_DOUBLE
- epicsArgs['pv_precision'] = args[4][7]
- if len(args[4])>=9: # DBR_CTRL
- epicsArgs['pv_upctrllim'] = args[4][7]
- epicsArgs['pv_loctrllim'] = args[4][8]
- if len(args[4])==10: # DBR_CTRL_FLOAT or DBR_CTRL_DOUBLE
- epicsArgs['pv_precision'] = args[4][9]
- return epicsArgs
-
-if __name__ == "__main__":
- import doctest
- doctest.testmod()
diff --git a/script/_Lib/epics/__init__.py b/script/_Lib/epics/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/script/_Lib/epics/_ca.py b/script/_Lib/epics/_ca.py
deleted file mode 100644
index 0f50f8b..0000000
--- a/script/_Lib/epics/_ca.py
+++ /dev/null
@@ -1,212 +0,0 @@
-import sys
-import traceback
-import java.lang.System
-import java.lang.Thread
-import java.lang.InterruptedException
-import gov.aps.jca.CAStatus
-import gov.aps.jca.JCALibrary
-import gov.aps.jca.configuration.DefaultConfiguration
-import gov.aps.jca.dbr.DBRType
-import gov.aps.jca.dbr.Severity
-import gov.aps.jca.event.PutListener
-import gov.aps.jca.event.GetListener
-import gov.aps.jca.event.MonitorListener
-import ch.psi.jcae.impl.JcaeProperties
-
-version = "PShell wrapper"
-release = "1.0.0"
-revision = "1.0.0"
-error = Exception
-
-def dbf_type_is_valid(type):
- return (type >= 0) and (type <= LAST_TYPE)
-def dbr_type_is_valid(type):
- return (type >= 0) and (type <= LAST_BUFFER_TYPE)
-def dbr_type_is_plain(type):
- return (type >= DBR_STRING) and (type <= DBR_DOUBLE)
-def dbr_type_is_STS(type):
- return (type >= DBR_STS_STRING) and (type <= DBR_STS_DOUBLE)
-def dbr_type_is_TIME(type):
- return (type >= DBR_TIME_STRING) and (type <= DBR_TIME_DOUBLE)
-def dbr_type_is_GR(type):
- return (type >= DBR_GR_STRING) and (type <= DBR_GR_DOUBLE)
-def dbr_type_is_CTRL(type):
- return (type >= DBR_CTRL_STRING) and (type <= DBR_CTRL_DOUBLE)
-def dbr_type_is_STRING(type):
- return (type >= 0) and (type <= LAST_BUFFER_TYPE) and (type%(LAST_TYPE+1) == DBR_STRING)
-def dbr_type_is_SHORT(type):
- return (type >= 0) and (type <= LAST_BUFFER_TYPE) and (type%(LAST_TYPE+1) == DBR_SHORT)
-def dbr_type_is_FLOAT(type):
- return (type >= 0) and (type <= LAST_BUFFER_TYPE) and (type%(LAST_TYPE+1) == DBR_FLOAT)
-def dbr_type_is_ENUM(type):
- return (type >= 0) and (type <= LAST_BUFFER_TYPE) and (type%(LAST_TYPE+1) == DBR_ENUM)
-def dbr_type_is_CHAR(type):
- return (type >= 0) and (type <= LAST_BUFFER_TYPE) and (type%(LAST_TYPE+1) == DBR_CHAR)
-def dbr_type_is_LONG(type):
- return (type >= 0) and (type <= LAST_BUFFER_TYPE) and (type%(LAST_TYPE+1) == DBR_LONG)
-def dbr_type_is_DOUBLE(type):
- return (type >= 0) and (type <= LAST_BUFFER_TYPE) and (type%(LAST_TYPE+1) == DBR_DOUBLE)
-
-#I am assuming have JCAE, but it is possible to implement over JCA only, prividing the configuration
-properties = ch.psi.jcae.impl.JcaeProperties.getInstance()
-jca= gov.aps.jca.JCALibrary.getInstance()
-context = None
-configuration = gov.aps.jca.configuration.DefaultConfiguration("jython ca context")
-configuration.setAttribute("class", gov.aps.jca.JCALibrary.CHANNEL_ACCESS_JAVA)
-configuration.setAttribute("addr_list", properties.getAddressList())
-configuration.setAttribute("auto_addr_list", str(properties.isAutoAddressList()));
-if properties.getMaxArrayBytes() is not None:
- configuration.setAttribute("max_array_bytes", properties.getMaxArrayBytes())
-if properties.getServerPort() is not None:
- configuration.setAttribute("server_port", properties.getServerPort())
-
-def initialize():
- global jca
- global context
- global configuration
-
- if context is not None:
- context.destroy()
-
- context= jca.createContext(configuration)
-
-initialize()
-
-
-class PutListener(gov.aps.jca.event.PutListener):
- def __init__(self, callback):
- self.callback = callback
- def putCompleted(self, put_ev):
- if put_ev is None:
- self.callback(None , None , None)
- else:
- count = put_ev.getCount()
- status = put_ev.getStatus()
- dbr_type = put_ev.getType()
- self.callback([count, status, dbr_type]) #TODO: Check these: status must be second par
-
-def formatCbArgs(status, dbr):
- dbrType = dbr.getType()
- if status <> gov.aps.jca.CAStatus.NORMAL:
- cb_args=[None, status.getValue()]
- else:
- try:
- val = dbr.getValue()
- if val is not None:
- val = val.tolist()
- if len(val) == 1:
- val = val[0]
- if dbr.isSTS():
- cb_args = [val, dbr.getSeverity().getValue(), status.getValue()]
- else:
- cb_args = [val, gov.aps.jca.dbr.Severity.NO_ALARM, status.getValue()]
- if dbr.isTIME():
- timestamp = dbr.getTimeStamp()
- cb_args.append( timestamp.nsec() if (timestamp is not None) else 0.0)
- else:
- cb_args.append(0.0)
- if dbr.isENUM():
- cb_args.append([None, None]) #TODO
- elif dbr.isGR():
- gr=[dbr.getUnits(), dbr.getUpperDispLimit(), dbr.getLowerDispLimit(),
- dbr.getUpperAlarmLimit(), dbr.getUpperWarningLimit(),
- dbr.getLowerAlarmLimit(), dbr.getLowerWarningLimit()]
- if (dbr.isCTRL()):
- gr.append(dbr.getUpperCtrlLimit())
- gr.append(dbr.getLowerCtrlLimit())
- if (dbr.isPRECSION()):
- gr.append(dbr.getPrecision())
- cb_args.append(gr)
- except:
- traceback.print_exc(file=sys.stderr)
- cb_args=[None, None]
- return cb_args
-
-
-class GetListener(gov.aps.jca.event.GetListener):
- def __init__(self, callback):
- self.callback = callback
- def getCompleted(self, get_ev):
- status = get_ev.getStatus()
- dbr = get_ev.getDBR()
- self.callback(formatCbArgs(status, dbr))
-
-class MonitorListener(gov.aps.jca.event.MonitorListener):
- def __init__(self, callback):
- self.callback = callback
- def monitorChanged(self, monitor_ev):
- status = monitor_ev.getStatus()
- dbr = monitor_ev.getDBR()
- self.callback(formatCbArgs(status, dbr))
- #print dbr.getValue()
-
-def search(name, callback): #returns channel
- ch= context.createChannel(name)
- context.pendIO(1.0)
- return ch
-
-def name(channel):
- return channel.getName()
-
-def clear(channel):
- channel.destroy()
- flush()
-
-def put(channel, val, not_used, put_callback, req_type):
- type = gov.aps.jca.dbr.DBRType.forValue(req_type)
- if put_callback is not None:
- listener = PutListener(put_callback)
- channel.put(val, listener)
- else:
- channel.put(val)
- flush()
-
-def get(channel, get_callback, req_type, count, *args):
- listener = GetListener(get_callback)
- type = gov.aps.jca.dbr.DBRType.forValue(req_type)
- channel.get(type, count, listener)
- flush()
-
-
-def monitor(channel, event_callback, count, mask, req_type, *args):
- listener = MonitorListener(event_callback)
- type = gov.aps.jca.dbr.DBRType.forValue(req_type)
- monitor = channel.addMonitor(type, count, mask, listener)
- flush()
- return monitor
-
-def clear_monitor(event_id):
- event_id.removeMonitorListener(event_id.getMonitorListener())
- flush()
-
-def ch_info(channel):
- return (channel.getFieldType().getValue(), channel.getElementCount() ,
- None, channel.getConnectionState().getValue(), channel.getHostName(),
- channel.getReadAccess() , channel.getWriteAccess())
-
-
-def pend_io(timeout):
- context.pendIO(timeout)
- _checkInterrupted()
- return 0 #for OK
-
-
-def pend_event(timeout):
- context.pendEvent(timeout)
- _checkInterrupted()
- return 80 #C library always returns ECA_TIMEOUT
-
-def poll():
- return pend_event(1e-12)
-
-def flush():
- context.flushIO()
- _checkInterrupted()
- return 0
-
-
-def _checkInterrupted():
- java.lang.Thread.currentThread().sleep(0)
- if java.lang.Thread.currentThread().isInterrupted():
- raise java.lang.InterruptedException()
-
diff --git a/script/_Lib/epics/_ca_fnal.py b/script/_Lib/epics/_ca_fnal.py
deleted file mode 100644
index 444dd1e..0000000
--- a/script/_Lib/epics/_ca_fnal.py
+++ /dev/null
@@ -1,88 +0,0 @@
-
-from _ca import *
-from cadefs import *
-import caError
-
-def alarmSeverityString(sevr):
- try:
- return AlarmSeverity.Strings[sevr]
- except:
- return "Unkown Severity"
-
-def alarmStatusString(status):
- try:
- return AlarmStatus.Strings[status]
- except:
- return "Unknown Alarm"
-
-def message(status):
- try:
- return caError._caErrorMsg[caError.CA_EXTRACT_MSG_NO(status)]
- except:
- return str(status)
-
-def dbf_type_is_valid(dbftype):
- return dbftype >= 0 and dbftype <= LAST_TYPE
-def dbr_type_is_valid(dbrtype):
- return dbrtype >= 0 and dbrtype <= LAST_BUFFER_TYPE
-
-def dbr_type_is_plain(dbrtype):
- return (dbrtype >= DBR_STRING and dbrtype <= DBR_DOUBLE)
-def dbr_type_is_STS(dbrtype):
- return (dbrtype >= DBR_STS_STRING and dbrtype <= DBR_STS_DOUBLE)
-def dbr_type_is_TIME(dbrtype):
- return (dbrtype >= DBR_TIME_STRING and dbrtype <= DBR_TIME_DOUBLE)
-def dbr_type_is_GR(dbrtype):
- return (dbrtype >= DBR_GR_STRING and dbrtype <= DBR_GR_DOUBLE)
-def dbr_type_is_CTRL(dbrtype):
- return (dbrtype >= DBR_CTRL_STRING and dbrtype <= DBR_CTRL_DOUBLE)
-
-def dbr_type_is_STRING(dbrtype):
- return (dbrtype >= 0 and dbrtype <= LAST_BUFFER_TYPE and
- dbrtype%(LAST_TYPE+1) == DBR_STRING)
-def dbr_type_is_SHORT(dbrtype):
- return (dbrtype >= 0 and dbrtype <= LAST_BUFFER_TYPE and
- dbrtype%(LAST_TYPE+1) == DBR_SHORT)
-def dbr_type_is_FLOAT(dbrtype):
- return (dbrtype >= 0 and dbrtype <= LAST_BUFFER_TYPE and
- dbrtype%(LAST_TYPE+1) == DBR_FLOAT)
-def dbr_type_is_ENUM(dbrtype):
- return (dbrtype >= 0 and dbrtype <= LAST_BUFFER_TYPE and
- dbrtype%(LAST_TYPE+1) == DBR_ENUM)
-def dbr_type_is_CHAR(dbrtype):
- return (dbrtype >= 0 and dbrtype <= LAST_BUFFER_TYPE and
- dbrtype%(LAST_TYPE+1) == DBR_CHAR)
-def dbr_type_is_LONG(dbrtype):
- return (dbrtype >= 0 and dbrtype <= LAST_BUFFER_TYPE and
- dbrtype%(LAST_TYPE+1) == DBR_LONG)
-def dbr_type_is_DOUBLE(dbrtype):
- return (dbrtype >= 0 and dbrtype <= LAST_BUFFER_TYPE and
- dbrtype%(LAST_TYPE+1) == DBR_DOUBLE)
-
-def dbf_type_to_DBR(dbftype):
- if dbftype>=0 and dbftype <= LAST_TYPE:
- return dbftype
- else:
- return -1
-
-def dbf_type_to_DBR_STS(dbftype):
- if dbftype>=0 and dbftype <= LAST_TYPE:
- return dbftype + LAST_TYPE+1
- else:
- return -1
-
-def dbf_type_to_DBR_TIME(dbftype):
- if dbftype>=0 and dbftype <= LAST_TYPE:
- return dbftype + (LAST_TYPE+1)*2
- else:
- return -1
-def dbf_type_to_DBR_GR(dbftype):
- if dbftype>=0 and dbftype <= LAST_TYPE:
- return dbftype + (LAST_TYPE+1)*3
- else:
- return -1
-def dbf_type_to_DBR_CTRL(dbftype):
- if dbftype>=0 and dbftype <= LAST_TYPE:
- return dbftype + (LAST_TYPE+1)*4
- else:
- return -1
diff --git a/script/_Lib/epics/_ca_kek.py b/script/_Lib/epics/_ca_kek.py
deleted file mode 100644
index 4c8bcd7..0000000
--- a/script/_Lib/epics/_ca_kek.py
+++ /dev/null
@@ -1,545 +0,0 @@
-#!/usr/bin/env python
-## @package ca: EPICS-CA interface module for Python.
-"""CA modlue : EPICS-CA interface module for Python.
-This module provide a version of EPICS-CA and Python interface.
-It users C module _ca. _ca module basically maps C-API in EPICS ca library into python. Interface between ca.py and _ca module is subject for change. You should not depend on it. API in ca.py will be preserved in future releases as much as possible.
-Author: Noboru Yamamoto, KEK, JAPAN. -2007.
-$Revision: 1.1 $
-"""
-from __future__ import print_function
-__version__ = "$Revision: 1.1 $"
-# $Source: /cvs/G/EPICS/extensions/src/PythonCA/src/_ca_kek.py,v $
-#
-try:
- import signal
-except:
- print("signal module is not avaialble")
-
-import time,thread,gc,sys,atexit
-from exceptions import ValueError
-
-# autGIL is not compatible with Tkinter and wx. So code was removed
-
-# force thread module to call PyEval_InitThread in it.
-__foo_lock=thread.allocate_lock()
-def __foo():
- """
- test function foo
-
- This function is used to ensure thread module is initialized before
- loading _ca module.
- """
- global __foo_lock
- __foo_lock.release()
- thread.exit_thread()
-# See Python/Include/ceval.h
-__foo_lock.acquire()
-thread.start_new_thread(__foo,()) # __foo release lock
-__foo_lock.acquire() # make sure threading is activated
-
-import _ca
-# version from _ca314.cpp
-version=_ca.version
-revision=_ca.release
-
-# some constants for EPICS channel Access library
-from cadefs import *
-from caError import *
-
-#export pend_xxx routines for global operation
-pendio =_ca.pendio
-pend_io=_ca.pendio
-pend_event=_ca.pend_event
-poll=_ca.poll
-poll_event=_ca.poll
-flush_io=_ca.flush
-flush=_ca.flush
-test_io=_ca.test_io # test_io retunrs 42 for IODONE , 43 for IOINPROGRESS
-add_fd_registration=_ca.add_fd_registration
-
-#Error Object
-error=_ca.error
-shutdown=_ca.__ca_task_exit
-
-#private dictionary for Get/Put functions
-
-__ca_dict={}
-__ca_dict_lock=thread.allocate_lock()
-_channel__debug=False
-
-class channel:
- """
- a channel object for EPICS Channel Access.
-
- It does not have direct connection
- to channel object in C-library for EPICS Channel Access.
- for creation just supply channel name to connect
- """
- dbr_types=(
- DBR_NATIVE, # default type
- DBR_STRING, DBR_CHAR, DBR_FLOAT,
- DBR_SHORT, #/* same as DBR_INT */
- DBR_ENUM, DBR_LONG, DBR_DOUBLE,
- DBR_TIME_STRING, DBR_TIME_CHAR, DBR_TIME_FLOAT,
- DBR_TIME_SHORT, #:/* same as DBR_TIME_INT */
- DBR_TIME_ENUM, DBR_TIME_LONG, DBR_TIME_DOUBLE,
- DBR_CTRL_CHAR, DBR_CTRL_LONG,
- DBR_CTRL_ENUM, DBR_CTRL_DOUBLE
- )
-
- def __init__(self, name, cb=None,noflush=None):
- if (not cb) : cb=self.update_info
- if name == "":
- raise ValueError(name)
- self.name=name
- self.field_type = None
- self.element_count = None
- self.puser = None
- self.conn_state = -1
- self.hostname = None
- self.raccess = None
- self.waccess = None
- self.sevr=None
- self.ts=None
- self.status=None
- self.evid=[]
- self.autoEvid=None
- self.__callbacks={}
- self.cbstate=None
- self.updated=False
- self.val=None
- self.chid=_ca.search(name,cb)
- if not noflush:
- self.flush()
-
- def clear(self):
- if self.chid:
- self.clear_monitor()
- self.flush()
- _ca.clear(self.chid)
- self.flush()
- self.chid=None
-
- def __del__(self):
- self.clear()
-
- def wait_conn(self, wait=20, dt=0.05):
- n=0
- self.pend_event(dt)
- self.update_info()
- self.poll()
- while (not self.isConnected()):
- self.update_info()
- self.pend_event(dt)
- n=n+1
- if (n > wait ) :
- raise ECA_BADCHID("%s %d"%(self.name,n))
- return -1
-
- def get(self,cb=None,Type=DBR_NATIVE, count=0, type=DBR_NATIVE, type_=DBR_NATIVE):
- try:
- if not self.isConnected():
- raise ECA_BADCHID(self.name)
- except:
- raise ECA_BADCHID(self.name)
- if (Type == DBR_NATIVE):
- if not(type == DBR_NATIVE):
- Type=type
- elif not(type_ == DBR_NATIVE):
- Type=type_
- rType=max(Type,type,type_)
- if rType not in self.dbr_types:
- raise TypeError(rType)
- if not cb: cb=self.update_val
-
- self.cbstate=None
- self.updated=False
- try:
- _ca.get(self.chid, cb, Type, count)
- finally:
- pass
-
- def put(self,*val,**kw):
- """
- channel.put(valu) will put scalar value to channel. You may need to call channel.flush()
-
- """
- if( val == ()):
- print("No value(s) to put")
- else:
- if kw.has_key('cb'):
- cb=kw['cb']
- else:
- cb=None
- #self.__lock.acquire()
- try:
- _ca.put(self.chid, val, self.val, cb, DBR_NATIVE)
- finally:
- #self.__lock.release()
- pass
-
- def put_and_notify(self,*val,**kw):
- if kw.has_key('cb'):
- cb=kw['cb']
- else:
- cb=None # ca_put_array_callback does not return value.
- if( val == ()):
- print("No value(s) to put")
- else:
- #self.__lock.acquire()
- try:
- _ca.put(self.chid,val,self.val,cb, DBR_NATIVE)
- finally:
- #self.__lock.release()
- pass
-
- def monitor(self,callback=None,count=0,evmask=(DBE_VALUE|DBE_ALARM)):
- if(not callback):
- raise PyCa_NoCallback
- if (self.conn_state != 2):
- #print self.name,self.get_info()
- raise ECA_BADCHID(self.name)
-
- self.update_info()
- if (self.field_type == DBR_NATIVE):
- #print self.name,self.get_info()
- raise ECA_BADTYPE(self.name)
- self.evid.append(_ca.monitor(self.chid,callback,count,evmask))
- self.__callbacks[self.evid[-1]]=callback
- return self.evid[-1]
-
- def __clear_event(self,evid):
- if(_channel__debug): print("clearing evid:",evid)
- _ca.clear_monitor(evid)
- del self.__callbacks[evid]
-
- def clear_monitor(self,evid=None):
- if(evid):
- if ( evid in self.evid):
- self.__clear_event(evid)
- i=self.evid.index(evid)
- del self.evid[i]
- i=self.evid.index(evid)
- del self.evid[i]
- else:
- for evid in self.evid:
- self.__clear_event(evid)
- self.evid=[]
-
- def autoUpdate(self):
- if self.autoEvid == None:
- self.monitor(self.update_val)
- self.autoEvid=self.evid[-1]
- self.flush()
-
- def clearAutoUpdate(self):
- if self.autoEvid is not None:
- self.clear_monitor(self.autoEvid)
- self.autoEvid=None
- self.flush()
-
- def pendio(self,tmo=0.001):
- v=_ca.pendio(float(tmo))
- return v
-
- def pend_io(self,tmo=0.001):
- v=_ca.pendio(float(tmo))
- return v
-
- def pend_event(self,tmo=0.001):
- v=_ca.pend_event(float(tmo))
- return v
-
- def poll(self):
- _ca.poll()
-
- def flush(self,wait=0.001):
- v=_ca.flush(wait)
- return v
-
- def update_val(self,valstat=None):
- if valstat ==None:
- raise caError("No value")
- #self.__lock.acquire()
- try:
- self.val=valstat[0]
- self.sevr=valstat[1]
- self.status=valstat[2]
- self.cbstate=1
- try:
- self.ts=valstat[3]
- except:
- pass
- try:
- self.ctrl=valstat[4]
- except:
- pass
- finally:
- #self.__lock.release()
- self.updated=True
- pass
-
- def clear_cbstate(self):
- #self.__lock.acquire()
- self.cbstate=None
- #self.__lock.release()
-
- def state(self):
- self.get_info()
- return (self.conn_state - ch_state.cs_conn)
-
- def isNeverConnected(self):
- self.get_info()
- return (self.conn_state == ch_state.cs_never_conn)
-
- def isConnected(self):
- self.get_info()
- return (self.conn_state == ch_state.cs_conn)
-
- def isPreviouslyConnected(self):
- self.get_info()
- return (self.conn_state == ch_state.cs_prev_conn)
-
- def isDisonnected(self):
- self.get_info()
- return (self.conn_state == ch_state.cs_prev_conn)
-
- def isClosed(self):
- self.get_info()
- return (self.conn_state == ch_state.cs_closed)
-
- def get_info(self):
- """
- update channel status information. return channel staus as a tuple.
- """
- #self.__lock.acquire()
- try:
- info=(self.field_type, self.element_count, self.puser,
- self.conn_state, self.hostname, self.raccess,
- self.waccess) = _ca.ch_info(self.chid)
- finally:
- #self.__lock.release()
- pass
- return info
-
- def update_info(self):
- """
- Just update channel status information. No return value.
- """
- self.get_info()
-
- def fileno(self):
- """returns socket number used to connect.Scoket id is shared by
- channels which are connected to the same IOC.
- It became obsolete in EPICS 3.14 version of Python-CA.
- You need to use fd_register function. But you may not need it anyway in multi-thread environment.
- """
- return _ca.fileno(self.chid)
-
-# convenient functions
-# you need to call Clear() function before stopping Python, otherwise it cause coredump. 2009/2/11 NY
-def __Ch(name,tmo=0.01):
- if (type(name) == type("")):
- if (__ca_dict.has_key(name)):
- ch=__ca_dict[name]
- else:
- try:
- ch=channel(name)
- ch.wait_conn()
- except:
- raise ECA_BADCHID(name)
- tmo=20*tmo
- __ca_dict_lock.acquire()
- try:
- __ca_dict[name]=ch
- finally:
- __ca_dict_lock.release()
- if( ch.state() != 0):
- ch.wait_conn(10)
- return ch
- else:
- raise ECA_BADTYPE(name)
-
-def Info(name = "",tmo=0.01):
- """
- returns a tuple as channel information.
- tuple format=(field_type, element_count, puser argument,
- connection_status, hostname:port,
- read access mode, write access mode)
- """
- ch=__Ch(name,tmo=tmo)
- return ch.get_info()
-
-def ClearAll():
- for name in __ca_dict.keys():
- Clear(name)
-
-# __ca_dict should be cleared before Stopping Python
-atexit.register(ClearAll)
-
-def Clear(name= ""):
- if (type(name) == type("")):
- __ca_dict_lock.acquire()
- try:
- if (__ca_dict.has_key(name)):
- ch=__ca_dict[name]
- del __ca_dict[name]
- ch.clear()
- del ch
- else:
- __ca_dict_lock.release()
- raise ECA_BADTYPE(name)
- finally:
- __ca_dict_lock.release()
- else:
- raise ECA_BADTYPE(name)
-
-def Get(name="",count=0,Type=DBR_NATIVE,tmo=0.01,maxtmo=3):
- """
- Get value from a channel "name".
- """
- ch=__Ch(name,tmo)
- def CB(vals,ch=ch):
- ch.update_val(vals)
- ch.get(cb=CB,Type=Type,count=count)
- ch.flush()
- while not ch.updated:
- time.sleep(tmo)
- maxtmo -=tmo
- if maxtmo <=0:
- raise caError("No get response")
- return ch.val
-
-def Put_and_Notify(name,val=None,cb=None):
- """
- Convenient function:Put_and_Notify
-
- calls put_and_notify with callback.
- If callback is None, then just put data to a channel.
- """
- ch=__Ch(name,tmo=0.1)
- ch.put_and_notify(val,cb=cb)
- ch.flush()
- return ch.val
-
-# define synonym
-Put=Put_and_Notify
-
-def Put_and_Notify_Array(name,val,cb=None):
- """
- put array test version : not tested with string arrays yet
- 2007.8.30 T. Matsumoto
- """
- ch=__Ch(name,tmo=0.1)
- apply(ch.put_and_notify,val,dict(cb=cb))
- ch.flush()
- return ch.val
-
-# define synonym
-Put_Array=Put_and_Notify_Array
-
-def Monitor(name,cb=None,evmask=(DBE_VALUE|DBE_ALARM)):
- ch=__Ch(name,tmo=0.1)
- if not cb:
- def myCB(val,ch=ch):
- print(ch.name,":",val[0],val[1],val[2],TS2Ascii(val[3]))
- else:
- def myCB(val, ch=ch, cb=cb):
- cb(ch,val)
- ch.clear_monitor()
- evid=ch.monitor(myCB,evmask=evmask)
- ch.flush()
- return evid
-
-def ClearMonitor(name,evid=None):
- ch=__Ch(name,tmo=0.1)
- try:
- ch.clear_monitor(evid)
- return
- except:
- raise ECA_BADCHID(name)
-#
-def isIODone():
- if _ca.test_io()== 42:
- return 1
- else:
- return 0
-#
-# syncronus group class
-# Author: N.Yamamoto
-# Date: May 27.1999 (first version)
-#
-
-class SyncGroup:
- def __init__(self):
- self.gid=_ca.sg_create()
- self.chs={}
-
- def add(self, chs):
- try:
- for ch in chs:
- if(not self.chs.has_key(ch)):
- self.chs[ch]=0
- except:
- if(not self.chs.has_key(chs)):
- self.chs[chs]=0
-
- def test(self):
- return _ca.sg_test(self.gid)
-
- def reset(self):
- return _ca.sg_reset(self.gid)
-
- def wait(self,tmo=1.0):
- return _ca.sg_block(self.gid,float(tmo))
-
- def put(self,ch,*value,**kw):
- if kw.has_key("Type"):
- Type=kw["Type"]
- else:
- Type=DBR_NATIVE
- if self.chs.has_key(ch):
- self.chs[ch]=_ca.sg_put(self.gid, ch.chid,
- self.chs[ch], value , Type)
-
- def get(self,ch):
- if self.chs.has_key(ch):
- self.chs[ch]=_ca.sg_get(self.gid,
- ch.chid, self.chs[ch])
- else:
- pass
-
- def convert(self,ch):
- if self.chs.has_key(ch):
- val=_ca.ca_convert(ch.chid, self.chs[ch])
- ch.update_val(val[0])
-
- def GetAll(self,tmo=1.0):
- for ch in self.chs.keys():
- self.chs[ch]=_ca.sg_get(self.gid,
- ch.chid, self.chs[ch])
- st=_ca.sg_block(self.gid,tmo)
- if st == 0:
- for ch in self.chs.keys():
- val=_ca.ca_convert(ch.chid,self.chs[ch])
- ch.update_val(val[0])
- else:
- raise Exception("CA_SG time out")
-
-# TimeStamp utilities
-# time.gmtime(631152000.0)=(1990, 1, 1, 0, 0, 0, 0, 1, 0)
-#
-__EPICS_TS_EPOCH=631152000.0
-
-def TS2Ascii(ts):
- import math
- tstr=time.ctime(ts+__EPICS_TS_EPOCH)
- nsstr=".%03d"%(math.modf(ts + __EPICS_TS_EPOCH)[0]*1000)
- return tstr[:-5]+nsstr+tstr[-5:]
-
-def TS2time(ts):
- return time.localtime(ts+__EPICS_TS_EPOCH)
-
-def TS2UTC(ts):
- return (ts+__EPICS_TS_EPOCH)
-
diff --git a/script/_Lib/epics/ca.py b/script/_Lib/epics/ca.py
deleted file mode 100644
index 0becf94..0000000
--- a/script/_Lib/epics/ca.py
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env python
-## @package ca: EPICS-CA interface module for Python.
-"""CA modlue : EPICS-CA interface module for Python.
-This module provide a version of EPICS-CA and Python interface.
-It users C module _ca. _ca module basically maps C-API in EPICS ca library into python. Interface between ca.py and _ca module is subject for change. You should not depend on it. API in ca.py will be preserved in future releases as much as possible.
-Author: Noboru Yamamoto, KEK, JAPAN. -2007.
-$Revision: 1.4 $
-"""
-
-__version__ = "$Revision: 1.4 $"
-# $Source: /cvs/G/EPICS/extensions/src/PythonCA/src/ca.py,v $
-
-import time,gc,sys,atexit
-if sys.hexversion >= 0x03000000:
- import _thread as thread
-else:
- import thread
-
-# autGIL is not compatible with Tkinter and wx. So code was removed
-
-# force thread module to call PyEval_InitThread in it.
-__foo_lock=thread.allocate_lock()
-def __foo():
- """
- test function foo
-
- This function is used to ensure thread module is initialized before
- loading _ca module.
- """
- global __foo_lock
- __foo_lock.release()
- thread.exit_thread()
-
-# See Python/Include/ceval.h
-__foo_lock.acquire()
-thread.start_new_thread(__foo,()) # __foo release lock
-__foo_lock.acquire() # make sure threading is activated
-
-import _ca
-# version from _ca314.cpp
-version=_ca.version
-revision=_ca.release
-
-# some constants for EPICS channel Access library
-from cadefs import *
-from caError import *
-
-# for FNAL version you need to provide _ca_fnal.py and import every thin from them
-from _ca_fnal import *
diff --git a/script/_Lib/epics/caError.py b/script/_Lib/epics/caError.py
deleted file mode 100644
index 20dc8b6..0000000
--- a/script/_Lib/epics/caError.py
+++ /dev/null
@@ -1,461 +0,0 @@
-import sys
-if sys.hexversion >= 0x03000000:
- intern = sys.intern
-
-from ca import _ca
-class caError(_ca.error):
- """ EPICS ca.py Errors"""
- pass
-
-__caErrorMsg=(
-"Normal successful completion",
-"Maximum simultaneous IOC connections exceeded",
-"Unknown internet host",
-"Unknown internet service",
-"Unable to allocate a new socket",
-"Unable to connect to internet host or service",
-"Unable to allocate additional dynamic memory",
-"Unknown IO channel",
-"Record field specified inappropriate for channel specified",
-"The requested data transfer is greater than available memory or EPICS_CA_MAX_ARRAY_BYTES",
-"User specified timeout on IO operation expired",
-"Sorry, that feature is planned but not supported at this time",
-"The supplied string is unusually large",
-"The request was ignored because the specified channel is disconnected",
-"The data type specifed is invalid",
-"Remote Channel not found",
-"Unable to locate all user specified channels",
-"Channel Access Internal Failure",
-"The requested local DB operation failed",
-"Channel read request failed",
-"Channel write request failed",
-"Channel subscription request failed",
-"Invalid element count requested",
-"Invalid string",
-"Virtual circuit disconnect",
-"Identical process variable names on multiple servers",
-"Request inappropriate within subscription (monitor) update callback",
-"Database value get for that channel failed during channel search",
-"Unable to initialize without the vxWorks VX_FP_TASK task option set",
-"Event queue overflow has prevented first pass event after event add",
-"Bad event subscription (monitor) identifier",
-"Remote channel has new network address",
-"New or resumed network connection",
-"Specified task isnt a member of a CA context",
-"Attempt to use defunct CA feature failed",
-"The supplied string is empty",
-"Unable to spawn the CA repeater thread- auto reconnect will fail",
-"No channel id match for search reply- search reply ignored",
-"Reseting dead connection- will try to reconnect",
-"Server (IOC) has fallen behind or is not responding- still waiting",
-"No internet interface with broadcast available",
-"Invalid event selection mask",
-"IO operations have completed",
-"IO operations are in progress",
-"Invalid synchronous group identifier",
-"Put callback timed out",
-"Read access denied",
-"Write access denied",
-"Requested feature is no longer supported",
-"Empty PV search address list",
-"No reasonable data conversion between client and server types",
-"Invalid channel identifier",
-"Invalid function pointer",
-"Thread is already attached to a client context",
-"Not supported by attached service",
-"User destroyed channel",
-"Invalid channel priority",
-"Preemptive callback not enabled - additional threads may not join context",
-"Client's protocol revision does not support transfers exceeding 16k bytes",
-"Virtual circuit connection sequence aborted",
-"Virtual circuit unresponsive",
-)
-_caErrorMsg=map(intern,__caErrorMsg)
-if sys.hexversion >= 0x03000000:
- _caErrorMsg = list(_caErrorMsg)
-
-ErrCode2Class={}
-class PyCa_NoCallback(caError):
- __doc__="Null callback routine"
-CA_M_MSG_NO = 0x0000FFF8
-CA_M_SEVERITY = 0x00000007
-CA_M_LEVEL = 0x00000003
-CA_M_SUCCESS = 0x00000001
-CA_M_ERROR = 0x00000002
-CA_M_SEVERE = 0x00000004
-CA_S_MSG_NO= 0x0D
-CA_S_SEVERITY=0x03
-CA_V_MSG_NO= 0x03
-CA_V_SEVERITY= 0x00
-CA_V_SUCCESS= 0x00
-
-def CA_EXTRACT_MSG_NO(code): return ( ( (code) & CA_M_MSG_NO ) >> CA_V_MSG_NO )
-def CA_EXTRACT_SEVERITY(code): return ( ( (code) & CA_M_SEVERITY ) >> CA_V_SEVERITY)
-def CA_EXTRACT_SUCCESS(code): ( ( (code) & CA_M_SUCCESS ) >> CA_V_SUCCESS )
-
-class ECA_NORMAL(caError):
- __doc__=_caErrorMsg[0]
- __errcode__=1
-
-ErrCode2Class[1]=ECA_NORMAL
-
-class ECA_MAXIOC(caError):
- __doc__=_caErrorMsg[1]
- __errcode__=10
-
-ErrCode2Class[10]=ECA_MAXIOC
-
-class ECA_UKNHOST(caError):
- __doc__=_caErrorMsg[2]
- __errcode__=18
-
-ErrCode2Class[18]=ECA_UKNHOST
-
-class ECA_UKNSERV(caError):
- __doc__=_caErrorMsg[3]
- __errcode__=26
-
-ErrCode2Class[26]=ECA_UKNSERV
-
-class ECA_SOCK(caError):
- __doc__=_caErrorMsg[4]
- __errcode__=34
-
-ErrCode2Class[34]=ECA_SOCK
-
-class ECA_CONN(caError):
- __doc__=_caErrorMsg[5]
- __errcode__=40
-
-ErrCode2Class[40]=ECA_CONN
-
-class ECA_ALLOCMEM(caError):
- __doc__=_caErrorMsg[6]
- __errcode__=48
-
-ErrCode2Class[48]=ECA_ALLOCMEM
-
-class ECA_UKNCHAN(caError):
- __doc__=_caErrorMsg[7]
- __errcode__=56
-
-ErrCode2Class[56]=ECA_UKNCHAN
-
-class ECA_UKNFIELD(caError):
- __doc__=_caErrorMsg[8]
- __errcode__=64
-
-ErrCode2Class[64]=ECA_UKNFIELD
-
-class ECA_TOLARGE(caError):
- __doc__=_caErrorMsg[9]
- __errcode__=72
-
-ErrCode2Class[72]=ECA_TOLARGE
-
-class ECA_TIMEOUT(caError):
- __doc__=_caErrorMsg[10]
- __errcode__=80
-
-ErrCode2Class[80]=ECA_TIMEOUT
-
-class ECA_NOSUPPORT(caError):
- __doc__=_caErrorMsg[11]
- __errcode__=88
-
-ErrCode2Class[88]=ECA_NOSUPPORT
-
-class ECA_STRTOBIG(caError):
- __doc__=_caErrorMsg[12]
- __errcode__=96
-
-ErrCode2Class[96]=ECA_STRTOBIG
-
-class ECA_DISCONNCHID(caError):
- __doc__=_caErrorMsg[13]
- __errcode__=106
-
-ErrCode2Class[106]=ECA_DISCONNCHID
-
-class ECA_BADTYPE(caError):
- __doc__=_caErrorMsg[14]
- __errcode__=114
-
-ErrCode2Class[114]=ECA_BADTYPE
-
-class ECA_CHIDNOTFND(caError):
- __doc__=_caErrorMsg[15]
- __errcode__=123
-
-ErrCode2Class[123]=ECA_CHIDNOTFND
-
-class ECA_CHIDRETRY(caError):
- __doc__=_caErrorMsg[16]
- __errcode__=131
-
-ErrCode2Class[131]=ECA_CHIDRETRY
-
-class ECA_INTERNAL(caError):
- __doc__=_caErrorMsg[17]
- __errcode__=142
-
-ErrCode2Class[142]=ECA_INTERNAL
-
-class ECA_DBLCLFAIL(caError):
- __doc__=_caErrorMsg[18]
- __errcode__=144
-
-ErrCode2Class[144]=ECA_DBLCLFAIL
-
-class ECA_GETFAIL(caError):
- __doc__=_caErrorMsg[19]
- __errcode__=152
-
-ErrCode2Class[152]=ECA_GETFAIL
-
-class ECA_PUTFAIL(caError):
- __doc__=_caErrorMsg[20]
- __errcode__=160
-
-ErrCode2Class[160]=ECA_PUTFAIL
-
-class ECA_ADDFAIL(caError):
- __doc__=_caErrorMsg[21]
- __errcode__=168
-
-ErrCode2Class[168]=ECA_ADDFAIL
-
-class ECA_BADCOUNT(caError):
- __doc__=_caErrorMsg[22]
- __errcode__=176
-
-ErrCode2Class[176]=ECA_BADCOUNT
-
-class ECA_BADSTR(caError):
- __doc__=_caErrorMsg[23]
- __errcode__=186
-
-ErrCode2Class[186]=ECA_BADSTR
-
-class ECA_DISCONN(caError):
- __doc__=_caErrorMsg[24]
- __errcode__=192
-
-ErrCode2Class[192]=ECA_DISCONN
-
-class ECA_DBLCHNL(caError):
- __doc__=_caErrorMsg[25]
- __errcode__=200
-
-ErrCode2Class[200]=ECA_DBLCHNL
-
-class ECA_EVDISALLOW(caError):
- __doc__=_caErrorMsg[26]
- __errcode__=210
-
-ErrCode2Class[210]=ECA_EVDISALLOW
-
-class ECA_BUILDGET(caError):
- __doc__=_caErrorMsg[27]
- __errcode__=216
-
-ErrCode2Class[216]=ECA_BUILDGET
-
-class ECA_NEEDSFP(caError):
- __doc__=_caErrorMsg[28]
- __errcode__=224
-
-ErrCode2Class[224]=ECA_NEEDSFP
-
-class ECA_OVEVFAIL(caError):
- __doc__=_caErrorMsg[29]
- __errcode__=232
-
-ErrCode2Class[232]=ECA_OVEVFAIL
-
-class ECA_BADMONID(caError):
- __doc__=_caErrorMsg[30]
- __errcode__=242
-
-ErrCode2Class[242]=ECA_BADMONID
-
-class ECA_NEWADDR(caError):
- __doc__=_caErrorMsg[31]
- __errcode__=248
-
-ErrCode2Class[248]=ECA_NEWADDR
-
-class ECA_NEWCONN(caError):
- __doc__=_caErrorMsg[32]
- __errcode__=259
-
-ErrCode2Class[259]=ECA_NEWCONN
-
-class ECA_NOCACTX(caError):
- __doc__=_caErrorMsg[33]
- __errcode__=264
-
-ErrCode2Class[264]=ECA_NOCACTX
-
-class ECA_DEFUNCT(caError):
- __doc__=_caErrorMsg[34]
- __errcode__=278
-
-ErrCode2Class[278]=ECA_DEFUNCT
-
-class ECA_EMPTYSTR(caError):
- __doc__=_caErrorMsg[35]
- __errcode__=280
-
-ErrCode2Class[280]=ECA_EMPTYSTR
-
-class ECA_NOREPEATER(caError):
- __doc__=_caErrorMsg[36]
- __errcode__=288
-
-ErrCode2Class[288]=ECA_NOREPEATER
-
-class ECA_NOCHANMSG(caError):
- __doc__=_caErrorMsg[37]
- __errcode__=296
-
-ErrCode2Class[296]=ECA_NOCHANMSG
-
-class ECA_DLCKREST(caError):
- __doc__=_caErrorMsg[38]
- __errcode__=304
-
-ErrCode2Class[304]=ECA_DLCKREST
-
-class ECA_SERVBEHIND(caError):
- __doc__=_caErrorMsg[39]
- __errcode__=312
-
-ErrCode2Class[312]=ECA_SERVBEHIND
-
-class ECA_NOCAST(caError):
- __doc__=_caErrorMsg[40]
- __errcode__=320
-
-ErrCode2Class[320]=ECA_NOCAST
-
-class ECA_BADMASK(caError):
- __doc__=_caErrorMsg[41]
- __errcode__=330
-
-ErrCode2Class[330]=ECA_BADMASK
-
-class ECA_IODONE(caError):
- __doc__=_caErrorMsg[42]
- __errcode__=339
-
-ErrCode2Class[339]=ECA_IODONE
-
-class ECA_IOINPROGRESS(caError):
- __doc__=_caErrorMsg[43]
- __errcode__=347
-
-ErrCode2Class[347]=ECA_IOINPROGRESS
-
-class ECA_BADSYNCGRP(caError):
- __doc__=_caErrorMsg[44]
- __errcode__=354
-
-ErrCode2Class[354]=ECA_BADSYNCGRP
-
-class ECA_PUTCBINPROG(caError):
- __doc__=_caErrorMsg[45]
- __errcode__=362
-
-ErrCode2Class[362]=ECA_PUTCBINPROG
-
-class ECA_NORDACCESS(caError):
- __doc__=_caErrorMsg[46]
- __errcode__=368
-
-ErrCode2Class[368]=ECA_NORDACCESS
-
-class ECA_NOWTACCESS(caError):
- __doc__=_caErrorMsg[47]
- __errcode__=376
-
-ErrCode2Class[376]=ECA_NOWTACCESS
-
-class ECA_ANACHRONISM(caError):
- __doc__=_caErrorMsg[48]
- __errcode__=386
-
-ErrCode2Class[386]=ECA_ANACHRONISM
-
-class ECA_NOSEARCHADDR(caError):
- __doc__=_caErrorMsg[49]
- __errcode__=392
-
-ErrCode2Class[392]=ECA_NOSEARCHADDR
-
-class ECA_NOCONVERT(caError):
- __doc__=_caErrorMsg[50]
- __errcode__=400
-
-ErrCode2Class[400]=ECA_NOCONVERT
-
-class ECA_BADCHID(caError):
- __doc__=_caErrorMsg[51]
- __errcode__=410
-
-ErrCode2Class[410]=ECA_BADCHID
-
-class ECA_BADFUNCPTR(caError):
- __doc__=_caErrorMsg[52]
- __errcode__=418
-
-ErrCode2Class[418]=ECA_BADFUNCPTR
-
-class ECA_ISATTACHED(caError):
- __doc__=_caErrorMsg[53]
- __errcode__=424
-
-ErrCode2Class[424]=ECA_ISATTACHED
-
-class ECA_UNAVAILINSERV(caError):
- __doc__=_caErrorMsg[54]
- __errcode__=432
-
-ErrCode2Class[432]=ECA_UNAVAILINSERV
-
-class ECA_CHANDESTROY(caError):
- __doc__=_caErrorMsg[55]
- __errcode__=440
-
-ErrCode2Class[440]=ECA_CHANDESTROY
-
-class ECA_BADPRIORITY(caError):
- __doc__=_caErrorMsg[56]
- __errcode__=450
-
-ErrCode2Class[450]=ECA_BADPRIORITY
-
-class ECA_NOTTHREADED(caError):
- __doc__=_caErrorMsg[57]
- __errcode__=458
-
-ErrCode2Class[458]=ECA_NOTTHREADED
-
-class ECA_16KARRAYCLIENT(caError):
- __doc__=_caErrorMsg[58]
- __errcode__=464
-
-ErrCode2Class[464]=ECA_16KARRAYCLIENT
-
-class ECA_CONNSEQTMO(caError):
- __doc__=_caErrorMsg[59]
- __errcode__=472
-
-ErrCode2Class[472]=ECA_CONNSEQTMO
-
-class ECA_UNRESPTMO(caError):
- __doc__=_caErrorMsg[60]
- __errcode__=480
-
-ErrCode2Class[480]=ECA_UNRESPTMO
-
diff --git a/script/_Lib/epics/ca_util.py b/script/_Lib/epics/ca_util.py
deleted file mode 100644
index 64be7f0..0000000
--- a/script/_Lib/epics/ca_util.py
+++ /dev/null
@@ -1,647 +0,0 @@
-# ca_util.py - a thin wrapper around CaChannel
-# Tim Mooney 12/05/2008
-#
-# Modified by Xiaoqiang Wang to be Python 3 compatible.
-
-"""ca_util.py is a wrapper around CaChannel that allows the caller to write,
-e.g.,
- caget("xxx:m1")
-instead of having to write
- m1 = CaChannel()
- m1.searchw("xxx:m1")
- m1.getw()
-Also, ca_util defends against null PV names and some effects of short-term
-CA disconnections, and it can verify that caput*() operations succeeded.
-"""
-
-version = "2.0"
-
-import ca
-import CaChannel
-import time
-import sys
-
-# DBR types
-# ca.DBR_STRING = 0
-# ca.DBR_SHORT = 1
-# ca.DBR_INT = 1
-# ca.DBR_FLOAT = 2
-# ca.DBR_ENUM = 3
-# ca.DBR_CHAR = 4
-# ca.DBR_LONG = 5
-# ca.DBR_DOUBLE = 6
-
-# If caller imported CaChannel using "from CaChannel import *", then the
-# class CaChannel will have the same name as the module CaChannel, and
-# we won't be able to see the module attribute, 'CaChannel.__file__'.
-def getCaChannelFileName():
- """ For internal ca_util use"""
- return CaChannel.__file__
-
-#######################################################################
-# Human readable exception description
-# try:
-# x = x + 1
-# except:
-# print formatExceptionInfo()
-import sys
-import traceback
-def formatExceptionInfo(maxTBlevel=5):
- cla, exc, trbk = sys.exc_info()
- excName = cla.__name__
- try:
- excArgs = exc.__dict__["args"]
- except KeyError:
- excArgs = ""
- excTb = traceback.format_tb(trbk, maxTBlevel)
- return (excName, excArgs, excTb)
-
-#######################################################################
-# channel-access connection states
-ca_states = {}
-# ...from cadef.h:
-ca_states[ca.cs_never_conn] = "never connected"
-ca_states[ca.cs_prev_conn] = "previously connected"
-ca_states[ca.cs_conn] = "connected"
-ca_states[ca.cs_closed] = "closed"
-ca_states[ca.cs_never_search] = "never searched"
-
-
-
-#######################################################################
-# default settings for ca_util
-defaultTimeout = None # 'None' means use CaChannel's timeout
-defaultRetries = 3
-readCheckTolerance = None # 'None" means don't check
-
-def set_ca_util_defaults(timeout=None, retries=None, read_check_tolerance=None):
- """
- usage: old = set_ca_util_defaults(timeout=None, retries=None,
- read_check_tolerance=None)
- alternate: set_ca_util_defaults(defaultsList), where defaultsList is like
- the list returned by get_ca_util_defaults()
- Setting an argument to the string "NONE" disables it.
- Returns the list of previous default values:
- [defaultTimeout, defaultRetries, readCheckTolerance]
- """
- global defaultTimeout, defaultRetries, readCheckTolerance
- old = [defaultTimeout, defaultRetries, readCheckTolerance]
- if type(timeout) == type([]):
- argList = timeout
- timeout = argList[0]
- retries = argList[1]
- read_check_tolerance = argList[2]
- if (timeout!=None) : defaultTimeout = timeout
- if (retries!=None) : defaultRetries = retries
- if (read_check_tolerance!=None) : readCheckTolerance = read_check_tolerance
- return old
-
-def get_ca_util_defaults():
- """
- usage: myList = get_ca_util_defaults()
- myList is set to [defaultTimeout, defaultRetries, readCheckTolerance]
- """
- global defaultTimeout, defaultRetries, readCheckTolerance
- return [defaultTimeout, defaultRetries, readCheckTolerance]
-
-def set_ca_util_default_timeout(timeout=None):
- """
- usage: old = set_ca_util_default_timeout(timeout=None)
- If timeout == "NONE", then ca_util doesn't specify any timeout in
- calls to underlying software.
- Returns previous default timeout.
- """
- global defaultTimeout
- old = defaultTimeout
- defaultTimeout = timeout
- return old
-
-def get_ca_util_default_timeout():
- global defaultTimeout
- return defaultTimeout
-
-def set_ca_util_default_retries(retries=None):
- """
- usage: old = set_ca_util_default_retries(retries=None)
- If retries == "NONE", then ca_util doesn't do any retries.
- Returns previous default retries.
- """
- global defaultRetries
- old = defaultRetries
- defaultRetries = retries
- return old
-
-def get_ca_util_default_retries():
- global defaultRetries
- return defaultRetries
-
-def set_ca_util_default_read_check_tolerance(read_check_tolerance=None):
- """
- usage: old = set_ca_util_default_read_check_tolerance(read_check_tolerance=None)
- If read_check_tolerance == "NONE", then ca_util doesn't compare the value
- it reads to the value it wrote.
- Returns previous default tolerance.
- """
- global readCheckTolerance
- old = readCheckTolerance
- readCheckTolerance = read_check_tolerance
- return old
-
-def get_ca_util_default_read_check_tolerance():
- global readCheckTolerance
- return readCheckTolerance
-
-
-#######################################################################
-# The dictionary, cadict, will be used to associate PV names with the
-# machinery required to talk to EPICS PV's. If no entry is found (the
-# name hasn't been used yet in a ca call), then we create a new instance
-# of CaChannel, connect it to the PV, and put it in the dictionary. We also
-# include a flag some of the ca_util routines can use to check if a callback
-# has occurred for this PV.
-
-class cadictEntry:
- def __init__(self, channel):
- self.channel = channel
- self.callbackReceived = 0 # reserved for use by caputw()
- self.field_type = channel.field_type()
- self.element_count = channel.element_count()
- #self.host_name = channel.host_name()
-
-cadict = {}
-
-#######################################################################
-ca_utilExceptionStrings = ["No name was provided.", "Readback disagrees with put value.",
- "PV is not connected."]
-EXCEPTION_NULL_NAME = 0
-EXCEPTION_READBACK_DISAGREES = 1
-EXCEPTION_NOT_CONNECTED = 2
-
-class ca_utilException(Exception):
- def __init__(self, *args):
- Exception.__init__(self, *args)
- self.errorNumber = args[0]
-
- def __int__(self):
- return int(self.errorNumber)
-
- def __str__(self):
- return ca_utilExceptionStrings[self.errorNumber]
-
-
-#######################################################################
-def convertToType(type, value):
- if type == ca.DBR_STRING:
- return str(value)
- elif type == ca.DBR_SHORT or type == ca.DBR_INT or type == ca.DBR_LONG:
- try:
- n = int(value)
- except:
- n = 0
- return n
- elif type == ca.DBR_FLOAT or type == ca.DBR_DOUBLE:
- try:
- n = float(value)
- except:
- n = 0.0
- return n
- elif type == ca.DBR_ENUM:
- return value
- elif type == ca.DBR_CHAR:
- return value
- else:
- return value
-
-#######################################################################
-def checkName(name, timeout=None, retries=None):
- """
- usage: checkName("xxx:m1.VAL", timeout=None, retries=None)
- Intended for internal use by ca_util functions.
- """
-
- global cadict, defaultTimeout, defaultRetries
- if not name:
- raise ca_utilException(EXCEPTION_NULL_NAME)
-
- if ((timeout == None) and (defaultTimeout != None)): timeout = defaultTimeout
- if (timeout == "NONE"): timeout = None
-
- if ((retries == None) and (defaultRetries != None)): retries = defaultRetries
- if ((retries == None) or (retries == "NONE")): retries = 0
-
- tries = 0
- while (name not in cadict) and (tries <= retries):
- # Make a new entry in the PV-name dictionary
- try:
- channel = CaChannel.CaChannel()
- if (timeout != None): channel.setTimeout(timeout)
- channel.searchw(name)
- cadict[name] = cadictEntry(channel)
- except CaChannel.CaChannelException:
- status = sys.exc_info()[1]
- del channel
- tries += 1
-
- if (name not in cadict):
- print("ca_util.checkName: Can't connect to '%s'" % name)
- raise CaChannel.CaChannelException(status)
-
-#######################################################################
-def castate(name=None, timeout=None, retries=None):
- """usage: val = castate("xxx:m1.VAL", timeout=None, retries=None)
- Try to read a PV, to find out whether it's really connected, and
- whether caller is permitted to read and write it, without allowing
- any exceptions to be thrown at the caller.
- """
-
- global cadict, defaultTimeout, defaultRetries
-
- if not name: return "Null name has no state"
-
- # The only reliable way to check the *current* state of a PV is to attempt to use it.
- try:
- val = caget(name, timeout=timeout, retries=retries)
- except CaChannel.CaChannelException:
- pass
-
- try:
- checkName(name, timeout=timeout)
- except CaChannel.CaChannelException:
- return "not connected"
- except:
- return "error"
-
- try:
- state = cadict[name].channel.state()
- except CaChannel.CaChannelException:
- return "not connected"
- except:
- return "error"
- else:
- try:
- read_access = cadict[name].channel.read_access()
- write_access = cadict[name].channel.write_access()
- if state in ca_states:
- s = ca_states[state]
- else:
- s = "unknown state"
- if not read_access: s += ", noread"
- if not write_access: s += ", nowrite"
- return s
- except:
- return "error"
-
-#######################################################################
-def caget(name, timeout=None, retries=None, req_type=None, req_count=None):
- """usage: val = caget("xxx:m1.VAL", timeout=None, retries=None,
- req_type=None, req_count=None)"""
-
- global cadict, defaultTimeout, defaultRetries
-
- if not name:
- print("caget: no PV name supplied")
- raise ca_utilException(EXCEPTION_NULL_NAME)
- if ((timeout==None) and (defaultTimeout != None)): timeout = defaultTimeout
- if (timeout == "NONE"): timeout = None
- if ((retries==None) and (defaultRetries != None)): retries = defaultRetries
- if ((retries == None) or (retries == "NONE")): retries = 0
- retries = max(retries,0)
- retry = retries + 1
- success = 0
-
- # CaChannel sometimes chokes when it tries to process a channel that has been disconnected.
- # The simplest fix is to clear the channel and reconnect to the PV, which we can do cleanly
- # by deleting our dict entry for the channel, and calling checkName() to make a new entry.
-
- while ((not success) and (retry > 0)):
- checked = 0
- while ((not checked) and (retry > 0)):
- retry -= 1
- try:
- checkName(name, timeout=timeout)
- except CaChannel.CaChannelException:
- if retry <= 0:
- raise
- else:
- checked = 1
-
- entry = cadict[name]
- if (timeout != None): entry.channel.setTimeout(timeout)
- if req_type == None:
- req_type=entry.field_type
- # kludge for broken DBR_CHAR
- if req_type == ca.DBR_CHAR:
- req_type = ca.DBR_INT
- if req_count == None:
- req_count = entry.element_count
- req_count = max(0, min(req_count, entry.element_count))
- try:
- val = entry.channel.getw(req_type=req_type, count=req_count)
- except CaChannel.CaChannelException:
- status = sys.exc_info()[1]
- #print "getw threw an exception (%s)" % status
- if ((int(status) == ca.ECA_BADTYPE) or (int(status) == ca.ECA_DISCONN)):
- # Delete dictionary entry. This clears the CA connection.
- print("caget: Repairing CA connection to ", name)
- del cadict[name]
- retry += 1
- if retry <= 0:
- raise
- else:
- success = 1
- return val
-
-def isNumber(s):
- try:
- n = int(s)
- except:
- return False
- return True
-
-#######################################################################
-def same(value, readback, native_readback, field_type, read_check_tolerance):
- """For internal use by ca_util"""
- #print "ca_util.same(): field_type=%s" % field_type
- #print "ca_util.same(): value='%s'; readback='%s', native_readback='%s'" % (str(value), str(readback), str(native_readback))
- #print "ca_util.same(): type(value)=%s; type(readback)=%s, type(native_readback)=%s" % (type(value),
- # type(readback), type(native_readback))
-
- if field_type in [ca.DBR_FLOAT, ca.DBR_DOUBLE]:
- return (abs(float(readback)-float(value)) < read_check_tolerance)
- elif field_type in [ca.DBR_INT, ca.DBR_SHORT, ca.DBR_LONG]:
- return (abs(int(readback)-int(value)) == 0)
- elif field_type == ca.DBR_ENUM:
- if str(value) == str(readback):
- return True
- if str(value) == str(native_readback):
- return True
- return False
- else:
- return (str(value) == str(readback))
-
-#######################################################################
-def caput(name, value, timeout=None, req_type=None, retries=None, read_check_tolerance=None):
- """
- usage: caput("xxx:m1.VAL", new_value, timeout=None, req_type=None,
- retries=None, read_check_tolerance=None)
- Put a value, and optionally check that the value arrived safely.
- If read_check_tolerance == None (or is not supplied) then the default
- read-check tolerance is used. If read_check_tolerance == "NONE", then no
- read check is done.
- If read_check_tolerance != "NONE", then floating point numbers must be
- closer than the tolerance, and other types must agree exactly.
- Note that defaults for timeout, retries, and read_check_tolerance can be
- set for all ca_util functions, using the command set_ca_util_defaults().
- """
-
- _caput("caput", name, value, 0, timeout, req_type, retries, read_check_tolerance)
-
-
-#######################################################################
-def __ca_util_waitCB(epics_args, user_args):
- """Function for internal use by caputw()."""
- #print "__ca_util_waitCB: %s done\n" % user_args[0]
- cadict[user_args[0]].callbackReceived = 1
-
-#######################################################################
-def caputw(name, value, wait_timeout=None, timeout=None, req_type=None, retries=None,
- read_check_tolerance=None):
- """
- usage: caputw("xxx:m1.VAL", new_value, wait_timeout=None, timeout=None,
- req_type=None, retries=None, read_check_tolerance=None)
- Put a value, optionally check that the value arrived safely, and wait (no
- longer than wait_timeout) for processing to complete. If
- read_check_tolerance == None (or is not supplied) then the default
- read-check tolerance is used. If read_check_tolerance == "NONE", then no
- read check is done. If read_check_tolerance != "NONE", then floating point
- numbers must be closer than the tolerance, and other types must agree
- exactly. Note that defaults for timeout, retries, and read_check_tolerance
- can be set for all ca_util functions, using the command
- set_ca_util_defaults().
- """
-
- _caput("caputw", name, value, wait_timeout, timeout, req_type, retries, read_check_tolerance)
-
-
-#######################################################################
-def _caput(function, name, value, wait_timeout=None, timeout=None, req_type=None, retries=None, read_check_tolerance=None):
-
- global cadict, defaultTimeout, defaultRetries, readCheckTolerance
-
- #print function
- if not name:
- print("%s: no PV name supplied" % function)
- raise ca_utilException(EXCEPTION_NULL_NAME)
- if ((timeout == None) and (defaultTimeout != None)): timeout = defaultTimeout
- if ((retries == None) and (defaultRetries != None)): retries = defaultRetries
- if ((retries == None) or (retries == "NONE")): retries = 0
- if ((read_check_tolerance == None) and (readCheckTolerance != None)):
- read_check_tolerance = readCheckTolerance
-
- retries = max(retries,0)
- retry = retries + 1
- success = 0
-
- checkName(name, timeout=timeout, retries=retries)
-
- while ((not success) and (retry > 0)):
-
- retry -= 1
- entry = cadict[name]
-
- state = castate(name, timeout)
- #print "%s: state='%s'" % (function, state)
- if (state != 'connected'):
- print("%s: Repairing CA connection to '%s'" % (function, name))
- del cadict[name]
- retry += 1
- else:
- if req_type == None:
- req_type=entry.field_type
- if ((timeout != None) and (timeout != "NONE")): entry.channel.setTimeout(timeout)
- entry.callbackReceived = 0 # in case we're doing caputw()
- #value = convertToType(value, req_type)
- try:
- if function == "caput":
- entry.channel.putw(value, req_type=req_type)
- else: #caputw
- retval = entry.channel.array_put_callback(value,req_type,entry.element_count,__ca_util_waitCB,name)
- except CaChannel.CaChannelException:
- status = sys.exc_info()[1]
- print("put() threw an exception (%s)" % status)
- if ((int(status) == ca.ECA_BADTYPE) or (int(status) == ca.ECA_DISCONN)):
- # Delete dictionary entry. This clears the CA connection.
- print("%s: Repairing CA connection to '%s'" % (function, name))
- del cadict[name]
- retry += 1
- if retry <= 0:
- raise
- entry.callbackReceived = 1
- return
- else:
- if ((read_check_tolerance == None) or (read_check_tolerance == "NONE")):
- success = True
- else:
- if timeout:
- ca.pend_io(timeout)
- else:
- ca.pend_io(1.0)
- readback_success = False
- count = 0
- while ((not readback_success) and (count < retries+1)):
- try:
- readback = caget(name, req_type=req_type)
- native_readback = caget(name)
- readback_success = True
- if same(value, readback, native_readback, entry.field_type, read_check_tolerance):
- success = True
- #print "%s: Success\n" % (function)
- else:
- print("%s: readback '%s' disagrees with the value '%s' we wrote." % (function, readback, value))
- raise ca_utilException(EXCEPTION_READBACK_DISAGREES)
- entry.callbackReceived = 1
- except CaChannel.CaChannelException:
- print("%s: exception during readback." % (function))
- count += 1
-
- if success and (function == "caputw"):
- start_time = time.time()
- timed_out = 0
- while (not entry.callbackReceived) and (not timed_out):
- #print "waiting for ", name
- time.sleep(0.1)
- #ca.pend_io(0.1)
- ca.poll()
- if (not wait_timeout):
- timed_out = 0
- else:
- timed_out = ((time.time()-start_time) > wait_timeout)
-
- if not entry.callbackReceived:
- print("Execution not completed by wait_timeout (%d seconds)" % wait_timeout)
-
-#######################################################################
-def camonitor(name, function, user_args=None, timeout=None, retries=None):
- """
- usage: camonitor("xxx:m1.VAL", python_function, user_args, timeout=None,
- retries=None)
- Don't forget to call ca.pend_event() periodically.
- """
-
- global defaultTimeout, defaultRetries
-
- if not name:
- print("camonitor: no PV name supplied")
- raise ca_utilException(EXCEPTION_NULL_NAME)
- if not function:
- print("camonitor: no callback function supplied")
- raise ca_utilException(EXCEPTION_NULL_NAME)
- if not user_args: user_args = name
- if ((timeout==None) and (defaultTimeout != None)): timeout = defaultTimeout
- if ((retries==None) and (defaultRetries != None)): retries = defaultRetries
- if ((retries == None) or (retries == "NONE")): retries = 0
-
- retries = max(retries,0)
- retry = retries + 1
- success = 0
-
- while ((not success) and (retry > 0)):
- checked = 0
- while ((not checked) and (retry > 0)):
- retry -= 1
- try:
- checkName(name, timeout=timeout)
- except CaChannel.CaChannelException:
- if retry <= 0:
- raise
- else:
- checked = 1
-
- entry = cadict[name]
- if ((timeout != None) and (timeout != "NONE")): entry.channel.setTimeout(timeout)
- try:
- entry.channel.add_masked_array_event(entry.field_type,entry.element_count,ca.DBE_VALUE, function, user_args)
- except CaChannel.CaChannelException:
- status = sys.exc_info()[1]
- #print "add_masked_array_event threw an exception (%s)" % status
- if ((int(status) == ca.ECA_BADTYPE) or (int(status) == ca.ECA_DISCONN)):
- # Delete dictionary entry. This clears the CA connection.
- print("camonitor: Repairing CA connection to %s" % name)
- del cadict[name]
- retry += 1
- if retry <= 0:
- raise
- else:
- success = 1
-
-#######################################################################
-def caunmonitor(name, timeout=None):
- """usage: caunmonitor("xxx:m1.VAL", timeout=None)"""
-
- global defaultTimeout
-
- if not name:
- print("caunmonitor: no PV name supplied")
- raise ca_utilException(EXCEPTION_NULL_NAME)
- if ((timeout==None) and (defaultTimeout != None)): timeout = defaultTimeout
-
- if name not in cadict:
- print("ca_util has no connection to '%s'" % name)
- raise ca_utilException(EXCEPTION_NOT_CONNECTED)
-
- channel = cadict[name].channel
- if ((timeout != None) and (timeout != "NONE")): channel.setTimeout(timeout)
- try:
- channel.clear_event()
- except CaChannel.CaChannelException:
- status = sys.exc_info()[1]
- print("caunmonitor: CaChannel exception, status=%d (%s)" % (status, ca.message(status)))
- return
-
-#######################################################################
-def test_monitor_function(epics_args, user_args):
- """Example callback routine for use with camonitor()."""
- print('test_monitor_function:')
- print("...epics_args: %s" % repr(epics_args))
- print("...user_args: %s" % repr(user_args))
-
-
-
-
-
-#-------------------------------------------------------------------------------------------
-# miscellaneous functions that might be useful, but haven't been integrated into the package
-
-#######################################################################
-def endianUs():
- """
- usage: endianUs()
- Returns one of "Little Endian", "Big Endian", "Unknown Endian".
- """
-
- from struct import pack
- if pack('h', 1) == pack('=h',1):
- return "Big Endian"
- else:
- return "Unknown Endian"
-
-#######################################################################
-def printExceptionInfo(maxTBlevel=15):
- """Intended for internal use by ca_util functions."""
-
- import sys, traceback
- cla, exc, trbk = sys.exc_info()
- excName = cla.__name__
- try:
- excArgs = exc.__dict__["args"]
- except KeyError:
- excArgs = ""
- excTb = traceback.format_tb(trbk, maxTBlevel)
- print("Unanticipated exception: %s %s\n" % (excName, excArgs))
- if (len(excTb) > 0):
- print("Traceback:")
- for trace in excTb:
- print(trace)
- return
diff --git a/script/_Lib/epics/cadefs.py b/script/_Lib/epics/cadefs.py
deleted file mode 100644
index 3c855f5..0000000
--- a/script/_Lib/epics/cadefs.py
+++ /dev/null
@@ -1,189 +0,0 @@
-""" @package cadefs
-contstants and enumerated conststant
-
-This defines constants and classes useful to inteprete code returned from CA library.
-"""
-#
-CA_OP_GET = 0
-CA_OP_PUT = 1
-CA_OP_CREATE_CHANNEL = 2
-CA_OP_ADD_EVENT = 3
-CA_OP_CLEAR_EVENT = 4
-CA_OP_OTHER = 5
-# used with connection callbacks
-CA_OP_CONN_UP = 6
-CA_OP_CONN_DOWN = 7
-# imported from caeventmask.h
-DBE_VALUE =(1<<0)
-DBE_LOG =(1<<1)
-DBE_ALARM =(1<<2)
-DBE_PROPERTY=(1<<3)
-# also chekc ECA_IODONE/ECA_IOINPROGRESS in caError.py
-IODONE = 42
-IOINPROGRESS = 43
-#
-DBF_NATIVE=-1
-DBF_STRING=0
-DBF_INT = 1
-DBF_SHORT =1
-DBF_FLOAT =2
-DBF_ENUM =3
-DBF_CHAR =4
-DBF_LONG = 5
-DBF_DOUBLE = 6
-DBF_NO_ACCES = 7
-LAST_TYPE = DBF_DOUBLE
-
-def VALID_DB_FIELD(x):
- return ((x >= 0) and (x <= LAST_TYPE))
-def INVALID_DB_FIELD(x):
- return ((x < 0) or (x > LAST_TYPE))
-
-#/* data request buffer types */
-DBR_NATIVE= DBF_NATIVE
-DBR_STRING = DBF_STRING
-DBR_INT = DBF_INT
-DBR_SHORT = DBF_INT
-DBR_FLOAT = DBF_FLOAT
-DBR_ENUM = DBF_ENUM
-DBR_CHAR = DBF_CHAR
-DBR_LONG = DBF_LONG
-DBR_DOUBLE = DBF_DOUBLE
-DBR_STS_STRING = 7
-DBR_STS_SHORT = 8
-DBR_STS_INT = DBR_STS_SHORT
-DBR_STS_FLOAT = 9
-DBR_STS_ENUM = 10
-DBR_STS_CHAR = 11
-DBR_STS_LONG = 12
-DBR_STS_DOUBLE = 13
-DBR_TIME_STRING = 14
-DBR_TIME_INT = 15
-DBR_TIME_SHORT = 15
-DBR_TIME_FLOAT = 16
-DBR_TIME_ENUM = 17
-DBR_TIME_CHAR = 18
-DBR_TIME_LONG = 19
-DBR_TIME_DOUBLE = 20
-DBR_GR_STRING = 21
-DBR_GR_SHORT = 22
-DBR_GR_INT = DBR_GR_SHORT
-DBR_GR_FLOAT = 23
-DBR_GR_ENUM = 24
-DBR_GR_CHAR = 25
-DBR_GR_LONG = 26
-DBR_GR_DOUBLE = 27
-DBR_CTRL_STRING = 28
-DBR_CTRL_SHORT = 29
-DBR_CTRL_INT = DBR_CTRL_SHORT
-DBR_CTRL_FLOAT = 30
-DBR_CTRL_ENUM = 31
-DBR_CTRL_CHAR = 32
-DBR_CTRL_LONG = 33
-DBR_CTRL_DOUBLE = 34
-DBR_PUT_ACKT = DBR_CTRL_DOUBLE + 1
-DBR_PUT_ACKS = DBR_PUT_ACKT + 1
-DBR_STSACK_STRING = DBR_PUT_ACKS + 1
-LAST_BUFFER_TYPE = DBR_STSACK_STRING
-
-def VALID_DB_REQ(x):
- return ((x >= 0) and (x <= LAST_BUFFER_TYPE))
-def INVALID_DB_REQ(x):
- return ((x < 0) or (x > LAST_BUFFER_TYPE))
-
-class AlarmSeverity:
- """Alarm Severity class
-
- AlarmSeverity class is provided to keep constants representing EPICS channel severity status.
- It also keeps strings and colors for each severity states.
- """
- NO_ALARM =0x0
- MINOR_ALARM=0x1
- MAJOR_ALARM=0x2
- INVALID_ALARM=0x3
- ALARM_NSEV=INVALID_ALARM+1
- Strings=(
- "NO_ALARM",
- "MINOR",
- "MAJOR",
- "INVALID",
- )
- Colors=("green","yellow","red","grey")
-
-class AlarmStatus:
- """!
- AlarmStatus class provides constants returned by EPICS Channe Access library as channel status code.
- It also gives you strings for corresponding channel status.
- """
- NO_ALARM = 0
- READ_ALARM = 1
- WRITE_ALARM = 2
- #/* ANALOG ALARMS */
- HIHI_ALARM = 3
- HIGH_ALARM = 4
- LOLO_ALARM = 5
- LOW_ALARM = 6
- #/* BINARY ALARMS */
- STATE_ALARM = 7
- COS_ALARM = 8
- #/* other alarms */
- COMM_ALARM = 9
- TIMEOUT_ALARM = 10
- HW_LIMIT_ALARM = 11
- CALC_ALARM = 12
- SCAN_ALARM = 13
- LINK_ALARM = 14
- SOFT_ALARM = 15
- BAD_SUB_ALARM = 16
- UDF_ALARM = 17
- DISABLE_ALARM = 18
- SIMM_ALARM = 19
- READ_ACCESS_ALARM = 20
- WRITE_ACCESS_ALARM = 21
- Strings=(
- "NO_ALARM",
- "READ",
- "WRITE",
- "HIHI",
- "HIGH",
- "LOLO",
- "LOW",
- "STATE",
- "COS",
- "COMM",
- "TIMEOUT",
- "HWLIMIT",
- "CALC",
- "SCAN",
- "LINK",
- "SOFT",
- "BAD_SUB",
- "UDF",
- "DISABLE",
- "SIMM",
- "READ_ACCESS",
- "WRITE_ACCESS",
- )
-
-
-# ch_state={cs_never_conn=0, cs_prev_conn, cs_conn, cs_closed}
-
-cs_never_conn= 0
-cs_prev_conn = 1
-cs_conn = 2
-cs_closed = 3
-
-class ch_state:
- """
- ch_state class provides constants representing channel connection status.
- """
- cs_never_conn= 0
- cs_prev_conn = 1
- cs_conn = 2
- cs_closed = 3
- Strings=(
- "channel never connected",
- "channel previously connected",
- "channel connected",
- "channel already closed",
- )
diff --git a/script/_Lib/epics/epicsMotor.py b/script/_Lib/epics/epicsMotor.py
deleted file mode 100644
index 79fd73f..0000000
--- a/script/_Lib/epics/epicsMotor.py
+++ /dev/null
@@ -1,357 +0,0 @@
-"""
-This module provides support for the EPICS motor record.
-
-Author: Mark Rivers
-Created: Sept. 16, 2002
-Modifications:
-"""
-import time
-
-import epicsPV
-
-class epicsMotor:
- """
- This module provides a class library for the EPICS motor record.
- It uses the epicsPV class, which is in turn a subclass of CaChannel.
-
- Virtual attributes:
- These attributes do not appear in the dictionary for this class, but
- are implemented with the __getattr__ and __setattr__ methods. They
- simply do getw() or putw(value) to the appropriate motor record fields.
- All attributes can be both read and written unless otherwise noted.
-
- Attribute Description Field
- --------- ----------------------- -----
- slew_speed Slew speed or velocity .VELO
- base_speed Base or starting speed .VBAS
- acceleration Acceleration time (sec) .ACCL
- description Description of motor .DESC
- resolution Resolution (units/step) .MRES
- high_limit High soft limit (user) .HLM
- low_limit Low soft limit (user) .LLM
- dial_high_limit High soft limit (dial) .DHLM
- dial_low_limit Low soft limit (dial) .DLLM
- backlash Backlash distance .BDST
- offset Offset from dial to user .OFF
- done_moving 1=Done, 0=Moving, read-only .DMOV
-
- Exceptions:
- The check_limits() method raises an "epicsMotorException" if a soft limit
- or hard limit is detected. The move() and wait() methods call
- check_limits() before they return, unless they are called with the
- ignore_limits=1 keyword set.
-
- Example use:
- from epicsMotor import *
- m=epicsMotor('13BMD:m38')
- m.move(10) # Move to position 10 in user coordinates
- m.move(100, dial=1) # Move to position 100 in dial coordinates
- m.move(1, step=1, relative=1) # Move 1 step relative to current position
- m.wait() # Wait for motor to stop moving
- m.wait(start=1) # Wait for motor to start moving
- m.wait(start=1, stop=1) # Wait for motor to start, then to stop
- m.stop() # Stop moving immediately
- high = m.high_limit # Get the high soft limit in user coordinates
- m.dial_high_limit = 100 # Set the high limit to 100 in dial coodinates
- speed = m.slew_speed # Get the slew speed
- m.acceleration = 0.1 # Set the acceleration to 0.1 seconds
- p=m.get_position() # Get the desired motor position in user coordinates
- p=m.get_position(dial=1) # Get the desired motor position in dial coordinates
- p=m.get_position(readback=1) # Get the actual position in user coordinates
- p=m.get_position(readback=1, step=1) Get the actual motor position in steps
- p=m.set_position(100) # Set the current position to 100 in user coordinates
- # Puts motor in Set mode, writes value, puts back in Use mode.
- p=m.set_position(10000, step=1) # Set the current position to 10000 steps
-"""
-
- def __init__(self, name):
- """
- Creates a new epicsMotor instance.
-
- Inputs:
- name:
- The name of the EPICS motor record without any trailing period or field
- name.
-
- Example:
- m=epicsMotor('13BMD:m38')
- """
- self.pvs = {'val' : epicsPV.epicsPV(name+'.VAL', wait=0),
- 'dval': epicsPV.epicsPV(name+'.DVAL', wait=0),
- 'rval': epicsPV.epicsPV(name+'.RVAL', wait=0),
- 'rlv' : epicsPV.epicsPV(name+'.RLV', wait=0),
- 'rbv' : epicsPV.epicsPV(name+'.RBV', wait=0),
- 'drbv': epicsPV.epicsPV(name+'.DRBV', wait=0),
- 'rrbv': epicsPV.epicsPV(name+'.RRBV', wait=0),
- 'dmov': epicsPV.epicsPV(name+'.DMOV', wait=0),
- 'stop': epicsPV.epicsPV(name+'.STOP', wait=0),
- 'velo': epicsPV.epicsPV(name+'.VELO', wait=0),
- 'vbas': epicsPV.epicsPV(name+'.VBAS', wait=0),
- 'accl': epicsPV.epicsPV(name+'.ACCL', wait=0),
- 'desc': epicsPV.epicsPV(name+'.DESC', wait=0),
- 'mres': epicsPV.epicsPV(name+'.MRES', wait=0),
- 'hlm': epicsPV.epicsPV(name+'.HLM', wait=0),
- 'llm': epicsPV.epicsPV(name+'.LLM', wait=0),
- 'dhlm': epicsPV.epicsPV(name+'.DHLM', wait=0),
- 'dllm': epicsPV.epicsPV(name+'.DLLM', wait=0),
- 'bdst': epicsPV.epicsPV(name+'.BDST', wait=0),
- 'set': epicsPV.epicsPV(name+'.SET', wait=0),
- 'lvio': epicsPV.epicsPV(name+'.LVIO', wait=0),
- 'lls': epicsPV.epicsPV(name+'.LLS', wait=0),
- 'hls': epicsPV.epicsPV(name+'.HLS', wait=0),
- 'off': epicsPV.epicsPV(name+'.OFF', wait=0)
- }
- # Wait for all PVs to connect
- self.pvs['val'].pend_io()
-
- def move(self, value, relative=0, dial=0, step=0, ignore_limits=0):
- """
- Moves a motor to an absolute position or relative to the current position
- in user, dial or step coordinates.
-
- Inputs:
- value:
- The absolute position or relative amount of the move
-
- Keywords:
- relative:
- Set relative=1 to move relative to current position.
- The default is an absolute move.
-
- dial:
- Set dial=1 if "value" is in dial coordinates.
- The default is user coordinates.
-
- step:
- Set step=1 if "value" is in steps.
- The default is user coordinates.
-
- ignore_limits:
- Set ignore_limits=1 to suppress raising exceptions
- if the move results in a soft or hard limit violation.
-
- Notes:
- The "step" and "dial" keywords are mutually exclusive.
- The "relative" keyword can be used in user, dial or step
- coordinates.
-
- Examples:
- m=epicsMotor('13BMD:m38')
- m.move(10) # Move to position 10 in user coordinates
- m.move(100, dial=1) # Move to position 100 in dial coordinates
- m.move(2, step=1, relative=1) # Move 2 steps
- """
- if (dial != 0):
- # Position in dial coordinates
- if (relative != 0):
- current = self.get_position(dial=1)
- self.pvs['dval'].putw(current+value)
- else:
- self.pvs['dval'].putw(value)
-
- elif (step != 0):
- # Position in steps
- if (relative != 0):
- current = self.get_position(step=1)
- self.pvs['rval'].putw(current + value)
- else:
- self.pvs['rval'].putw(value)
- else:
- # Position in user coordinates
- if (relative != 0):
- self.pvs['rlv'].putw(value)
- else:
- self.pvs['val'].putw(value)
-
- # Check for limit violations
- if (ignore_limits == 0): self.check_limits()
-
- def check_limits(self):
- limit = self.pvs['lvio'].getw()
- if (limit!=0):
- raise epicsMotorException('Soft limit violation')
- limit = self.pvs['lls'].getw()
- if (limit!=0):
- raise epicsMotorException('Low hard limit violation')
- limit = self.pvs['hls'].getw()
- if (limit!=0):
- raise epicsMotorException('High hard limit violation')
-
-
- def stop(self):
- """
- Immediately stops a motor from moving by writing 1 to the .STOP field.
-
- Examples:
- m=epicsMotor('13BMD:m38')
- m.move(10) # Move to position 10 in user coordinates
- m.stop() # Stop motor
- """
- self.pvs['stop'].putw(1)
-
- def get_position(self, dial=0, readback=0, step=0):
- """
- Returns the target or readback motor position in user, dial or step
- coordinates.
-
- Keywords:
- readback:
- Set readback=1 to return the readback position in the
- desired coordinate system. The default is to return the
- target position of the motor.
-
- dial:
- Set dial=1 to return the position in dial coordinates.
- The default is user coordinates.
-
- step:
- Set step=1 to return the position in steps.
- The default is user coordinates.
-
- Notes:
- The "step" and "dial" keywords are mutually exclusive.
- The "readback" keyword can be used in user, dial or step
- coordinates.
-
- Examples:
- m=epicsMotor('13BMD:m38')
- m.move(10) # Move to position 10 in user coordinates
- p=m.get_position(dial=1) # Read the target position in
- # dial coordinates
- p=m.get_position(readback=1, step=1) # Read the actual position in
- # steps
- """
- if (dial != 0):
- if (readback != 0):
- return self.pvs['drbv'].getw()
- else:
- return self.pvs['dval'].getw()
- elif (step != 0):
- if (readback != 0):
- return self.pvs['rrbv'].getw()
- else:
- return self.pvs['rval'].getw()
- else:
- if (readback != 0):
- return self.pvs['rbv'].getw()
- else:
- return self.pvs['val'].getw()
-
- def set_position(self, position, dial=0, step=0):
- """
- Sets the motor position in user, dial or step coordinates.
-
- Inputs:
- position:
- The new motor position
-
- Keywords:
- dial:
- Set dial=1 to set the position in dial coordinates.
- The default is user coordinates.
-
- step:
- Set step=1 to set the position in steps.
- The default is user coordinates.
-
- Notes:
- The "step" and "dial" keywords are mutually exclusive.
-
- Examples:
- m=epicsMotor('13BMD:m38')
- m.set_position(10, dial=1) # Set the motor position to 10 in
- # dial coordinates
- m.set_position(1000, step=1) # Set the motor position to 1000 steps
- """
- # Put the motor in "SET" mode
- self.pvs['set'].putw(1)
- if (dial != 0):
- self.pvs['dval'].putw(position)
- elif (step != 0):
- self.pvs['rval'].putw(position)
- else:
- self.pvs['val'].putw(position)
- # Put the motor back in "Use" mode
- self.pvs['set'].putw(0)
-
-
- def wait(self, start=0, stop=0, poll=0.01, ignore_limits=0):
- """
- Waits for the motor to start moving and/or stop moving.
-
- Keywords:
- start:
- Set start=1 to wait for the motor to start moving.
-
- stop:
- Set stop=1 to wait for the motor to stop moving.
-
- poll:
- Set this keyword to the time to wait between reading the
- .DMOV field of the record to see if the motor is moving.
- The default is 0.01 seconds.
-
- ignore_limits:
- Set ignore_limits=1 to suppress raising an exception if a soft or
- hard limit is detected
-
- Notes:
- If neither the "start" nor "stop" keywords are set then "stop"
- is set to 1, so the routine waits for the motor to stop moving.
- If only "start" is set to 1 then the routine only waits for the
- motor to start moving.
- If both "start" and "stop" are set to 1 then the routine first
- waits for the motor to start moving, and then to stop moving.
-
- Examples:
- m=epicsMotor('13BMD:m38')
- m.move(100) # Move to position 100
- m.wait(start=1, stop=1) # Wait for the motor to start moving
- # and then to stop moving
- """
- if (start == 0) and (stop == 0): stop=1
- if (start != 0):
- while(1):
- done = self.pvs['dmov'].getw()
- if (done != 1): break
- time.sleep(poll)
- if (stop != 0):
- while(1):
- done = self.pvs['dmov'].getw()
- if (done != 0): break
- time.sleep(poll)
- if (ignore_limits == 0): self.check_limits()
-
- def __getattr__(self, attrname):
- if (attrname == 'slew_speed'): return self.pvs['velo'].getw()
- elif (attrname == 'base_speed'): return self.pvs['vbas'].getw()
- elif (attrname == 'acceleration'): return self.pvs['accl'].getw()
- elif (attrname == 'description'): return self.pvs['desc'].getw()
- elif (attrname == 'resolution'): return self.pvs['mres'].getw()
- elif (attrname == 'high_limit'): return self.pvs['hlm'].getw()
- elif (attrname == 'low_limit'): return self.pvs['llm'].getw()
- elif (attrname == 'dial_high_limit'): return self.pvs['dhlm'].getw()
- elif (attrname == 'dial_low_limit'): return self.pvs['dllm'].getw()
- elif (attrname == 'backlash'): return self.pvs['bdst'].getw()
- elif (attrname == 'offset'): return self.pvs['off'].getw()
- elif (attrname == 'done_moving'): return self.pvs['dmov'].getw()
- else: raise AttributeError(attrname)
-
- def __setattr__(self, attrname, value):
- if (attrname == 'pvs'): self.__dict__[attrname]=value
- elif (attrname == 'slew_speed'): self.pvs['velo'].putw(value)
- elif (attrname == 'base_speed'): self.pvs['vbas'].putw(value)
- elif (attrname == 'acceleration'): self.pvs['accl'].putw(value)
- elif (attrname == 'description'): self.pvs['desc'].putw(value)
- elif (attrname == 'resolution'): self.pvs['mres'].putw(value)
- elif (attrname == 'high_limit'): self.pvs['hlm'].putw(value)
- elif (attrname == 'low_limit'): self.pvs['llm'].putw(value)
- elif (attrname == 'dial_high_limit'): self.pvs['dhlm'].putw(value)
- elif (attrname == 'dial_low_limit'): self.pvs['dllm'].putw(value)
- elif (attrname == 'backlash'): self.pvs['bdst'].putw(value)
- elif (attrname == 'offset'): self.pvs['off'].putw(value)
- else: raise AttributeError(attrname)
-
-class epicsMotorException(Exception):
- def __init__(self, args=None):
- self.args=args
diff --git a/script/_Lib/epics/epicsPV.py b/script/_Lib/epics/epicsPV.py
deleted file mode 100644
index 56aa574..0000000
--- a/script/_Lib/epics/epicsPV.py
+++ /dev/null
@@ -1,273 +0,0 @@
-"""
-This module defines the epicsPV class, which adds additional features to
-Geoff Savage's CaChannel class.
-
-Author: Mark Rivers
-Created: Sept. 16, 2002.
-Modifications:
-"""
-import CaChannel
-
-class epicsPV(CaChannel.CaChannel):
- """
- This class subclasses Geoff Savage's CaChannel class to add the following
- features:
-
- - If a PV name is given then the class constructor will do a searchw()
- by default.
-
- - setMonitor() sets a generic callback routine for value change events.
- Subsequent getw(), getValue() or array_get() calls will return the
- value from the most recent callback, and hence do not result in any
- network activity or latency. This can greatly improve performance.
-
- - checkMonitor() returns a flag to indicate if a callback has occured
- since the last call to checkMonitor(), getw(), getValue() or
- array_get(). It can be used to increase efficiency in polling
- applications.
-
- - getControl() reads the "control" and other information from an
- EPICS PV without having to use callbacks.
- In addition to the PV value, this will return the graphic, control and
- alarm limits, etc.
-
- - putWait() calls array_put_callback() and waits for the callback to
- occur before it returns. This allows programs to use array_put_callback()
- synchronously and without user-written callbacks.
-
- Created: Mark Rivers, Sept. 16, 2002.
- Modifications:
- """
-
- def __init__(self, pvName=None, wait=1):
- """
- Keywords:
- pvName:
- An optional name of an EPICS Process Variable.
-
- wait:
- If wait==1 and pvName != None then this constructor will do a
- CaChannel.searchw() on the PV. If wait==0 and pvName != None then
- this constructor will do a CaChannel.search() on the PV, and the user
- must subsequently do a pend_io() on this or another epicsPV or CaChannel
- object.
-
- Procedure:
- Invokes CaChannel.__init__() and then searchw() or search() as explained
- above
- """
- # Invoke the base class initialization
- self.callBack = callBack()
- CaChannel.CaChannel.__init__(self)
- if (pvName != None):
- if (wait):
- self.searchw(pvName)
- else:
- self.search(pvName)
-
- def setMonitor(self):
- """
- Sets a generic callback routine for value change events.
- Subsequent getw(), getValue() or array_get() calls will return the
- value from the most recent callback, do not result in any network
- latency. This can greatly improve efficiency.
- """
- self.add_masked_array_event(None, None, CaChannel.ca.DBE_VALUE,
- getCallback, self.callBack)
- self.callBack.monitorState = 1
-
- def clearMonitor(self):
- """
- Cancels the effect of a previous call to setMonitor().
- Calls CaChannel.clear_event().
- Subsequent getw(), getValue() or array_get() calls will no longer
- return the value from the most recent callback, but will actually result
- in channel access calls.
- """
- self.clear_event()
- self.callBack.monitorState = 0
-
- def checkMonitor(self):
- """
- Returns 1 to indicate if a value callback has occured
- since the last call to checkMonitor(), getw(), getValue() or
- array_get(), indicating that a new value is available. Returns 0 if
- no such callback has occurred.
- It can be used to increase efficiency in polling applications.
- """
- # This should be self.poll(), but that is generating errors
- self.pend_event(.0001)
- m = self.callBack.newMonitor
- self.callBack.newMonitor = 0
- return m
-
- def getControl(self, req_type=None, count=None, wait=1, poll=.01):
- """
- Provides a method to read the "control" and other information from an
- EPICS PV without having to use callbacks.
- It calls CaChannel.array_get_callback() with a database request type of
- CaChannel.ca.dbf_type_to_DBR_CTRL(req_type).
- In addition to the PV value, this will return the graphic, control and
- alarm limits, etc.
-
- Example:
- >>> pv = epicsPV('13IDC:m1')
- >>> pv.getControl()
- >>> for field in dir(pv.callBack):
- >>> print field, ':', getattr(pv.callBack, field)
- chid : _bfffec34_chid_p
- count : 1
- monitorState : 0
- newMonitor : 1
- putComplete : 0
- pv_loalarmlim : 0.0
- pv_loctrllim : -22.0
- pv_lodislim : -22.0
- pv_lowarnlim : 0.0
- pv_precision : 4
- pv_riscpad0 : 256
- pv_severity : 0
- pv_status : 0
- pv_units : mm
- pv_upalarmlim : 0.0
- pv_upctrllim : 28.0
- pv_updislim : 28.0
- pv_upwarnlim : 0.0
- pv_value : -15.0
- status : 1
- type : 34
-
- Note the fields such as pv_plocrtllim, the lower control limit, and
- pv_precision, the display precision.
-
- Keywords:
- wait:
- If this keyword is 1 (the default) then this routine waits for
- the callback before returning. If this keyword is 0 then it is
- the user's responsibility to wait or check for the callback
- by calling checkMonitor().
-
- poll:
- The timeout for pend_event() calls, waiting for the callback
- to occur. Shorter times reduce the latency at the price of CPU
- cycles.
- """
- if (req_type == None): req_type = self.field_type()
- if (wait != 0): self.callBack.newMonitor = 0
- self.array_get_callback(CaChannel.ca.dbf_type_to_DBR_CTRL(req_type),
- count, getCallback, self.callBack)
- if (wait != 0):
- while(self.callBack.newMonitor == 0):
- self.pend_event(poll)
-
- def array_get(self, req_type=None, count=None):
- """
- If setMonitor() has not been called then this function simply calls
- CaChannel.array_get(). If setMonitor has been called then it calls
- CaChannel.pend_event() with a very short timeout, and then returns the
- PV value from the last callback.
- """
- if (self.callBack.monitorState != 0):
- # This should be self.poll(), but that is generating errors
- self.pend_event(.0001)
- if (self.callBack.monitorState == 2):
- self.callBack.newMonitor = 0
- return self.callBack.pv_value
- else:
- return CaChannel.CaChannel.array_get(self, req_type, count)
-
- def getw(self, req_type=None, count=None):
- """
- If setMonitor() has not been called then this function simply calls
- CaChannel.getw(). If setMonitor has been called then it calls
- CaChannel.pend_event() with a very short timeout, and then returns the
- PV value from the last callback.
- """
- if (self.callBack.monitorState != 0):
- # This should be self.poll(), but that is generating errors
- self.pend_event(.0001)
- if (self.callBack.monitorState == 2):
- self.callBack.newMonitor = 0
- if (count == None):
- return self.callBack.pv_value
- else:
- return self.callBack.pv_value[0:count]
- else:
- return CaChannel.CaChannel.getw(self, req_type, count)
-
- def getValue(self):
- """
- If setMonitor() has not been called then this function simply calls
- CaChannel.getValue(). If setMonitor has been called then it calls
- CaChannel.pend_event() with a very short timeout, and then returns the
- PV value from the last callback.
- """
- if (self.callBack.monitorState != 0):
- # This should be self.poll(), but that is generating errors
- self.pend_event(.0001)
- if (self.callBack.monitorState == 2):
- self.callBack.newMonitor = 0
- return self.callBack.pv_value
- else:
- return CaChannel.CaChannel.getValue(self)
-
- def putWait(self, value, req_type=None, count=None, poll=.01):
- """
- Calls CaChannel.array_put_callback() and waits for the callback to
- occur before it returns. This allows programs to use array_put_callback()
- without having to handle asynchronous callbacks.
-
- Keywords:
- req_type:
- See CaChannel.array_put_callback()
-
- count:
- See CaChannel.array_put_callback()
-
- poll:
- The timeout for pend_event() calls, waiting for the callback
- to occur. Shorter times reduce the latency at the price of CPU
- cycles.
- """
- self.callBack.putComplete=0
- self.array_put_callback(value, req_type, count, putCallBack, self.callBack)
- while(self.callBack.putComplete == 0):
- self.pend_event(poll)
-
-class callBack:
- """
- This class is used by the epicsPV class to handle callbacks. It is required
- to avoid circular references to the epicsPV object itself when dealing with
- callbacks, in order to allow the CaChannel destructor to be called.
- Users will only be interested in the fields that are copied to this class in
- the callback resulting from a call to epicsPV.getControl().
- """
- def __init__(self):
- self.newMonitor = 0
- self.putComplete = 0
- self.monitorState = 0
- # monitorState:
- # 0=not monitored
- # 1=monitor requested, but no callback yet
- # 2=monitor requested, callback has arrived
-
-
-def putCallBack(epicsArgs, userArgs):
- """
- This is the generic callback function used by the epicsPV.putWait() method.
- It simply sets the callBack.putComplete flag to 1.
- """
- userArgs[0].putComplete=1
-
-def getCallback(epicsArgs, userArgs):
- """
- This is the generic callback function enabled by the epicsPV.setMonitor() method.
- It sets the callBack.monitorState flag to 2, indicating that a monitor has
- been received. It copies all of the attributes in the epicsArgs dictionary
- to the callBack attribute of the epicsPV object.
- """
- for key in epicsArgs.keys():
- setattr(userArgs[0], key, epicsArgs[key])
- if (userArgs[0].monitorState == 1): userArgs[0].monitorState = 2
- userArgs[0].newMonitor = 1
-
diff --git a/script/_Lib/ijutils.js b/script/_Lib/ijutils.js
deleted file mode 100644
index cdae6d7..0000000
--- a/script/_Lib/ijutils.js
+++ /dev/null
@@ -1,896 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// Facade to ImageJ functionality
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-//More information on:
-// Image: https://imagej.nih.gov/ij/docs/guide/146-28.htmltoc-Section-28
-// Process: https://imagej.nih.gov/ij/docs/guide/146-29.html#toc-Section-29
-// Analyze: https://imagej.nih.gov/ij/docs/guide/146-30.html#toc-Section-30
-
-Utils = Java.type('ch.psi.pshell.imaging.Utils')
-Pair = Java.type('org.apache.commons.math3.util.Pair')
-
-
-IJ = Java.type('ij.IJ')
-ImageJ = Java.type('ij.ImageJ')
-WindowManager = Java.type('ij.WindowManager')
-ImagePlus = Java.type('ij.ImagePlus')
-Prefs = Java.type('ij.Prefs')
-FileSaver = Java.type('ij.io.FileSaver')
-
-ImageProcessor = Java.type('ij.process.ImageProcessor')
-ByteProcessor = Java.type('ij.process.ByteProcessor')
-ShortProcessor = Java.type('ij.process.ShortProcessor')
-ColorProcessor = Java.type('ij.process.ColorProcessor')
-FloatProcessor = Java.type('ij.process.FloatProcessor')
-ImageConverter = Java.type('ij.process.ImageConverter')
-AutoThresholder = Java.type('ij.process.AutoThresholder')
-LUT = Java.type('ij.process.LUT')
-Measurements = Java.type('ij.measure.Measurements')
-
-ResultsTable = Java.type('ij.measure.ResultsTable')
-Analyzer = Java.type('ij.plugin.filter.Analyzer')
-GaussianBlur = Java.type('ij.plugin.filter.GaussianBlur')
-Filters = Java.type('ij.plugin.filter.Filters')
-FFTFilter = Java.type('ij.plugin.filter.FFTFilter')
-BackgroundSubtracter = Java.type('ij.plugin.filter.BackgroundSubtracter')
-EDM = Java.type('ij.plugin.filter.EDM')
-Shadows = Java.type('ij.plugin.filter.Shadows')
-UnsharpMask = Java.type('ij.plugin.filter.UnsharpMask')
-MaximumFinder = Java.type('ij.plugin.filter.MaximumFinder')
-EDM = Java.type('ij.plugin.filter.EDM')
-Shadows = Java.type('ij.plugin.filter.Shadows')
-UnsharpMask = Java.type('ij.plugin.filter.UnsharpMask')
-RankFilters = Java.type('ij.plugin.filter.RankFilters')
-Convolver = Java.type('ij.plugin.filter.Convolver')
-ParticleAnalyzer = Java.type('ij.plugin.filter.ParticleAnalyzer')
-
-ContrastEnhancer = Java.type('ij.plugin.ContrastEnhancer')
-Thresholder = Java.type('ij.plugin.Thresholder')
-ImageCalculator = Java.type('ij.plugin.ImageCalculator')
-FFT = Java.type('ij.plugin.FFT')
-Concatenator = Java.type('ij.plugin.Concatenator')
-
-//ImageJ customizations
-FFTMath = Java.type('ch.psi.pshell.imaging.ij.FFTMath')
-FFTFilter = Java.type('ch.psi.pshell.imaging.ij.FFTFilter')
-Binary = Java.type('ch.psi.pshell.imaging.ij.Binary')
-Slicer = Java.type('ch.psi.pshell.imaging.ij.Slicer')
-
-
-//This eliminates the error messages due to the bug on ij.gui.ImageWindow row 555 (ij is null)
-try{
- _image_j
-} catch(ex) {
- _image_j = new ImageJ(null, ImageJ.NO_SHOW)
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-//Image creation, copying & saving
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-function load_image(image, title){
- /*
- image: file name or BufferedImage
- */
- if (!is_defined(title)) title ="img"
-
- if (typeof image == 'string')
- try{
- file = get_context().setup.expandPath(image)
- } catch(ex) {
- }
- try{
- image = Utils.newImage(file)
- } catch(ex) {
- //try loading from assembly
- image = get_context().setup.getAssemblyImage(image)
- }
- return new ImagePlus(title, image)
-}
-
-function load_array(array, width, height, title){
- /*
- array: 1d array if width and height defined , or else 2d array to be flattened.
- */
- if (!is_defined(width)) width = null
- if (!is_defined(height)) height = null
- if (!is_defined(title)) title ="img"
- //2D
- if ((width==null) && (height==null)){
- if (array.typecode == '[B') proc = new ByteProcessor(array[0].length, array.length, Convert.flatten(array))
- else if (array.typecode == '[S') proc = new ShortProcessor(array[0].length, array.length, Convert.flatten(array), null)
- else if (array.typecode == '[I') proc = new FloatProcessor(array[0].length, array.length, Convert.flatten(array))
- else if (array.typecode == '[F') proc = new FloatProcessor(array[0].length, array.length, Convert.flatten(array))
- else if (array.typecode == '[D') proc = new FloatProcessor(array[0].length, array.length, Convert.flatten(array))
- else throw "Invalid array type"
- //1D
- }else{
- if (array.length > width*height)
- array = array.slice[0, width*height]
- if (array.typecode == 'b') proc = new yteProcessor(width, height, array)
- else if (array.typecode == 'h') proc = new ShortProcessor(width, height, array, null)
- else if (array.typecode == 'i') proc = new FloatProcessor(width, height, array)
- else if (array.typecode == 'f') proc = new FloatProcessor(width, height, array)
- else if (array.typecode == 'd') proc = new FloatProcessor(width, height, array)
- else throw "Invalid array type"
- }
- return new ImagePlus(title, proc)
-}
-
-function save_image(ip, path, format){
- /*
- Saves image or stack
- If parameters omitted, saves image again in same location, with same format.
- */
- if (!is_defined(path)) path = null
- if (!is_defined(format)) format = null
- var fs = new FileSaver(ip)
- if (path == null)fs.save()
- else{
- try{
- path = get_context().setup.expandPath(path)
- } catch(ex) {
- }
- if (format == "bmp") fs.saveAsBmp(path)
- else if (format == "fits") fs.saveAsFits(path)
- else if (format == "gif") fs.saveAsGif(path)
- else if (format == "jpeg") fs.saveAsJpeg(path)
- else if (format == "lut") fs.saveAsLut(path)
- else if (format == "pgm") fs.saveAsPgm(path)
- else if (format == "png") fs.saveAsPng(path)
- else if (format == "raw" && (ip.getImageStackSize()>1)) fs.saveAsRawStack(path)
- else if (format == "raw") fs.saveAsRaw(path)
- else if (format == "txt") fs.saveAsText(path)
- else if (format == "tiff" && (ip.getImageStackSize()>1)) fs.saveAsTiffStack(path)
- else if (format == "tiff") fs.saveAsTiff(path)
- else if (format == "zip") fs.saveAsZip(path)
- }
-}
-
-function new_image(width, height, image_type, title, fill_color){
- /*
- type = "byte", "short", "color" or "float"
- */
- if (!is_defined(image_type)) image_type = "byte"
- if (!is_defined(title)) title = "img"
- if (!is_defined(fill_color)) fill_color = null
- if (image_type == "byte") p= new ByteProcessor(width, height)
- else if (image_type == "short") p= new ShortProcessor(width, height)
- else if (image_type == "color") p= new ColorProcessor(width, height)
- else if (image_type == "float") p= new FloatProcessor(width, height)
- else throw ("Invalid image type " + str(image_type))
- ret = new ImagePlus(title, p)
- if (fill_color != null){
- p.setColor(fill_color)
- p.resetRoi()
- p.fill()
- }
- return ret
-}
-
-function sub_image(ip, x, y, width, height){
- /*
- Returns new ImagePlus
- */
- ip.setRoi(x, y, width, height)
- p=ip.getProcessor().crop()
- return new ImagePlus(ip.getTitle() + " subimage", p)
-}
-
-function copy_image(ip){
- return ip.duplicate()
-}
-
-function copy_image_to(ip_source, ip_dest, x, y){
- ip_source.deleteRoi()
- ip_source.copy()
- ip_dest.setRoi(x, y, ip_source.getWidth(), ip_source.getHeight())
- ip_dest.paste()
- ip_dest.changes = false
- ip_dest.deleteRoi()
-}
-
-function pad_image(ip, left, right, top, bottom, fill_color){
- if (!is_defined(left)) left = 0
- if (!is_defined(right)) right = 0
- if (!is_defined(top)) top = 0
- if (!is_defined(bottom)) bottom = 0
- if (!is_defined(fill_color)) fill_color = null
- p=ip.getProcessor()
- width = p.getWidth() + left + right
- height = p.getHeight() + top + bottom
- image_type = get_image_type(ip)
- ret = new_image(width, height, image_type, ip.getTitle() + " padded", fill_color)
- ip.deleteRoi()
- ip.copy()
- ret.setRoi(left, top, p.getWidth(), p.getHeight())
- ret.paste()
- ret.changes = false
- ret.deleteRoi()
- return ret
-}
-
-function get_image_type(ip){
- /*
- Returns: "byte", "short", "color" or "float"
- */
- p=ip.getProcessor()
- if (p instanceof ShortProcessor) return "short"
- else if (p instanceof ColorProcessor) return "color"
- else if (p instanceof FloatProcessor) return "float"
- return "byte"
-}
-///////////////////////////////////////////////////////////////////////////////////////////////////
-//Image type conversion
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-function grayscale(ip, in_place){
- if (!is_defined(in_place)) in_place = true
- ip = (in_place==true) ? ip : ip.duplicate()
- ic = new ImageConverter(ip)
- ic.convertToGray8()
- return ip
-}
-
-function get_channel(ip, channel){
- /*
- Return a channel from a color image as a new ImagePlus.
- channel: "red", "green","blue", "alpha", "brightness",
- */
- proc = ip.getProcessor()
- if (channel == "red") ret = proc.getChannel(1, null)
- else if (channel == "green") ret = proc.getChannel(2, null)
- else if (channel == "blue") ret = proc.getChannel(3, null)
- else if (channel == "alpha") ret = proc.getChannel(4, null)
- else if (channel == "brightness") ret = proc.getBrightness()
- else throw ("Invalid channel " + channel)
- return new ImagePlus(ip.getTitle() + " channel: " + channel, ret)
-}
-///////////////////////////////////////////////////////////////////////////////////////////////////
-//Thresholder
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-function threshold(ip, min_threshold, max_threshold, in_place){
- if (!is_defined(in_place)) in_place = true
- ip = in_place ? ip : ip.duplicate()
- ip.getProcessor().setThreshold(min_threshold, max_threshold, ImageProcessor.NO_LUT_UPDATE)
- WindowManager.setTempCurrentImage(ip)
- new Thresholder().run("mask")
- return ip
-}
-
-function auto_threshold(ip, dark_background, method, in_place){
- if (!is_defined(dark_background)) dark_background = false
- if (!is_defined(method)) method = AutoThresholder.getMethods()[0]
- if (!is_defined(in_place)) in_place = true
- ip = in_place ? ip : ip.duplicate()
- ip.getProcessor().setAutoThreshold(method, dark_background , ImageProcessor.NO_LUT_UPDATE)
- WindowManager.setTempCurrentImage(ip)
- thresholder=new Thresholder().run("mask")
- return ip
-}
-///////////////////////////////////////////////////////////////////////////////////////////////////
-//Binary functions
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-function binary_op(ip, op, dark_background, iterations, count, in_place){
- /*
- op = "erode","dilate", "open","close", "outline", "fill holes", "skeletonize"
- */
- if (!is_defined(dark_background)) dark_background = false
- if (!is_defined(iterations)) iterations = 1
- if (!is_defined(count)) count = 1
- if (!is_defined(in_place)) in_place = true
- ip = in_place ? ip : ip.duplicate()
- binary = new Binary()
- Binary.count = count
- Binary.iterations = iterations
- Prefs.blackBackground=dark_background
- binary.setup(op, ip)
- binary.run(ip.getProcessor())
- return ip
-}
-
-function binary_erode(ip, dark_background, iterations, count, in_place){
- return binary_op(ip, "erode", dark_background, iterations, count, in_place)
-}
-
-function binary_dilate(ip, dark_background, iterations, count, in_place){
- return binary_op(ip, "dilate", dark_background, iterations, count, in_place)
-}
-
-function binary_open(ip, dark_background, iterations, count, in_place){
- return binary_op(ip, "open", dark_background, iterations, count, in_place)
-}
-
-function binary_close(ip, dark_background, iterations, count, in_place){
- return binary_op(ip, "close", dark_background, iterations, count, in_place)
-}
-
-function binary_outline(ip, dark_background, in_place){
- return binary_op(ip, "outline", dark_background, 1, 1, in_place)
-}
-
-function binary_fill_holes(ip, dark_background, in_place){
- return binary_op(ip, "fill holes", dark_background, 1, 1, in_place)
-}
-
-function binary_skeletonize(ip, dark_background, in_place){
- return binary_op(ip, "skeletonize", dark_background, 1, 1, in_place)
-}
-
-function analyse_particles(ip, min_size, max_size, fill_holes, exclude_edges, extra_measurements,print_table, output_image, minCirc, maxCirc){
- /*
- Returns: tuple (ResultsTable results_table, ImagePlus output_image)
- output_image = "outlines", "overlay_outlines", "masks", "overlay_masks", "roi_masks" or null
- extra_measurements = mask with Measurements.CENTROID, PERIMETER, RECT, MIN_MAX, ELLIPSE, CIRCULARITY, AREA_FRACTION, INTEGRATED_DENSITY, INVERT_Y, FERET, KURTOSIS, MEDIAN, MODE, SKEWNESS, STD_DEV
- Measurements is a mask of flags: https://imagej.nih.gov/ij/developer/api/ij/measure/Measurements.html.
- Returned ResultsTable hold public fields: https://imagej.nih.gov/ij/developer/api/ij/measure/ResultsTable.html
-
- */
- if (!is_defined(fill_holes)) fill_holes = true
- if (!is_defined(exclude_edges)) exclude_edges = true
- if (!is_defined(extra_measurements)) extra_measurements = 0
- if (!is_defined(print_table)) print_table = false
- if (!is_defined(output_image)) output_image = "outlines"
- if (!is_defined(minCirc)) minCirc = 0.0
- if (!is_defined(maxCirc)) maxCirc = 1.0
- rt = new ResultsTable()
- show_summary = false
- var options = ParticleAnalyzer.SHOW_RESULTS | ParticleAnalyzer.CLEAR_WORKSHEET
- /*
- ParticleAnalyzer.SHOW_ROI_MASKS | \
- //ParticleAnalyzer.RECORD_STARTS | \
- //ParticleAnalyzer.ADD_TO_MANAGER | \
- //ParticleAnalyzer.FOUR_CONNECTED | \
- //ParticleAnalyzer.IN_SITU_SHOW | \
- //ParticleAnalyzer.SHOW_NONE | \
- */
- if (show_summary) options = options | ParticleAnalyzer.DISPLAY_SUMMARY
- if (output_image == "outlines") options = options | ParticleAnalyzer.SHOW_OUTLINES
- else if (output_image == "overlay_outlines") options = options | ParticleAnalyzer.SHOW_OVERLAY_OUTLINES
- else if (output_image == "masks") options = options | ParticleAnalyzer.SHOW_MASKS
- else if (output_image == "overlay_masks") options = options | ParticleAnalyzer.SHOW_OVERLAY_MASKS
- else if (output_image == "roi_masks") options = options | ParticleAnalyzer.SHOW_ROI_MASKS
- //ParticleAnalyzer.SHOW_ROI_MASKS
- if (exclude_edges) options = options | ParticleAnalyzer.EXCLUDE_EDGE_PARTICLES
- if (fill_holes) options = options | ParticleAnalyzer.INCLUDE_HOLES
- measurements = Measurements.AREA | Measurements.MEAN | Measurements.CENTER_OF_MASS | Measurements.RECT
- pa = new ParticleAnalyzer(options, measurements, rt, min_size, max_size, minCirc, maxCirc)
- pa.setHideOutputImage(true)
- ParticleAnalyzer.setResultsTable(rt)
- if (pa.analyze(ip)){
- if (print_table){
- print (rt.getColumnHeadings())
- for (var row= 0; row width*height):
- array = array[:(width*height)]
- if array.typecode == 'b': proc = ByteProcessor(width, height, array)
- elif array.typecode == 'h': proc = ShortProcessor(width, height, array, None)
- elif array.typecode in ['i','f','d']: proc = FloatProcessor(width, height, array)
- else: raise Exception("Invalid array type")
- return ImagePlus(title, proc)
-
-def save_image(ip, path=None, format = None):
- """
- Saves image or stack
- If parameters omitted, saves image again in same location, with same format.
- """
- fs = FileSaver(ip)
- if path == None: fs.save()
- else:
- try:
- path = get_context().setup.expandPath(path)
- except:
- pass
- if format == "bmp": fs.saveAsBmp(path)
- elif format == "fits": fs.saveAsFits(path)
- elif format == "gif": fs.saveAsGif(path)
- elif format == "jpeg": fs.saveAsJpeg(path)
- elif format == "lut": fs.saveAsLut(path)
- elif format == "pgm": fs.saveAsPgm(path)
- elif format == "png": fs.saveAsPng(path)
- elif format == "raw" and ip.getImageStackSize()>1: fs.saveAsRawStack(path)
- elif format == "raw": fs.saveAsRaw(path)
- elif format == "txt": fs.saveAsText(path)
- elif format == "tiff" and ip.getImageStackSize()>1: fs.saveAsTiffStack(path)
- elif format == "tiff": fs.saveAsTiff(path)
- elif format == "zip": fs.saveAsZip(path)
-
-def new_image(width, height, image_type="byte", title = "img", fill_color = None):
- """
- type = "byte", "short", "color" or "float"
- """
- if image_type == "byte": p=ByteProcessor(width, height)
- elif image_type == "short": p=ShortProcessor(width, height)
- elif image_type == "color": p=ColorProcessor(width, height)
- elif image_type == "float": p=FloatProcessor(width, height)
- else: raise Exception("Invalid image type " + str(image_type))
- ret = ImagePlus(title, p)
- if fill_color is not None:
- p.setColor(fill_color)
- p.resetRoi()
- p.fill()
- return ret
-
-def sub_image(ip, x, y, width, height):
- """
- Returns new ImagePlus
- """
- ip.setRoi(x, y, width, height)
- p=ip.getProcessor().crop()
- return ImagePlus(ip.getTitle() + " subimage", p)
-
-def copy_image(ip):
- return ip.duplicate()
-
-def copy_image_to(ip_source, ip_dest, x, y):
- ip_source.deleteRoi()
- ip_source.copy()
- ip_dest.setRoi(x, y, ip_source.getWidth(), ip_source.getHeight())
- ip_dest.paste()
- ip_dest.changes = False
- ip_dest.deleteRoi()
-
-def pad_image(ip, left=0, right=0, top=0, bottom=0, fill_color = None):
- p=ip.getProcessor()
- width = p.getWidth() + left + right
- height = p.getHeight() + top + bottom
- image_type = get_image_type(ip)
- ret = new_image(width, height, image_type, ip.getTitle() + " padded", fill_color)
- ip.deleteRoi()
- ip.copy()
- ret.setRoi(left, top, p.getWidth(), p.getHeight())
- ret.paste()
- ret.changes = False
- ret.deleteRoi()
- return ret
-
-def get_image_type(ip):
- """
- Returns: "byte", "short", "color" or "float"
- """
- p=ip.getProcessor()
- if type(p) == ShortProcessor: return "short"
- elif type(p) == ColorProcessor: return "color"
- elif type(p) == FloatProcessor: return "float"
- return "byte"
-
-###################################################################################################
-#Image type conversion
-###################################################################################################
-def grayscale(ip, do_scaling=None, in_place=True):
- ip = ip if in_place else ip.duplicate()
- ic = ImageConverter(ip)
- if do_scaling is not None:
- ic.setDoScaling(do_scaling)
- ic.convertToGray8()
- return ip
-
-def get_channel(ip, channel):
- """
- Return a channel from a color image as a new ImagePlus.
- channel: "red", "green","blue", "alpha", "brightness",
- """
- proc = ip.getProcessor()
- if channel == "red": ret = proc.getChannel(1, None)
- elif channel == "green": ret = proc.getChannel(2, None)
- elif channel == "blue": ret = proc.getChannel(3, None)
- elif channel == "alpha": ret = proc.getChannel(4, None)
- elif channel == "brightness": ret = proc.getBrightness()
- else: raise Exception("Invalid channel " + str(channel))
- return ImagePlus(ip.getTitle() + " channel: " + channel, ret)
-
-###################################################################################################
-#Thresholder
-###################################################################################################
-def threshold(ip, min_threshold, max_threshold, in_place=True):
- ip = ip if in_place else ip.duplicate()
- ip.getProcessor().setThreshold(min_threshold, max_threshold, ImageProcessor.NO_LUT_UPDATE)
- WindowManager.setTempCurrentImage(ip)
- Thresholder().run("mask")
- return ip
-
-def auto_threshold(ip, dark_background = False, method = AutoThresholder.getMethods()[0], in_place=True):
- ip = ip if in_place else ip.duplicate()
- ip.getProcessor().setAutoThreshold(method, dark_background , ImageProcessor.NO_LUT_UPDATE)
- WindowManager.setTempCurrentImage(ip)
- thresholder=Thresholder().run("mask")
- return ip
-
-###################################################################################################
-#Binary functions
-###################################################################################################
-def binary_op(ip, op, dark_background=False, iterations=1, count=1, in_place=True):
- """
- op = "erode","dilate", "open","close", "outline", "fill holes", "skeletonize"
- """
- ip = ip if in_place else ip.duplicate()
- binary = Binary()
- Binary.count = count
- Binary.iterations = iterations
- Prefs.blackBackground=dark_background
- binary.setup(op, ip)
- binary.run(ip.getProcessor())
- return ip
-
-def binary_erode(ip, dark_background=False, iterations=1, count=1, in_place=True):
- return binary_op(ip, "erode", dark_background, iterations, count, in_place)
-
-def binary_dilate(ip, dark_background=False, iterations=1, count=1, in_place=True):
- return binary_op(ip, "dilate", dark_background, iterations, count, in_place)
-
-def binary_open(ip, dark_background=False, iterations=1, count=1, in_place=True):
- return binary_op(ip, "open", dark_background, iterations, count, in_place)
-
-def binary_close(ip, dark_background=False, iterations=1, count=1, in_place=True):
- return binary_op(ip, "close", dark_background, iterations, count)
-
-def binary_outline(ip, dark_background=False, in_place=True):
- return binary_op(ip, "outline", dark_background, in_place=in_place)
-
-def binary_fill_holes(ip, dark_background=False, in_place=True):
- return binary_op(ip, "fill holes", dark_background, in_place=in_place)
-
-def binary_skeletonize(ip, dark_background=False, in_place=True):
- return binary_op(ip, "skeletonize", dark_background, in_place=in_place)
-
-def analyse_particles(ip, min_size, max_size, fill_holes = True, exclude_edges = True, extra_measurements = 0, \
- print_table = False, output_image = "outlines", minCirc = 0.0, maxCirc = 1.0):
- """
- Returns: tuple (ResultsTable results_table, ImagePlus output_image)
- output_image = "outlines", "overlay_outlines", "masks", "overlay_masks", "roi_masks" or None
- extra_measurements = mask with Measurements.CENTROID, PERIMETER, RECT, MIN_MAX, ELLIPSE, CIRCULARITY, AREA_FRACTION, INTEGRATED_DENSITY, INVERT_Y, FERET, KURTOSIS, MEDIAN, MODE, SKEWNESS, STD_DEV
- Measurements is a mask of flags: https://imagej.nih.gov/ij/developer/api/ij/measure/Measurements.html.
- Returned ResultsTable hold public fields: https://imagej.nih.gov/ij/developer/api/ij/measure/ResultsTable.html
-
- """
- rt = ResultsTable()
- show_summary = False
- options = ParticleAnalyzer.SHOW_RESULTS | ParticleAnalyzer.CLEAR_WORKSHEET
- """
- ParticleAnalyzer.SHOW_ROI_MASKS | \
- #ParticleAnalyzer.RECORD_STARTS | \
- #ParticleAnalyzer.ADD_TO_MANAGER | \
- #ParticleAnalyzer.FOUR_CONNECTED | \
- #ParticleAnalyzer.IN_SITU_SHOW | \
- #ParticleAnalyzer.SHOW_NONE | \
- """
- if show_summary: options = options | ParticleAnalyzer.DISPLAY_SUMMARY
- if output_image == "outlines": options = options | ParticleAnalyzer.SHOW_OUTLINES
- elif output_image == "overlay_outlines": options = options | ParticleAnalyzer.SHOW_OVERLAY_OUTLINES
- elif output_image == "masks": options = options | ParticleAnalyzer.SHOW_MASKS
- elif output_image == "overlay_masks": options = options | ParticleAnalyzer.SHOW_OVERLAY_MASKS
- elif output_image == "roi_masks": options = options | ParticleAnalyzer.SHOW_ROI_MASKS
- #ParticleAnalyzer.SHOW_ROI_MASKS
- if exclude_edges: options = options | ParticleAnalyzer.EXCLUDE_EDGE_PARTICLES
- if fill_holes: options = options | ParticleAnalyzer.INCLUDE_HOLES
- measurements = Measurements.AREA | Measurements.MEAN | Measurements.CENTER_OF_MASS | Measurements.RECT
- pa = ParticleAnalyzer(options, measurements, rt, min_size, max_size, minCirc, maxCirc)
- pa.setHideOutputImage(True)
- pa.setResultsTable(rt)
- if pa.analyze(ip):
- if print_table:
- print rt.getColumnHeadings()
- for row in range (rt.counter):
- print rt.getRowAsString(row)
- return (rt, pa.getOutputImage())
-
-###################################################################################################
-#Image operators
-###################################################################################################
-def op_image(ip1, ip2, op, float_result=False, in_place=True):
- """
- op = "add","subtract", "multiply","divide", "and", "or", "xor", "min", "max", "average", "difference" or "copy"
- """
- ip1 = ip1 if in_place else ip1.duplicate()
- ic = ImageCalculator()
- pars = op
- if float_result:
- op = op + " float"
- ic.run(pars, ip1, ip2)
- return ip1
-
-def op_const(ip, op, val, in_place=True):
- """
- op = "add","subtract", "multiply","divide", "and", "or", "xor", "min", "max", "gamma", "set" or "log", "exp", "sqr", "sqrt","abs"
- """
- ip = ip if in_place else ip.duplicate()
- pr = ip.getProcessor()
- if op == 'add': pr.add(val)
- elif op == 'sub': pr.subtract(val)
- elif op == 'multiply': pr.multiply(val)
- elif op == 'divide' and val!=0: pr.multiply(1.0/val)
- elif op == 'and': pr.and(val)
- elif op == 'or': pr.or(val)
- elif op == 'xor': pr.xor(val)
- elif op == 'min': pr.min(val);pr.resetMinAndMax()
- elif op == 'max': pr.max(val);pr.resetMinAndMax()
- elif op == 'gamma' and 0.05 < val < 5.0: pr.gamma(val)
- elif op == 'set': pr.set(val)
- elif op == 'log': pr.log()
- elif op == 'exp': pr.exp()
- elif op == 'sqr': pr.sqr()
- elif op == 'sqrt': pr.sqrt()
- elif op == 'abs': pr.abs();pr.resetMinAndMax()
- else: raise Exception("Invalid operation " + str(op))
- return ip
-
-def op_fft(ip1, ip2, op, do_inverse = True) :
- """
- Images must have same sizes, and multiple of 2 height and width.
- op = "correlate" (complex conjugate multiply), "convolve" (Fourier domain multiply), "deconvolve" (Fourier domain divide)
- """
- if op == "correlate": op_index = 0
- elif op == "convolve": op_index = 1
- elif op == "deconvolve": op_index = 2
- else: raise Exception("Invalid operation " + str(op))
- return FFTMath().doMath(ip1, ip2, op_index, do_inverse)
-
-def op_rank(ip, op, kernel_radius =1 , dark_outliers = False ,threshold = 50, in_place=True):
- """
- op = "mean", "min", "max", "variance", "median", "close_maxima", "open_maxima", "remove_outliers", "remove_nan", "despeckle"
- """
- if op == "mean": filter_type = RankFilters.MEAN
- elif op == "min": filter_type = RankFilters.MIN
- elif op == "max": filter_type = RankFilters.MAX
- elif op == "variance": filter_type = RankFilters.VARIANCE
- elif op == "median": filter_type = RankFilters.MEDIAN
- elif op == "close_maxima": filter_type = RankFilters.CLOSE
- elif op == "open_maxima": filter_type = RankFilters.OPEN
- elif op == "remove_outliers": filter_type = RankFilters.OUTLIERS
- elif op == "remove_nan": filter_type = RankFilters.REMOVE_NAN
- elif op == "despeckle": filter_type, kernel_radius = RankFilters.MEDIAN, 1
- else: raise Exception("Invalid operation " + str(op))
- ip = ip if in_place else ip.duplicate()
- RankFilters().rank(ip.getProcessor(), kernel_radius, filter_type, RankFilters.DARK_OUTLIERS if dark_outliers else RankFilters.BRIGHT_OUTLIERS ,threshold)
- return ip
-
-def op_edm(ip, op="edm", dark_background=False, in_place=True):
- """
- Euclidian distance map & derived operations
- op ="edm", "watershed","points", "voronoi"
- """
- ip = ip if in_place else ip.duplicate()
- pr = ip.getProcessor()
- edm=EDM()
- Prefs.blackBackground=dark_background
- if op=="edm":
- #pr.setPixels(0, edm.makeFloatEDM(pr, 0, False));
- #pr.resetMinAndMax();
- if dark_background:
- pr.invert()
- edm.toEDM(pr)
- else:
- edm.setup(op, ip)
- edm.run(pr)
- return ip
-
-def watershed(ip, dark_background=False, in_place=True):
- return op_edm(ip, "watershed", dark_background, in_place)
-
-def ultimate_points(ip, dark_background=False, in_place=True):
- return op_edm(ip, "points", dark_background, in_place)
-
-def veronoi(ip, dark_background=False, in_place=True):
- return op_edm(ip, "voronoi", dark_background, in_place)
-
-def edm(ip, dark_background=False, in_place=True):
- return op_edm(ip, "edm", dark_background, in_place)
-
-def op_filter(ip, op, in_place=True):
- """
- This is redundant as just calls processor methods.
- op ="invert", "smooth", "sharpen", "edge", "add"
- """
- ip = ip if in_place else ip.duplicate()
- f = Filters()
- f.setup(op, ip )
- f.run(ip.getProcessor())
- return ip
-
-###################################################################################################
-#Other operations
-###################################################################################################
-def gaussian_blur(ip, sigma_x=3.0, sigma_y=3.0, accuracy = 0.01, in_place=True):
- ip = ip if in_place else ip.duplicate()
- GaussianBlur().blurGaussian(ip.getProcessor(), sigma_x, sigma_y, accuracy)
- return ip
-
-def find_maxima(ip, tolerance=25, threshold = ImageProcessor.NO_THRESHOLD, output_type=MaximumFinder.IN_TOLERANCE, exclude_on_edges = False, is_edm = False):
- """
- Returns new ImagePlus
- tolerance: maxima are accepted only if protruding more than this value from the ridge to a higher maximum
- threshhold: minimum height of a maximum (uncalibrated);
- output_type = SINGLE_POINTS, IN_TOLERANCE or SEGMENTED. No output image is created for output types POINT_SELECTION, LIST and COUNT.
- """
- byte_processor = MaximumFinder().findMaxima(ip.getProcessor(), tolerance, threshold, output_type, exclude_on_edges, is_edm)
- return ImagePlus(ip.getTitle() + " maxima", byte_processor)
-
-
-def get_maxima_points(ip, tolerance=25, exclude_on_edges = False):
- polygon = MaximumFinder().getMaxima(ip.getProcessor(), tolerance, exclude_on_edges)
- return (polygon.xpoints, polygon.ypoints)
-
-def enhance_contrast(ip, equalize_histo = True, saturated_pixels = 0.5, normalize = False, stack_histo = False, in_place=True):
- ip = ip if in_place else ip.duplicate()
- ce = ContrastEnhancer()
- if equalize_histo:
- ce.equalize(ip.getProcessor());
- else:
- ce.stretchHistogram(ip.getProcessor(), saturated_pixels)
- if normalize:
- ip.getProcessor().setMinAndMax(0,1.0 if (ip.getProcessor().getBitDepth()==32) else ip.getProcessor().maxValue())
- return ip
-
-def shadows(ip, op, in_place=True):
- """
- op ="north","northeast", "east", "southeast","south", "southwest", "west","northwest"
- """
- ip = ip if in_place else ip.duplicate()
- shadows= Shadows()
- shadows.setup(op, ip)
- shadows.run(ip.getProcessor())
- return ip
-
-def unsharp_mask(ip, sigma, weight, in_place=True):
- """
- Float processor
- """
- ip = ip if in_place else ip.duplicate()
- ip.getProcessor().snapshot()
- unsharp=UnsharpMask()
- USmask.setup(" ", ip)
- USmask.sharpenFloat( ip.getProcessor(),sigma, weight)
- return ip
-
-def subtract_background(ip, radius = 50, create_background=False, dark_background=False, use_paraboloid =True, do_presmooth = True, correctCorners = True, rgb_brightness=False, in_place=True):
- ip = ip if in_place else ip.duplicate()
- if rgb_brightness:
- BackgroundSubtracter().rollingBallBrightnessBackground(ip.getProcessor(), radius, create_background,not dark_background, use_paraboloid, do_presmooth, correctCorners)
- else:
- BackgroundSubtracter().rollingBallBackground(ip.getProcessor(), radius, create_background, not dark_background, use_paraboloid, do_presmooth, correctCorners)
- return ip
-
-###################################################################################################
-#FFT
-###################################################################################################
-def image_fft(ip, show = True):
- WindowManager.setTempCurrentImage(ip)
- fft = FFT()
- fft.run("fft")
- #TODO: how to avoid it to be created?
- #ret = ImagePlus("FHT of " + ip.getTitle(), WindowManager.getCurrentImage().getProcessor())
- ret = WindowManager.getCurrentImage()
- if not show:
- WindowManager.getCurrentImage().hide()
- return ret
-
-
-def image_ffti(ip, show = True):
- WindowManager.setTempCurrentImage(ip)
- fft = FFT()
- fft.run("inverse")
- #WindowManager.getCurrentImage().hide()
- #TODO: how to avoid it to be created?
- #ret = WindowManager.getCurrentImage()
- #WindowManager.getCurrentImage().hide()
- #ret = ImagePlus(ip.getTitle() + " ffti", WindowManager.getCurrentImage().getProcessor())
- ret = WindowManager.getCurrentImage()
- if not show:
- WindowManager.getCurrentImage().hide()
-
- return ret
-
-def bandpass_filter(ip, small_dia_px, large_dia_px, suppress_stripes = 0, stripes_tolerance_direction = 5.0, autoscale_after_filtering = False, saturate_if_autoscale = False, display_filter = False, in_place=True):
- """
- suppress_stripes = 0 for none, 1 for horizontal, 2 for vertical
- """
- ip = ip if in_place else ip.duplicate()
- filter= FFTFilter();
- FFTFilter.filterLargeDia = large_dia_px
- FFTFilter.filterSmallDia = small_dia_px
- FFTFilter.choiceIndex = suppress_stripes
- FFTFilter.toleranceDia = stripes_tolerance_direction
- FFTFilter.doScalingDia = autoscale_after_filtering
- FFTFilter.saturateDia = saturate_if_autoscale
- FFTFilter.displayFilter =display_filter
- filter.setup(None, ip);
- filter.run(ip.getProcessor())
- return ip
-
-###################################################################################################
-#Convolution
-###################################################################################################
-
-KERNEL_BLUR = [[0.1111, 0.1111, 0.1111], [0.1111, 0.1111, 0.1111], [0.1111, 0.1111, 0.1111]]
-KERNEL_SHARPEN = [[0.0, -0.75, 0.0], [-0.75, 4.0, -0.75], [0.0, -0.75, 0.0]]
-KERNEL_SHARPEN_2 = [[-1.0, -1.0, -1.0], [-1.0, 9.0, -1.0], [-1.0, -1.0, -1.0]]
-KERNEL_LIGHT = [[0.1, 0.1, 0.1], [0.1, 1.0, 0.1],[0.1, 0.1, 0.1]]
-KERNEL_DARK = [[0.01, 0.01, 0.01],[0.01, 0.5, 0.01],[0.01, 0.01, 0.01]]
-KERNEL_EDGE_DETECT = [[0.0, -0.75, 0.0], [-0.75, 3.0, -0.75], [0.0, -0.75, 0.0]]
-KERNEL_EDGE_DETECT_2 = [[-0.5, -0.5, -0.5], [-0.5, 4.0, -0.5], [-0.5, -0.5, -0.5]]
-KERNEL_DIFFERENTIAL_EDGE_DETECT = [[-1.0, 0.0, 1.0], [0.0, 0.0, 0.0], [1.0, 0.0, -1.0]]
-KERNEL_PREWITT = [[-2.0, -1.0, 0.0], [-1.0, 0.0, 1.0 ], [0.0, 1.0, 2.0]]
-KERNEL_SOBEL = [[2.0, 2.0, 0.0], [2.0, 0.0, -2.0 ], [0.0, -2.0, -2.0]]
-
-
-def convolve(ip, kernel, in_place=True):
- """
- kernel: list of lists
- """
- ip = ip if in_place else ip.duplicate()
- kernel_width = len(kernel)
- kernel_height= len(kernel[0])
- kernel = [item for row in kernel for item in row]
- #Convolver().convolve(ip.getProcessor(), kernel, kernel_width, kernel_height)
- ip.getProcessor().convolve(kernel, kernel_width, kernel_height)
- return ip
-
-
-###################################################################################################
-#Shortcut to ImageProcessor methods
-###################################################################################################
-def invert(ip, in_place=True):
- ip = ip if in_place else ip.duplicate()
- ip.getProcessor().invert()
- return ip
-
-def smooth(ip, in_place=True):
- ip = ip if in_place else ip.duplicate()
- ip.getProcessor().smooth()
- return ip
-
-def sharpen(ip, in_place=True):
- ip = ip if in_place else ip.duplicate()
- ip.getProcessor().sharpen()
- return ip
-
-def edges(ip, in_place=True): #Sobel
- ip = ip if in_place else ip.duplicate()
- ip.getProcessor().findEdges()
- return ip
-
-def noise(ip, sigma = 25.0, in_place=True):
- ip = ip if in_place else ip.duplicate()
- ip.getProcessor().noise(sigma)
- return ip
-
-def remap(ip, min=None, max=None, in_place=True):
- ip = ip if in_place else ip.duplicate()
- if min is None or max is None:
- stats = get_statistics(ip, Measurements.MIN_MAX)
- if min is None: min = stats.min
- if max is None: max = stats.max
- ip.getProcessor().setMinAndMax(min, max)
- return ip
-
-def set_lut(ip, r, g, b):
- """
- r,g and b are lists of 256 integers
- """
- r = [x if x<128 else x-256 for x in r]
- g = [x if x<128 else x-256 for x in g]
- b = [x if x<128 else x-256 for x in b]
- ip.setLut(LUT(jarray.array(r,'b'),jarray.array(g,'b'),jarray.array(b,'b')))
-
-def resize(ip, width, height):
- """
- Returns new ImagePlus
- """
- p = ip.getProcessor().resize(width, height)
- return ImagePlus(ip.getTitle() + " resized", p)
-
-def binning(ip, factor):
- p=ip.getProcessor().bin(factor)
- return ImagePlus(ip.getTitle() + " resized", p)
-
-def get_histogram(ip, hist_min = 0, hist_max = 0, hist_bins = 256, roi=None):
- """
- hist_min, hist_max, hist_bins used only for float images (otherwise fixed to 0,255,256)
- roi is list [x,y,w,h]
- """
- if roi == None: ip.deleteRoi()
- else: ip.setRoi(roi[0],roi[1],roi[2],roi[3])
- image_statistics = ip.getStatistics(0, hist_bins, hist_min, hist_max)
- return image_statistics.getHistogram()
-
-
-def get_array(ip):
- return ip.getProcessor().getIntArray()
-
-def get_line(ip, x1, y1, x2, y2):
- return ip.getProcessor().getLine(x1, y1, x2, y2)
-
-def get_pixel_range(ip):
- return (ip.getProcessor().getMin(), ip.getProcessor().getMax())
-
-def get_num_channels(ip):
- return ip.getProcessor().getNChannels()
-
-def is_binary(ip):
- return ip.getProcessor().isBinary()
-
-def get_pixel(ip, x, y):
- return ip.getProcessor().getPixel(x,y)
-
-def get_pixel_array(ip, x, y):
- a = [0]*get_num_channels(ip)
- return ip.getProcessor().getPixel(x,y,a)
-
-def get_pixels(ip):
- return ip.getProcessor().getPixels()
-
-def get_width(ip):
- return ip.getProcessor().getWidth()
-
-def get_height(ip):
- return ip.getProcessor().getHeight()
-
-def get_row(ip, y):
- a = [0]*get_width(ip)
- array = jarray.array(a,'i')
- ip.getProcessor().getRow(0, y, array, get_width(ip))
- return array
-
-def get_col(ip, x):
- a = [0]*get_height(ip)
- array = jarray.array(a,'i')
- ip.getProcessor().getColumn(x, 0, array, get_height(ip))
- return array
-
-def get_statistics(ip, measurements = None):
- """
- Measurements is a mask of flags: https://imagej.nih.gov/ij/developer/api/ij/measure/Measurements.html.
- Statistics object hold public fields: https://imagej.nih.gov/ij/developer/api/ij/process/ImageStatistics.html
- """
- if measurements is None:
- return ip.getStatistics()
- else:
- return ip.getStatistics(measurements)
-
-###################################################################################################
-#Image stack functions
-###################################################################################################
-def create_stack(ip_list, keep=True, title = None):
- stack = Concatenator().concatenate(ip_list, keep)
- if title is not None:
- stack.setTitle(title)
- return stack
-
-def reslice(stack, start_at = "Top", vertically = True, flip = True, output_pixel_spacing=1.0, avoid_interpolation = True, title = None):
- ss = Slicer()
- ss.rotate = vertically
- ss.startAt = start_at
- ss.flip = flip
- ss.nointerpolate = avoid_interpolation
- ss.outputZSpacing = output_pixel_spacing
- stack = ss.reslice(stack)
- if title is not None:
- stack.setTitle(title)
- return stack
-
-
-
diff --git a/script/_Lib/jeputils.js b/script/_Lib/jeputils.js
deleted file mode 100644
index bc84745..0000000
--- a/script/_Lib/jeputils.js
+++ /dev/null
@@ -1,148 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// Facade to JEP: Embedded Python
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-//Matplotlib won't work out of the box because it's default backend (Qt) uses signals, which only works in
-//the main thread. Ideally should find a fix, in order to mark the running thread as the main.
-//As a workaround, one can use the Tk backend:
-//
-//import matplotlib
-//matplotlib.use('TkAgg')
-
-
-importClass(java.io.File)
-importClass(java.lang.Thread)
-
-Jep = Java.type('jep.Jep')
-NDArray = Java.type('jep.NDArray')
-
-
-__jep = {}
-
-function __get_jep(){
- t = java.lang.Thread.currentThread()
- if (!(t in __jep)){
- init_jep()
- }
- return __jep[t]
-}
-
-function __close_jep(){
- t = java.lang.Thread.currentThread()
- if (t in __jep){
- __jep[t].close()
- }
-}
-
-function init_jep(){
- //TODO: Should do it but generates errors
- //__close_jep()
- j = new Jep(false)
- //Faster, but statements must be complete
- j.setInteractive(false)
- __jep[java.lang.Thread.currentThread()] = j
- j.eval("import sys")
- //sys.argv is not present in JEP and may be needed for certain modules (as Tkinter)
- j.eval("sys.argv = ['PShell']");
- //Add standard script path to python path
- j.eval("sys.path.append('" + get_context().setup.getScriptPath() + "')")
-
- //Redirect stdout
- j.eval("class JepStdout:\n" +
- " def write(self, str):\n" +
- " self.str += str\n" +
- " def clear(self):\n" +
- " self.str = ''\n" +
- " def flush(self):\n" +
- " pass\n")
- j.eval("sys.stdout=JepStdout()")
- j.eval("sys.stderr=JepStdout()")
- j.eval("sys.stdout.clear()")
- j.eval("sys.stderr.clear()")
-}
-
-function __print_stdout(){
- j=__get_jep()
- output = j.getValue("sys.stdout.str")
- err = j.getValue("sys.stderr.str")
- j.eval("sys.stdout.clear()")
- j.eval("sys.stderr.clear()")
- if ((output != null) && (output.length>0)){
- print (output)
- }
- if ((err != null) && (err.length>0)){
- java.lang.System.err.println(err)
- }
-}
-
-function run_jep(script_name, vars){
- if (!script_name.toLowerCase().endsWith(".py")){
- script_name += ".py"
- }
- if (!is_defined(vars)) {
- vars = {};
- }
- script = get_context().scriptManager.library.resolveFile(script_name)
- if (script == null){
- script= new File(script_name).getAbsolutePath()
- }
- j=__get_jep()
-
- for (var v in vars){
- j.set(v, vars[v])
- }
- try{
- j.runScript(script)
- } finally {
- __print_stdout()
- }
-}
-
-function eval_jep(line){
- j=__get_jep()
- try{
- j.eval(line)
- } finally {
- __print_stdout()
- }
-}
-
-function set_jep(v, value){
- j=__get_jep()
- j.set(v, value)
-}
-
-function get_jep(v){
- j=__get_jep()
- return j.getValue(v)
-}
-
-function call_jep(module, func, args){
- if (!is_defined(args)) {
- args = [];
- }
-
- j=__get_jep()
- f = module+"_" + func +"_"+ j.hashCode()
- try{
- eval_jep("from " + module + " import " + func + " as " + f)
- ret = j.invoke(f, to_array(args,'o'))
- } finally {
- __print_stdout()
- }
- return ret
-}
-
-function to_npa(data, dimensions, type){
- if (!is_defined(dimensions)) {
- dimensions = null;
- }
- if (!is_defined(type)) {
- type='d'
- }
- data = to_array(data, type)
- return new NDArray(data, dimensions)
-}
-
-
-
\ No newline at end of file
diff --git a/script/_Lib/jeputils.py b/script/_Lib/jeputils.py
deleted file mode 100644
index 072245f..0000000
--- a/script/_Lib/jeputils.py
+++ /dev/null
@@ -1,128 +0,0 @@
-###################################################################################################
-# Facade to JEP: Embedded Python
-###################################################################################################
-
-#Matplotlib won't work out of the box because it's default backend (Qt) uses signals, which only works in
-#the main thread. Ideally should find a fix, in order to mark the running thread as the main.
-#As a workaround, one can use the Tk backend:
-#
-#import matplotlib
-#matplotlib.use('TkAgg')
-
-
-import sys
-import os
-import jep.Jep
-import jep.NDArray
-import java.lang.Thread
-from startup import to_array, get_context
-
-__jep = {}
-
-def __get_jep():
- t = java.lang.Thread.currentThread()
- if not t in __jep:
- init_jep()
- return __jep[t]
-
-def __close_jep():
- t = java.lang.Thread.currentThread()
- if t in __jep:
- __jep[t].close()
-
-def init_jep():
- #TODO: Should do it but generates errors
- #__close_jep()
- j = jep.Jep(False)
- #Faster, but statements must be complete
- j.setInteractive(False)
- __jep[java.lang.Thread.currentThread()] = j
- j.eval("import sys")
- #sys.argv is not present in JEP and may be needed for certain modules (as Tkinter)
- j.eval("sys.argv = ['PShell']");
- #Add standard script path to python path
- j.eval("sys.path.append('" + get_context().setup.getScriptPath() + "')")
-
- #Redirect stdout
- j.eval("class JepStdout:\n" +
- " def write(self, str):\n" +
- " self.str += str\n" +
- " def clear(self):\n" +
- " self.str = ''\n" +
- " def flush(self):\n" +
- " pass\n")
- j.eval("sys.stdout=JepStdout()");
- j.eval("sys.stderr=JepStdout()");
- j.eval("sys.stdout.clear()")
- j.eval("sys.stderr.clear()")
-
-def __print_stdout():
- j=__get_jep()
- output = j.getValue("sys.stdout.str")
- err = j.getValue("sys.stderr.str")
- j.eval("sys.stdout.clear()")
- j.eval("sys.stderr.clear()")
- if (output is not None) and len(output)>0:
- print output
- if (err is not None) and len(err)>0:
- print >> sys.stderr, err
-
-def run_jep(script_name, vars = {}):
- global __jep
- script = get_context().scriptManager.library.resolveFile(script_name)
- if script is None :
- script= os.path.abspath(script_name)
- j=__get_jep()
-
- for v in vars:
- j.set(v, vars[v])
- try:
- j.runScript(script)
- finally:
- __print_stdout()
-
-def eval_jep(line):
- j=__get_jep()
- try:
- j.eval(line)
- finally:
- __print_stdout()
-
-def set_jep(var, value):
- j=__get_jep()
- j.set(var, value)
-
-def get_jep(var):
- j=__get_jep()
- return j.getValue(var)
-
-def call_jep(module, function, args = []):
- j=__get_jep()
- if "/" in module:
- script = get_context().scriptManager.library.resolveFile(module)
- if "\\" in script:
- #Windows paths
- module_path = script[0:script.rfind("\\")]
- module = script[script.rfind("\\")+1:]
- else:
- #Linux paths
- module_path = script[0:script.rfind("/")]
- module = script[script.rfind("/")+1:]
- eval_jep("import sys")
- eval_jep("sys.path.append('" + module_path + "')")
- if module.endswith(".py"):
- module = module[0:-3]
-
- f = module+"_" + function+"_"+str(j.hashCode())
- try:
- eval_jep("from " + module + " import " + function + " as " + f)
- ret = j.invoke(f, args)
- finally:
- __print_stdout()
- return ret
-
-#Converts pythonlist or Java array to numpy array
-def to_npa(data, dimensions = None, type = None):
-
- data = to_array(data,'d' if type is None else type)
- return jep.NDArray(data, dimensions)
\ No newline at end of file
diff --git a/script/_Lib/jsonrpclib/SimpleJSONRPCServer.py b/script/_Lib/jsonrpclib/SimpleJSONRPCServer.py
deleted file mode 100644
index 3a0a3bb..0000000
--- a/script/_Lib/jsonrpclib/SimpleJSONRPCServer.py
+++ /dev/null
@@ -1,234 +0,0 @@
-import jsonrpclib
-from jsonrpclib import Fault
-from jsonrpclib.jsonrpc import USE_UNIX_SOCKETS
-import SimpleXMLRPCServer
-import SocketServer
-import socket
-import logging
-import os
-import types
-import traceback
-import sys
-try:
- import fcntl
-except ImportError:
- # For Windows
- fcntl = None
-
-
-def get_version(request):
- # must be a dict
- if 'jsonrpc' in request.keys():
- return 2.0
- if 'id' in request.keys():
- return 1.0
- return None
-
-
-def validate_request(request):
- if not isinstance(request, dict):
- fault = Fault(
- -32600, 'Request must be {}, not %s.' % type(request)
- )
- return fault
- rpcid = request.get('id', None)
- version = get_version(request)
- if not version:
- fault = Fault(-32600, 'Request %s invalid.' % request, rpcid=rpcid)
- return fault
- request.setdefault('params', [])
- method = request.get('method', None)
- params = request.get('params')
- param_types = (types.ListType, types.DictType, types.TupleType)
- if not method or type(method) not in types.StringTypes or \
- type(params) not in param_types:
- fault = Fault(
- -32600, 'Invalid request parameters or method.', rpcid=rpcid
- )
- return fault
- return True
-
-
-class SimpleJSONRPCDispatcher(SimpleXMLRPCServer.SimpleXMLRPCDispatcher):
-
- def __init__(self, encoding=None):
- SimpleXMLRPCServer.SimpleXMLRPCDispatcher.__init__(
- self, allow_none=True, encoding=encoding)
-
- def _marshaled_dispatch(self, data, dispatch_method=None):
- response = None
- try:
- request = jsonrpclib.loads(data)
- except Exception, e:
- fault = Fault(-32700, 'Request %s invalid. (%s)' % (data, e))
- response = fault.response()
- return response
- if not request:
- fault = Fault(-32600, 'Request invalid -- no request data.')
- return fault.response()
- if isinstance(request, list):
- # This SHOULD be a batch, by spec
- responses = []
- for req_entry in request:
- result = validate_request(req_entry)
- if type(result) is Fault:
- responses.append(result.response())
- continue
- resp_entry = self._marshaled_single_dispatch(req_entry)
- if resp_entry is not None:
- responses.append(resp_entry)
- if len(responses) > 0:
- response = '[%s]' % ','.join(responses)
- else:
- response = ''
- else:
- result = validate_request(request)
- if type(result) is Fault:
- return result.response()
- response = self._marshaled_single_dispatch(request)
- return response
-
- def _marshaled_single_dispatch(self, request):
- # TODO - Use the multiprocessing and skip the response if
- # it is a notification
- # Put in support for custom dispatcher here
- # (See SimpleXMLRPCServer._marshaled_dispatch)
- method = request.get('method')
- params = request.get('params')
- try:
- response = self._dispatch(method, params)
- except:
- exc_type, exc_value, exc_tb = sys.exc_info()
- fault = Fault(-32603, '%s:%s' % (exc_type, exc_value))
- return fault.response()
- if 'id' not in request.keys() or request['id'] is None:
- # It's a notification
- return None
- try:
- response = jsonrpclib.dumps(response,
- methodresponse=True,
- rpcid=request['id']
- )
- return response
- except:
- exc_type, exc_value, exc_tb = sys.exc_info()
- fault = Fault(-32603, '%s:%s' % (exc_type, exc_value))
- return fault.response()
-
- def _dispatch(self, method, params):
- func = None
- try:
- func = self.funcs[method]
- except KeyError:
- if self.instance is not None:
- if hasattr(self.instance, '_dispatch'):
- return self.instance._dispatch(method, params)
- else:
- try:
- func = SimpleXMLRPCServer.resolve_dotted_attribute(
- self.instance,
- method,
- True
- )
- except AttributeError:
- pass
- if func is not None:
- try:
- if isinstance(params, types.ListType):
- response = func(*params)
- else:
- response = func(**params)
- return response
- # except TypeError:
- # return Fault(-32602, 'Invalid parameters.')
- except:
- err_lines = traceback.format_exc().splitlines()
- trace_string = '%s | %s' % (err_lines[-3], err_lines[-1])
- fault = jsonrpclib.Fault(-32603, 'Server error: %s' %
- trace_string)
- return fault
- else:
- return Fault(-32601, 'Method %s not supported.' % method)
-
-
-class SimpleJSONRPCRequestHandler(
- SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
-
- def do_POST(self):
- if not self.is_rpc_path_valid():
- self.report_404()
- return
- try:
- max_chunk_size = 10*1024*1024
- size_remaining = int(self.headers["content-length"])
- L = []
- while size_remaining:
- chunk_size = min(size_remaining, max_chunk_size)
- L.append(self.rfile.read(chunk_size))
- size_remaining -= len(L[-1])
- data = ''.join(L)
- response = self.server._marshaled_dispatch(data)
- self.send_response(200)
- except Exception:
- self.send_response(500)
- err_lines = traceback.format_exc().splitlines()
- trace_string = '%s | %s' % (err_lines[-3], err_lines[-1])
- fault = jsonrpclib.Fault(-32603, 'Server error: %s' % trace_string)
- response = fault.response()
- if response is None:
- response = ''
- self.send_header("Content-type", "application/json-rpc")
- self.send_header("Content-length", str(len(response)))
- self.end_headers()
- self.wfile.write(response)
- self.wfile.flush()
- self.connection.shutdown(1)
-
-
-class SimpleJSONRPCServer(SocketServer.TCPServer, SimpleJSONRPCDispatcher):
-
- allow_reuse_address = True
-
- def __init__(self, addr, requestHandler=SimpleJSONRPCRequestHandler,
- logRequests=True, encoding=None, bind_and_activate=True,
- address_family=socket.AF_INET):
- self.logRequests = logRequests
- SimpleJSONRPCDispatcher.__init__(self, encoding)
- # TCPServer.__init__ has an extra parameter on 2.6+, so
- # check Python version and decide on how to call it
- vi = sys.version_info
- self.address_family = address_family
- if USE_UNIX_SOCKETS and address_family == socket.AF_UNIX:
- # Unix sockets can't be bound if they already exist in the
- # filesystem. The convention of e.g. X11 is to unlink
- # before binding again.
- if os.path.exists(addr):
- try:
- os.unlink(addr)
- except OSError:
- logging.warning("Could not unlink socket %s", addr)
- # if python 2.5 and lower
- if vi[0] < 3 and vi[1] < 6:
- SocketServer.TCPServer.__init__(self, addr, requestHandler)
- else:
- SocketServer.TCPServer.__init__(
- self, addr, requestHandler, bind_and_activate)
- if fcntl is not None and hasattr(fcntl, 'FD_CLOEXEC'):
- flags = fcntl.fcntl(self.fileno(), fcntl.F_GETFD)
- flags |= fcntl.FD_CLOEXEC
- fcntl.fcntl(self.fileno(), fcntl.F_SETFD, flags)
-
-
-class CGIJSONRPCRequestHandler(SimpleJSONRPCDispatcher):
-
- def __init__(self, encoding=None):
- SimpleJSONRPCDispatcher.__init__(self, encoding)
-
- def handle_jsonrpc(self, request_text):
- response = self._marshaled_dispatch(request_text)
- print 'Content-Type: application/json-rpc'
- print 'Content-Length: %d' % len(response)
- print
- sys.stdout.write(response)
-
- handle_xmlrpc = handle_jsonrpc
diff --git a/script/_Lib/jsonrpclib/__init__.py b/script/_Lib/jsonrpclib/__init__.py
deleted file mode 100644
index 6e884b8..0000000
--- a/script/_Lib/jsonrpclib/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from jsonrpclib.config import Config
-config = Config.instance()
-from jsonrpclib.history import History
-history = History.instance()
-from jsonrpclib.jsonrpc import Server, MultiCall, Fault
-from jsonrpclib.jsonrpc import ProtocolError, loads, dumps
diff --git a/script/_Lib/jsonrpclib/config.py b/script/_Lib/jsonrpclib/config.py
deleted file mode 100644
index ca926ca..0000000
--- a/script/_Lib/jsonrpclib/config.py
+++ /dev/null
@@ -1,40 +0,0 @@
-import sys
-
-
-class LocalClasses(dict):
- def add(self, cls):
- self[cls.__name__] = cls
-
-
-class Config(object):
- """
- This is pretty much used exclusively for the 'jsonclass'
- functionality... set use_jsonclass to False to turn it off.
- You can change serialize_method and ignore_attribute, or use
- the local_classes.add(class) to include "local" classes.
- """
- use_jsonclass = True
- # Change to False to keep __jsonclass__ entries raw.
- serialize_method = '_serialize'
- # The serialize_method should be a string that references the
- # method on a custom class object which is responsible for
- # returning a tuple of the constructor arguments and a dict of
- # attributes.
- ignore_attribute = '_ignore'
- # The ignore attribute should be a string that references the
- # attribute on a custom class object which holds strings and / or
- # references of the attributes the class translator should ignore.
- classes = LocalClasses()
- # The list of classes to use for jsonclass translation.
- version = 2.0
- # Version of the JSON-RPC spec to support
- user_agent = 'jsonrpclib/0.1 (Python %s)' % \
- '.'.join([str(ver) for ver in sys.version_info[0:3]])
- # User agent to use for calls.
- _instance = None
-
- @classmethod
- def instance(cls):
- if not cls._instance:
- cls._instance = cls()
- return cls._instance
diff --git a/script/_Lib/jsonrpclib/history.py b/script/_Lib/jsonrpclib/history.py
deleted file mode 100644
index f052baa..0000000
--- a/script/_Lib/jsonrpclib/history.py
+++ /dev/null
@@ -1,40 +0,0 @@
-class History(object):
- """
- This holds all the response and request objects for a
- session. A server using this should call "clear" after
- each request cycle in order to keep it from clogging
- memory.
- """
- requests = []
- responses = []
- _instance = None
-
- @classmethod
- def instance(cls):
- if not cls._instance:
- cls._instance = cls()
- return cls._instance
-
- def add_response(self, response_obj):
- self.responses.append(response_obj)
-
- def add_request(self, request_obj):
- self.requests.append(request_obj)
-
- @property
- def request(self):
- if len(self.requests) == 0:
- return None
- else:
- return self.requests[-1]
-
- @property
- def response(self):
- if len(self.responses) == 0:
- return None
- else:
- return self.responses[-1]
-
- def clear(self):
- del self.requests[:]
- del self.responses[:]
diff --git a/script/_Lib/jsonrpclib/jsonclass.py b/script/_Lib/jsonrpclib/jsonclass.py
deleted file mode 100644
index 4326f28..0000000
--- a/script/_Lib/jsonrpclib/jsonclass.py
+++ /dev/null
@@ -1,155 +0,0 @@
-import types
-import inspect
-import re
-
-from jsonrpclib import config
-
-iter_types = [
- types.DictType,
- types.ListType,
- types.TupleType
-]
-
-string_types = [
- types.StringType,
- types.UnicodeType
-]
-
-numeric_types = [
- types.IntType,
- types.LongType,
- types.FloatType
-]
-
-value_types = [
- types.BooleanType,
- types.NoneType
-]
-
-supported_types = iter_types+string_types+numeric_types+value_types
-invalid_module_chars = r'[^a-zA-Z0-9\_\.]'
-
-
-class TranslationError(Exception):
- pass
-
-
-def dump(obj, serialize_method=None, ignore_attribute=None, ignore=[]):
- if not serialize_method:
- serialize_method = config.serialize_method
- if not ignore_attribute:
- ignore_attribute = config.ignore_attribute
- obj_type = type(obj)
- # Parse / return default "types"...
- if obj_type in numeric_types+string_types+value_types:
- return obj
- if obj_type in iter_types:
- if obj_type in (types.ListType, types.TupleType):
- new_obj = []
- for item in obj:
- new_obj.append(
- dump(item, serialize_method, ignore_attribute, ignore))
- if isinstance(obj_type, types.TupleType):
- new_obj = tuple(new_obj)
- return new_obj
- # It's a dict...
- else:
- new_obj = {}
- for key, value in obj.iteritems():
- new_obj[key] = dump(
- value, serialize_method, ignore_attribute, ignore)
- return new_obj
- # It's not a standard type, so it needs __jsonclass__
- module_name = inspect.getmodule(obj).__name__
- class_name = obj.__class__.__name__
- json_class = class_name
- if module_name not in ['', '__main__']:
- json_class = '%s.%s' % (module_name, json_class)
- return_obj = {"__jsonclass__": [json_class]}
- # If a serialization method is defined..
- if serialize_method in dir(obj):
- # Params can be a dict (keyword) or list (positional)
- # Attrs MUST be a dict.
- serialize = getattr(obj, serialize_method)
- params, attrs = serialize()
- return_obj['__jsonclass__'].append(params)
- return_obj.update(attrs)
- return return_obj
- # Otherwise, try to figure it out
- # Obviously, we can't assume to know anything about the
- # parameters passed to __init__
- return_obj['__jsonclass__'].append([])
- attrs = {}
- ignore_list = getattr(obj, ignore_attribute, [])+ignore
- for attr_name, attr_value in obj.__dict__.iteritems():
- if type(attr_value) in supported_types and \
- attr_name not in ignore_list and \
- attr_value not in ignore_list:
- attrs[attr_name] = dump(
- attr_value, serialize_method, ignore_attribute, ignore)
- return_obj.update(attrs)
- return return_obj
-
-
-def load(obj):
- if type(obj) in string_types + numeric_types + value_types:
- return obj
-
- if isinstance(obj, list):
- return_list = []
- for entry in obj:
- return_list.append(load(entry))
- return return_list
- # Othewise, it's a dict type
- if '__jsonclass__' not in obj:
- return_dict = {}
- for key, value in obj.iteritems():
- new_value = load(value)
- return_dict[key] = new_value
- return return_dict
- # It's a dict, and it's a __jsonclass__
- orig_module_name = obj['__jsonclass__'][0]
- params = obj['__jsonclass__'][1]
- if orig_module_name == '':
- raise TranslationError('Module name empty.')
- json_module_clean = re.sub(invalid_module_chars, '', orig_module_name)
- if json_module_clean != orig_module_name:
- raise TranslationError('Module name %s has invalid characters.' %
- orig_module_name)
- json_module_parts = json_module_clean.split('.')
- json_class = None
- if len(json_module_parts) == 1:
- # Local class name -- probably means it won't work
- if json_module_parts[0] not in config.classes.keys():
- raise TranslationError('Unknown class or module %s.' %
- json_module_parts[0])
- json_class = config.classes[json_module_parts[0]]
- else:
- json_class_name = json_module_parts.pop()
- json_module_tree = '.'.join(json_module_parts)
- try:
- temp_module = __import__(json_module_tree)
- except ImportError:
- raise TranslationError('Could not import %s from module %s.' %
- (json_class_name, json_module_tree))
-
- # The returned class is the top-level module, not the one we really
- # want. (E.g., if we import a.b.c, we now have a.) Walk through other
- # path components to get to b and c.
- for i in json_module_parts[1:]:
- temp_module = getattr(temp_module, i)
-
- json_class = getattr(temp_module, json_class_name)
- # Creating the object...
- new_obj = None
- if isinstance(params, list):
- new_obj = json_class(*params)
- elif isinstance(params, dict):
- new_obj = json_class(**params)
- else:
- raise TranslationError('Constructor args must be a dict or list.')
- for key, value in obj.iteritems():
- if key == '__jsonclass__':
- continue
- setattr(new_obj, key, value)
- return new_obj
diff --git a/script/_Lib/jsonrpclib/jsonrpc.py b/script/_Lib/jsonrpclib/jsonrpc.py
deleted file mode 100644
index 167bcd7..0000000
--- a/script/_Lib/jsonrpclib/jsonrpc.py
+++ /dev/null
@@ -1,596 +0,0 @@
-"""
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-============================
-JSONRPC Library (jsonrpclib)
-============================
-
-This library is a JSON-RPC v.2 (proposed) implementation which
-follows the xmlrpclib API for portability between clients. It
-uses the same Server / ServerProxy, loads, dumps, etc. syntax,
-while providing features not present in XML-RPC like:
-
-* Keyword arguments
-* Notifications
-* Versioning
-* Batches and batch notifications
-
-Eventually, I'll add a SimpleXMLRPCServer compatible library,
-and other things to tie the thing off nicely. :)
-
-For a quick-start, just open a console and type the following,
-replacing the server address, method, and parameters
-appropriately.
->>> import jsonrpclib
->>> server = jsonrpclib.Server('http://localhost:8181')
->>> server.add(5, 6)
-11
->>> server._notify.add(5, 6)
->>> batch = jsonrpclib.MultiCall(server)
->>> batch.add(3, 50)
->>> batch.add(2, 3)
->>> batch._notify.add(3, 5)
->>> batch()
-[53, 5]
-
-See http://code.google.com/p/jsonrpclib/ for more info.
-"""
-
-import types
-from xmlrpclib import Transport as XMLTransport
-from xmlrpclib import SafeTransport as XMLSafeTransport
-from xmlrpclib import ServerProxy as XMLServerProxy
-from xmlrpclib import _Method as XML_Method
-import string
-import random
-
-# Library includes
-from jsonrpclib import config
-from jsonrpclib import history
-
-# JSON library importing
-cjson = None
-json = None
-try:
- import cjson
-except ImportError:
- try:
- import json
- except ImportError:
- try:
- import simplejson as json
- except ImportError:
- raise ImportError(
- 'You must have the cjson, json, or simplejson ' +
- 'module(s) available.'
- )
-
-IDCHARS = string.ascii_lowercase+string.digits
-
-
-class UnixSocketMissing(Exception):
- """
- Just a properly named Exception if Unix Sockets usage is
- attempted on a platform that doesn't support them (Windows)
- """
- pass
-
-
-# JSON Abstractions
-
-
-def jdumps(obj, encoding='utf-8'):
- # Do 'serialize' test at some point for other classes
- global cjson
- if cjson:
- return cjson.encode(obj)
- else:
- return json.dumps(obj, encoding=encoding)
-
-
-def jloads(json_string):
- global cjson
- if cjson:
- return cjson.decode(json_string)
- else:
- return json.loads(json_string)
-
-
-# XMLRPClib re-implementations
-
-
-class ProtocolError(Exception):
- pass
-
-
-class TransportMixIn(object):
- """ Just extends the XMLRPC transport where necessary. """
- user_agent = config.user_agent
- # for Python 2.7 support
- _connection = (None, None)
- _extra_headers = []
-
- def send_content(self, connection, request_body):
- connection.putheader("Content-Type", "application/json-rpc")
- connection.putheader("Content-Length", str(len(request_body)))
- connection.endheaders()
- if request_body:
- connection.send(request_body)
-
- def getparser(self):
- target = JSONTarget()
- return JSONParser(target), target
-
-
-class JSONParser(object):
- def __init__(self, target):
- self.target = target
-
- def feed(self, data):
- self.target.feed(data)
-
- def close(self):
- pass
-
-
-class JSONTarget(object):
- def __init__(self):
- self.data = []
-
- def feed(self, data):
- self.data.append(data)
-
- def close(self):
- return ''.join(self.data)
-
-
-class Transport(TransportMixIn, XMLTransport):
- def __init__(self):
- TransportMixIn.__init__(self)
- XMLTransport.__init__(self)
-
-
-class SafeTransport(TransportMixIn, XMLSafeTransport):
- def __init__(self):
- TransportMixIn.__init__(self)
- XMLSafeTransport.__init__(self)
-
-from httplib import HTTP, HTTPConnection
-from socket import socket
-
-USE_UNIX_SOCKETS = False
-
-try:
- from socket import AF_UNIX, SOCK_STREAM
- USE_UNIX_SOCKETS = True
-except ImportError:
- pass
-
-if (USE_UNIX_SOCKETS):
-
- class UnixHTTPConnection(HTTPConnection):
- def connect(self):
- self.sock = socket(AF_UNIX, SOCK_STREAM)
- self.sock.connect(self.host)
-
- class UnixHTTP(HTTP):
- _connection_class = UnixHTTPConnection
-
- class UnixTransport(TransportMixIn, XMLTransport):
-
- def make_connection(self, host):
- host, extra_headers, x509 = self.get_host_info(host)
- return UnixHTTP(host)
-
-
-class ServerProxy(XMLServerProxy):
- """
- Unfortunately, much more of this class has to be copied since
- so much of it does the serialization.
- """
-
- def __init__(self, uri, transport=None, encoding=None,
- verbose=0, version=None):
- import urllib
- if not version:
- version = config.version
- self.__version = version
- schema, uri = urllib.splittype(uri)
- if schema not in ('http', 'https', 'unix'):
- raise IOError('Unsupported JSON-RPC protocol.')
- if schema == 'unix':
- if not USE_UNIX_SOCKETS:
- # Don't like the "generic" Exception...
- raise UnixSocketMissing("Unix sockets not available.")
- self.__host = uri
- self.__handler = '/'
- else:
- self.__host, self.__handler = urllib.splithost(uri)
- if not self.__handler:
- # Not sure if this is in the JSON spec?
- # self.__handler = '/'
- self.__handler == '/'
- if transport is None:
- if schema == 'unix':
- transport = UnixTransport()
- elif schema == 'https':
- transport = SafeTransport()
- else:
- transport = Transport()
- self.__transport = transport
- self.__encoding = encoding
- self.__verbose = verbose
-
- def _request(self, methodname, params, rpcid=None):
- request = dumps(params, methodname, encoding=self.__encoding,
- rpcid=rpcid, version=self.__version)
- response = self._run_request(request)
- check_for_errors(response)
- return response['result']
-
- def _request_notify(self, methodname, params, rpcid=None):
- request = dumps(params, methodname, encoding=self.__encoding,
- rpcid=rpcid, version=self.__version, notify=True)
- response = self._run_request(request, notify=True)
- check_for_errors(response)
- return
-
- def _run_request(self, request, notify=None):
- history.add_request(request)
-
- response = self.__transport.request(
- self.__host,
- self.__handler,
- request,
- verbose=self.__verbose
- )
-
- # Here, the XMLRPC library translates a single list
- # response to the single value -- should we do the
- # same, and require a tuple / list to be passed to
- # the response object, or expect the Server to be
- # outputting the response appropriately?
-
- history.add_response(response)
- if not response:
- return None
- return_obj = loads(response)
- return return_obj
-
- def __getattr__(self, name):
- # Same as original, just with new _Method reference
- return _Method(self._request, name)
-
- @property
- def _notify(self):
- # Just like __getattr__, but with notify namespace.
- return _Notify(self._request_notify)
-
-
-class _Method(XML_Method):
-
- def __call__(self, *args, **kwargs):
- if len(args) > 0 and len(kwargs) > 0:
- raise ProtocolError(
- 'Cannot use both positional and keyword arguments '
- '(according to JSON-RPC spec.)')
- if len(args) > 0:
- return self.__send(self.__name, args)
- else:
- return self.__send(self.__name, kwargs)
-
- def __getattr__(self, name):
- return _Method(self.__send, "%s.%s" % (self.__name, name))
-
- def __repr__(self):
- return '<{} "{}">'.format(self.__class__.__name__, self.__name)
-
- def __str__(self):
- return self.__repr__()
-
- def __dir__(self):
- return self.__dict__.keys()
-
-
-class _Notify(object):
- def __init__(self, request):
- self._request = request
-
- def __getattr__(self, name):
- return _Method(self._request, name)
-
-
-# Batch implementation
-
-
-class MultiCallMethod(object):
-
- def __init__(self, method, notify=False):
- self.method = method
- self.params = []
- self.notify = notify
-
- def __call__(self, *args, **kwargs):
- if len(kwargs) > 0 and len(args) > 0:
- raise ProtocolError('JSON-RPC does not support both ' +
- 'positional and keyword arguments.')
- if len(kwargs) > 0:
- self.params = kwargs
- else:
- self.params = args
-
- def request(self, encoding=None, rpcid=None):
- return dumps(self.params, self.method, version=2.0,
- encoding=encoding, rpcid=rpcid, notify=self.notify)
-
- def __repr__(self):
- return '%s' % self.request()
-
- def __getattr__(self, method):
- new_method = '%s.%s' % (self.method, method)
- self.method = new_method
- return self
-
-
-class MultiCallNotify(object):
-
- def __init__(self, multicall):
- self.multicall = multicall
-
- def __getattr__(self, name):
- new_job = MultiCallMethod(name, notify=True)
- self.multicall._job_list.append(new_job)
- return new_job
-
-
-class MultiCallIterator(object):
-
- def __init__(self, results):
- self.results = results
-
- def __iter__(self):
- for i in range(0, len(self.results)):
- yield self[i]
- raise StopIteration
-
- def __getitem__(self, i):
- item = self.results[i]
- check_for_errors(item)
- return item['result']
-
- def __len__(self):
- return len(self.results)
-
-
-class MultiCall(object):
-
- def __init__(self, server):
- self._server = server
- self._job_list = []
-
- def _request(self):
- if len(self._job_list) < 1:
- # Should we alert? This /is/ pretty obvious.
- return
- request_body = '[ {0} ]'.format(
- ','.join([job.request() for job in self._job_list]))
- responses = self._server._run_request(request_body)
- del self._job_list[:]
- if not responses:
- responses = []
- return MultiCallIterator(responses)
-
- @property
- def _notify(self):
- return MultiCallNotify(self)
-
- def __getattr__(self, name):
- new_job = MultiCallMethod(name)
- self._job_list.append(new_job)
- return new_job
-
- __call__ = _request
-
-# These lines conform to xmlrpclib's "compatibility" line.
-# Not really sure if we should include these, but oh well.
-Server = ServerProxy
-
-
-class Fault(object):
- # JSON-RPC error class
-
- def __init__(self, code=-32000, message='Server error', rpcid=None):
- self.faultCode = code
- self.faultString = message
- self.rpcid = rpcid
-
- def error(self):
- return {'code': self.faultCode, 'message': self.faultString}
-
- def response(self, rpcid=None, version=None):
- if not version:
- version = config.version
- if rpcid:
- self.rpcid = rpcid
- return dumps(
- self, methodresponse=True, rpcid=self.rpcid, version=version
- )
-
- def __repr__(self):
- return '' % (self.faultCode, self.faultString)
-
-
-def random_id(length=8):
- return_id = ''
- for i in range(length):
- return_id += random.choice(IDCHARS)
- return return_id
-
-
-class Payload(dict):
- def __init__(self, rpcid=None, version=None):
- if not version:
- version = config.version
- self.id = rpcid
- self.version = float(version)
-
- def request(self, method, params=[]):
- if type(method) not in types.StringTypes:
- raise ValueError('Method name must be a string.')
- if not self.id:
- self.id = random_id()
- request = {'id': self.id, 'method': method}
- if params:
- request['params'] = params
- if self.version >= 2:
- request['jsonrpc'] = str(self.version)
- return request
-
- def notify(self, method, params=[]):
- request = self.request(method, params)
- if self.version >= 2:
- del request['id']
- else:
- request['id'] = None
- return request
-
- def response(self, result=None):
- response = {'result': result, 'id': self.id}
- if self.version >= 2:
- response['jsonrpc'] = str(self.version)
- else:
- response['error'] = None
- return response
-
- def error(self, code=-32000, message='Server error.'):
- error = self.response()
- if self.version >= 2:
- del error['result']
- else:
- error['result'] = None
- error['error'] = {'code': code, 'message': message}
- return error
-
-
-def dumps(
- params=[], methodname=None, methodresponse=None,
- encoding=None, rpcid=None, version=None, notify=None):
- """
- This differs from the Python implementation in that it implements
- the rpcid argument since the 2.0 spec requires it for responses.
- """
- if not version:
- version = config.version
- valid_params = (types.TupleType, types.ListType, types.DictType)
- if methodname in types.StringTypes and \
- type(params) not in valid_params and \
- not isinstance(params, Fault):
- """
- If a method, and params are not in a listish or a Fault,
- error out.
- """
- raise TypeError('Params must be a dict, list, tuple or Fault ' +
- 'instance.')
- # Begin parsing object
- payload = Payload(rpcid=rpcid, version=version)
- if not encoding:
- encoding = 'utf-8'
- if type(params) is Fault:
- response = payload.error(params.faultCode, params.faultString)
- return jdumps(response, encoding=encoding)
-
- if type(methodname) not in types.StringTypes and \
- methodresponse is not True:
- raise ValueError(
- 'Method name must be a string, or methodresponse must '
- 'be set to True.')
-
- if config.use_jsonclass is True:
- from jsonrpclib import jsonclass
- params = jsonclass.dump(params)
- if methodresponse is True:
- if rpcid is None:
- raise ValueError('A method response must have an rpcid.')
- response = payload.response(params)
- return jdumps(response, encoding=encoding)
- request = None
- if notify is True:
- request = payload.notify(methodname, params)
- else:
- request = payload.request(methodname, params)
- return jdumps(request, encoding=encoding)
-
-
-def loads(data):
- """
- This differs from the Python implementation, in that it returns
- the request structure in Dict format instead of the method, params.
- It will return a list in the case of a batch request / response.
- """
- if data == '':
- # notification
- return None
- result = jloads(data)
- # if the above raises an error, the implementing server code
- # should return something like the following:
- # { 'jsonrpc':'2.0', 'error': fault.error(), id: None }
- if config.use_jsonclass is True:
- from jsonrpclib import jsonclass
- result = jsonclass.load(result)
- return result
-
-
-def check_for_errors(result):
- if not result:
- # Notification
- return result
-
- if not isinstance(result, dict):
- raise TypeError('Response is not a dict.')
- if 'jsonrpc' in result.keys() and float(result['jsonrpc']) > 2.0:
- raise NotImplementedError('JSON-RPC version not yet supported.')
- if 'result' not in result.keys() and 'error' not in result.keys():
- raise ValueError('Response does not have a result or error key.')
- if 'error' in result.keys() and result['error'] is not None:
- code = result['error']['code']
- message = result['error']['message']
- raise ProtocolError((code, message))
- return result
-
-
-def isbatch(result):
- if type(result) not in (types.ListType, types.TupleType):
- return False
- if len(result) < 1:
- return False
- if not isinstance(result[0], dict):
- return False
- if 'jsonrpc' not in result[0].keys():
- return False
- try:
- version = float(result[0]['jsonrpc'])
- except ValueError:
- raise ProtocolError('"jsonrpc" key must be a float(able) value.')
- if version < 2:
- return False
- return True
-
-
-def isnotification(request):
- if 'id' not in request.keys():
- # 2.0 notification
- return True
- if request['id'] is None:
- # 1.0 notification
- return True
- return False
diff --git a/script/_Lib/mathutils.js b/script/_Lib/mathutils.js
deleted file mode 100644
index b1a2870..0000000
--- a/script/_Lib/mathutils.js
+++ /dev/null
@@ -1,599 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// Facade to Apache Commons Math
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-importClass(java.util.List)
-importClass(java.lang.Class)
-
-FastMath = Java.type('org.apache.commons.math3.util.FastMath')
-Pair = Java.type('org.apache.commons.math3.util.Pair')
-Complex = Java.type('org.apache.commons.math3.complex.Complex')
-
-DifferentiableUnivariateFunction = Java.type('org.apache.commons.math3.analysis.DifferentiableUnivariateFunction')
-Gaussian = Java.type('org.apache.commons.math3.analysis.function.Gaussian')
-HarmonicOscillator = Java.type('org.apache.commons.math3.analysis.function.HarmonicOscillator')
-DerivativeStructure = Java.type('org.apache.commons.math3.analysis.differentiation.DerivativeStructure')
-FiniteDifferencesDifferentiator = Java.type('org.apache.commons.math3.analysis.differentiation.FiniteDifferencesDifferentiator')
-SimpsonIntegrator = Java.type('org.apache.commons.math3.analysis.integration.SimpsonIntegrator')
-TrapezoidIntegrator = Java.type('org.apache.commons.math3.analysis.integration.TrapezoidIntegrator')
-RombergIntegrator = Java.type('org.apache.commons.math3.analysis.integration.RombergIntegrator')
-MidPointIntegrator = Java.type('org.apache.commons.math3.analysis.integration.MidPointIntegrator')
-PolynomialFunction = Java.type('org.apache.commons.math3.analysis.polynomials.PolynomialFunction')
-PolynomialFunctionLagrangeForm = Java.type('org.apache.commons.math3.analysis.polynomials.PolynomialFunctionLagrangeForm')
-LaguerreSolver = Java.type('org.apache.commons.math3.analysis.solvers.LaguerreSolver')
-UnivariateFunction = Java.type('org.apache.commons.math3.analysis.UnivariateFunction')
-SplineInterpolator = Java.type('org.apache.commons.math3.analysis.interpolation.SplineInterpolator')
-LinearInterpolator = Java.type('org.apache.commons.math3.analysis.interpolation.LinearInterpolator')
-NevilleInterpolator = Java.type('org.apache.commons.math3.analysis.interpolation.NevilleInterpolator')
-LoessInterpolator = Java.type('org.apache.commons.math3.analysis.interpolation.LoessInterpolator')
-DividedDifferenceInterpolator = Java.type('org.apache.commons.math3.analysis.interpolation.DividedDifferenceInterpolator')
-AkimaSplineInterpolator = Java.type('org.apache.commons.math3.analysis.interpolation.AkimaSplineInterpolator')
-
-GaussianCurveFitter = Java.type('org.apache.commons.math3.fitting.GaussianCurveFitter')
-PolynomialCurveFitter = Java.type('org.apache.commons.math3.fitting.PolynomialCurveFitter')
-HarmonicCurveFitter = Java.type('org.apache.commons.math3.fitting.HarmonicCurveFitter')
-WeightedObservedPoint = Java.type('org.apache.commons.math3.fitting.WeightedObservedPoint')
-MultivariateJacobianFunction = Java.type('org.apache.commons.math3.fitting.leastsquares.MultivariateJacobianFunction')
-LeastSquaresBuilder = Java.type('org.apache.commons.math3.fitting.leastsquares.LeastSquaresBuilder')
-LevenbergMarquardtOptimizer = Java.type('org.apache.commons.math3.fitting.leastsquares.LevenbergMarquardtOptimizer')
-GaussNewtonOptimizer = Java.type('org.apache.commons.math3.fitting.leastsquares.GaussNewtonOptimizer')
-
-SimpleRegression = Java.type('org.apache.commons.math3.stat.regression.SimpleRegression')
-
-FastFourierTransformer = Java.type('org.apache.commons.math3.transform.FastFourierTransformer')
-DftNormalization = Java.type('org.apache.commons.math3.transform.DftNormalization')
-TransformType = Java.type('org.apache.commons.math3.transform.TransformType')
-
-ArrayRealVector = Java.type('org.apache.commons.math3.linear.ArrayRealVector')
-Array2DRowRealMatrix = Java.type('org.apache.commons.math3.linear.Array2DRowRealMatrix')
-MatrixUtils = Java.type('org.apache.commons.math3.linear.MatrixUtils')
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-//Derivative and interpolation
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-function get_values(f, xdata){
- /*
- Return list of values of a function
-
- Args:
- f(UnivariateFunction): function
- xdata(float array or list): Domain values
- Returns:
- List of doubles
-
- */
- v = []
- for (var x in xdata){
- v.push(f.value(xdata[x]))
- }
- return v
-}
-
-function interpolate(data, xdata, interpolation_type){
- /*
- Interpolate data array or list to a UnivariateFunction
-
- Args:
- data(float array or list): The values to interpolate
- xdata(float array or list, optional): Domain values
- interpolation_type(str , optional): "linear", "cubic", "akima", "neville", "loess", "newton"
- Returns:
- UnivariateDifferentiableFunction object
-
- */
- if (!is_defined(xdata)) xdata =null
- if (!is_defined(interpolation_type)) interpolation_type ="linear"
- if (xdata == null){
- xdata = range(0, data.length, 1.0)
- }
- if ((data.length != xdata.length) || (data.length<2)){
- throw "Dimension mismatch"
- }
- if (interpolation_type == "cubic"){
- i = new SplineInterpolator()
- } else if (interpolation_type == "linear"){
- i = new LinearInterpolator()
- } else if (interpolation_type == "akima"){
- i = new AkimaSplineInterpolator()
- } else if (interpolation_type == "neville"){
- i = new NevilleInterpolator()
- } else if (interpolation_type == "loess"){
- i = new LoessInterpolator()
- } else if (interpolation_type == "newton"){
- i = new DividedDifferenceInterpolator()
- }else{
- throw "Invalid interpolation type"
- }
- return i.interpolate(to_array(xdata,'d'), to_array(data,'d'))
-}
-
-function deriv(f, xdata, interpolation_type){
- /*
- Calculate derivative of UnivariateFunction, array or list.
-
- Args:
- f(UnivariateFunction or array): The function object. If array it is interpolated.
- xdata(float array or list, optional): Domain values to process.
- interpolation_type(str , optional): "linear", "cubic", "akima", "neville", "loess", "newton"
- Returns:
- List with the derivative values for xdata
-
- */
- if (!is_defined(xdata)) xdata =null
- if (!is_defined(interpolation_type)) interpolation_type ="linear"
-
- if (! (f instanceof UnivariateFunction)){
- if (xdata == null){
- xdata = range(0, f.length, 1.0)
- }
- f = interpolate(f, xdata, interpolation_type)
- }
- if (xdata == null){
- if (f instanceof DifferentiableUnivariateFunction){
- return f.derivative()
- }
- throw "Domain range not defined"
- }
- d = []
- for (var x in xdata){
- var xds = new DerivativeStructure(1, 2, 0, x)
- var yds = f.value(xds)
- d.push( yds.getPartialDerivative(1))
- }
- return d
-}
-
-function integrate(f, range, xdata , interpolation_type , integrator_type){
- /*
- Integrate UnivariateFunction, array or list in an interval.
-
- Args:
- f(UnivariateFunction or array): The function object. If array it is interpolated.
- range(list, optional): integration range ([min, max]).
- xdata(float array or list, optional): disregarded if f is UnivariateFunction.
- interpolation_type(str , optional): "linear", "cubic", "akima", "neville", "loess", "newton"
- integrator_type(str , optional): "simpson", "trapezoid", "romberg" or "midpoint"
- Returns:
- Integrated value (Float)
-
- */
- if (!is_defined(range)) range =null
- if (!is_defined(xdata)) xdata =null
- if (!is_defined(interpolation_type)) interpolation_type ="linear"
- if (!is_defined(integrator_type)) integrator_type ="simpson"
-
- if (! (f instanceof UnivariateFunction)){
- if (xdata == null){
- xdata = range(0, f.length, 1.0)
- }
- if (range == null){
- range = xdata
- }
- f = interpolate(f, xdata, interpolation_type)
- }
- if (range == null){
- throw "Domain range not defined"
- }
- d = []
- if (integrator_type == "simpson"){
- integrator = new SimpsonIntegrator()
- } else if (integrator_type == "trapezoid"){
- integrator = new TrapezoidIntegrator()
- } else if (integrator_type == "romberg"){
- integrator = new RombergIntegrator()
- } else if (integrator_type == "midpoint"){
- integrator = new MidPointIntegrator()
- throw "Invalid integrator type"
- }
- max_eval = 1000000
- lower = Math.min.apply(null, range)
- upper = Math.max.apply(null, range)
- return integrator.integrate(max_eval, f, lower, upper)
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-//Fitting and peak search
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-MAX_FLOAT = 1.7976931348623157e+308
-
-MAX_ITERATIONS = 1000
-MAX_EVALUATIONS = 1000
-
-function calculate_peaks(func, start_value, end_value, positive){
- /*
- Calculate peaks of a DifferentiableUnivariateFunction in a given range by finding the roots of the derivative
-
- Args:
- function(DifferentiableUnivariateFunction): The function object.
- start_value(float): start of range
- end_value(float, optional): end of range
- positive (boolean, optional): True for searching positive peaks, False for negative.
- Returns:
- List of peaks in the interval
-
- */
- if (!is_defined(end_value)) end_value =MAX_FLOAT
- if (!is_defined(positive)) positive =true
- derivative = func.derivative()
- derivative2 = derivative.derivative()
- var peaks = []
- solver = new LaguerreSolver()
- var ret = solver.solveAllComplex(derivative.coefficients, start_value)
- for (var complex in ret){
- var r = ret[complex].getReal()
- if ((start_value < r) && (r < end_value)){
- if ((positive && (derivative2.value(r) < 0)) || ( (!positive) && (derivative2.value(r) > 0)))
- peaks.push(r)
- }
- }
- return peaks
-}
-
-function estimate_peak_indexes(data, xdata, threshold, min_peak_distance, positive){
- /*
- Estimation of peaks in an array by ordering local maxima according to given criteria.
-
- Args:
- data(float array or list)
- xdata(float array or list, optional): if not null must have the same length as data.
- threshold(float, optional): if specified filter peaks below this value
- min_peak_distance(float, optional): if specified defines minimum distance between two peaks.
- if xdata == null, it represents index counts, otherwise in xdata units.
- positive (boolean, optional): True for searching positive peaks, False for negative.
- Returns:
- List of peaks indexes.
- */
- if (!is_defined(xdata)) xdata =null
- if (!is_defined(threshold)) threshold =null
- if (!is_defined(min_peak_distance)) min_peak_distance =null
- if (!is_defined(positive)) positive =true
- peaks = []
- indexes = sort_indexes(data, positive)
- for (var index in indexes){
- first = (indexes[index] == 0)
- last = (indexes[index] == (data.length-1))
- val=data[indexes[index]]
- prev = first ? Number.NaN : data[indexes[index]-1]
- next = last ? Number.NaN : data[indexes[index]+1]
-
- if (threshold != null){
- if ((positive && (valthreshold)))
- break
- }
- if ( ( (positive) && (first || val>prev ) && (last || val>=next ) ) || (
- (!positive) && (first || valfy.length)))
- throw "Invalid data for fit"
-}
-
-function fit_gaussians(fy, fx, peak_indexes){
- /*
- Fits data on multiple gaussians on the given peak indexes.
-
- Args:
- x(float array or list)
- y(float array or list)
- peak_indexes(list of int)
- Returns:
- List of tuples of gaussian parameters: (normalization, mean, sigma)
- */
- fx = to_array(fx)
- fy = to_array(fy)
- _assert_valid_for_fit(fy,fx)
- ret = []
-
- minimum = Math.min.apply(null, fy)
- for (var peak in peak_indexes){
- //Copy data
- data = fy.slice(0)
- //Remover data from other peaks
- for (var p in peak_indexes){
- limit = Math.floor(Math.round((peak_indexes[p]+peak_indexes[peak])/2))
- if (peak_indexes[p] > peak_indexes[peak]){
- for (var x = limit; x< fy.length; x++){
- data[x] = minimum
- }
- } else if (peak_indexes[p] < peak_indexes[peak]){
- for (var x = 0; x< limit; x++){
- data[x] = minimum
- }
- }
- }
- //Build fit point list
- values = create_fit_point_list(data, fx)
- maximum = Math.max.apply(null, data)
- gaussian_fitter = GaussianCurveFitter.create().withStartPoint([(maximum-minimum)/2,fx[peak_indexes[peak]],1.0]).withMaxIterations(MAX_ITERATIONS)
- //Fit return parameters: (normalization, mean, sigma)
- try{
- ret.push(to_array(gaussian_fitter.fit(values)))
- } catch(ex) {
- ret.push(null) //Fitting error
- }
- }
- return ret
-}
-
-function create_fit_point_list(fy, fx, weights){
- if (!is_defined(weights)) weights =null
- values = []
- for (var i = 0; i< fx.length; i++)
- if (weights == null){
- values.push(new WeightedObservedPoint(1.0, fx[i], fy[i]))
- } else {
- values.push(new WeightedObservedPoint(weights[i], fx[i], fy[i]))
- }
- return values
-}
-
-function fit_polynomial(fy, fx, order, start_point, weights){
- /*
- Fits data into a polynomial.
-
- Args:
- x(float array or list): observed points x
- y(float array or list): observed points y
- order(int): if start_point is provided order parameter is disregarded - set to len(start_point)-1.
- start_point(optional tuple of float): initial parameters (a0, a1, a2, ...)
- weights(optional float array or list): weight for each observed point
- Returns:
- Tuples of polynomial parameters: (a0, a1, a2, ...)
- */
- if (!is_defined(start_point)) start_point =null
- if (!is_defined(weights)) weights =null
- _assert_valid_for_fit(fy,fx)
- fit_point_list = create_fit_point_list(fy, fx, weights)
- if (start_point == null){
- polynomial_fitter = PolynomialCurveFitter.create(order).withMaxIterations(MAX_ITERATIONS)
- } else {
- polynomial_fitter = PolynomialCurveFitter.create(0).withStartPoint(start_point).withMaxIterations(MAX_ITERATIONS)
- }
- try{
- return to_array(polynomial_fitter.fit(fit_point_list))
- } catch(ex) {
- throw "Fitting failure"
- }
-}
-
-function fit_gaussian(fy, fx, start_point, weights){
- /*
- Fits data into a gaussian.
-
- Args:
- x(float array or list): observed points x
- y(float array or list): observed points y
- start_point(optional tuple of float): initial parameters (normalization, mean, sigma)
- weights(optional float array or list): weight for each observed point
- Returns:
- Tuples of gaussian parameters: (normalization, mean, sigma)
- */
- if (!is_defined(start_point)) start_point =null
- if (!is_defined(weights)) weights =null
- _assert_valid_for_fit(fy,fx)
- fit_point_list = create_fit_point_list(fy, fx, weights)
-
- //If start point not provided, start on peak
- if (start_point == null){
- peaks = estimate_peak_indexes(fy, fx)
- minimum = Math.min.apply(null, fy)
- maximum = Math.max.apply(null, fy)
- start_point = [(maximum-minimum)/2,fx[peaks[0]],1.0]
- }
- gaussian_fitter = GaussianCurveFitter.create().withStartPoint(start_point).withMaxIterations(MAX_ITERATIONS)
- try{
- return to_array(gaussian_fitter.fit(fit_point_list)) // (normalization, mean, sigma)
- } catch(ex) {
- throw "Fitting failure"
- }
-}
-
-function fit_harmonic(fy, fx, start_point, weights){
- /*
- Fits data into an harmonic.
-
- Args:
- x(float array or list): observed points x
- y(float array or list): observed points y
- start_point(optional tuple of float): initial parameters (amplitude, angular_frequency, phase)
- weights(optional float array or list): weight for each observed point
- Returns:
- Tuples of harmonic parameters: (amplitude, angular_frequency, phase)
- */
- if (!is_defined(start_point)) start_point =null
- if (!is_defined(weights)) weights =null
- _assert_valid_for_fit(fy,fx)
- fit_point_list = create_fit_point_list(fy, fx, weights)
- if (start_point == null){
- harmonic_fitter = HarmonicCurveFitter.create().withMaxIterations(MAX_ITERATIONS)
- } else {
- harmonic_fitter = HarmonicCurveFitter.create().withStartPoint(start_point).withMaxIterations(MAX_ITERATIONS)
- }
- try{
- return to_array(harmonic_fitter.fit(fit_point_list)) // (amplitude, angular_frequency, phase)
- } catch(ex) {
- throw "Fitting failure"
- }
-}
-///////////////////////////////////////////////////////////////////////////////////////////////////
-//Least squares problem
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-function optimize_least_squares(model, target, initial, weights){
- if (is_array(weights)){
- weights = MatrixUtils.createRealDiagonalMatrix(weights)
- }
- problem = new LeastSquaresBuilder().start(initial).model(model).target(target).lazyEvaluation(false).maxEvaluations(MAX_EVALUATIONS).maxIterations(MAX_ITERATIONS).weight(weights).build()
- optimizer = new LevenbergMarquardtOptimizer()
- optimum = optimizer.optimize(problem)
-
- parameters=to_array(optimum.getPoint().toArray())
- residuals = to_array(optimum.getResiduals().toArray())
- rms = optimum.getRMS()
- evals = optimum.getEvaluations()
- iters = optimum.getIterations()
- return [parameters, residuals, rms, evals, iters]
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-//FFT
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-function is_power_of_2(n){
- return n && (n & (n - 1)) === 0;
-}
-
-function bit_length(num) {
- return num.toString(2).length
-}
-
-
-function is_complex(v) {
- return v instanceof Complex
-}
-
-
-function pad_to_power_of_two(data){
- if (is_power_of_2(data.length)){
- return data
- }
- pad =(1 << bit_length(data.length)) - data.length
- elem = is_complex(data[0]) ? new Complex(0,0) : [0.0,]
- for (var i=0; i 0)):
- ret.append(r)
- return ret
-
-
-def estimate_peak_indexes(data, xdata = None, threshold = None, min_peak_distance = None, positive = True):
- """Estimation of peaks in an array by ordering local maxima according to given criteria.
-
- Args:
- data(float array or list)
- xdata(float array or list, optional): if not None must have the same length as data.
- threshold(float, optional): if specified filter peaks below this value
- min_peak_distance(float, optional): if specified defines minimum distance between two peaks.
- if xdata == None, it represents index counts, otherwise in xdata units.
- positive (boolean, optional): True for searching positive peaks, False for negative.
- Returns:
- List of peaks indexes.
- """
- peaks = []
- indexes = sorted(range(len(data)),key=lambda x:data[x])
- if positive:
- indexes = reversed(indexes)
- for index in indexes:
- first = (index == 0)
- last = (index == (len(data)-1))
- val=data[index]
- prev = float('NaN') if first else data[index-1]
- next = float('NaN') if last else data[index+1]
-
- if threshold is not None:
- if (positive and (valthreshold)):
- break
- if ( positive and (first or val>prev ) and (last or val>=next ) ) or (
- (not positive) and (first or vallen(y))):
- raise Exception("Invalid data for fit")
-
-def fit_gaussians(y, x, peak_indexes):
- """Fits data on multiple gaussians on the given peak indexes.
-
- Args:
- x(float array or list)
- y(float array or list)
- peak_indexes(list of int)
- Returns:
- List of tuples of gaussian parameters: (normalization, mean, sigma)
- """
- _assert_valid_for_fit(y,x)
- ret = []
-
- minimum = min(y)
- for peak in peak_indexes:
- #Copy data
- data = y[:]
- #Remover data from other peaks
- for p in peak_indexes:
- limit = int(round((p+peak)/2))
- if (p > peak):
- data[limit : len(y)] =[minimum] * (len(y)-limit)
- elif (p < peak):
- data[0:limit] = [minimum] *limit
- #Build fit point list
- values = create_fit_point_list(data, x)
- maximum = max(data)
- gaussian_fitter = GaussianCurveFitter.create().withStartPoint([(maximum-minimum)/2,x[peak],1.0]).withMaxIterations(MAX_ITERATIONS)
- #Fit return parameters: (normalization, mean, sigma)
- try:
- ret.append(gaussian_fitter.fit(values).tolist())
- except:
- ret.append(None) #Fitting error
- return ret
-
-
-def create_fit_point_list(y, x, weights = None):
- values = []
- for i in sorted(range(len(x)),key=lambda v:x[v]): #Creating list ordered by x, needed for gauss fit
- if weights is None:
- values.append(WeightedObservedPoint(1.0, x[i], y[i]))
- else:
- values.append(WeightedObservedPoint(weights[i], x[i], y[i]))
- return values
-
-def fit_polynomial(y, x, order, start_point = None, weights = None):
- """Fits data into a polynomial.
-
- Args:
- x(float array or list): observed points x
- y(float array or list): observed points y
- order(int): if start_point is provided order parameter is disregarded - set to len(start_point)-1.
- start_point(optional tuple of float): initial parameters (a0, a1, a2, ...)
- weights(optional float array or list): weight for each observed point
- Returns:
- Tuples of polynomial parameters: (a0, a1, a2, ...)
- """
- _assert_valid_for_fit(y,x)
- fit_point_list = create_fit_point_list(y, x, weights)
- if start_point is None:
- polynomial_fitter = PolynomialCurveFitter.create(order).withMaxIterations(MAX_ITERATIONS)
- else:
- polynomial_fitter = PolynomialCurveFitter.create(0).withStartPoint(start_point).withMaxIterations(MAX_ITERATIONS)
- try:
- return polynomial_fitter.fit(fit_point_list).tolist()
- except:
- raise Exception("Fitting failure")
-
-def fit_gaussian(y, x, start_point = None, weights = None):
- """Fits data into a gaussian.
-
- Args:
- x(float array or list): observed points x
- y(float array or list): observed points y
- start_point(optional tuple of float): initial parameters (normalization, mean, sigma)
- If None, use a custom initial estimation.
- Set to "default" to force Commons.Math the default (GaussianCurveFitter.ParameterGuesser).
- weights(optional float array or list): weight for each observed point
- Returns:
- Tuples of gaussian parameters: (normalization, mean, sigma)
- """
- _assert_valid_for_fit(y,x)
- fit_point_list = create_fit_point_list(y, x, weights)
-
- #If start point not provided, start on peak
- if start_point is None:
- maximum, minimum = max(y), min(y)
- norm = maximum - minimum
- mean = x[y.index(maximum)]
- sigma = trapz([v-minimum for v in y], x) / (norm*math.sqrt(2*math.pi))
- start_point = (norm, mean, sigma)
- elif start_point == "simple":
- start_point = [(max(y)-min(y))/2, x[y.index(max(y))], 1.0]
- elif start_point == "default":
- start_point = GaussianCurveFitter.ParameterGuesser(fit_point_list).guess().tolist()
- gaussian_fitter = GaussianCurveFitter.create().withStartPoint(start_point).withMaxIterations(MAX_ITERATIONS)
- try:
- return gaussian_fitter.fit(fit_point_list).tolist() # (normalization, mean, sigma)
- except:
- raise Exception("Fitting failure")
-
-def fit_harmonic(y, x, start_point = None, weights = None):
- """Fits data into an harmonic.
-
- Args:
- x(float array or list): observed points x
- y(float array or list): observed points y
- start_point(optional tuple of float): initial parameters (amplitude, angular_frequency, phase)
- weights(optional float array or list): weight for each observed point
- Returns:
- Tuples of harmonic parameters: (amplitude, angular_frequency, phase)
- """
- _assert_valid_for_fit(y,x)
- fit_point_list = create_fit_point_list(y, x, weights)
- if start_point is None:
- harmonic_fitter = HarmonicCurveFitter.create().withMaxIterations(MAX_ITERATIONS)
- else:
- harmonic_fitter = HarmonicCurveFitter.create().withStartPoint(start_point).withMaxIterations(MAX_ITERATIONS)
- try:
- return harmonic_fitter.fit(fit_point_list).tolist() # (amplitude, angular_frequency, phase)
- except:
- raise Exception("Fitting failure")
-
-
-def fit_gaussian_offset(y, x, start_point = None, weights = None):
- """Fits data into a gaussian with offset (constant background).
- f(x) = a + b * exp(-(pow((x - c), 2) / (2 * pow(d, 2))))
-
- Args:
- x(float array or list): observed points x
- y(float array or list): observed points y
- start_point(optional tuple of float): initial parameters (normalization, mean, sigma)
- weights(optional float array or list): weight for each observed point
- Returns:
- Tuples of gaussian parameters: (offset, normalization, mean, sigma)
- """
-
- # For normalised gauss curve sigma=1/(amp*sqrt(2*pi))
- if start_point is None:
- off = min(y) # good enough starting point for offset
- com = x[y.index(max(y))]
- amp = max(y) - off
- sigma = trapz([v-off for v in y], x) / (amp*math.sqrt(2*math.pi))
- start_point = [off, amp, com , sigma]
-
- class Model(MultivariateJacobianFunction):
- def value(self, variables):
- value = ArrayRealVector(len(x))
- jacobian = Array2DRowRealMatrix(len(x), 4)
- for i in range(len(x)):
- (a,b,c,d) = (variables.getEntry(0), variables.getEntry(1), variables.getEntry(2), variables.getEntry(3))
- v = math.exp(-(math.pow((x[i] - c), 2) / (2 * math.pow(d, 2))))
- model = a + b * v
- value.setEntry(i, model)
- jacobian.setEntry(i, 0, 1) # derivative with respect to p0 = a
- jacobian.setEntry(i, 1, v) # derivative with respect to p1 = b
- v2 = b*v*((x[i] - c)/math.pow(d, 2))
- jacobian.setEntry(i, 2, v2) # derivative with respect to p2 = c
- jacobian.setEntry(i, 3, v2*(x[i] - c)/d ) # derivative with respect to p3 = d
- return Pair(value, jacobian)
-
- model = Model()
- target = [v for v in y] #the target is to have all points at the positios
- (parameters, residuals, rms, evals, iters) = optimize_least_squares(model, target, start_point, weights)
- return parameters
-
-
-def fit_gaussian_linear(y, x, start_point = None, weights = None):
- """Fits data into a gaussian with linear background.
- f(x) = a * x + b + c * exp(-(pow((x - d), 2) / (2 * pow(e, 2))))
-
- Args:
- x(float array or list): observed points x
- y(float array or list): observed points y
- start_point(optional tuple of float): initial parameters (normalization, mean, sigma)
- weights(optional float array or list): weight for each observed point
- Returns:
- Tuples of gaussian parameters: (offset, normalization, mean, sigma)
- """
-
- # For normalised gauss curve sigma=1/(amp*sqrt(2*pi))
- if start_point is None:
- off = min(y) # good enough starting point for offset
- com = x[y.index(max(y))]
- amp = max(y) - off
- sigma = trapz([v-off for v in y], x) / (amp*math.sqrt(2*math.pi))
- start_point = [0, off, amp, com, sigma]
-
- class Model(MultivariateJacobianFunction):
- def value(self, variables):
- value = ArrayRealVector(len(x))
- jacobian = Array2DRowRealMatrix(len(x), 5)
- for i in range(len(x)):
- (a,b,c,d,e) = (variables.getEntry(0), variables.getEntry(1), variables.getEntry(2), variables.getEntry(3), variables.getEntry(4))
- v = math.exp(-(math.pow((x[i] - d), 2) / (2 * math.pow(e, 2))))
- model = a*x[i] + b + c * v
- value.setEntry(i, model)
- jacobian.setEntry(i, 0, x[i]) # derivative with respect to p0 = a
- jacobian.setEntry(i, 1, 1) # derivative with respect to p1 = b
- jacobian.setEntry(i, 2, v) # derivative with respect to p2 = c
- v2 = c*v*((x[i] - d)/math.pow(e, 2))
- jacobian.setEntry(i, 3, v2) # derivative with respect to p3 = d
- jacobian.setEntry(i, 4, v2*(x[i] - d)/e ) # derivative with respect to p4 = e
- return Pair(value, jacobian)
-
- model = Model()
- target = [v for v in y] #the target is to have all points at the positios
- (parameters, residuals, rms, evals, iters) = optimize_least_squares(model, target, start_point, weights)
- return parameters
-
-###################################################################################################
-#Least squares problem
-###################################################################################################
-
-def optimize_least_squares(model, target, initial, weights):
- """Fits a parametric model to a set of observed values by minimizing a cost function.
-
- Args:
- model(MultivariateJacobianFunction): observed points x
- target(float array or list): observed data
- initial(optional tuple of float): initial guess
- weights(optional float array or list): weight for each observed point
- Returns:
- Tuples of harmonic parameters: (amplitude, angular_frequency, phase)
- """
- if isinstance(weights,tuple) or isinstance(weights,list):
- weights = MatrixUtils.createRealDiagonalMatrix(weights)
- problem = LeastSquaresBuilder().start(initial).model(model).target(target).lazyEvaluation(False).maxEvaluations(MAX_EVALUATIONS).maxIterations(MAX_ITERATIONS).weight(weights).build()
- optimizer = LevenbergMarquardtOptimizer()
- optimum = optimizer.optimize(problem)
-
- parameters=optimum.getPoint().toArray().tolist()
- residuals = optimum.getResiduals().toArray().tolist()
- rms = optimum.getRMS()
- evals = optimum.getEvaluations()
- iters = optimum.getIterations()
- return (parameters, residuals, rms, evals, iters)
-
-
-###################################################################################################
-#FFT
-###################################################################################################
-
-def is_power(num, base):
- if base<=1: return num == 1
- power = int (math.log (num, base) + 0.5)
- return base ** power == num
-
-def pad_to_power_of_two(data):
- if is_power(len(data),2):
- return data
- pad =(1 << len(data).bit_length()) - len(data)
- elem = complex(0,0) if type(data[0]) is complex else [0.0,]
- return data + elem * pad
-
-def get_real(values):
- """Returns real part of a complex numbers vector.
- Args:
- values: List of complex.
- Returns:
- List of float
- """
- ret = []
- for c in values:
- ret.append(c.real)
- return ret
-
-def get_imag(values):
- """Returns imaginary part of a complex numbers vector.
- Args:
- values: List of complex.
- Returns:
- List of float
- """
- ret = []
- for c in values:
- ret.append(c.imag)
- return ret
-
-def get_modulus(values):
- """Returns the modulus of a complex numbers vector.
- Args:
- values: List of complex.
- Returns:
- List of float
- """
- ret = []
- for c in values:
- ret.append(math.hypot(c.imag,c.real))
- return ret
-
-def get_phase(values):
- """Returns the phase of a complex numbers vector.
- Args:
- values: List of complex.
- Returns:
- List of float
- """
- ret = []
- for c in values:
- ret.append(math.atan(c.imag/c.real))
- return ret
-
-def fft(f):
- """Calculates the Fast Fourrier Transform of a vector, padding to the next power of 2 elements.
- Args:
- values(): List of float or complex
- Returns:
- List of complex
- """
- f = pad_to_power_of_two(f)
- if type(f[0]) is complex:
- aux = []
- for c in f:
- aux.append(Complex(c.real, c.imag))
- f = aux
- fftt = FastFourierTransformer(DftNormalization.STANDARD)
- ret = []
- for c in fftt.transform(f,TransformType.FORWARD ):
- ret.append(complex(c.getReal(),c.getImaginary()))
- return ret
-
-def ffti(f):
- """Calculates the Inverse Fast Fourrier Transform of a vector, padding to the next power of 2 elements.
- Args:
- values(): List of float or complex
- Returns:
- List of complex
- """
- f = pad_to_power_of_two(f)
- if type(f[0]) is complex:
- aux = []
- for c in f:
- aux.append(Complex(c.real, c.imag))
- f = aux
- fftt = FastFourierTransformer(DftNormalization.STANDARD)
- ret = []
- for c in fftt.transform(f,TransformType.INVERSE ):
- ret.append(complex(c.getReal(),c.getImaginary()))
- return ret
\ No newline at end of file
diff --git a/script/_Lib/plotutils.js b/script/_Lib/plotutils.js
deleted file mode 100644
index 8aa9771..0000000
--- a/script/_Lib/plotutils.js
+++ /dev/null
@@ -1,116 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// Plot utilities
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-function plot_function(plot, func, name, range, show_points, show_lines, color){
- /*
- Plots a function to a plot.
-
- Args:
- plot(LinePlot)
- func(UnivariateFunction): Gaussian, PolynomialFunction, HarmonicOscillator...
- name(str): name of the series
- range(list or array of floats): x values to plot
- Returns:
- Tuples of harmonic parameters: (amplitude, angular_frequency, phase)
- */
- if (!is_defined(show_points)) show_points =true
- if (!is_defined(show_lines)) show_lines = true
- if (!is_defined(color)) color = null
-
- if (plot.getStyle().isError()){
- s = new LinePlotErrorSeries(name, color)
- }
- else{
- s = new LinePlotSeries(name, color)
- }
- plot.addSeries(s)
- s.setPointsVisible(show_points)
- s.setLinesVisible(show_lines)
- for (var x in range){
- s.appendData(range[x], func.value(range[x]))
- }
- return s
-}
-
-function plot_point(plot, x, y, size, color, name){
- if (!is_defined(size)) size =3
- if (!is_defined(name)) name = "Point"
- if (!is_defined(color)) color = null
- s = new LinePlotSeries(name, color)
- plot.addSeries(s)
- s.setPointSize(size)
- s.appendData(x, y)
- return s
-}
-
-function plot_line(plot, x1, y1, x2, y2, width, color, name){
- if (!is_defined(width)) width = 1
- if (!is_defined(name)) name = "Line"
- if (!is_defined(color)) color = null
- s = new LinePlotSeries(name, color)
- plot.addSeries(s)
- s.setLineWidth(width)
- s.setPointsVisible(false)
- s.appendData(x1, y1)
- s.appendData(x2, y2)
- return s
-}
-
-function plot_cross(plot, x, y, size, width, color, name){
- if (!is_defined(size)) size =1
- if (!is_defined(width)) width = 1
- if (!is_defined(color)) color = null
- if (!is_defined(name)) name = "Cross"
- s = new LinePlotSeries(name, color)
- plot.addSeries(s)
- s.setLineWidth(width)
- s.setPointsVisible(false)
- s.appendData(NaN, NaN)
- s.appendData(x-size/2, y)
- s.appendData(x+size/2, y)
- s.appendData(NaN, NaN)
- s.appendData(x, y-size/2)
- s.appendData(x, y+size/2)
- return s
- }
-
-function plot_rectangle(plot, x1, y1, x2, y2, width, color, name){
- if (!is_defined(width)) width = 1
- if (!is_defined(name)) name = "Rectangle"
- if (!is_defined(color)) color = null
- s = new LinePlotSeries(name, color)
- plot.addSeries(s)
- s.setLineWidth(width)
- s.setPointsVisible(false)
- s.appendData(x1, y1)
- s.appendData(x1, y2)
- s.appendData(x2, y2)
- s.appendData(x2, y1)
- s.appendData(x1, y1)
- return s
-}
-
-function plot_circle(plot, cx, cy, radius, width, color, name){
- if (!is_defined(width)) width = 1
- if (!is_defined(name)) name = "Circle"
- if (!is_defined(color)) color = null
- s = new LinePlotSeries(name, color)
- plot.addSeries(s)
- s.setLineWidth(width)
- s.setPointsVisible(false)
- res=radius / 100.0
- epson = 1e-12
- for (var xp = cx+radius-epson ; xp >= ( cx-radius+epson) ; xp-=res){
- yp = Math.sqrt(Math.pow(radius, 2) - Math.pow(xp - cx, 2)) + cy
- s.appendData(xp, yp)
- }
- for (var xp = cx-radius+epson ; xp <= ( cx+radius-epson) ; xp+=res){
- yp = -Math.sqrt(Math.pow(radius, 2) - Math.pow(xp - cx, 2)) + cy
- s.appendData(xp, yp)
- }
- if (s.getCount()>0)
- s.appendData(s.getX()[0], s.getY()[0])
- return s
-}
\ No newline at end of file
diff --git a/script/_Lib/plotutils.py b/script/_Lib/plotutils.py
deleted file mode 100644
index c67acb6..0000000
--- a/script/_Lib/plotutils.py
+++ /dev/null
@@ -1,119 +0,0 @@
-###################################################################################################
-# Plot utilities
-###################################################################################################
-
-import ch.psi.pshell.plot.LinePlotSeries as LinePlotSeries
-import ch.psi.pshell.plot.LinePlotErrorSeries as LinePlotErrorSeries
-import math
-from startup import frange, to_array
-
-def plot_function(plot, function, name, range, show_points = True, show_lines = True, color = None):
- """Plots a function to a plot.
-
- Args:
- plot(LinePlot)
- function(UnivariateFunction): Gaussian, PolynomialFunction, HarmonicOscillator...
- name(str): name of the series
- range(list or array of floats): x values to plot
- Returns:
- Tuples of harmonic parameters: (amplitude, angular_frequency, phase)
- """
- if plot.style.isError():
- s = LinePlotErrorSeries(name, color)
- else:
- s = LinePlotSeries(name, color)
- plot.addSeries(s)
- s.setPointsVisible(show_points)
- s.setLinesVisible(show_lines)
- for x in range:
- s.appendData(x, function.value(x))
- return s
-
-def plot_data(plot, data, name, xdata = None, error = None, show_points = True, show_lines = True, color = None):
- """Plots a subscriptable object to a plot.
-
- Args:
- plot(LinePlot)
- data(subscriptable): Y data
- name(str): name of the series
- xdata(subscriptable): X data
- error(subscriptable): Error data (only for error plots)
- Returns:
- Tuples of harmonic parameters: (amplitude, angular_frequency, phase)
- """
- if plot.style.isError():
- s = LinePlotErrorSeries(name, color)
- else:
- s = LinePlotSeries(name, color)
- plot.addSeries(s)
- s.setPointsVisible(show_points)
- s.setLinesVisible(show_lines)
- if xdata is None:
- xdata = range(len(data))
- xdata = to_array(xdata, 'd')
- data = to_array(data, 'd')
- if plot.style.isError():
- error = to_array(error, 'd')
- s.setData(xdata, data, error)
- else:
- s.setData(xdata, data)
- return s
-
-def plot_point(plot, x, y, size = 3, color = None, name = "Point"):
- s = LinePlotSeries(name, color)
- plot.addSeries(s)
- s.setPointSize(size)
- s.appendData(x, y)
- return s
-
-def plot_line(plot, x1, y1, x2, y2, width = 1, color = None, name = "Line"):
- s = LinePlotSeries(name, color)
- plot.addSeries(s)
- s.setLineWidth(width)
- s.setPointsVisible(False)
- s.appendData(x1, y1)
- s.appendData(x2, y2)
- return s
-
-def plot_cross(plot, x, y, size = 1.0, width = 1, color = None, name = "Cross"):
- size = float(size)
- s = LinePlotSeries(name, color)
- plot.addSeries(s)
- s.setLineWidth(width)
- s.setPointsVisible(False)
- s.appendData(float('nan'), float('nan'))
- s.appendData(x-size/2, y)
- s.appendData(x+size/2, y)
- s.appendData(float('nan'), float('nan'))
- s.appendData(x, y-size/2)
- s.appendData(x, y+size/2)
- return s
-
-def plot_rectangle(plot, x1, y1, x2, y2, width = 1, color = None, name = "Rectangle"):
- s = LinePlotSeries(name, color)
- plot.addSeries(s)
- s.setLineWidth(width)
- s.setPointsVisible(False)
- s.appendData(x1, y1)
- s.appendData(x1, y2)
- s.appendData(x2, y2)
- s.appendData(x2, y1)
- s.appendData(x1, y1)
- return s
-
-def plot_circle(plot, cx, cy, radius, width = 1, color = None, name = "Circle"):
- s = LinePlotSeries(name, color)
- plot.addSeries(s)
- s.setLineWidth(width)
- s.setPointsVisible(False)
- res=float(radius) / 100.0
- epson = 1e-12
- for xp in frange (cx+radius-epson , cx-radius+epson , -res):
- yp = math.sqrt(math.pow(radius, 2) - math.pow(xp - cx, 2)) + cy
- s.appendData(xp, yp)
- for xp in frange (cx-radius+epson , cx+radius-epson, res):
- yp = -math.sqrt(math.pow(radius, 2) - math.pow(xp - cx, 2)) + cy
- s.appendData(xp, yp)
- if s.getCount()>0:
- s.appendData(s.getX()[0], s.getY()[0])
- return s
\ No newline at end of file
diff --git a/script/_Lib/requests-2.4.3-py2.7.egg-info b/script/_Lib/requests-2.4.3-py2.7.egg-info
deleted file mode 100644
index 6220998..0000000
--- a/script/_Lib/requests-2.4.3-py2.7.egg-info
+++ /dev/null
@@ -1,963 +0,0 @@
-Metadata-Version: 1.1
-Name: requests
-Version: 2.4.3
-Summary: Python HTTP for Humans.
-Home-page: http://python-requests.org
-Author: Kenneth Reitz
-Author-email: me@kennethreitz.com
-License: Apache 2.0
-Description: Requests: HTTP for Humans
- =========================
-
- .. image:: https://badge.fury.io/py/requests.png
- :target: http://badge.fury.io/py/requests
-
- .. image:: https://pypip.in/d/requests/badge.png
- :target: https://crate.io/packages/requests/
-
-
- Requests is an Apache2 Licensed HTTP library, written in Python, for human
- beings.
-
- Most existing Python modules for sending HTTP requests are extremely
- verbose and cumbersome. Python's builtin urllib2 module provides most of
- the HTTP capabilities you should need, but the api is thoroughly broken.
- It requires an enormous amount of work (even method overrides) to
- perform the simplest of tasks.
-
- Things shouldn't be this way. Not in Python.
-
- .. code-block:: pycon
-
- >>> r = requests.get('https://api.github.com', auth=('user', 'pass'))
- >>> r.status_code
- 204
- >>> r.headers['content-type']
- 'application/json'
- >>> r.text
- ...
-
- See `the same code, without Requests `_.
-
- Requests allow you to send HTTP/1.1 requests. You can add headers, form data,
- multipart files, and parameters with simple Python dictionaries, and access the
- response data in the same way. It's powered by httplib and `urllib3
- `_, but it does all the hard work and crazy
- hacks for you.
-
-
- Features
- --------
-
- - International Domains and URLs
- - Keep-Alive & Connection Pooling
- - Sessions with Cookie Persistence
- - Browser-style SSL Verification
- - Basic/Digest Authentication
- - Elegant Key/Value Cookies
- - Automatic Decompression
- - Unicode Response Bodies
- - Multipart File Uploads
- - Connection Timeouts
- - Thread-safety
- - HTTP(S) proxy support
-
-
- Installation
- ------------
-
- To install Requests, simply:
-
- .. code-block:: bash
-
- $ pip install requests
-
-
- Documentation
- -------------
-
- Documentation is available at http://docs.python-requests.org/.
-
-
- Contribute
- ----------
-
- #. Check for open issues or open a fresh issue to start a discussion around a feature idea or a bug. There is a `Contributor Friendly`_ tag for issues that should be ideal for people who are not very familiar with the codebase yet.
- #. If you feel uncomfortable or uncertain about an issue or your changes, feel free to email @sigmavirus24 and he will happily help you via email, Skype, remote pairing or whatever you are comfortable with.
- #. Fork `the repository`_ on GitHub to start making your changes to the **master** branch (or branch off of it).
- #. Write a test which shows that the bug was fixed or that the feature works as expected.
- #. Send a pull request and bug the maintainer until it gets merged and published. :) Make sure to add yourself to AUTHORS_.
-
- .. _`the repository`: http://github.com/kennethreitz/requests
- .. _AUTHORS: https://github.com/kennethreitz/requests/blob/master/AUTHORS.rst
- .. _Contributor Friendly: https://github.com/kennethreitz/requests/issues?direction=desc&labels=Contributor+Friendly&page=1&sort=updated&state=open
-
-
- .. :changelog:
-
- Release History
- ---------------
-
- 2.4.3 (2014-10-06)
- ++++++++++++++++++
-
- **Bugfixes**
-
- - Unicode URL improvements for Python 2.
- - Re-order JSON param for backwards compat.
- - Automatically defrag authentication schemes from host/pass URIs. (`#2249 `_)
-
-
- 2.4.2 (2014-10-05)
- ++++++++++++++++++
-
- **Improvements**
-
- - FINALLY! Add json parameter for uploads! (`#2258 `_)
- - Support for bytestring URLs on Python 3.x (`#2238 `_)
-
- **Bugfixes**
-
- - Avoid getting stuck in a loop (`#2244 `_)
- - Multiple calls to iter* fail with unhelpful error. (`#2240 `_, `#2241 `_)
-
- **Documentation**
-
- - Correct redirection introduction (`#2245 `_)
- - Added example of how to send multiple files in one request. (`#2227 `_)
- - Clarify how to pass a custom set of CAs (`#2248 `_)
-
-
-
- 2.4.1 (2014-09-09)
- ++++++++++++++++++
-
- - Now has a "security" package extras set, ``$ pip install requests[security]``
- - Requests will now use Certifi if it is available.
- - Capture and re-raise urllib3 ProtocolError
- - Bugfix for responses that attempt to redirect to themselves forever (wtf?).
-
-
- 2.4.0 (2014-08-29)
- ++++++++++++++++++
-
- **Behavioral Changes**
-
- - ``Connection: keep-alive`` header is now sent automatically.
-
- **Improvements**
-
- - Support for connect timeouts! Timeout now accepts a tuple (connect, read) which is used to set individual connect and read timeouts.
- - Allow copying of PreparedRequests without headers/cookies.
- - Updated bundled urllib3 version.
- - Refactored settings loading from environment — new `Session.merge_environment_settings`.
- - Handle socket errors in iter_content.
-
-
- 2.3.0 (2014-05-16)
- ++++++++++++++++++
-
- **API Changes**
-
- - New ``Response`` property ``is_redirect``, which is true when the
- library could have processed this response as a redirection (whether
- or not it actually did).
- - The ``timeout`` parameter now affects requests with both ``stream=True`` and
- ``stream=False`` equally.
- - The change in v2.0.0 to mandate explicit proxy schemes has been reverted.
- Proxy schemes now default to ``http://``.
- - The ``CaseInsensitiveDict`` used for HTTP headers now behaves like a normal
- dictionary when references as string or viewed in the interpreter.
-
- **Bugfixes**
-
- - No longer expose Authorization or Proxy-Authorization headers on redirect.
- Fix CVE-2014-1829 and CVE-2014-1830 respectively.
- - Authorization is re-evaluated each redirect.
- - On redirect, pass url as native strings.
- - Fall-back to autodetected encoding for JSON when Unicode detection fails.
- - Headers set to ``None`` on the ``Session`` are now correctly not sent.
- - Correctly honor ``decode_unicode`` even if it wasn't used earlier in the same
- response.
- - Stop advertising ``compress`` as a supported Content-Encoding.
- - The ``Response.history`` parameter is now always a list.
- - Many, many ``urllib3`` bugfixes.
-
- 2.2.1 (2014-01-23)
- ++++++++++++++++++
-
- **Bugfixes**
-
- - Fixes incorrect parsing of proxy credentials that contain a literal or encoded '#' character.
- - Assorted urllib3 fixes.
-
- 2.2.0 (2014-01-09)
- ++++++++++++++++++
-
- **API Changes**
-
- - New exception: ``ContentDecodingError``. Raised instead of ``urllib3``
- ``DecodeError`` exceptions.
-
- **Bugfixes**
-
- - Avoid many many exceptions from the buggy implementation of ``proxy_bypass`` on OS X in Python 2.6.
- - Avoid crashing when attempting to get authentication credentials from ~/.netrc when running as a user without a home directory.
- - Use the correct pool size for pools of connections to proxies.
- - Fix iteration of ``CookieJar`` objects.
- - Ensure that cookies are persisted over redirect.
- - Switch back to using chardet, since it has merged with charade.
-
- 2.1.0 (2013-12-05)
- ++++++++++++++++++
-
- - Updated CA Bundle, of course.
- - Cookies set on individual Requests through a ``Session`` (e.g. via ``Session.get()``) are no longer persisted to the ``Session``.
- - Clean up connections when we hit problems during chunked upload, rather than leaking them.
- - Return connections to the pool when a chunked upload is successful, rather than leaking it.
- - Match the HTTPbis recommendation for HTTP 301 redirects.
- - Prevent hanging when using streaming uploads and Digest Auth when a 401 is received.
- - Values of headers set by Requests are now always the native string type.
- - Fix previously broken SNI support.
- - Fix accessing HTTP proxies using proxy authentication.
- - Unencode HTTP Basic usernames and passwords extracted from URLs.
- - Support for IP address ranges for no_proxy environment variable
- - Parse headers correctly when users override the default ``Host:`` header.
- - Avoid munging the URL in case of case-sensitive servers.
- - Looser URL handling for non-HTTP/HTTPS urls.
- - Accept unicode methods in Python 2.6 and 2.7.
- - More resilient cookie handling.
- - Make ``Response`` objects pickleable.
- - Actually added MD5-sess to Digest Auth instead of pretending to like last time.
- - Updated internal urllib3.
- - Fixed @Lukasa's lack of taste.
-
- 2.0.1 (2013-10-24)
- ++++++++++++++++++
-
- - Updated included CA Bundle with new mistrusts and automated process for the future
- - Added MD5-sess to Digest Auth
- - Accept per-file headers in multipart file POST messages.
- - Fixed: Don't send the full URL on CONNECT messages.
- - Fixed: Correctly lowercase a redirect scheme.
- - Fixed: Cookies not persisted when set via functional API.
- - Fixed: Translate urllib3 ProxyError into a requests ProxyError derived from ConnectionError.
- - Updated internal urllib3 and chardet.
-
- 2.0.0 (2013-09-24)
- ++++++++++++++++++
-
- **API Changes:**
-
- - Keys in the Headers dictionary are now native strings on all Python versions,
- i.e. bytestrings on Python 2, unicode on Python 3.
- - Proxy URLs now *must* have an explicit scheme. A ``MissingSchema`` exception
- will be raised if they don't.
- - Timeouts now apply to read time if ``Stream=False``.
- - ``RequestException`` is now a subclass of ``IOError``, not ``RuntimeError``.
- - Added new method to ``PreparedRequest`` objects: ``PreparedRequest.copy()``.
- - Added new method to ``Session`` objects: ``Session.update_request()``. This
- method updates a ``Request`` object with the data (e.g. cookies) stored on
- the ``Session``.
- - Added new method to ``Session`` objects: ``Session.prepare_request()``. This
- method updates and prepares a ``Request`` object, and returns the
- corresponding ``PreparedRequest`` object.
- - Added new method to ``HTTPAdapter`` objects: ``HTTPAdapter.proxy_headers()``.
- This should not be called directly, but improves the subclass interface.
- - ``httplib.IncompleteRead`` exceptions caused by incorrect chunked encoding
- will now raise a Requests ``ChunkedEncodingError`` instead.
- - Invalid percent-escape sequences now cause a Requests ``InvalidURL``
- exception to be raised.
- - HTTP 208 no longer uses reason phrase ``"im_used"``. Correctly uses
- ``"already_reported"``.
- - HTTP 226 reason added (``"im_used"``).
-
- **Bugfixes:**
-
- - Vastly improved proxy support, including the CONNECT verb. Special thanks to
- the many contributors who worked towards this improvement.
- - Cookies are now properly managed when 401 authentication responses are
- received.
- - Chunked encoding fixes.
- - Support for mixed case schemes.
- - Better handling of streaming downloads.
- - Retrieve environment proxies from more locations.
- - Minor cookies fixes.
- - Improved redirect behaviour.
- - Improved streaming behaviour, particularly for compressed data.
- - Miscellaneous small Python 3 text encoding bugs.
- - ``.netrc`` no longer overrides explicit auth.
- - Cookies set by hooks are now correctly persisted on Sessions.
- - Fix problem with cookies that specify port numbers in their host field.
- - ``BytesIO`` can be used to perform streaming uploads.
- - More generous parsing of the ``no_proxy`` environment variable.
- - Non-string objects can be passed in data values alongside files.
-
- 1.2.3 (2013-05-25)
- ++++++++++++++++++
-
- - Simple packaging fix
-
-
- 1.2.2 (2013-05-23)
- ++++++++++++++++++
-
- - Simple packaging fix
-
-
- 1.2.1 (2013-05-20)
- ++++++++++++++++++
-
- - 301 and 302 redirects now change the verb to GET for all verbs, not just
- POST, improving browser compatibility.
- - Python 3.3.2 compatibility
- - Always percent-encode location headers
- - Fix connection adapter matching to be most-specific first
- - new argument to the default connection adapter for passing a block argument
- - prevent a KeyError when there's no link headers
-
- 1.2.0 (2013-03-31)
- ++++++++++++++++++
-
- - Fixed cookies on sessions and on requests
- - Significantly change how hooks are dispatched - hooks now receive all the
- arguments specified by the user when making a request so hooks can make a
- secondary request with the same parameters. This is especially necessary for
- authentication handler authors
- - certifi support was removed
- - Fixed bug where using OAuth 1 with body ``signature_type`` sent no data
- - Major proxy work thanks to @Lukasa including parsing of proxy authentication
- from the proxy url
- - Fix DigestAuth handling too many 401s
- - Update vendored urllib3 to include SSL bug fixes
- - Allow keyword arguments to be passed to ``json.loads()`` via the
- ``Response.json()`` method
- - Don't send ``Content-Length`` header by default on ``GET`` or ``HEAD``
- requests
- - Add ``elapsed`` attribute to ``Response`` objects to time how long a request
- took.
- - Fix ``RequestsCookieJar``
- - Sessions and Adapters are now picklable, i.e., can be used with the
- multiprocessing library
- - Update charade to version 1.0.3
-
- The change in how hooks are dispatched will likely cause a great deal of
- issues.
-
- 1.1.0 (2013-01-10)
- ++++++++++++++++++
-
- - CHUNKED REQUESTS
- - Support for iterable response bodies
- - Assume servers persist redirect params
- - Allow explicit content types to be specified for file data
- - Make merge_kwargs case-insensitive when looking up keys
-
- 1.0.3 (2012-12-18)
- ++++++++++++++++++
-
- - Fix file upload encoding bug
- - Fix cookie behavior
-
- 1.0.2 (2012-12-17)
- ++++++++++++++++++
-
- - Proxy fix for HTTPAdapter.
-
- 1.0.1 (2012-12-17)
- ++++++++++++++++++
-
- - Cert verification exception bug.
- - Proxy fix for HTTPAdapter.
-
- 1.0.0 (2012-12-17)
- ++++++++++++++++++
-
- - Massive Refactor and Simplification
- - Switch to Apache 2.0 license
- - Swappable Connection Adapters
- - Mountable Connection Adapters
- - Mutable ProcessedRequest chain
- - /s/prefetch/stream
- - Removal of all configuration
- - Standard library logging
- - Make Response.json() callable, not property.
- - Usage of new charade project, which provides python 2 and 3 simultaneous chardet.
- - Removal of all hooks except 'response'
- - Removal of all authentication helpers (OAuth, Kerberos)
-
- This is not a backwards compatible change.
-
- 0.14.2 (2012-10-27)
- +++++++++++++++++++
-
- - Improved mime-compatible JSON handling
- - Proxy fixes
- - Path hack fixes
- - Case-Insensistive Content-Encoding headers
- - Support for CJK parameters in form posts
-
-
- 0.14.1 (2012-10-01)
- +++++++++++++++++++
-
- - Python 3.3 Compatibility
- - Simply default accept-encoding
- - Bugfixes
-
-
- 0.14.0 (2012-09-02)
- ++++++++++++++++++++
-
- - No more iter_content errors if already downloaded.
-
- 0.13.9 (2012-08-25)
- +++++++++++++++++++
-
- - Fix for OAuth + POSTs
- - Remove exception eating from dispatch_hook
- - General bugfixes
-
- 0.13.8 (2012-08-21)
- +++++++++++++++++++
-
- - Incredible Link header support :)
-
- 0.13.7 (2012-08-19)
- +++++++++++++++++++
-
- - Support for (key, value) lists everywhere.
- - Digest Authentication improvements.
- - Ensure proxy exclusions work properly.
- - Clearer UnicodeError exceptions.
- - Automatic casting of URLs to tsrings (fURL and such)
- - Bugfixes.
-
- 0.13.6 (2012-08-06)
- +++++++++++++++++++
-
- - Long awaited fix for hanging connections!
-
- 0.13.5 (2012-07-27)
- +++++++++++++++++++
-
- - Packaging fix
-
- 0.13.4 (2012-07-27)
- +++++++++++++++++++
-
- - GSSAPI/Kerberos authentication!
- - App Engine 2.7 Fixes!
- - Fix leaking connections (from urllib3 update)
- - OAuthlib path hack fix
- - OAuthlib URL parameters fix.
-
- 0.13.3 (2012-07-12)
- +++++++++++++++++++
-
- - Use simplejson if available.
- - Do not hide SSLErrors behind Timeouts.
- - Fixed param handling with urls containing fragments.
- - Significantly improved information in User Agent.
- - client certificates are ignored when verify=False
-
- 0.13.2 (2012-06-28)
- +++++++++++++++++++
-
- - Zero dependencies (once again)!
- - New: Response.reason
- - Sign querystring parameters in OAuth 1.0
- - Client certificates no longer ignored when verify=False
- - Add openSUSE certificate support
-
- 0.13.1 (2012-06-07)
- +++++++++++++++++++
-
- - Allow passing a file or file-like object as data.
- - Allow hooks to return responses that indicate errors.
- - Fix Response.text and Response.json for body-less responses.
-
- 0.13.0 (2012-05-29)
- +++++++++++++++++++
-
- - Removal of Requests.async in favor of `grequests `_
- - Allow disabling of cookie persistiance.
- - New implimentation of safe_mode
- - cookies.get now supports default argument
- - Session cookies not saved when Session.request is called with return_response=False
- - Env: no_proxy support.
- - RequestsCookieJar improvements.
- - Various bug fixes.
-
- 0.12.1 (2012-05-08)
- +++++++++++++++++++
-
- - New ``Response.json`` property.
- - Ability to add string file uploads.
- - Fix out-of-range issue with iter_lines.
- - Fix iter_content default size.
- - Fix POST redirects containing files.
-
- 0.12.0 (2012-05-02)
- +++++++++++++++++++
-
- - EXPERIMENTAL OAUTH SUPPORT!
- - Proper CookieJar-backed cookies interface with awesome dict-like interface.
- - Speed fix for non-iterated content chunks.
- - Move ``pre_request`` to a more usable place.
- - New ``pre_send`` hook.
- - Lazily encode data, params, files.
- - Load system Certificate Bundle if ``certify`` isn't available.
- - Cleanups, fixes.
-
- 0.11.2 (2012-04-22)
- +++++++++++++++++++
-
- - Attempt to use the OS's certificate bundle if ``certifi`` isn't available.
- - Infinite digest auth redirect fix.
- - Multi-part file upload improvements.
- - Fix decoding of invalid %encodings in URLs.
- - If there is no content in a response don't throw an error the second time that content is attempted to be read.
- - Upload data on redirects.
-
- 0.11.1 (2012-03-30)
- +++++++++++++++++++
-
- * POST redirects now break RFC to do what browsers do: Follow up with a GET.
- * New ``strict_mode`` configuration to disable new redirect behavior.
-
-
- 0.11.0 (2012-03-14)
- +++++++++++++++++++
-
- * Private SSL Certificate support
- * Remove select.poll from Gevent monkeypatching
- * Remove redundant generator for chunked transfer encoding
- * Fix: Response.ok raises Timeout Exception in safe_mode
-
- 0.10.8 (2012-03-09)
- +++++++++++++++++++
-
- * Generate chunked ValueError fix
- * Proxy configuration by environment variables
- * Simplification of iter_lines.
- * New `trust_env` configuration for disabling system/environment hints.
- * Suppress cookie errors.
-
- 0.10.7 (2012-03-07)
- +++++++++++++++++++
-
- * `encode_uri` = False
-
- 0.10.6 (2012-02-25)
- +++++++++++++++++++
-
- * Allow '=' in cookies.
-
- 0.10.5 (2012-02-25)
- +++++++++++++++++++
-
- * Response body with 0 content-length fix.
- * New async.imap.
- * Don't fail on netrc.
-
-
- 0.10.4 (2012-02-20)
- +++++++++++++++++++
-
- * Honor netrc.
-
- 0.10.3 (2012-02-20)
- +++++++++++++++++++
-
- * HEAD requests don't follow redirects anymore.
- * raise_for_status() doesn't raise for 3xx anymore.
- * Make Session objects picklable.
- * ValueError for invalid schema URLs.
-
- 0.10.2 (2012-01-15)
- +++++++++++++++++++
-
- * Vastly improved URL quoting.
- * Additional allowed cookie key values.
- * Attempted fix for "Too many open files" Error
- * Replace unicode errors on first pass, no need for second pass.
- * Append '/' to bare-domain urls before query insertion.
- * Exceptions now inherit from RuntimeError.
- * Binary uploads + auth fix.
- * Bugfixes.
-
-
- 0.10.1 (2012-01-23)
- +++++++++++++++++++
-
- * PYTHON 3 SUPPORT!
- * Dropped 2.5 Support. (*Backwards Incompatible*)
-
- 0.10.0 (2012-01-21)
- +++++++++++++++++++
-
- * ``Response.content`` is now bytes-only. (*Backwards Incompatible*)
- * New ``Response.text`` is unicode-only.
- * If no ``Response.encoding`` is specified and ``chardet`` is available, ``Respoonse.text`` will guess an encoding.
- * Default to ISO-8859-1 (Western) encoding for "text" subtypes.
- * Removal of `decode_unicode`. (*Backwards Incompatible*)
- * New multiple-hooks system.
- * New ``Response.register_hook`` for registering hooks within the pipeline.
- * ``Response.url`` is now Unicode.
-
- 0.9.3 (2012-01-18)
- ++++++++++++++++++
-
- * SSL verify=False bugfix (apparent on windows machines).
-
- 0.9.2 (2012-01-18)
- ++++++++++++++++++
-
- * Asynchronous async.send method.
- * Support for proper chunk streams with boundaries.
- * session argument for Session classes.
- * Print entire hook tracebacks, not just exception instance.
- * Fix response.iter_lines from pending next line.
- * Fix but in HTTP-digest auth w/ URI having query strings.
- * Fix in Event Hooks section.
- * Urllib3 update.
-
-
- 0.9.1 (2012-01-06)
- ++++++++++++++++++
-
- * danger_mode for automatic Response.raise_for_status()
- * Response.iter_lines refactor
-
- 0.9.0 (2011-12-28)
- ++++++++++++++++++
-
- * verify ssl is default.
-
-
- 0.8.9 (2011-12-28)
- ++++++++++++++++++
-
- * Packaging fix.
-
-
- 0.8.8 (2011-12-28)
- ++++++++++++++++++
-
- * SSL CERT VERIFICATION!
- * Release of Cerifi: Mozilla's cert list.
- * New 'verify' argument for SSL requests.
- * Urllib3 update.
-
- 0.8.7 (2011-12-24)
- ++++++++++++++++++
-
- * iter_lines last-line truncation fix
- * Force safe_mode for async requests
- * Handle safe_mode exceptions more consistently
- * Fix iteration on null responses in safe_mode
-
- 0.8.6 (2011-12-18)
- ++++++++++++++++++
-
- * Socket timeout fixes.
- * Proxy Authorization support.
-
- 0.8.5 (2011-12-14)
- ++++++++++++++++++
-
- * Response.iter_lines!
-
- 0.8.4 (2011-12-11)
- ++++++++++++++++++
-
- * Prefetch bugfix.
- * Added license to installed version.
-
- 0.8.3 (2011-11-27)
- ++++++++++++++++++
-
- * Converted auth system to use simpler callable objects.
- * New session parameter to API methods.
- * Display full URL while logging.
-
- 0.8.2 (2011-11-19)
- ++++++++++++++++++
-
- * New Unicode decoding system, based on over-ridable `Response.encoding`.
- * Proper URL slash-quote handling.
- * Cookies with ``[``, ``]``, and ``_`` allowed.
-
- 0.8.1 (2011-11-15)
- ++++++++++++++++++
-
- * URL Request path fix
- * Proxy fix.
- * Timeouts fix.
-
- 0.8.0 (2011-11-13)
- ++++++++++++++++++
-
- * Keep-alive support!
- * Complete removal of Urllib2
- * Complete removal of Poster
- * Complete removal of CookieJars
- * New ConnectionError raising
- * Safe_mode for error catching
- * prefetch parameter for request methods
- * OPTION method
- * Async pool size throttling
- * File uploads send real names
- * Vendored in urllib3
-
- 0.7.6 (2011-11-07)
- ++++++++++++++++++
-
- * Digest authentication bugfix (attach query data to path)
-
- 0.7.5 (2011-11-04)
- ++++++++++++++++++
-
- * Response.content = None if there was an invalid repsonse.
- * Redirection auth handling.
-
- 0.7.4 (2011-10-26)
- ++++++++++++++++++
-
- * Session Hooks fix.
-
- 0.7.3 (2011-10-23)
- ++++++++++++++++++
-
- * Digest Auth fix.
-
-
- 0.7.2 (2011-10-23)
- ++++++++++++++++++
-
- * PATCH Fix.
-
-
- 0.7.1 (2011-10-23)
- ++++++++++++++++++
-
- * Move away from urllib2 authentication handling.
- * Fully Remove AuthManager, AuthObject, &c.
- * New tuple-based auth system with handler callbacks.
-
-
- 0.7.0 (2011-10-22)
- ++++++++++++++++++
-
- * Sessions are now the primary interface.
- * Deprecated InvalidMethodException.
- * PATCH fix.
- * New config system (no more global settings).
-
-
- 0.6.6 (2011-10-19)
- ++++++++++++++++++
-
- * Session parameter bugfix (params merging).
-
-
- 0.6.5 (2011-10-18)
- ++++++++++++++++++
-
- * Offline (fast) test suite.
- * Session dictionary argument merging.
-
-
- 0.6.4 (2011-10-13)
- ++++++++++++++++++
-
- * Automatic decoding of unicode, based on HTTP Headers.
- * New ``decode_unicode`` setting.
- * Removal of ``r.read/close`` methods.
- * New ``r.faw`` interface for advanced response usage.*
- * Automatic expansion of parameterized headers.
-
-
- 0.6.3 (2011-10-13)
- ++++++++++++++++++
-
- * Beautiful ``requests.async`` module, for making async requests w/ gevent.
-
-
- 0.6.2 (2011-10-09)
- ++++++++++++++++++
-
- * GET/HEAD obeys allow_redirects=False.
-
-
- 0.6.1 (2011-08-20)
- ++++++++++++++++++
-
- * Enhanced status codes experience ``\o/``
- * Set a maximum number of redirects (``settings.max_redirects``)
- * Full Unicode URL support
- * Support for protocol-less redirects.
- * Allow for arbitrary request types.
- * Bugfixes
-
-
- 0.6.0 (2011-08-17)
- ++++++++++++++++++
-
- * New callback hook system
- * New persistient sessions object and context manager
- * Transparent Dict-cookie handling
- * Status code reference object
- * Removed Response.cached
- * Added Response.request
- * All args are kwargs
- * Relative redirect support
- * HTTPError handling improvements
- * Improved https testing
- * Bugfixes
-
-
- 0.5.1 (2011-07-23)
- ++++++++++++++++++
-
- * International Domain Name Support!
- * Access headers without fetching entire body (``read()``)
- * Use lists as dicts for parameters
- * Add Forced Basic Authentication
- * Forced Basic is default authentication type
- * ``python-requests.org`` default User-Agent header
- * CaseInsensitiveDict lower-case caching
- * Response.history bugfix
-
-
- 0.5.0 (2011-06-21)
- ++++++++++++++++++
-
- * PATCH Support
- * Support for Proxies
- * HTTPBin Test Suite
- * Redirect Fixes
- * settings.verbose stream writing
- * Querystrings for all methods
- * URLErrors (Connection Refused, Timeout, Invalid URLs) are treated as explicity raised
- ``r.requests.get('hwe://blah'); r.raise_for_status()``
-
-
- 0.4.1 (2011-05-22)
- ++++++++++++++++++
-
- * Improved Redirection Handling
- * New 'allow_redirects' param for following non-GET/HEAD Redirects
- * Settings module refactoring
-
-
- 0.4.0 (2011-05-15)
- ++++++++++++++++++
-
- * Response.history: list of redirected responses
- * Case-Insensitive Header Dictionaries!
- * Unicode URLs
-
-
- 0.3.4 (2011-05-14)
- ++++++++++++++++++
-
- * Urllib2 HTTPAuthentication Recursion fix (Basic/Digest)
- * Internal Refactor
- * Bytes data upload Bugfix
-
-
-
- 0.3.3 (2011-05-12)
- ++++++++++++++++++
-
- * Request timeouts
- * Unicode url-encoded data
- * Settings context manager and module
-
-
- 0.3.2 (2011-04-15)
- ++++++++++++++++++
-
- * Automatic Decompression of GZip Encoded Content
- * AutoAuth Support for Tupled HTTP Auth
-
-
- 0.3.1 (2011-04-01)
- ++++++++++++++++++
-
- * Cookie Changes
- * Response.read()
- * Poster fix
-
-
- 0.3.0 (2011-02-25)
- ++++++++++++++++++
-
- * Automatic Authentication API Change
- * Smarter Query URL Parameterization
- * Allow file uploads and POST data together
- * New Authentication Manager System
- - Simpler Basic HTTP System
- - Supports all build-in urllib2 Auths
- - Allows for custom Auth Handlers
-
-
- 0.2.4 (2011-02-19)
- ++++++++++++++++++
-
- * Python 2.5 Support
- * PyPy-c v1.4 Support
- * Auto-Authentication tests
- * Improved Request object constructor
-
- 0.2.3 (2011-02-15)
- ++++++++++++++++++
-
- * New HTTPHandling Methods
- - Response.__nonzero__ (false if bad HTTP Status)
- - Response.ok (True if expected HTTP Status)
- - Response.error (Logged HTTPError if bad HTTP Status)
- - Response.raise_for_status() (Raises stored HTTPError)
-
-
- 0.2.2 (2011-02-14)
- ++++++++++++++++++
-
- * Still handles request in the event of an HTTPError. (Issue #2)
- * Eventlet and Gevent Monkeypatch support.
- * Cookie Support (Issue #1)
-
-
- 0.2.1 (2011-02-14)
- ++++++++++++++++++
-
- * Added file attribute to POST and PUT requests for multipart-encode file uploads.
- * Added Request.url attribute for context and redirects
-
-
- 0.2.0 (2011-02-14)
- ++++++++++++++++++
-
- * Birth!
-
-
- 0.0.1 (2011-02-13)
- ++++++++++++++++++
-
- * Frustration
- * Conception
-
-
-Platform: UNKNOWN
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Intended Audience :: Developers
-Classifier: Natural Language :: English
-Classifier: License :: OSI Approved :: Apache Software License
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2.6
-Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.3
-Classifier: Programming Language :: Python :: 3.4
diff --git a/script/_Lib/requests/__init__.py b/script/_Lib/requests/__init__.py
deleted file mode 100644
index d5e1956..0000000
--- a/script/_Lib/requests/__init__.py
+++ /dev/null
@@ -1,77 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# __
-# /__) _ _ _ _ _/ _
-# / ( (- (/ (/ (- _) / _)
-# /
-
-"""
-requests HTTP library
-~~~~~~~~~~~~~~~~~~~~~
-
-Requests is an HTTP library, written in Python, for human beings. Basic GET
-usage:
-
- >>> import requests
- >>> r = requests.get('https://www.python.org')
- >>> r.status_code
- 200
- >>> 'Python is a programming language' in r.content
- True
-
-... or POST:
-
- >>> payload = dict(key1='value1', key2='value2')
- >>> r = requests.post('http://httpbin.org/post', data=payload)
- >>> print(r.text)
- {
- ...
- "form": {
- "key2": "value2",
- "key1": "value1"
- },
- ...
- }
-
-The other HTTP methods are supported - see `requests.api`. Full documentation
-is at .
-
-:copyright: (c) 2014 by Kenneth Reitz.
-:license: Apache 2.0, see LICENSE for more details.
-
-"""
-
-__title__ = 'requests'
-__version__ = '2.4.3'
-__build__ = 0x020403
-__author__ = 'Kenneth Reitz'
-__license__ = 'Apache 2.0'
-__copyright__ = 'Copyright 2014 Kenneth Reitz'
-
-# Attempt to enable urllib3's SNI support, if possible
-try:
- from .packages.urllib3.contrib import pyopenssl
- pyopenssl.inject_into_urllib3()
-except ImportError:
- pass
-
-from . import utils
-from .models import Request, Response, PreparedRequest
-from .api import request, get, head, post, patch, put, delete, options
-from .sessions import session, Session
-from .status_codes import codes
-from .exceptions import (
- RequestException, Timeout, URLRequired,
- TooManyRedirects, HTTPError, ConnectionError
-)
-
-# Set default logging handler to avoid "No handler found" warnings.
-import logging
-try: # Python 2.7+
- from logging import NullHandler
-except ImportError:
- class NullHandler(logging.Handler):
- def emit(self, record):
- pass
-
-logging.getLogger(__name__).addHandler(NullHandler())
diff --git a/script/_Lib/requests/adapters.py b/script/_Lib/requests/adapters.py
deleted file mode 100644
index abb25d1..0000000
--- a/script/_Lib/requests/adapters.py
+++ /dev/null
@@ -1,426 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-requests.adapters
-~~~~~~~~~~~~~~~~~
-
-This module contains the transport adapters that Requests uses to define
-and maintain connections.
-"""
-
-import socket
-
-from .models import Response
-from .packages.urllib3 import Retry
-from .packages.urllib3.poolmanager import PoolManager, proxy_from_url
-from .packages.urllib3.response import HTTPResponse
-from .packages.urllib3.util import Timeout as TimeoutSauce
-from .compat import urlparse, basestring
-from .utils import (DEFAULT_CA_BUNDLE_PATH, get_encoding_from_headers,
- prepend_scheme_if_needed, get_auth_from_url, urldefragauth)
-from .structures import CaseInsensitiveDict
-from .packages.urllib3.exceptions import ConnectTimeoutError
-from .packages.urllib3.exceptions import HTTPError as _HTTPError
-from .packages.urllib3.exceptions import MaxRetryError
-from .packages.urllib3.exceptions import ProxyError as _ProxyError
-from .packages.urllib3.exceptions import ProtocolError
-from .packages.urllib3.exceptions import ReadTimeoutError
-from .packages.urllib3.exceptions import SSLError as _SSLError
-from .cookies import extract_cookies_to_jar
-from .exceptions import (ConnectionError, ConnectTimeout, ReadTimeout, SSLError,
- ProxyError)
-from .auth import _basic_auth_str
-
-DEFAULT_POOLBLOCK = False
-DEFAULT_POOLSIZE = 10
-DEFAULT_RETRIES = 0
-
-
-class BaseAdapter(object):
- """The Base Transport Adapter"""
-
- def __init__(self):
- super(BaseAdapter, self).__init__()
-
- def send(self):
- raise NotImplementedError
-
- def close(self):
- raise NotImplementedError
-
-
-class HTTPAdapter(BaseAdapter):
- """The built-in HTTP Adapter for urllib3.
-
- Provides a general-case interface for Requests sessions to contact HTTP and
- HTTPS urls by implementing the Transport Adapter interface. This class will
- usually be created by the :class:`Session ` class under the
- covers.
-
- :param pool_connections: The number of urllib3 connection pools to cache.
- :param pool_maxsize: The maximum number of connections to save in the pool.
- :param int max_retries: The maximum number of retries each connection
- should attempt. Note, this applies only to failed connections and
- timeouts, never to requests where the server returns a response.
- :param pool_block: Whether the connection pool should block for connections.
-
- Usage::
-
- >>> import requests
- >>> s = requests.Session()
- >>> a = requests.adapters.HTTPAdapter(max_retries=3)
- >>> s.mount('http://', a)
- """
- __attrs__ = ['max_retries', 'config', '_pool_connections', '_pool_maxsize',
- '_pool_block']
-
- def __init__(self, pool_connections=DEFAULT_POOLSIZE,
- pool_maxsize=DEFAULT_POOLSIZE, max_retries=DEFAULT_RETRIES,
- pool_block=DEFAULT_POOLBLOCK):
- self.max_retries = max_retries
- self.config = {}
- self.proxy_manager = {}
-
- super(HTTPAdapter, self).__init__()
-
- self._pool_connections = pool_connections
- self._pool_maxsize = pool_maxsize
- self._pool_block = pool_block
-
- self.init_poolmanager(pool_connections, pool_maxsize, block=pool_block)
-
- def __getstate__(self):
- return dict((attr, getattr(self, attr, None)) for attr in
- self.__attrs__)
-
- def __setstate__(self, state):
- # Can't handle by adding 'proxy_manager' to self.__attrs__ because
- # because self.poolmanager uses a lambda function, which isn't pickleable.
- self.proxy_manager = {}
- self.config = {}
-
- for attr, value in state.items():
- setattr(self, attr, value)
-
- self.init_poolmanager(self._pool_connections, self._pool_maxsize,
- block=self._pool_block)
-
- def init_poolmanager(self, connections, maxsize, block=DEFAULT_POOLBLOCK, **pool_kwargs):
- """Initializes a urllib3 PoolManager.
-
- This method should not be called from user code, and is only
- exposed for use when subclassing the
- :class:`HTTPAdapter `.
-
- :param connections: The number of urllib3 connection pools to cache.
- :param maxsize: The maximum number of connections to save in the pool.
- :param block: Block when no free connections are available.
- :param pool_kwargs: Extra keyword arguments used to initialize the Pool Manager.
- """
- # save these values for pickling
- self._pool_connections = connections
- self._pool_maxsize = maxsize
- self._pool_block = block
-
- self.poolmanager = PoolManager(num_pools=connections, maxsize=maxsize,
- block=block, **pool_kwargs)
-
- def proxy_manager_for(self, proxy, **proxy_kwargs):
- """Return urllib3 ProxyManager for the given proxy.
-
- This method should not be called from user code, and is only
- exposed for use when subclassing the
- :class:`HTTPAdapter `.
-
- :param proxy: The proxy to return a urllib3 ProxyManager for.
- :param proxy_kwargs: Extra keyword arguments used to configure the Proxy Manager.
- :returns: ProxyManager
- """
- if not proxy in self.proxy_manager:
- proxy_headers = self.proxy_headers(proxy)
- self.proxy_manager[proxy] = proxy_from_url(
- proxy,
- proxy_headers=proxy_headers,
- num_pools=self._pool_connections,
- maxsize=self._pool_maxsize,
- block=self._pool_block,
- **proxy_kwargs)
-
- return self.proxy_manager[proxy]
-
- def cert_verify(self, conn, url, verify, cert):
- """Verify a SSL certificate. This method should not be called from user
- code, and is only exposed for use when subclassing the
- :class:`HTTPAdapter `.
-
- :param conn: The urllib3 connection object associated with the cert.
- :param url: The requested URL.
- :param verify: Whether we should actually verify the certificate.
- :param cert: The SSL certificate to verify.
- """
- if url.lower().startswith('https') and verify:
-
- cert_loc = None
-
- # Allow self-specified cert location.
- if verify is not True:
- cert_loc = verify
-
- if not cert_loc:
- cert_loc = DEFAULT_CA_BUNDLE_PATH
-
- if not cert_loc:
- raise Exception("Could not find a suitable SSL CA certificate bundle.")
-
- conn.cert_reqs = 'CERT_REQUIRED'
- conn.ca_certs = cert_loc
- else:
- conn.cert_reqs = 'CERT_NONE'
- conn.ca_certs = None
-
- if cert:
- if not isinstance(cert, basestring):
- conn.cert_file = cert[0]
- conn.key_file = cert[1]
- else:
- conn.cert_file = cert
-
- def build_response(self, req, resp):
- """Builds a :class:`Response ` object from a urllib3
- response. This should not be called from user code, and is only exposed
- for use when subclassing the
- :class:`HTTPAdapter `
-
- :param req: The :class:`PreparedRequest ` used to generate the response.
- :param resp: The urllib3 response object.
- """
- response = Response()
-
- # Fallback to None if there's no status_code, for whatever reason.
- response.status_code = getattr(resp, 'status', None)
-
- # Make headers case-insensitive.
- response.headers = CaseInsensitiveDict(getattr(resp, 'headers', {}))
-
- # Set encoding.
- response.encoding = get_encoding_from_headers(response.headers)
- response.raw = resp
- response.reason = response.raw.reason
-
- if isinstance(req.url, bytes):
- response.url = req.url.decode('utf-8')
- else:
- response.url = req.url
-
- # Add new cookies from the server.
- extract_cookies_to_jar(response.cookies, req, resp)
-
- # Give the Response some context.
- response.request = req
- response.connection = self
-
- return response
-
- def get_connection(self, url, proxies=None):
- """Returns a urllib3 connection for the given URL. This should not be
- called from user code, and is only exposed for use when subclassing the
- :class:`HTTPAdapter `.
-
- :param url: The URL to connect to.
- :param proxies: (optional) A Requests-style dictionary of proxies used on this request.
- """
- proxies = proxies or {}
- proxy = proxies.get(urlparse(url.lower()).scheme)
-
- if proxy:
- proxy = prepend_scheme_if_needed(proxy, 'http')
- proxy_manager = self.proxy_manager_for(proxy)
- conn = proxy_manager.connection_from_url(url)
- else:
- # Only scheme should be lower case
- parsed = urlparse(url)
- url = parsed.geturl()
- conn = self.poolmanager.connection_from_url(url)
-
- return conn
-
- def close(self):
- """Disposes of any internal state.
-
- Currently, this just closes the PoolManager, which closes pooled
- connections.
- """
- self.poolmanager.clear()
-
- def request_url(self, request, proxies):
- """Obtain the url to use when making the final request.
-
- If the message is being sent through a HTTP proxy, the full URL has to
- be used. Otherwise, we should only use the path portion of the URL.
-
- This should not be called from user code, and is only exposed for use
- when subclassing the
- :class:`HTTPAdapter `.
-
- :param request: The :class:`PreparedRequest ` being sent.
- :param proxies: A dictionary of schemes to proxy URLs.
- """
- proxies = proxies or {}
- scheme = urlparse(request.url).scheme
- proxy = proxies.get(scheme)
-
- if proxy and scheme != 'https':
- url = urldefragauth(request.url)
- else:
- url = request.path_url
-
- return url
-
- def add_headers(self, request, **kwargs):
- """Add any headers needed by the connection. As of v2.0 this does
- nothing by default, but is left for overriding by users that subclass
- the :class:`HTTPAdapter `.
-
- This should not be called from user code, and is only exposed for use
- when subclassing the
- :class:`HTTPAdapter `.
-
- :param request: The :class:`PreparedRequest ` to add headers to.
- :param kwargs: The keyword arguments from the call to send().
- """
- pass
-
- def proxy_headers(self, proxy):
- """Returns a dictionary of the headers to add to any request sent
- through a proxy. This works with urllib3 magic to ensure that they are
- correctly sent to the proxy, rather than in a tunnelled request if
- CONNECT is being used.
-
- This should not be called from user code, and is only exposed for use
- when subclassing the
- :class:`HTTPAdapter `.
-
- :param proxies: The url of the proxy being used for this request.
- :param kwargs: Optional additional keyword arguments.
- """
- headers = {}
- username, password = get_auth_from_url(proxy)
-
- if username and password:
- headers['Proxy-Authorization'] = _basic_auth_str(username,
- password)
-
- return headers
-
- def send(self, request, stream=False, timeout=None, verify=True, cert=None, proxies=None):
- """Sends PreparedRequest object. Returns Response object.
-
- :param request: The :class:`PreparedRequest ` being sent.
- :param stream: (optional) Whether to stream the request content.
- :param timeout: (optional) How long to wait for the server to send
- data before giving up, as a float, or a (`connect timeout, read
- timeout `_) tuple.
- :type timeout: float or tuple
- :param verify: (optional) Whether to verify SSL certificates.
- :param cert: (optional) Any user-provided SSL certificate to be trusted.
- :param proxies: (optional) The proxies dictionary to apply to the request.
- """
-
- conn = self.get_connection(request.url, proxies)
-
- self.cert_verify(conn, request.url, verify, cert)
- url = self.request_url(request, proxies)
- self.add_headers(request)
-
- chunked = not (request.body is None or 'Content-Length' in request.headers)
-
- if isinstance(timeout, tuple):
- try:
- connect, read = timeout
- timeout = TimeoutSauce(connect=connect, read=read)
- except ValueError as e:
- # this may raise a string formatting error.
- err = ("Invalid timeout {0}. Pass a (connect, read) "
- "timeout tuple, or a single float to set "
- "both timeouts to the same value".format(timeout))
- raise ValueError(err)
- else:
- timeout = TimeoutSauce(connect=timeout, read=timeout)
-
- try:
- if not chunked:
- resp = conn.urlopen(
- method=request.method,
- url=url,
- body=request.body,
- headers=request.headers,
- redirect=False,
- assert_same_host=False,
- preload_content=False,
- decode_content=False,
- retries=Retry(self.max_retries, read=False),
- timeout=timeout
- )
-
- # Send the request.
- else:
- if hasattr(conn, 'proxy_pool'):
- conn = conn.proxy_pool
-
- low_conn = conn._get_conn(timeout=timeout)
-
- try:
- low_conn.putrequest(request.method,
- url,
- skip_accept_encoding=True)
-
- for header, value in request.headers.items():
- low_conn.putheader(header, value)
-
- low_conn.endheaders()
-
- for i in request.body:
- low_conn.send(hex(len(i))[2:].encode('utf-8'))
- low_conn.send(b'\r\n')
- low_conn.send(i)
- low_conn.send(b'\r\n')
- low_conn.send(b'0\r\n\r\n')
-
- r = low_conn.getresponse()
- resp = HTTPResponse.from_httplib(
- r,
- pool=conn,
- connection=low_conn,
- preload_content=False,
- decode_content=False
- )
- except:
- # If we hit any problems here, clean up the connection.
- # Then, reraise so that we can handle the actual exception.
- low_conn.close()
- raise
- else:
- # All is well, return the connection to the pool.
- conn._put_conn(low_conn)
-
- except (ProtocolError, socket.error) as err:
- raise ConnectionError(err, request=request)
-
- except MaxRetryError as e:
- if isinstance(e.reason, ConnectTimeoutError):
- raise ConnectTimeout(e, request=request)
-
- raise ConnectionError(e, request=request)
-
- except _ProxyError as e:
- raise ProxyError(e)
-
- except (_SSLError, _HTTPError) as e:
- if isinstance(e, _SSLError):
- raise SSLError(e, request=request)
- elif isinstance(e, ReadTimeoutError):
- raise ReadTimeout(e, request=request)
- else:
- raise
-
- return self.build_response(request, resp)
diff --git a/script/_Lib/requests/api.py b/script/_Lib/requests/api.py
deleted file mode 100644
index 4eaaf9e..0000000
--- a/script/_Lib/requests/api.py
+++ /dev/null
@@ -1,126 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-requests.api
-~~~~~~~~~~~~
-
-This module implements the Requests API.
-
-:copyright: (c) 2012 by Kenneth Reitz.
-:license: Apache2, see LICENSE for more details.
-
-"""
-
-from . import sessions
-
-
-def request(method, url, **kwargs):
- """Constructs and sends a :class:`Request `.
- Returns :class:`Response ` object.
-
- :param method: method for the new :class:`Request` object.
- :param url: URL for the new :class:`Request` object.
- :param params: (optional) Dictionary or bytes to be sent in the query string for the :class:`Request`.
- :param data: (optional) Dictionary, bytes, or file-like object to send in the body of the :class:`Request`.
- :param json: (optional) json data to send in the body of the :class:`Request`.
- :param headers: (optional) Dictionary of HTTP Headers to send with the :class:`Request`.
- :param cookies: (optional) Dict or CookieJar object to send with the :class:`Request`.
- :param files: (optional) Dictionary of ``'name': file-like-objects`` (or ``{'name': ('filename', fileobj)}``) for multipart encoding upload.
- :param auth: (optional) Auth tuple to enable Basic/Digest/Custom HTTP Auth.
- :param timeout: (optional) How long to wait for the server to send data
- before giving up, as a float, or a (`connect timeout, read timeout
- `_) tuple.
- :type timeout: float or tuple
- :param allow_redirects: (optional) Boolean. Set to True if POST/PUT/DELETE redirect following is allowed.
- :type allow_redirects: bool
- :param proxies: (optional) Dictionary mapping protocol to the URL of the proxy.
- :param verify: (optional) if ``True``, the SSL cert will be verified. A CA_BUNDLE path can also be provided.
- :param stream: (optional) if ``False``, the response content will be immediately downloaded.
- :param cert: (optional) if String, path to ssl client cert file (.pem). If Tuple, ('cert', 'key') pair.
-
- Usage::
-
- >>> import requests
- >>> req = requests.request('GET', 'http://httpbin.org/get')
-
- """
-
- session = sessions.Session()
- return session.request(method=method, url=url, **kwargs)
-
-
-def get(url, **kwargs):
- """Sends a GET request. Returns :class:`Response` object.
-
- :param url: URL for the new :class:`Request` object.
- :param \*\*kwargs: Optional arguments that ``request`` takes.
- """
-
- kwargs.setdefault('allow_redirects', True)
- return request('get', url, **kwargs)
-
-
-def options(url, **kwargs):
- """Sends a OPTIONS request. Returns :class:`Response` object.
-
- :param url: URL for the new :class:`Request` object.
- :param \*\*kwargs: Optional arguments that ``request`` takes.
- """
-
- kwargs.setdefault('allow_redirects', True)
- return request('options', url, **kwargs)
-
-
-def head(url, **kwargs):
- """Sends a HEAD request. Returns :class:`Response` object.
-
- :param url: URL for the new :class:`Request` object.
- :param \*\*kwargs: Optional arguments that ``request`` takes.
- """
-
- kwargs.setdefault('allow_redirects', False)
- return request('head', url, **kwargs)
-
-
-def post(url, data=None, json=None, **kwargs):
- """Sends a POST request. Returns :class:`Response` object.
-
- :param url: URL for the new :class:`Request` object.
- :param data: (optional) Dictionary, bytes, or file-like object to send in the body of the :class:`Request`.
- :param json: (optional) json data to send in the body of the :class:`Request`.
- :param \*\*kwargs: Optional arguments that ``request`` takes.
- """
-
- return request('post', url, data=data, json=json, **kwargs)
-
-
-def put(url, data=None, **kwargs):
- """Sends a PUT request. Returns :class:`Response` object.
-
- :param url: URL for the new :class:`Request` object.
- :param data: (optional) Dictionary, bytes, or file-like object to send in the body of the :class:`Request`.
- :param \*\*kwargs: Optional arguments that ``request`` takes.
- """
-
- return request('put', url, data=data, **kwargs)
-
-
-def patch(url, data=None, **kwargs):
- """Sends a PATCH request. Returns :class:`Response` object.
-
- :param url: URL for the new :class:`Request` object.
- :param data: (optional) Dictionary, bytes, or file-like object to send in the body of the :class:`Request`.
- :param \*\*kwargs: Optional arguments that ``request`` takes.
- """
-
- return request('patch', url, data=data, **kwargs)
-
-
-def delete(url, **kwargs):
- """Sends a DELETE request. Returns :class:`Response` object.
-
- :param url: URL for the new :class:`Request` object.
- :param \*\*kwargs: Optional arguments that ``request`` takes.
- """
-
- return request('delete', url, **kwargs)
diff --git a/script/_Lib/requests/auth.py b/script/_Lib/requests/auth.py
deleted file mode 100644
index 9b6426d..0000000
--- a/script/_Lib/requests/auth.py
+++ /dev/null
@@ -1,197 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-requests.auth
-~~~~~~~~~~~~~
-
-This module contains the authentication handlers for Requests.
-"""
-
-import os
-import re
-import time
-import hashlib
-
-from base64 import b64encode
-
-from .compat import urlparse, str
-from .cookies import extract_cookies_to_jar
-from .utils import parse_dict_header, to_native_string
-
-CONTENT_TYPE_FORM_URLENCODED = 'application/x-www-form-urlencoded'
-CONTENT_TYPE_MULTI_PART = 'multipart/form-data'
-
-
-def _basic_auth_str(username, password):
- """Returns a Basic Auth string."""
-
- authstr = 'Basic ' + to_native_string(
- b64encode(('%s:%s' % (username, password)).encode('latin1')).strip()
- )
-
- return authstr
-
-
-class AuthBase(object):
- """Base class that all auth implementations derive from"""
-
- def __call__(self, r):
- raise NotImplementedError('Auth hooks must be callable.')
-
-
-class HTTPBasicAuth(AuthBase):
- """Attaches HTTP Basic Authentication to the given Request object."""
- def __init__(self, username, password):
- self.username = username
- self.password = password
-
- def __call__(self, r):
- r.headers['Authorization'] = _basic_auth_str(self.username, self.password)
- return r
-
-
-class HTTPProxyAuth(HTTPBasicAuth):
- """Attaches HTTP Proxy Authentication to a given Request object."""
- def __call__(self, r):
- r.headers['Proxy-Authorization'] = _basic_auth_str(self.username, self.password)
- return r
-
-
-class HTTPDigestAuth(AuthBase):
- """Attaches HTTP Digest Authentication to the given Request object."""
- def __init__(self, username, password):
- self.username = username
- self.password = password
- self.last_nonce = ''
- self.nonce_count = 0
- self.chal = {}
- self.pos = None
-
- def build_digest_header(self, method, url):
-
- realm = self.chal['realm']
- nonce = self.chal['nonce']
- qop = self.chal.get('qop')
- algorithm = self.chal.get('algorithm')
- opaque = self.chal.get('opaque')
-
- if algorithm is None:
- _algorithm = 'MD5'
- else:
- _algorithm = algorithm.upper()
- # lambdas assume digest modules are imported at the top level
- if _algorithm == 'MD5' or _algorithm == 'MD5-SESS':
- def md5_utf8(x):
- if isinstance(x, str):
- x = x.encode('utf-8')
- return hashlib.md5(x).hexdigest()
- hash_utf8 = md5_utf8
- elif _algorithm == 'SHA':
- def sha_utf8(x):
- if isinstance(x, str):
- x = x.encode('utf-8')
- return hashlib.sha1(x).hexdigest()
- hash_utf8 = sha_utf8
-
- KD = lambda s, d: hash_utf8("%s:%s" % (s, d))
-
- if hash_utf8 is None:
- return None
-
- # XXX not implemented yet
- entdig = None
- p_parsed = urlparse(url)
- path = p_parsed.path
- if p_parsed.query:
- path += '?' + p_parsed.query
-
- A1 = '%s:%s:%s' % (self.username, realm, self.password)
- A2 = '%s:%s' % (method, path)
-
- HA1 = hash_utf8(A1)
- HA2 = hash_utf8(A2)
-
- if nonce == self.last_nonce:
- self.nonce_count += 1
- else:
- self.nonce_count = 1
- ncvalue = '%08x' % self.nonce_count
- s = str(self.nonce_count).encode('utf-8')
- s += nonce.encode('utf-8')
- s += time.ctime().encode('utf-8')
- s += os.urandom(8)
-
- cnonce = (hashlib.sha1(s).hexdigest()[:16])
- noncebit = "%s:%s:%s:%s:%s" % (nonce, ncvalue, cnonce, qop, HA2)
- if _algorithm == 'MD5-SESS':
- HA1 = hash_utf8('%s:%s:%s' % (HA1, nonce, cnonce))
-
- if qop is None:
- respdig = KD(HA1, "%s:%s" % (nonce, HA2))
- elif qop == 'auth' or 'auth' in qop.split(','):
- respdig = KD(HA1, noncebit)
- else:
- # XXX handle auth-int.
- return None
-
- self.last_nonce = nonce
-
- # XXX should the partial digests be encoded too?
- base = 'username="%s", realm="%s", nonce="%s", uri="%s", ' \
- 'response="%s"' % (self.username, realm, nonce, path, respdig)
- if opaque:
- base += ', opaque="%s"' % opaque
- if algorithm:
- base += ', algorithm="%s"' % algorithm
- if entdig:
- base += ', digest="%s"' % entdig
- if qop:
- base += ', qop="auth", nc=%s, cnonce="%s"' % (ncvalue, cnonce)
-
- return 'Digest %s' % (base)
-
- def handle_401(self, r, **kwargs):
- """Takes the given response and tries digest-auth, if needed."""
-
- if self.pos is not None:
- # Rewind the file position indicator of the body to where
- # it was to resend the request.
- r.request.body.seek(self.pos)
- num_401_calls = getattr(self, 'num_401_calls', 1)
- s_auth = r.headers.get('www-authenticate', '')
-
- if 'digest' in s_auth.lower() and num_401_calls < 2:
-
- setattr(self, 'num_401_calls', num_401_calls + 1)
- pat = re.compile(r'digest ', flags=re.IGNORECASE)
- self.chal = parse_dict_header(pat.sub('', s_auth, count=1))
-
- # Consume content and release the original connection
- # to allow our new request to reuse the same one.
- r.content
- r.raw.release_conn()
- prep = r.request.copy()
- extract_cookies_to_jar(prep._cookies, r.request, r.raw)
- prep.prepare_cookies(prep._cookies)
-
- prep.headers['Authorization'] = self.build_digest_header(
- prep.method, prep.url)
- _r = r.connection.send(prep, **kwargs)
- _r.history.append(r)
- _r.request = prep
-
- return _r
-
- setattr(self, 'num_401_calls', 1)
- return r
-
- def __call__(self, r):
- # If we have a saved nonce, skip the 401
- if self.last_nonce:
- r.headers['Authorization'] = self.build_digest_header(r.method, r.url)
- try:
- self.pos = r.body.tell()
- except AttributeError:
- pass
- r.register_hook('response', self.handle_401)
- return r
diff --git a/script/_Lib/requests/cacert.pem b/script/_Lib/requests/cacert.pem
deleted file mode 100644
index 729fe15..0000000
--- a/script/_Lib/requests/cacert.pem
+++ /dev/null
@@ -1,5026 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# Issuer: CN=GTE CyberTrust Global Root O=GTE Corporation OU=GTE CyberTrust Solutions, Inc.
-# Subject: CN=GTE CyberTrust Global Root O=GTE Corporation OU=GTE CyberTrust Solutions, Inc.
-# Label: "GTE CyberTrust Global Root"
-# Serial: 421
-# MD5 Fingerprint: ca:3d:d3:68:f1:03:5c:d0:32:fa:b8:2b:59:e8:5a:db
-# SHA1 Fingerprint: 97:81:79:50:d8:1c:96:70:cc:34:d8:09:cf:79:44:31:36:7e:f4:74
-# SHA256 Fingerprint: a5:31:25:18:8d:21:10:aa:96:4b:02:c7:b7:c6:da:32:03:17:08:94:e5:fb:71:ff:fb:66:67:d5:e6:81:0a:36
------BEGIN CERTIFICATE-----
-MIICWjCCAcMCAgGlMA0GCSqGSIb3DQEBBAUAMHUxCzAJBgNVBAYTAlVTMRgwFgYD
-VQQKEw9HVEUgQ29ycG9yYXRpb24xJzAlBgNVBAsTHkdURSBDeWJlclRydXN0IFNv
-bHV0aW9ucywgSW5jLjEjMCEGA1UEAxMaR1RFIEN5YmVyVHJ1c3QgR2xvYmFsIFJv
-b3QwHhcNOTgwODEzMDAyOTAwWhcNMTgwODEzMjM1OTAwWjB1MQswCQYDVQQGEwJV
-UzEYMBYGA1UEChMPR1RFIENvcnBvcmF0aW9uMScwJQYDVQQLEx5HVEUgQ3liZXJU
-cnVzdCBTb2x1dGlvbnMsIEluYy4xIzAhBgNVBAMTGkdURSBDeWJlclRydXN0IEds
-b2JhbCBSb290MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCVD6C28FCc6HrH
-iM3dFw4usJTQGz0O9pTAipTHBsiQl8i4ZBp6fmw8U+E3KHNgf7KXUwefU/ltWJTS
-r41tiGeA5u2ylc9yMcqlHHK6XALnZELn+aks1joNrI1CqiQBOeacPwGFVw1Yh0X4
-04Wqk2kmhXBIgD8SFcd5tB8FLztimQIDAQABMA0GCSqGSIb3DQEBBAUAA4GBAG3r
-GwnpXtlR22ciYaQqPEh346B8pt5zohQDhT37qw4wxYMWM4ETCJ57NE7fQMh017l9
-3PR2VX2bY1QY6fDq81yx2YtCHrnAlU66+tXifPVoYb+O7AWXX1uw16OFNMQkpw0P
-lZPvy5TYnh+dXIVtx6quTx8itc2VrbqnzPmrC3p/
------END CERTIFICATE-----
-
-# Issuer: CN=Thawte Server CA O=Thawte Consulting cc OU=Certification Services Division
-# Subject: CN=Thawte Server CA O=Thawte Consulting cc OU=Certification Services Division
-# Label: "Thawte Server CA"
-# Serial: 1
-# MD5 Fingerprint: c5:70:c4:a2:ed:53:78:0c:c8:10:53:81:64:cb:d0:1d
-# SHA1 Fingerprint: 23:e5:94:94:51:95:f2:41:48:03:b4:d5:64:d2:a3:a3:f5:d8:8b:8c
-# SHA256 Fingerprint: b4:41:0b:73:e2:e6:ea:ca:47:fb:c4:2f:8f:a4:01:8a:f4:38:1d:c5:4c:fa:a8:44:50:46:1e:ed:09:45:4d:e9
------BEGIN CERTIFICATE-----
-MIIDEzCCAnygAwIBAgIBATANBgkqhkiG9w0BAQQFADCBxDELMAkGA1UEBhMCWkEx
-FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYD
-VQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlv
-biBTZXJ2aWNlcyBEaXZpc2lvbjEZMBcGA1UEAxMQVGhhd3RlIFNlcnZlciBDQTEm
-MCQGCSqGSIb3DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0ZS5jb20wHhcNOTYwODAx
-MDAwMDAwWhcNMjAxMjMxMjM1OTU5WjCBxDELMAkGA1UEBhMCWkExFTATBgNVBAgT
-DFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYDVQQKExRUaGF3
-dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNl
-cyBEaXZpc2lvbjEZMBcGA1UEAxMQVGhhd3RlIFNlcnZlciBDQTEmMCQGCSqGSIb3
-DQEJARYXc2VydmVyLWNlcnRzQHRoYXd0ZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQAD
-gY0AMIGJAoGBANOkUG7I/1Zr5s9dtuoMaHVHoqrC2oQl/Kj0R1HahbUgdJSGHg91
-yekIYfUGbTBuFRkC6VLAYttNmZ7iagxEOM3+vuNkCXDF/rFrKbYvScg71CcEJRCX
-L+eQbcAoQpnXTEPew/UhbVSfXcNY4cDk2VuwuNy0e982OsK1ZiIS1ocNAgMBAAGj
-EzARMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEEBQADgYEAB/pMaVz7lcxG
-7oWDTSEwjsrZqG9JGubaUeNgcGyEYRGhGshIPllDfU+VPaGLtwtimHp1it2ITk6e
-QNuozDJ0uW8NxuOzRAvZim+aKZuZGCg70eNAKJpaPNW15yAbi8qkq43pUdniTCxZ
-qdq5snUb9kLy78fyGPmJvKP/iiMucEc=
------END CERTIFICATE-----
-
-# Issuer: CN=Thawte Premium Server CA O=Thawte Consulting cc OU=Certification Services Division
-# Subject: CN=Thawte Premium Server CA O=Thawte Consulting cc OU=Certification Services Division
-# Label: "Thawte Premium Server CA"
-# Serial: 1
-# MD5 Fingerprint: 06:9f:69:79:16:66:90:02:1b:8c:8c:a2:c3:07:6f:3a
-# SHA1 Fingerprint: 62:7f:8d:78:27:65:63:99:d2:7d:7f:90:44:c9:fe:b3:f3:3e:fa:9a
-# SHA256 Fingerprint: ab:70:36:36:5c:71:54:aa:29:c2:c2:9f:5d:41:91:16:3b:16:2a:22:25:01:13:57:d5:6d:07:ff:a7:bc:1f:72
------BEGIN CERTIFICATE-----
-MIIDJzCCApCgAwIBAgIBATANBgkqhkiG9w0BAQQFADCBzjELMAkGA1UEBhMCWkEx
-FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYD
-VQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlv
-biBTZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UEAxMYVGhhd3RlIFByZW1pdW0gU2Vy
-dmVyIENBMSgwJgYJKoZIhvcNAQkBFhlwcmVtaXVtLXNlcnZlckB0aGF3dGUuY29t
-MB4XDTk2MDgwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgc4xCzAJBgNVBAYTAlpB
-MRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEdMBsG
-A1UEChMUVGhhd3RlIENvbnN1bHRpbmcgY2MxKDAmBgNVBAsTH0NlcnRpZmljYXRp
-b24gU2VydmljZXMgRGl2aXNpb24xITAfBgNVBAMTGFRoYXd0ZSBQcmVtaXVtIFNl
-cnZlciBDQTEoMCYGCSqGSIb3DQEJARYZcHJlbWl1bS1zZXJ2ZXJAdGhhd3RlLmNv
-bTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0jY2aovXwlue2oFBYo847kkE
-VdbQ7xwblRZH7xhINTpS9CtqBo87L+pW46+GjZ4X9560ZXUCTe/LCaIhUdib0GfQ
-ug2SBhRz1JPLlyoAnFxODLz6FVL88kRu2hFKbgifLy3j+ao6hnO2RlNYyIkFvYMR
-uHM/qgeN9EJN50CdHDcCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG
-9w0BAQQFAAOBgQAmSCwWwlj66BZ0DKqqX1Q/8tfJeGBeXm43YyJ3Nn6yF8Q0ufUI
-hfzJATj/Tb7yFkJD57taRvvBxhEf8UqwKEbJw8RCfbz6q1lu1bdRiBHjpIUZa4JM
-pAwSremkrj/xw0llmozFyD4lt5SZu5IycQfwhl7tUCemDaYj+bvLpgcUQg==
------END CERTIFICATE-----
-
-# Issuer: O=Equifax OU=Equifax Secure Certificate Authority
-# Subject: O=Equifax OU=Equifax Secure Certificate Authority
-# Label: "Equifax Secure CA"
-# Serial: 903804111
-# MD5 Fingerprint: 67:cb:9d:c0:13:24:8a:82:9b:b2:17:1e:d1:1b:ec:d4
-# SHA1 Fingerprint: d2:32:09:ad:23:d3:14:23:21:74:e4:0d:7f:9d:62:13:97:86:63:3a
-# SHA256 Fingerprint: 08:29:7a:40:47:db:a2:36:80:c7:31:db:6e:31:76:53:ca:78:48:e1:be:bd:3a:0b:01:79:a7:07:f9:2c:f1:78
------BEGIN CERTIFICATE-----
-MIIDIDCCAomgAwIBAgIENd70zzANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJV
-UzEQMA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2Vy
-dGlmaWNhdGUgQXV0aG9yaXR5MB4XDTk4MDgyMjE2NDE1MVoXDTE4MDgyMjE2NDE1
-MVowTjELMAkGA1UEBhMCVVMxEDAOBgNVBAoTB0VxdWlmYXgxLTArBgNVBAsTJEVx
-dWlmYXggU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eTCBnzANBgkqhkiG9w0B
-AQEFAAOBjQAwgYkCgYEAwV2xWGcIYu6gmi0fCG2RFGiYCh7+2gRvE4RiIcPRfM6f
-BeC4AfBONOziipUEZKzxa1NfBbPLZ4C/QgKO/t0BCezhABRP/PvwDN1Dulsr4R+A
-cJkVV5MW8Q+XarfCaCMczE1ZMKxRHjuvK9buY0V7xdlfUNLjUA86iOe/FP3gx7kC
-AwEAAaOCAQkwggEFMHAGA1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEQ
-MA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlm
-aWNhdGUgQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMBoGA1UdEAQTMBGBDzIwMTgw
-ODIyMTY0MTUxWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUSOZo+SvSspXXR9gj
-IBBPM5iQn9QwHQYDVR0OBBYEFEjmaPkr0rKV10fYIyAQTzOYkJ/UMAwGA1UdEwQF
-MAMBAf8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUA
-A4GBAFjOKer89961zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y
-7qj/WsjTVbJmcVfewCHrPSqnI0kBBIZCe/zuf6IWUrVnZ9NA2zsmWLIodz2uFHdh
-1voqZiegDfqnc1zqcPGUIWVEX/r87yloqaKHee9570+sB3c4
------END CERTIFICATE-----
-
-# Issuer: O=VeriSign, Inc. OU=Class 3 Public Primary Certification Authority
-# Subject: O=VeriSign, Inc. OU=Class 3 Public Primary Certification Authority
-# Label: "Verisign Class 3 Public Primary Certification Authority"
-# Serial: 149843929435818692848040365716851702463
-# MD5 Fingerprint: 10:fc:63:5d:f6:26:3e:0d:f3:25:be:5f:79:cd:67:67
-# SHA1 Fingerprint: 74:2c:31:92:e6:07:e4:24:eb:45:49:54:2b:e1:bb:c5:3e:61:74:e2
-# SHA256 Fingerprint: e7:68:56:34:ef:ac:f6:9a:ce:93:9a:6b:25:5b:7b:4f:ab:ef:42:93:5b:50:a2:65:ac:b5:cb:60:27:e4:4e:70
------BEGIN CERTIFICATE-----
-MIICPDCCAaUCEHC65B0Q2Sk0tjjKewPMur8wDQYJKoZIhvcNAQECBQAwXzELMAkG
-A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz
-cyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2
-MDEyOTAwMDAwMFoXDTI4MDgwMTIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV
-BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmlt
-YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN
-ADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhE
-BarsAx94f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/is
-I19wKTakyYbnsZogy1Olhec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0G
-CSqGSIb3DQEBAgUAA4GBALtMEivPLCYATxQT3ab7/AoRhIzzKBxnki98tsX63/Do
-lbwdj2wsqFHMc9ikwFPwTtYmwHYBV4GSXiHx0bH/59AhWM1pF+NEHJwZRDmJXNyc
-AA9WjQKZ7aKQRUzkuxCkPfAyAw7xzvjoyVGM5mKf5p/AfbdynMk2OmufTqj/ZA1k
------END CERTIFICATE-----
-
-# Issuer: O=VeriSign, Inc. OU=Class 3 Public Primary Certification Authority - G2/(c) 1998 VeriSign, Inc. - For authorized use only/VeriSign Trust Network
-# Subject: O=VeriSign, Inc. OU=Class 3 Public Primary Certification Authority - G2/(c) 1998 VeriSign, Inc. - For authorized use only/VeriSign Trust Network
-# Label: "Verisign Class 3 Public Primary Certification Authority - G2"
-# Serial: 167285380242319648451154478808036881606
-# MD5 Fingerprint: a2:33:9b:4c:74:78:73:d4:6c:e7:c1:f3:8d:cb:5c:e9
-# SHA1 Fingerprint: 85:37:1c:a6:e5:50:14:3d:ce:28:03:47:1b:de:3a:09:e8:f8:77:0f
-# SHA256 Fingerprint: 83:ce:3c:12:29:68:8a:59:3d:48:5f:81:97:3c:0f:91:95:43:1e:da:37:cc:5e:36:43:0e:79:c7:a8:88:63:8b
------BEGIN CERTIFICATE-----
-MIIDAjCCAmsCEH3Z/gfPqB63EHln+6eJNMYwDQYJKoZIhvcNAQEFBQAwgcExCzAJ
-BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xh
-c3MgMyBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcy
-MTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3Jp
-emVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMB4X
-DTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVTMRcw
-FQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMyBQdWJsaWMg
-UHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEo
-YykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5
-MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEB
-AQUAA4GNADCBiQKBgQDMXtERXVxp0KvTuWpMmR9ZmDCOFoUgRm1HP9SFIIThbbP4
-pO0M8RcPO/mn+SXXwc+EY/J8Y8+iR/LGWzOOZEAEaMGAuWQcRXfH2G71lSk8UOg0
-13gfqLptQ5GVj0VXXn7F+8qkBOvqlzdUMG+7AUcyM83cV5tkaWH4mx0ciU9cZwID
-AQABMA0GCSqGSIb3DQEBBQUAA4GBAFFNzb5cy5gZnBWyATl4Lk0PZ3BwmcYQWpSk
-U01UbSuvDV1Ai2TT1+7eVmGSX6bEHRBhNtMsJzzoKQm5EWR0zLVznxxIqbxhAe7i
-F6YM40AIOw7n60RzKprxaZLvcRTDOaxxp5EJb+RxBrO6WVcmeQD2+A2iMzAo1KpY
-oJ2daZH9
------END CERTIFICATE-----
-
-# Issuer: CN=GlobalSign Root CA O=GlobalSign nv-sa OU=Root CA
-# Subject: CN=GlobalSign Root CA O=GlobalSign nv-sa OU=Root CA
-# Label: "GlobalSign Root CA"
-# Serial: 4835703278459707669005204
-# MD5 Fingerprint: 3e:45:52:15:09:51:92:e1:b7:5d:37:9f:b1:87:29:8a
-# SHA1 Fingerprint: b1:bc:96:8b:d4:f4:9d:62:2a:a8:9a:81:f2:15:01:52:a4:1d:82:9c
-# SHA256 Fingerprint: eb:d4:10:40:e4:bb:3e:c7:42:c9:e3:81:d3:1e:f2:a4:1a:48:b6:68:5c:96:e7:ce:f3:c1:df:6c:d4:33:1c:99
------BEGIN CERTIFICATE-----
-MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkG
-A1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jv
-b3QgQ0ExGzAZBgNVBAMTEkdsb2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAw
-MDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9i
-YWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYDVQQDExJHbG9iYWxT
-aWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaDuaZ
-jc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavp
-xy0Sy6scTHAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp
-1Wrjsok6Vjk4bwY8iGlbKk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdG
-snUOhugZitVtbNV4FpWi6cgKOOvyJBNPc1STE4U6G7weNLWLBYy5d4ux2x8gkasJ
-U26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrXgzT/LCrBbBlDSgeF59N8
-9iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8E
-BTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0B
-AQUFAAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOz
-yj1hTdNGCbM+w6DjY1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE
-38NflNUVyRRBnMRddWQVDf9VMOyGj/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymP
-AbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhHhm4qxFYxldBniYUr+WymXUad
-DKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveCX4XSQRjbgbME
-HMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==
------END CERTIFICATE-----
-
-# Issuer: CN=GlobalSign O=GlobalSign OU=GlobalSign Root CA - R2
-# Subject: CN=GlobalSign O=GlobalSign OU=GlobalSign Root CA - R2
-# Label: "GlobalSign Root CA - R2"
-# Serial: 4835703278459682885658125
-# MD5 Fingerprint: 94:14:77:7e:3e:5e:fd:8f:30:bd:41:b0:cf:e7:d0:30
-# SHA1 Fingerprint: 75:e0:ab:b6:13:85:12:27:1c:04:f8:5f:dd:de:38:e4:b7:24:2e:fe
-# SHA256 Fingerprint: ca:42:dd:41:74:5f:d0:b8:1e:b9:02:36:2c:f9:d8:bf:71:9d:a1:bd:1b:1e:fc:94:6f:5b:4c:99:f4:2c:1b:9e
------BEGIN CERTIFICATE-----
-MIIDujCCAqKgAwIBAgILBAAAAAABD4Ym5g0wDQYJKoZIhvcNAQEFBQAwTDEgMB4G
-A1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjIxEzARBgNVBAoTCkdsb2JhbFNp
-Z24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMDYxMjE1MDgwMDAwWhcNMjExMjE1
-MDgwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSMjETMBEG
-A1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAKbPJA6+Lm8omUVCxKs+IVSbC9N/hHD6ErPL
-v4dfxn+G07IwXNb9rfF73OX4YJYJkhD10FPe+3t+c4isUoh7SqbKSaZeqKeMWhG8
-eoLrvozps6yWJQeXSpkqBy+0Hne/ig+1AnwblrjFuTosvNYSuetZfeLQBoZfXklq
-tTleiDTsvHgMCJiEbKjNS7SgfQx5TfC4LcshytVsW33hoCmEofnTlEnLJGKRILzd
-C9XZzPnqJworc5HGnRusyMvo4KD0L5CLTfuwNhv2GXqF4G3yYROIXJ/gkwpRl4pa
-zq+r1feqCapgvdzZX99yqWATXgAByUr6P6TqBwMhAo6CygPCm48CAwEAAaOBnDCB
-mTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUm+IH
-V2ccHsBqBt5ZtJot39wZhi4wNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL2NybC5n
-bG9iYWxzaWduLm5ldC9yb290LXIyLmNybDAfBgNVHSMEGDAWgBSb4gdXZxwewGoG
-3lm0mi3f3BmGLjANBgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4Gs
-J0/WwbgcQ3izDJr86iw8bmEbTUsp9Z8FHSbBuOmDAGJFtqkIk7mpM0sYmsL4h4hO
-291xNBrBVNpGP+DTKqttVCL1OmLNIG+6KYnX3ZHu01yiPqFbQfXf5WRDLenVOavS
-ot+3i9DAgBkcRcAtjOj4LaR0VknFBbVPFd5uRHg5h6h+u/N5GJG79G+dwfCMNYxd
-AfvDbbnvRG15RjF+Cv6pgsH/76tuIMRQyV+dTZsXjAzlAcmgQWpzU/qlULRuJQ/7
-TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg==
------END CERTIFICATE-----
-
-# Issuer: CN=http://www.valicert.com/ O=ValiCert, Inc. OU=ValiCert Class 1 Policy Validation Authority
-# Subject: CN=http://www.valicert.com/ O=ValiCert, Inc. OU=ValiCert Class 1 Policy Validation Authority
-# Label: "ValiCert Class 1 VA"
-# Serial: 1
-# MD5 Fingerprint: 65:58:ab:15:ad:57:6c:1e:a8:a7:b5:69:ac:bf:ff:eb
-# SHA1 Fingerprint: e5:df:74:3c:b6:01:c4:9b:98:43:dc:ab:8c:e8:6a:81:10:9f:e4:8e
-# SHA256 Fingerprint: f4:c1:49:55:1a:30:13:a3:5b:c7:bf:fe:17:a7:f3:44:9b:c1:ab:5b:5a:0a:e7:4b:06:c2:3b:90:00:4c:01:04
------BEGIN CERTIFICATE-----
-MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0
-IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz
-BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDEgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y
-aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG
-9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNTIyMjM0OFoXDTE5MDYy
-NTIyMjM0OFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y
-azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
-YXNzIDEgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw
-Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl
-cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDYWYJ6ibiWuqYvaG9Y
-LqdUHAZu9OqNSLwxlBfw8068srg1knaw0KWlAdcAAxIiGQj4/xEjm84H9b9pGib+
-TunRf50sQB1ZaG6m+FiwnRqP0z/x3BkGgagO4DrdyFNFCQbmD3DD+kCmDuJWBQ8Y
-TfwggtFzVXSNdnKgHZ0dwN0/cQIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFBoPUn0
-LBwGlN+VYH+Wexf+T3GtZMjdd9LvWVXoP+iOBSoh8gfStadS/pyxtuJbdxdA6nLW
-I8sogTLDAHkY7FkXicnGah5xyf23dKUlRWnFSKsZ4UWKJWsZ7uW7EvV/96aNUcPw
-nXS3qT6gpf+2SQMT2iLM7XGCK5nPOrf1LXLI
------END CERTIFICATE-----
-
-# Issuer: CN=http://www.valicert.com/ O=ValiCert, Inc. OU=ValiCert Class 2 Policy Validation Authority
-# Subject: CN=http://www.valicert.com/ O=ValiCert, Inc. OU=ValiCert Class 2 Policy Validation Authority
-# Label: "ValiCert Class 2 VA"
-# Serial: 1
-# MD5 Fingerprint: a9:23:75:9b:ba:49:36:6e:31:c2:db:f2:e7:66:ba:87
-# SHA1 Fingerprint: 31:7a:2a:d0:7f:2b:33:5e:f5:a1:c3:4e:4b:57:e8:b7:d8:f1:fc:a6
-# SHA256 Fingerprint: 58:d0:17:27:9c:d4:dc:63:ab:dd:b1:96:a6:c9:90:6c:30:c4:e0:87:83:ea:e8:c1:60:99:54:d6:93:55:59:6b
------BEGIN CERTIFICATE-----
-MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0
-IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz
-BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y
-aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG
-9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAwMTk1NFoXDTE5MDYy
-NjAwMTk1NFowgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y
-azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
-YXNzIDIgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw
-Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl
-cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDOOnHK5avIWZJV16vY
-dA757tn2VUdZZUcOBVXc65g2PFxTXdMwzzjsvUGJ7SVCCSRrCl6zfN1SLUzm1NZ9
-WlmpZdRJEy0kTRxQb7XBhVQ7/nHk01xC+YDgkRoKWzk2Z/M/VXwbP7RfZHM047QS
-v4dk+NoS/zcnwbNDu+97bi5p9wIDAQABMA0GCSqGSIb3DQEBBQUAA4GBADt/UG9v
-UJSZSWI4OB9L+KXIPqeCgfYrx+jFzug6EILLGACOTb2oWH+heQC1u+mNr0HZDzTu
-IYEZoDJJKPTEjlbVUjP9UNV+mWwD5MlM/Mtsq2azSiGM5bUMMj4QssxsodyamEwC
-W/POuZ6lcg5Ktz885hZo+L7tdEy8W9ViH0Pd
------END CERTIFICATE-----
-
-# Issuer: CN=http://www.valicert.com/ O=ValiCert, Inc. OU=ValiCert Class 3 Policy Validation Authority
-# Subject: CN=http://www.valicert.com/ O=ValiCert, Inc. OU=ValiCert Class 3 Policy Validation Authority
-# Label: "RSA Root Certificate 1"
-# Serial: 1
-# MD5 Fingerprint: a2:6f:53:b7:ee:40:db:4a:68:e7:fa:18:d9:10:4b:72
-# SHA1 Fingerprint: 69:bd:8c:f4:9c:d3:00:fb:59:2e:17:93:ca:55:6a:f3:ec:aa:35:fb
-# SHA256 Fingerprint: bc:23:f9:8a:31:3c:b9:2d:e3:bb:fc:3a:5a:9f:44:61:ac:39:49:4c:4a:e1:5a:9e:9d:f1:31:e9:9b:73:01:9a
------BEGIN CERTIFICATE-----
-MIIC5zCCAlACAQEwDQYJKoZIhvcNAQEFBQAwgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0
-IFZhbGlkYXRpb24gTmV0d29yazEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAz
-BgNVBAsTLFZhbGlDZXJ0IENsYXNzIDMgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9y
-aXR5MSEwHwYDVQQDExhodHRwOi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG
-9w0BCQEWEWluZm9AdmFsaWNlcnQuY29tMB4XDTk5MDYyNjAwMjIzM1oXDTE5MDYy
-NjAwMjIzM1owgbsxJDAiBgNVBAcTG1ZhbGlDZXJ0IFZhbGlkYXRpb24gTmV0d29y
-azEXMBUGA1UEChMOVmFsaUNlcnQsIEluYy4xNTAzBgNVBAsTLFZhbGlDZXJ0IENs
-YXNzIDMgUG9saWN5IFZhbGlkYXRpb24gQXV0aG9yaXR5MSEwHwYDVQQDExhodHRw
-Oi8vd3d3LnZhbGljZXJ0LmNvbS8xIDAeBgkqhkiG9w0BCQEWEWluZm9AdmFsaWNl
-cnQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDjmFGWHOjVsQaBalfD
-cnWTq8+epvzzFlLWLU2fNUSoLgRNB0mKOCn1dzfnt6td3zZxFJmP3MKS8edgkpfs
-2Ejcv8ECIMYkpChMMFp2bbFc893enhBxoYjHW5tBbcqwuI4V7q0zK89HBFx1cQqY
-JJgpp0lZpd34t0NiYfPT4tBVPwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFa7AliE
-Zwgs3x/be0kz9dNnnfS0ChCzycUs4pJqcXgn8nCDQtM+z6lU9PHYkhaM0QTLS6vJ
-n0WuPIqpsHEzXcjFV9+vqDWzf4mH6eglkrh/hXqu1rweN1gqZ8mRzyqBPu3GOd/A
-PhmcGcwTTYJBtYze4D1gCCAPRX5ron+jjBXu
------END CERTIFICATE-----
-
-# Issuer: CN=VeriSign Class 3 Public Primary Certification Authority - G3 O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 1999 VeriSign, Inc. - For authorized use only
-# Subject: CN=VeriSign Class 3 Public Primary Certification Authority - G3 O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 1999 VeriSign, Inc. - For authorized use only
-# Label: "Verisign Class 3 Public Primary Certification Authority - G3"
-# Serial: 206684696279472310254277870180966723415
-# MD5 Fingerprint: cd:68:b6:a7:c7:c4:ce:75:e0:1d:4f:57:44:61:92:09
-# SHA1 Fingerprint: 13:2d:0d:45:53:4b:69:97:cd:b2:d5:c3:39:e2:55:76:60:9b:5c:c6
-# SHA256 Fingerprint: eb:04:cf:5e:b1:f3:9a:fa:76:2f:2b:b1:20:f2:96:cb:a5:20:c1:b9:7d:b1:58:95:65:b8:1c:b9:a1:7b:72:44
------BEGIN CERTIFICATE-----
-MIIEGjCCAwICEQCbfgZJoz5iudXukEhxKe9XMA0GCSqGSIb3DQEBBQUAMIHKMQsw
-CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl
-cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu
-LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT
-aWduIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
-dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD
-VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT
-aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ
-bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu
-IENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
-LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMu6nFL8eB8aHm8b
-N3O9+MlrlBIwT/A2R/XQkQr1F8ilYcEWQE37imGQ5XYgwREGfassbqb1EUGO+i2t
-KmFZpGcmTNDovFJbcCAEWNF6yaRpvIMXZK0Fi7zQWM6NjPXr8EJJC52XJ2cybuGu
-kxUccLwgTS8Y3pKI6GyFVxEa6X7jJhFUokWWVYPKMIno3Nij7SqAP395ZVc+FSBm
-CC+Vk7+qRy+oRpfwEuL+wgorUeZ25rdGt+INpsyow0xZVYnm6FNcHOqd8GIWC6fJ
-Xwzw3sJ2zq/3avL6QaaiMxTJ5Xpj055iN9WFZZ4O5lMkdBteHRJTW8cs54NJOxWu
-imi5V5cCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAERSWwauSCPc/L8my/uRan2Te
-2yFPhpk0djZX3dAVL8WtfxUfN2JzPtTnX84XA9s1+ivbrmAJXx5fj267Cz3qWhMe
-DGBvtcC1IyIuBwvLqXTLR7sdwdela8wv0kL9Sd2nic9TutoAWii/gt/4uhMdUIaC
-/Y4wjylGsB49Ndo4YhYYSq3mtlFs3q9i6wHQHiT+eo8SGhJouPtmmRQURVyu565p
-F4ErWjfJXir0xuKhXFSbplQAz/DxwceYMBo7Nhbbo27q/a2ywtrvAkcTisDxszGt
-TxzhT5yvDwyd93gN2PQ1VoDat20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ==
------END CERTIFICATE-----
-
-# Issuer: CN=VeriSign Class 4 Public Primary Certification Authority - G3 O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 1999 VeriSign, Inc. - For authorized use only
-# Subject: CN=VeriSign Class 4 Public Primary Certification Authority - G3 O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 1999 VeriSign, Inc. - For authorized use only
-# Label: "Verisign Class 4 Public Primary Certification Authority - G3"
-# Serial: 314531972711909413743075096039378935511
-# MD5 Fingerprint: db:c8:f2:27:2e:b1:ea:6a:29:23:5d:fe:56:3e:33:df
-# SHA1 Fingerprint: c8:ec:8c:87:92:69:cb:4b:ab:39:e9:8d:7e:57:67:f3:14:95:73:9d
-# SHA256 Fingerprint: e3:89:36:0d:0f:db:ae:b3:d2:50:58:4b:47:30:31:4e:22:2f:39:c1:56:a0:20:14:4e:8d:96:05:61:79:15:06
------BEGIN CERTIFICATE-----
-MIIEGjCCAwICEQDsoKeLbnVqAc/EfMwvlF7XMA0GCSqGSIb3DQEBBQUAMIHKMQsw
-CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl
-cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu
-LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT
-aWduIENsYXNzIDQgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
-dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD
-VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT
-aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ
-bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu
-IENsYXNzIDQgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
-LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK3LpRFpxlmr8Y+1
-GQ9Wzsy1HyDkniYlS+BzZYlZ3tCD5PUPtbut8XzoIfzk6AzufEUiGXaStBO3IFsJ
-+mGuqPKljYXCKtbeZjbSmwL0qJJgfJxptI8kHtCGUvYynEFYHiK9zUVilQhu0Gbd
-U6LM8BDcVHOLBKFGMzNcF0C5nk3T875Vg+ixiY5afJqWIpA7iCXy0lOIAgwLePLm
-NxdLMEYH5IBtptiWLugs+BGzOA1mppvqySNb247i8xOOGlktqgLw7KSHZtzBP/XY
-ufTsgsbSPZUd5cBPhMnZo0QoBmrXRazwa2rvTl/4EYIeOGM0ZlDUPpNz+jDDZq3/
-ky2X7wMCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAj/ola09b5KROJ1WrIhVZPMq1
-CtRK26vdoV9TxaBXOcLORyu+OshWv8LZJxA6sQU8wHcxuzrTBXttmhwwjIDLk5Mq
-g6sFUYICABFna/OIYUdfA5PVWw3g8dShMjWFsjrbsIKr0csKvE+MW8VLADsfKoKm
-fjaF3H48ZwC15DtS4KjrXRX5xm3wrR0OhbepmnMUWluPQSjA1egtTaRezarZ7c7c
-2NU8Qh0XwRJdRTjDOPP8hS6DRkiy1yBfkjaP53kPmF6Z6PDQpLv1U70qzlmwr25/
-bLvSHgCwIe34QWKCudiyxLtGUPMxxY8BqHTr9Xgn2uf3ZkPznoM+IKrDNWCRzg==
------END CERTIFICATE-----
-
-# Issuer: CN=Entrust.net Secure Server Certification Authority O=Entrust.net OU=www.entrust.net/CPS incorp. by ref. (limits liab.)/(c) 1999 Entrust.net Limited
-# Subject: CN=Entrust.net Secure Server Certification Authority O=Entrust.net OU=www.entrust.net/CPS incorp. by ref. (limits liab.)/(c) 1999 Entrust.net Limited
-# Label: "Entrust.net Secure Server CA"
-# Serial: 927650371
-# MD5 Fingerprint: df:f2:80:73:cc:f1:e6:61:73:fc:f5:42:e9:c5:7c:ee
-# SHA1 Fingerprint: 99:a6:9b:e6:1a:fe:88:6b:4d:2b:82:00:7c:b8:54:fc:31:7e:15:39
-# SHA256 Fingerprint: 62:f2:40:27:8c:56:4c:4d:d8:bf:7d:9d:4f:6f:36:6e:a8:94:d2:2f:5f:34:d9:89:a9:83:ac:ec:2f:ff:ed:50
------BEGIN CERTIFICATE-----
-MIIE2DCCBEGgAwIBAgIEN0rSQzANBgkqhkiG9w0BAQUFADCBwzELMAkGA1UEBhMC
-VVMxFDASBgNVBAoTC0VudHJ1c3QubmV0MTswOQYDVQQLEzJ3d3cuZW50cnVzdC5u
-ZXQvQ1BTIGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTElMCMGA1UECxMc
-KGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDE6MDgGA1UEAxMxRW50cnVzdC5u
-ZXQgU2VjdXJlIFNlcnZlciBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw05OTA1
-MjUxNjA5NDBaFw0xOTA1MjUxNjM5NDBaMIHDMQswCQYDVQQGEwJVUzEUMBIGA1UE
-ChMLRW50cnVzdC5uZXQxOzA5BgNVBAsTMnd3dy5lbnRydXN0Lm5ldC9DUFMgaW5j
-b3JwLiBieSByZWYuIChsaW1pdHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBF
-bnRydXN0Lm5ldCBMaW1pdGVkMTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUg
-U2VydmVyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGdMA0GCSqGSIb3DQEBAQUA
-A4GLADCBhwKBgQDNKIM0VBuJ8w+vN5Ex/68xYMmo6LIQaO2f55M28Qpku0f1BBc/
-I0dNxScZgSYMVHINiC3ZH5oSn7yzcdOAGT9HZnuMNSjSuQrfJNqc1lB5gXpa0zf3
-wkrYKZImZNHkmGw6AIr1NJtl+O3jEP/9uElY3KDegjlrgbEWGWG5VLbmQwIBA6OC
-AdcwggHTMBEGCWCGSAGG+EIBAQQEAwIABzCCARkGA1UdHwSCARAwggEMMIHeoIHb
-oIHYpIHVMIHSMQswCQYDVQQGEwJVUzEUMBIGA1UEChMLRW50cnVzdC5uZXQxOzA5
-BgNVBAsTMnd3dy5lbnRydXN0Lm5ldC9DUFMgaW5jb3JwLiBieSByZWYuIChsaW1p
-dHMgbGlhYi4pMSUwIwYDVQQLExwoYykgMTk5OSBFbnRydXN0Lm5ldCBMaW1pdGVk
-MTowOAYDVQQDEzFFbnRydXN0Lm5ldCBTZWN1cmUgU2VydmVyIENlcnRpZmljYXRp
-b24gQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMCmgJ6AlhiNodHRwOi8vd3d3LmVu
-dHJ1c3QubmV0L0NSTC9uZXQxLmNybDArBgNVHRAEJDAigA8xOTk5MDUyNTE2MDk0
-MFqBDzIwMTkwNTI1MTYwOTQwWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAU8Bdi
-E1U9s/8KAGv7UISX8+1i0BowHQYDVR0OBBYEFPAXYhNVPbP/CgBr+1CEl/PtYtAa
-MAwGA1UdEwQFMAMBAf8wGQYJKoZIhvZ9B0EABAwwChsEVjQuMAMCBJAwDQYJKoZI
-hvcNAQEFBQADgYEAkNwwAvpkdMKnCqV8IY00F6j7Rw7/JXyNEwr75Ji174z4xRAN
-95K+8cPV1ZVqBLssziY2ZcgxxufuP+NXdYR6Ee9GTxj005i7qIcyunL2POI9n9cd
-2cNgQ4xYDiKWL2KjLB+6rQXvqzJ4h6BUcxm1XAX5Uj5tLUUL9wqT6u0G+bI=
------END CERTIFICATE-----
-
-# Issuer: CN=Entrust.net Certification Authority (2048) O=Entrust.net OU=www.entrust.net/CPS_2048 incorp. by ref. (limits liab.)/(c) 1999 Entrust.net Limited
-# Subject: CN=Entrust.net Certification Authority (2048) O=Entrust.net OU=www.entrust.net/CPS_2048 incorp. by ref. (limits liab.)/(c) 1999 Entrust.net Limited
-# Label: "Entrust.net Premium 2048 Secure Server CA"
-# Serial: 946069240
-# MD5 Fingerprint: ee:29:31:bc:32:7e:9a:e6:e8:b5:f7:51:b4:34:71:90
-# SHA1 Fingerprint: 50:30:06:09:1d:97:d4:f5:ae:39:f7:cb:e7:92:7d:7d:65:2d:34:31
-# SHA256 Fingerprint: 6d:c4:71:72:e0:1c:bc:b0:bf:62:58:0d:89:5f:e2:b8:ac:9a:d4:f8:73:80:1e:0c:10:b9:c8:37:d2:1e:b1:77
------BEGIN CERTIFICATE-----
-MIIEKjCCAxKgAwIBAgIEOGPe+DANBgkqhkiG9w0BAQUFADCBtDEUMBIGA1UEChML
-RW50cnVzdC5uZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9DUFNfMjA0OCBp
-bmNvcnAuIGJ5IHJlZi4gKGxpbWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAxOTk5
-IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNVBAMTKkVudHJ1c3QubmV0IENlcnRp
-ZmljYXRpb24gQXV0aG9yaXR5ICgyMDQ4KTAeFw05OTEyMjQxNzUwNTFaFw0yOTA3
-MjQxNDE1MTJaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3d3d3
-LmVudHJ1c3QubmV0L0NQU18yMDQ4IGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxp
-YWIuKTElMCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEG
-A1UEAxMqRW50cnVzdC5uZXQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgKDIwNDgp
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArU1LqRKGsuqjIAcVFmQq
-K0vRvwtKTY7tgHalZ7d4QMBzQshowNtTK91euHaYNZOLGp18EzoOH1u3Hs/lJBQe
-sYGpjX24zGtLA/ECDNyrpUAkAH90lKGdCCmziAv1h3edVc3kw37XamSrhRSGlVuX
-MlBvPci6Zgzj/L24ScF2iUkZ/cCovYmjZy/Gn7xxGWC4LeksyZB2ZnuU4q941mVT
-XTzWnLLPKQP5L6RQstRIzgUyVYr9smRMDuSYB3Xbf9+5CFVghTAp+XtIpGmG4zU/
-HoZdenoVve8AjhUiVBcAkCaTvA5JaJG/+EfTnZVCwQ5N328mz8MYIWJmQ3DW1cAH
-4QIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNV
-HQ4EFgQUVeSB0RGAvtiJuQijMfmhJAkWuXAwDQYJKoZIhvcNAQEFBQADggEBADub
-j1abMOdTmXx6eadNl9cZlZD7Bh/KM3xGY4+WZiT6QBshJ8rmcnPyT/4xmf3IDExo
-U8aAghOY+rat2l098c5u9hURlIIM7j+VrxGrD9cv3h8Dj1csHsm7mhpElesYT6Yf
-zX1XEC+bBAlahLVu2B064dae0Wx5XnkcFMXj0EyTO2U87d89vqbllRrDtRnDvV5b
-u/8j72gZyxKTJ1wDLW8w0B62GqzeWvfRqqgnpv55gcR5mTNXuhKwqeBCbJPKVt7+
-bYQLCIt+jerXmCHG8+c8eS9enNFMFY3h7CI3zJpDC5fcgJCNs2ebb0gIFVbPv/Er
-fF6adulZkMV8gzURZVE=
------END CERTIFICATE-----
-
-# Issuer: CN=Baltimore CyberTrust Root O=Baltimore OU=CyberTrust
-# Subject: CN=Baltimore CyberTrust Root O=Baltimore OU=CyberTrust
-# Label: "Baltimore CyberTrust Root"
-# Serial: 33554617
-# MD5 Fingerprint: ac:b6:94:a5:9c:17:e0:d7:91:52:9b:b1:97:06:a6:e4
-# SHA1 Fingerprint: d4:de:20:d0:5e:66:fc:53:fe:1a:50:88:2c:78:db:28:52:ca:e4:74
-# SHA256 Fingerprint: 16:af:57:a9:f6:76:b0:ab:12:60:95:aa:5e:ba:de:f2:2a:b3:11:19:d6:44:ac:95:cd:4b:93:db:f3:f2:6a:eb
------BEGIN CERTIFICATE-----
-MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJ
-RTESMBAGA1UEChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYD
-VQQDExlCYWx0aW1vcmUgQ3liZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoX
-DTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMCSUUxEjAQBgNVBAoTCUJhbHRpbW9y
-ZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFsdGltb3JlIEN5YmVy
-VHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKMEuyKr
-mD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjr
-IZ3AQSsBUnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeK
-mpYcqWe4PwzV9/lSEy/CG9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSu
-XmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9XbIGevOF6uvUA65ehD5f/xXtabz5OTZy
-dc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjprl3RjM71oGDHweI12v/ye
-jl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoIVDaGezq1
-BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3
-DQEBBQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT92
-9hkTI7gQCvlYpNRhcL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3Wgx
-jkzSswF07r51XgdIGn9w/xZchMB5hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0
-Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsaY71k5h+3zvDyny67G7fyUIhz
-ksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9HRCwBXbsdtTLS
-R9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp
------END CERTIFICATE-----
-
-# Issuer: CN=Equifax Secure Global eBusiness CA-1 O=Equifax Secure Inc.
-# Subject: CN=Equifax Secure Global eBusiness CA-1 O=Equifax Secure Inc.
-# Label: "Equifax Secure Global eBusiness CA"
-# Serial: 1
-# MD5 Fingerprint: 8f:5d:77:06:27:c4:98:3c:5b:93:78:e7:d7:7d:9b:cc
-# SHA1 Fingerprint: 7e:78:4a:10:1c:82:65:cc:2d:e1:f1:6d:47:b4:40:ca:d9:0a:19:45
-# SHA256 Fingerprint: 5f:0b:62:ea:b5:e3:53:ea:65:21:65:16:58:fb:b6:53:59:f4:43:28:0a:4a:fb:d1:04:d7:7d:10:f9:f0:4c:07
------BEGIN CERTIFICATE-----
-MIICkDCCAfmgAwIBAgIBATANBgkqhkiG9w0BAQQFADBaMQswCQYDVQQGEwJVUzEc
-MBoGA1UEChMTRXF1aWZheCBTZWN1cmUgSW5jLjEtMCsGA1UEAxMkRXF1aWZheCBT
-ZWN1cmUgR2xvYmFsIGVCdXNpbmVzcyBDQS0xMB4XDTk5MDYyMTA0MDAwMFoXDTIw
-MDYyMTA0MDAwMFowWjELMAkGA1UEBhMCVVMxHDAaBgNVBAoTE0VxdWlmYXggU2Vj
-dXJlIEluYy4xLTArBgNVBAMTJEVxdWlmYXggU2VjdXJlIEdsb2JhbCBlQnVzaW5l
-c3MgQ0EtMTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAuucXkAJlsTRVPEnC
-UdXfp9E3j9HngXNBUmCbnaEXJnitx7HoJpQytd4zjTov2/KaelpzmKNc6fuKcxtc
-58O/gGzNqfTWK8D3+ZmqY6KxRwIP1ORROhI8bIpaVIRw28HFkM9yRcuoWcDNM50/
-o5brhTMhHD4ePmBudpxnhcXIw2ECAwEAAaNmMGQwEQYJYIZIAYb4QgEBBAQDAgAH
-MA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUvqigdHJQa0S3ySPY+6j/s1dr
-aGwwHQYDVR0OBBYEFL6ooHRyUGtEt8kj2Puo/7NXa2hsMA0GCSqGSIb3DQEBBAUA
-A4GBADDiAVGqx+pf2rnQZQ8w1j7aDRRJbpGTJxQx78T3LUX47Me/okENI7SS+RkA
-Z70Br83gcfxaz2TE4JaY0KNA4gGK7ycH8WUBikQtBmV1UsCGECAhX2xrD2yuCRyv
-8qIYNMR1pHMc8Y3c7635s3a0kr/clRAevsvIO1qEYBlWlKlV
------END CERTIFICATE-----
-
-# Issuer: CN=Equifax Secure eBusiness CA-1 O=Equifax Secure Inc.
-# Subject: CN=Equifax Secure eBusiness CA-1 O=Equifax Secure Inc.
-# Label: "Equifax Secure eBusiness CA 1"
-# Serial: 4
-# MD5 Fingerprint: 64:9c:ef:2e:44:fc:c6:8f:52:07:d0:51:73:8f:cb:3d
-# SHA1 Fingerprint: da:40:18:8b:91:89:a3:ed:ee:ae:da:97:fe:2f:9d:f5:b7:d1:8a:41
-# SHA256 Fingerprint: cf:56:ff:46:a4:a1:86:10:9d:d9:65:84:b5:ee:b5:8a:51:0c:42:75:b0:e5:f9:4f:40:bb:ae:86:5e:19:f6:73
------BEGIN CERTIFICATE-----
-MIICgjCCAeugAwIBAgIBBDANBgkqhkiG9w0BAQQFADBTMQswCQYDVQQGEwJVUzEc
-MBoGA1UEChMTRXF1aWZheCBTZWN1cmUgSW5jLjEmMCQGA1UEAxMdRXF1aWZheCBT
-ZWN1cmUgZUJ1c2luZXNzIENBLTEwHhcNOTkwNjIxMDQwMDAwWhcNMjAwNjIxMDQw
-MDAwWjBTMQswCQYDVQQGEwJVUzEcMBoGA1UEChMTRXF1aWZheCBTZWN1cmUgSW5j
-LjEmMCQGA1UEAxMdRXF1aWZheCBTZWN1cmUgZUJ1c2luZXNzIENBLTEwgZ8wDQYJ
-KoZIhvcNAQEBBQADgY0AMIGJAoGBAM4vGbwXt3fek6lfWg0XTzQaDJj0ItlZ1MRo
-RvC0NcWFAyDGr0WlIVFFQesWWDYyb+JQYmT5/VGcqiTZ9J2DKocKIdMSODRsjQBu
-WqDZQu4aIZX5UkxVWsUPOE9G+m34LjXWHXzr4vCwdYDIqROsvojvOm6rXyo4YgKw
-Env+j6YDAgMBAAGjZjBkMBEGCWCGSAGG+EIBAQQEAwIABzAPBgNVHRMBAf8EBTAD
-AQH/MB8GA1UdIwQYMBaAFEp4MlIR21kWNl7fwRQ2QGpHfEyhMB0GA1UdDgQWBBRK
-eDJSEdtZFjZe38EUNkBqR3xMoTANBgkqhkiG9w0BAQQFAAOBgQB1W6ibAxHm6VZM
-zfmpTMANmvPMZWnmJXbMWbfWVMMdzZmsGd20hdXgPfxiIKeES1hl8eL5lSE/9dR+
-WB5Hh1Q+WKG1tfgq73HnvMP2sUlG4tega+VWeponmHxGYhTnyfxuAxJ5gDgdSIKN
-/Bf+KpYrtWKmpj29f5JZzVoqgrI3eQ==
------END CERTIFICATE-----
-
-# Issuer: CN=AddTrust Class 1 CA Root O=AddTrust AB OU=AddTrust TTP Network
-# Subject: CN=AddTrust Class 1 CA Root O=AddTrust AB OU=AddTrust TTP Network
-# Label: "AddTrust Low-Value Services Root"
-# Serial: 1
-# MD5 Fingerprint: 1e:42:95:02:33:92:6b:b9:5f:c0:7f:da:d6:b2:4b:fc
-# SHA1 Fingerprint: cc:ab:0e:a0:4c:23:01:d6:69:7b:dd:37:9f:cd:12:eb:24:e3:94:9d
-# SHA256 Fingerprint: 8c:72:09:27:9a:c0:4e:27:5e:16:d0:7f:d3:b7:75:e8:01:54:b5:96:80:46:e3:1f:52:dd:25:76:63:24:e9:a7
------BEGIN CERTIFICATE-----
-MIIEGDCCAwCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJTRTEU
-MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3
-b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwHhcNMDAwNTMw
-MTAzODMxWhcNMjAwNTMwMTAzODMxWjBlMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
-QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYD
-VQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQCWltQhSWDia+hBBwzexODcEyPNwTXH+9ZOEQpnXvUGW2ul
-CDtbKRY654eyNAbFvAWlA3yCyykQruGIgb3WntP+LVbBFc7jJp0VLhD7Bo8wBN6n
-tGO0/7Gcrjyvd7ZWxbWroulpOj0OM3kyP3CCkplhbY0wCI9xP6ZIVxn4JdxLZlyl
-dI+Yrsj5wAYi56xz36Uu+1LcsRVlIPo1Zmne3yzxbrww2ywkEtvrNTVokMsAsJch
-PXQhI2U0K7t4WaPW4XY5mqRJjox0r26kmqPZm9I4XJuiGMx1I4S+6+JNM3GOGvDC
-+Mcdoq0Dlyz4zyXG9rgkMbFjXZJ/Y/AlyVMuH79NAgMBAAGjgdIwgc8wHQYDVR0O
-BBYEFJWxtPCUtr3H2tERCSG+wa9J/RB7MAsGA1UdDwQEAwIBBjAPBgNVHRMBAf8E
-BTADAQH/MIGPBgNVHSMEgYcwgYSAFJWxtPCUtr3H2tERCSG+wa9J/RB7oWmkZzBl
-MQswCQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFk
-ZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENB
-IFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBACxtZBsfzQ3duQH6lmM0MkhHma6X
-7f1yFqZzR1r0693p9db7RcwpiURdv0Y5PejuvE1Uhh4dbOMXJ0PhiVYrqW9yTkkz
-43J8KiOavD7/KCrto/8cI7pDVwlnTUtiBi34/2ydYB7YHEt9tTEv2dB8Xfjea4MY
-eDdXL+gzB2ffHsdrKpV2ro9Xo/D0UrSpUwjP4E/TelOL/bscVjby/rK25Xa71SJl
-pz/+0WatC7xrmYbvP33zGDLKe8bjq2RGlfgmadlVg3sslgf/WSxEo8bl6ancoWOA
-WiFeIc9TVPC6b4nbqKqVz4vjccweGyBECMB6tkD9xOQ14R0WHNC8K47Wcdk=
------END CERTIFICATE-----
-
-# Issuer: CN=AddTrust External CA Root O=AddTrust AB OU=AddTrust External TTP Network
-# Subject: CN=AddTrust External CA Root O=AddTrust AB OU=AddTrust External TTP Network
-# Label: "AddTrust External Root"
-# Serial: 1
-# MD5 Fingerprint: 1d:35:54:04:85:78:b0:3f:42:42:4d:bf:20:73:0a:3f
-# SHA1 Fingerprint: 02:fa:f3:e2:91:43:54:68:60:78:57:69:4d:f5:e4:5b:68:85:18:68
-# SHA256 Fingerprint: 68:7f:a4:51:38:22:78:ff:f0:c8:b1:1f:8d:43:d5:76:67:1c:6e:b2:bc:ea:b4:13:fb:83:d9:65:d0:6d:2f:f2
------BEGIN CERTIFICATE-----
-MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEU
-MBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFs
-IFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290
-MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFowbzELMAkGA1UEBhMCU0Ux
-FDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRUcnVzdCBFeHRlcm5h
-bCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0EgUm9v
-dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvt
-H7xsD821+iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9
-uMq/NzgtHj6RQa1wVsfwTz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzX
-mk6vBbOmcZSccbNQYArHE504B4YCqOmoaSYYkKtMsE8jqzpPhNjfzp/haW+710LX
-a0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy2xSoRcRdKn23tNbE7qzN
-E0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv77+ldU9U0
-WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYD
-VR0PBAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0
-Jvf6xCZU7wO94CTLVBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRU
-cnVzdCBBQjEmMCQGA1UECxMdQWRkVHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsx
-IjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENBIFJvb3SCAQEwDQYJKoZIhvcN
-AQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZlj7DYd7usQWxH
-YINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5
-6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvC
-Nr4TDea9Y355e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEX
-c4g/VhsxOBi0cQ+azcgOno4uG+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5a
-mnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
------END CERTIFICATE-----
-
-# Issuer: CN=AddTrust Public CA Root O=AddTrust AB OU=AddTrust TTP Network
-# Subject: CN=AddTrust Public CA Root O=AddTrust AB OU=AddTrust TTP Network
-# Label: "AddTrust Public Services Root"
-# Serial: 1
-# MD5 Fingerprint: c1:62:3e:23:c5:82:73:9c:03:59:4b:2b:e9:77:49:7f
-# SHA1 Fingerprint: 2a:b6:28:48:5e:78:fb:f3:ad:9e:79:10:dd:6b:df:99:72:2c:96:e5
-# SHA256 Fingerprint: 07:91:ca:07:49:b2:07:82:aa:d3:c7:d7:bd:0c:df:c9:48:58:35:84:3e:b2:d7:99:60:09:ce:43:ab:6c:69:27
------BEGIN CERTIFICATE-----
-MIIEFTCCAv2gAwIBAgIBATANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJTRTEU
-MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3
-b3JrMSAwHgYDVQQDExdBZGRUcnVzdCBQdWJsaWMgQ0EgUm9vdDAeFw0wMDA1MzAx
-MDQxNTBaFw0yMDA1MzAxMDQxNTBaMGQxCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtB
-ZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQIE5ldHdvcmsxIDAeBgNV
-BAMTF0FkZFRydXN0IFB1YmxpYyBDQSBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA6Rowj4OIFMEg2Dybjxt+A3S72mnTRqX4jsIMEZBRpS9mVEBV
-6tsfSlbunyNu9DnLoblv8n75XYcmYZ4c+OLspoH4IcUkzBEMP9smcnrHAZcHF/nX
-GCwwfQ56HmIexkvA/X1id9NEHif2P0tEs7c42TkfYNVRknMDtABp4/MUTu7R3AnP
-dzRGULD4EfL+OHn3Bzn+UZKXC1sIXzSGAa2Il+tmzV7R/9x98oTaunet3IAIx6eH
-1lWfl2royBFkuucZKT8Rs3iQhCBSWxHveNCD9tVIkNAwHM+A+WD+eeSI8t0A65RF
-62WUaUC6wNW0uLp9BBGo6zEFlpROWCGOn9Bg/QIDAQABo4HRMIHOMB0GA1UdDgQW
-BBSBPjfYkrAfd59ctKtzquf2NGAv+jALBgNVHQ8EBAMCAQYwDwYDVR0TAQH/BAUw
-AwEB/zCBjgYDVR0jBIGGMIGDgBSBPjfYkrAfd59ctKtzquf2NGAv+qFopGYwZDEL
-MAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQLExRBZGRU
-cnVzdCBUVFAgTmV0d29yazEgMB4GA1UEAxMXQWRkVHJ1c3QgUHVibGljIENBIFJv
-b3SCAQEwDQYJKoZIhvcNAQEFBQADggEBAAP3FUr4JNojVhaTdt02KLmuG7jD8WS6
-IBh4lSknVwW8fCr0uVFV2ocC3g8WFzH4qnkuCRO7r7IgGRLlk/lL+YPoRNWyQSW/
-iHVv/xD8SlTQX/D67zZzfRs2RcYhbbQVuE7PnFylPVoAjgbjPGsye/Kf8Lb93/Ao
-GEjwxrzQvzSAlsJKsW2Ox5BF3i9nrEUEo3rcVZLJR2bYGozH7ZxOmuASu7VqTITh
-4SINhwBk/ox9Yjllpu9CtoAlEmEBqCQTcAARJl/6NVDFSMwGR+gn2HCNX2TmoUQm
-XiLsks3/QppEIW1cxeMiHV9HEufOX1362KqxMy3ZdvJOOjMMK7MtkAY=
------END CERTIFICATE-----
-
-# Issuer: CN=AddTrust Qualified CA Root O=AddTrust AB OU=AddTrust TTP Network
-# Subject: CN=AddTrust Qualified CA Root O=AddTrust AB OU=AddTrust TTP Network
-# Label: "AddTrust Qualified Certificates Root"
-# Serial: 1
-# MD5 Fingerprint: 27:ec:39:47:cd:da:5a:af:e2:9a:01:65:21:a9:4c:bb
-# SHA1 Fingerprint: 4d:23:78:ec:91:95:39:b5:00:7f:75:8f:03:3b:21:1e:c5:4d:8b:cf
-# SHA256 Fingerprint: 80:95:21:08:05:db:4b:bc:35:5e:44:28:d8:fd:6e:c2:cd:e3:ab:5f:b9:7a:99:42:98:8e:b8:f4:dc:d0:60:16
------BEGIN CERTIFICATE-----
-MIIEHjCCAwagAwIBAgIBATANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJTRTEU
-MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3
-b3JrMSMwIQYDVQQDExpBZGRUcnVzdCBRdWFsaWZpZWQgQ0EgUm9vdDAeFw0wMDA1
-MzAxMDQ0NTBaFw0yMDA1MzAxMDQ0NTBaMGcxCzAJBgNVBAYTAlNFMRQwEgYDVQQK
-EwtBZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQIE5ldHdvcmsxIzAh
-BgNVBAMTGkFkZFRydXN0IFF1YWxpZmllZCBDQSBSb290MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEA5B6a/twJWoekn0e+EV+vhDTbYjx5eLfpMLXsDBwq
-xBb/4Oxx64r1EW7tTw2R0hIYLUkVAcKkIhPHEWT/IhKauY5cLwjPcWqzZwFZ8V1G
-87B4pfYOQnrjfxvM0PC3KP0q6p6zsLkEqv32x7SxuCqg+1jxGaBvcCV+PmlKfw8i
-2O+tCBGaKZnhqkRFmhJePp1tUvznoD1oL/BLcHwTOK28FSXx1s6rosAx1i+f4P8U
-WfyEk9mHfExUE+uf0S0R+Bg6Ot4l2ffTQO2kBhLEO+GRwVY18BTcZTYJbqukB8c1
-0cIDMzZbdSZtQvESa0NvS3GU+jQd7RNuyoB/mC9suWXY6QIDAQABo4HUMIHRMB0G
-A1UdDgQWBBQ5lYtii1zJ1IC6WA+XPxUIQ8yYpzALBgNVHQ8EBAMCAQYwDwYDVR0T
-AQH/BAUwAwEB/zCBkQYDVR0jBIGJMIGGgBQ5lYtii1zJ1IC6WA+XPxUIQ8yYp6Fr
-pGkwZzELMAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQL
-ExRBZGRUcnVzdCBUVFAgTmV0d29yazEjMCEGA1UEAxMaQWRkVHJ1c3QgUXVhbGlm
-aWVkIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBABmrder4i2VhlRO6aQTv
-hsoToMeqT2QbPxj2qC0sVY8FtzDqQmodwCVRLae/DLPt7wh/bDxGGuoYQ992zPlm
-hpwsaPXpF/gxsxjE1kh9I0xowX67ARRvxdlu3rsEQmr49lx95dr6h+sNNVJn0J6X
-dgWTP5XHAeZpVTh/EGGZyeNfpso+gmNIquIISD6q8rKFYqa0p9m9N5xotS1WfbC3
-P6CxB9bpT9zeRXEwMn8bLgn5v1Kh7sKAPgZcLlVAwRv1cEWw3F369nJad9Jjzc9Y
-iQBCYz95OdBEsIJuQRno3eDBiFrRHnGTHyQwdOUeqN48Jzd/g66ed8/wMLH/S5no
-xqE=
------END CERTIFICATE-----
-
-# Issuer: CN=Entrust Root Certification Authority O=Entrust, Inc. OU=www.entrust.net/CPS is incorporated by reference/(c) 2006 Entrust, Inc.
-# Subject: CN=Entrust Root Certification Authority O=Entrust, Inc. OU=www.entrust.net/CPS is incorporated by reference/(c) 2006 Entrust, Inc.
-# Label: "Entrust Root Certification Authority"
-# Serial: 1164660820
-# MD5 Fingerprint: d6:a5:c3:ed:5d:dd:3e:00:c1:3d:87:92:1f:1d:3f:e4
-# SHA1 Fingerprint: b3:1e:b1:b7:40:e3:6c:84:02:da:dc:37:d4:4d:f5:d4:67:49:52:f9
-# SHA256 Fingerprint: 73:c1:76:43:4f:1b:c6:d5:ad:f4:5b:0e:76:e7:27:28:7c:8d:e5:76:16:c1:e6:e6:14:1a:2b:2c:bc:7d:8e:4c
------BEGIN CERTIFICATE-----
-MIIEkTCCA3mgAwIBAgIERWtQVDANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMC
-VVMxFjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xOTA3BgNVBAsTMHd3dy5lbnRydXN0
-Lm5ldC9DUFMgaXMgaW5jb3Jwb3JhdGVkIGJ5IHJlZmVyZW5jZTEfMB0GA1UECxMW
-KGMpIDIwMDYgRW50cnVzdCwgSW5jLjEtMCsGA1UEAxMkRW50cnVzdCBSb290IENl
-cnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA2MTEyNzIwMjM0MloXDTI2MTEyNzIw
-NTM0MlowgbAxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMTkw
-NwYDVQQLEzB3d3cuZW50cnVzdC5uZXQvQ1BTIGlzIGluY29ycG9yYXRlZCBieSBy
-ZWZlcmVuY2UxHzAdBgNVBAsTFihjKSAyMDA2IEVudHJ1c3QsIEluYy4xLTArBgNV
-BAMTJEVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBALaVtkNC+sZtKm9I35RMOVcF7sN5EUFo
-Nu3s/poBj6E4KPz3EEZmLk0eGrEaTsbRwJWIsMn/MYszA9u3g3s+IIRe7bJWKKf4
-4LlAcTfFy0cOlypowCKVYhXbR9n10Cv/gkvJrT7eTNuQgFA/CYqEAOwwCj0Yzfv9
-KlmaI5UXLEWeH25DeW0MXJj+SKfFI0dcXv1u5x609mhF0YaDW6KKjbHjKYD+JXGI
-rb68j6xSlkuqUY3kEzEZ6E5Nn9uss2rVvDlUccp6en+Q3X0dgNmBu1kmwhH+5pPi
-94DkZfs0Nw4pgHBNrziGLp5/V6+eF67rHMsoIV+2HNjnogQi+dPa2MsCAwEAAaOB
-sDCBrTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zArBgNVHRAEJDAi
-gA8yMDA2MTEyNzIwMjM0MlqBDzIwMjYxMTI3MjA1MzQyWjAfBgNVHSMEGDAWgBRo
-kORnpKZTgMeGZqTx90tD+4S9bTAdBgNVHQ4EFgQUaJDkZ6SmU4DHhmak8fdLQ/uE
-vW0wHQYJKoZIhvZ9B0EABBAwDhsIVjcuMTo0LjADAgSQMA0GCSqGSIb3DQEBBQUA
-A4IBAQCT1DCw1wMgKtD5Y+iRDAUgqV8ZyntyTtSx29CW+1RaGSwMCPeyvIWonX9t
-O1KzKtvn1ISMY/YPyyYBkVBs9F8U4pN0wBOeMDpQ47RgxRzwIkSNcUesyBrJ6Zua
-AGAT/3B+XxFNSRuzFVJ7yVTav52Vr2ua2J7p8eRDjeIRRDq/r72DQnNSi6q7pynP
-9WQcCk3RvKqsnyrQ/39/2n3qse0wJcGE2jTSW3iDVuycNsMm4hH2Z0kdkquM++v/
-eu6FSqdQgPCnXEqULl8FmTxSQeDNtGPPAUO6nIPcj2A781q0tHuu2guQOHXvgR1m
-0vdXcDazv/wor3ElhVsT/h5/WrQ8
------END CERTIFICATE-----
-
-# Issuer: O=RSA Security Inc OU=RSA Security 2048 V3
-# Subject: O=RSA Security Inc OU=RSA Security 2048 V3
-# Label: "RSA Security 2048 v3"
-# Serial: 13297492616345471454730593562152402946
-# MD5 Fingerprint: 77:0d:19:b1:21:fd:00:42:9c:3e:0c:a5:dd:0b:02:8e
-# SHA1 Fingerprint: 25:01:90:19:cf:fb:d9:99:1c:b7:68:25:74:8d:94:5f:30:93:95:42
-# SHA256 Fingerprint: af:8b:67:62:a1:e5:28:22:81:61:a9:5d:5c:55:9e:e2:66:27:8f:75:d7:9e:83:01:89:a5:03:50:6a:bd:6b:4c
------BEGIN CERTIFICATE-----
-MIIDYTCCAkmgAwIBAgIQCgEBAQAAAnwAAAAKAAAAAjANBgkqhkiG9w0BAQUFADA6
-MRkwFwYDVQQKExBSU0EgU2VjdXJpdHkgSW5jMR0wGwYDVQQLExRSU0EgU2VjdXJp
-dHkgMjA0OCBWMzAeFw0wMTAyMjIyMDM5MjNaFw0yNjAyMjIyMDM5MjNaMDoxGTAX
-BgNVBAoTEFJTQSBTZWN1cml0eSBJbmMxHTAbBgNVBAsTFFJTQSBTZWN1cml0eSAy
-MDQ4IFYzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAt49VcdKA3Xtp
-eafwGFAyPGJn9gqVB93mG/Oe2dJBVGutn3y+Gc37RqtBaB4Y6lXIL5F4iSj7Jylg
-/9+PjDvJSZu1pJTOAeo+tWN7fyb9Gd3AIb2E0S1PRsNO3Ng3OTsor8udGuorryGl
-wSMiuLgbWhOHV4PR8CDn6E8jQrAApX2J6elhc5SYcSa8LWrg903w8bYqODGBDSnh
-AMFRD0xS+ARaqn1y07iHKrtjEAMqs6FPDVpeRrc9DvV07Jmf+T0kgYim3WBU6JU2
-PcYJk5qjEoAAVZkZR73QpXzDuvsf9/UP+Ky5tfQ3mBMY3oVbtwyCO4dvlTlYMNpu
-AWgXIszACwIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
-BjAfBgNVHSMEGDAWgBQHw1EwpKrpRa41JPr/JCwz0LGdjDAdBgNVHQ4EFgQUB8NR
-MKSq6UWuNST6/yQsM9CxnYwwDQYJKoZIhvcNAQEFBQADggEBAF8+hnZuuDU8TjYc
-HnmYv/3VEhF5Ug7uMYm83X/50cYVIeiKAVQNOvtUudZj1LGqlk2iQk3UUx+LEN5/
-Zb5gEydxiKRz44Rj0aRV4VCT5hsOedBnvEbIvz8XDZXmxpBp3ue0L96VfdASPz0+
-f00/FGj1EVDVwfSQpQgdMWD/YIwjVAqv/qFuxdF6Kmh4zx6CCiC0H63lhbJqaHVO
-rSU3lIW+vaHU6rcMSzyd6BIA8F+sDeGscGNz9395nzIlQnQFgCi/vcEkllgVsRch
-6YlL2weIZ/QVrXA+L02FO8K32/6YaCOJ4XQP3vTFhGMpG8zLB8kApKnXwiJPZ9d3
-7CAFYd4=
------END CERTIFICATE-----
-
-# Issuer: CN=GeoTrust Global CA O=GeoTrust Inc.
-# Subject: CN=GeoTrust Global CA O=GeoTrust Inc.
-# Label: "GeoTrust Global CA"
-# Serial: 144470
-# MD5 Fingerprint: f7:75:ab:29:fb:51:4e:b7:77:5e:ff:05:3c:99:8e:f5
-# SHA1 Fingerprint: de:28:f4:a4:ff:e5:b9:2f:a3:c5:03:d1:a3:49:a7:f9:96:2a:82:12
-# SHA256 Fingerprint: ff:85:6a:2d:25:1d:cd:88:d3:66:56:f4:50:12:67:98:cf:ab:aa:de:40:79:9c:72:2d:e4:d2:b5:db:36:a7:3a
------BEGIN CERTIFICATE-----
-MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVT
-MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9i
-YWwgQ0EwHhcNMDIwNTIxMDQwMDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQG
-EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEbMBkGA1UEAxMSR2VvVHJ1c3Qg
-R2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2swYYzD9
-9BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjoBbdq
-fnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDv
-iS2Aelet8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU
-1XupGc1V3sjs0l44U+VcT4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+
-bw8HHa8sHo9gOeL6NlMTOdReJivbPagUvTLrGAMoUgRx5aszPeE4uwc2hGKceeoW
-MPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTA
-ephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVkDBF9qn1l
-uMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKIn
-Z57QzxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfS
-tQWVYrmm3ok9Nns4d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcF
-PseKUgzbFbS9bZvlxrFUaKnjaZC2mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Un
-hw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6pXE0zX5IJL4hmXXeXxx12E6nV
-5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvmMw==
------END CERTIFICATE-----
-
-# Issuer: CN=GeoTrust Global CA 2 O=GeoTrust Inc.
-# Subject: CN=GeoTrust Global CA 2 O=GeoTrust Inc.
-# Label: "GeoTrust Global CA 2"
-# Serial: 1
-# MD5 Fingerprint: 0e:40:a7:6c:de:03:5d:8f:d1:0f:e4:d1:8d:f9:6c:a9
-# SHA1 Fingerprint: a9:e9:78:08:14:37:58:88:f2:05:19:b0:6d:2b:0d:2b:60:16:90:7d
-# SHA256 Fingerprint: ca:2d:82:a0:86:77:07:2f:8a:b6:76:4f:f0:35:67:6c:fe:3e:5e:32:5e:01:21:72:df:3f:92:09:6d:b7:9b:85
------BEGIN CERTIFICATE-----
-MIIDZjCCAk6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJVUzEW
-MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3QgR2xvYmFs
-IENBIDIwHhcNMDQwMzA0MDUwMDAwWhcNMTkwMzA0MDUwMDAwWjBEMQswCQYDVQQG
-EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3Qg
-R2xvYmFsIENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDvPE1A
-PRDfO1MA4Wf+lGAVPoWI8YkNkMgoI5kF6CsgncbzYEbYwbLVjDHZ3CB5JIG/NTL8
-Y2nbsSpr7iFY8gjpeMtvy/wWUsiRxP89c96xPqfCfWbB9X5SJBri1WeR0IIQ13hL
-TytCOb1kLUCgsBDTOEhGiKEMuzozKmKY+wCdE1l/bztyqu6mD4b5BWHqZ38MN5aL
-5mkWRxHCJ1kDs6ZgwiFAVvqgx306E+PsV8ez1q6diYD3Aecs9pYrEw15LNnA5IZ7
-S4wMcoKK+xfNAGw6EzywhIdLFnopsk/bHdQL82Y3vdj2V7teJHq4PIu5+pIaGoSe
-2HSPqht/XvT+RSIhAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
-FHE4NvICMVNHK266ZUapEBVYIAUJMB8GA1UdIwQYMBaAFHE4NvICMVNHK266ZUap
-EBVYIAUJMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQUFAAOCAQEAA/e1K6td
-EPx7srJerJsOflN4WT5CBP51o62sgU7XAotexC3IUnbHLB/8gTKY0UvGkpMzNTEv
-/NgdRN3ggX+d6YvhZJFiCzkIjKx0nVnZellSlxG5FntvRdOW2TF9AjYPnDtuzywN
-A0ZF66D0f0hExghAzN4bcLUprbqLOzRldRtxIR0sFAqwlpW41uryZfspuk/qkZN0
-abby/+Ea0AzRdoXLiiW9l14sbxWZJue2Kf8i7MkCx1YAzUm5s2x7UwQa4qjJqhIF
-I8LO57sEAszAR6LkxCkvW0VXiVHuPOtSCP8HNR6fNWpHSlaY0VqFH4z1Ir+rzoPz
-4iIprn2DQKi6bA==
------END CERTIFICATE-----
-
-# Issuer: CN=GeoTrust Universal CA O=GeoTrust Inc.
-# Subject: CN=GeoTrust Universal CA O=GeoTrust Inc.
-# Label: "GeoTrust Universal CA"
-# Serial: 1
-# MD5 Fingerprint: 92:65:58:8b:a2:1a:31:72:73:68:5c:b4:a5:7a:07:48
-# SHA1 Fingerprint: e6:21:f3:35:43:79:05:9a:4b:68:30:9d:8a:2f:74:22:15:87:ec:79
-# SHA256 Fingerprint: a0:45:9b:9f:63:b2:25:59:f5:fa:5d:4c:6d:b3:f9:f7:2f:f1:93:42:03:35:78:f0:73:bf:1d:1b:46:cb:b9:12
------BEGIN CERTIFICATE-----
-MIIFaDCCA1CgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJVUzEW
-MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgVW5pdmVy
-c2FsIENBMB4XDTA0MDMwNDA1MDAwMFoXDTI5MDMwNDA1MDAwMFowRTELMAkGA1UE
-BhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xHjAcBgNVBAMTFUdlb1RydXN0
-IFVuaXZlcnNhbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKYV
-VaCjxuAfjJ0hUNfBvitbtaSeodlyWL0AG0y/YckUHUWCq8YdgNY96xCcOq9tJPi8
-cQGeBvV8Xx7BDlXKg5pZMK4ZyzBIle0iN430SppyZj6tlcDgFgDgEB8rMQ7XlFTT
-QjOgNB0eRXbdT8oYN+yFFXoZCPzVx5zw8qkuEKmS5j1YPakWaDwvdSEYfyh3peFh
-F7em6fgemdtzbvQKoiFs7tqqhZJmr/Z6a4LauiIINQ/PQvE1+mrufislzDoR5G2v
-c7J2Ha3QsnhnGqQ5HFELZ1aD/ThdDc7d8Lsrlh/eezJS/R27tQahsiFepdaVaH/w
-mZ7cRQg+59IJDTWU3YBOU5fXtQlEIGQWFwMCTFMNaN7VqnJNk22CDtucvc+081xd
-VHppCZbW2xHBjXWotM85yM48vCR85mLK4b19p71XZQvk/iXttmkQ3CgaRr0BHdCX
-teGYO8A3ZNY9lO4L4fUorgtWv3GLIylBjobFS1J72HGrH4oVpjuDWtdYAVHGTEHZ
-f9hBZ3KiKN9gg6meyHv8U3NyWfWTehd2Ds735VzZC1U0oqpbtWpU5xPKV+yXbfRe
-Bi9Fi1jUIxaS5BZuKGNZMN9QAZxjiRqf2xeUgnA3wySemkfWWspOqGmJch+RbNt+
-nhutxx9z3SxPGWX9f5NAEC7S8O08ni4oPmkmM8V7AgMBAAGjYzBhMA8GA1UdEwEB
-/wQFMAMBAf8wHQYDVR0OBBYEFNq7LqqwDLiIJlF0XG0D08DYj3rWMB8GA1UdIwQY
-MBaAFNq7LqqwDLiIJlF0XG0D08DYj3rWMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG
-9w0BAQUFAAOCAgEAMXjmx7XfuJRAyXHEqDXsRh3ChfMoWIawC/yOsjmPRFWrZIRc
-aanQmjg8+uUfNeVE44B5lGiku8SfPeE0zTBGi1QrlaXv9z+ZhP015s8xxtxqv6fX
-IwjhmF7DWgh2qaavdy+3YL1ERmrvl/9zlcGO6JP7/TG37FcREUWbMPEaiDnBTzyn
-ANXH/KttgCJwpQzgXQQpAvvLoJHRfNbDflDVnVi+QTjruXU8FdmbyUqDWcDaU/0z
-uzYYm4UPFd3uLax2k7nZAY1IEKj79TiG8dsKxr2EoyNB3tZ3b4XUhRxQ4K5RirqN
-Pnbiucon8l+f725ZDQbYKxek0nxru18UGkiPGkzns0ccjkxFKyDuSN/n3QmOGKja
-QI2SJhFTYXNd673nxE0pN2HrrDktZy4W1vUAg4WhzH92xH3kt0tm7wNFYGm2DFKW
-koRepqO1pD4r2czYG0eq8kTaT/kD6PAUyz/zg97QwVTjt+gKN02LIFkDMBmhLMi9
-ER/frslKxfMnZmaGrGiR/9nmUxwPi1xpZQomyB40w11Re9epnAahNt3ViZS82eQt
-DF4JbAiXfKM9fJP/P6EUp8+1Xevb2xzEdt+Iub1FBZUbrvxGakyvSOPOrg/Sfuvm
-bJxPgWp6ZKy7PtXny3YuxadIwVyQD8vIP/rmMuGNG2+k5o7Y+SlIis5z/iw=
------END CERTIFICATE-----
-
-# Issuer: CN=GeoTrust Universal CA 2 O=GeoTrust Inc.
-# Subject: CN=GeoTrust Universal CA 2 O=GeoTrust Inc.
-# Label: "GeoTrust Universal CA 2"
-# Serial: 1
-# MD5 Fingerprint: 34:fc:b8:d0:36:db:9e:14:b3:c2:f2:db:8f:e4:94:c7
-# SHA1 Fingerprint: 37:9a:19:7b:41:85:45:35:0c:a6:03:69:f3:3c:2e:af:47:4f:20:79
-# SHA256 Fingerprint: a0:23:4f:3b:c8:52:7c:a5:62:8e:ec:81:ad:5d:69:89:5d:a5:68:0d:c9:1d:1c:b8:47:7f:33:f8:78:b9:5b:0b
------BEGIN CERTIFICATE-----
-MIIFbDCCA1SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBHMQswCQYDVQQGEwJVUzEW
-MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVy
-c2FsIENBIDIwHhcNMDQwMzA0MDUwMDAwWhcNMjkwMzA0MDUwMDAwWjBHMQswCQYD
-VQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1
-c3QgVW5pdmVyc2FsIENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC
-AQCzVFLByT7y2dyxUxpZKeexw0Uo5dfR7cXFS6GqdHtXr0om/Nj1XqduGdt0DE81
-WzILAePb63p3NeqqWuDW6KFXlPCQo3RWlEQwAx5cTiuFJnSCegx2oG9NzkEtoBUG
-FF+3Qs17j1hhNNwqCPkuwwGmIkQcTAeC5lvO0Ep8BNMZcyfwqph/Lq9O64ceJHdq
-XbboW0W63MOhBW9Wjo8QJqVJwy7XQYci4E+GymC16qFjwAGXEHm9ADwSbSsVsaxL
-se4YuU6W3Nx2/zu+z18DwPw76L5GG//aQMJS9/7jOvdqdzXQ2o3rXhhqMcceujwb
-KNZrVMaqW9eiLBsZzKIC9ptZvTdrhrVtgrrY6slWvKk2WP0+GfPtDCapkzj4T8Fd
-IgbQl+rhrcZV4IErKIM6+vR7IVEAvlI4zs1meaj0gVbi0IMJR1FbUGrP20gaXT73
-y/Zl92zxlfgCOzJWgjl6W70viRu/obTo/3+NjN8D8WBOWBFM66M/ECuDmgFz2ZRt
-hAAnZqzwcEAJQpKtT5MNYQlRJNiS1QuUYbKHsu3/mjX/hVTK7URDrBs8FmtISgoc
-QIgfksILAAX/8sgCSqSqqcyZlpwvWOB94b67B9xfBHJcMTTD7F8t4D1kkCLm0ey4
-Lt1ZrtmhN79UNdxzMk+MBB4zsslG8dhcyFVQyWi9qLo2CQIDAQABo2MwYTAPBgNV
-HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAfBgNV
-HSMEGDAWgBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAOBgNVHQ8BAf8EBAMCAYYwDQYJ
-KoZIhvcNAQEFBQADggIBAGbBxiPz2eAubl/oz66wsCVNK/g7WJtAJDday6sWSf+z
-dXkzoS9tcBc0kf5nfo/sm+VegqlVHy/c1FEHEv6sFj4sNcZj/NwQ6w2jqtB8zNHQ
-L1EuxBRa3ugZ4T7GzKQp5y6EqgYweHZUcyiYWTjgAA1i00J9IZ+uPTqM1fp3DRgr
-Fg5fNuH8KrUwJM/gYwx7WBr+mbpCErGR9Hxo4sjoryzqyX6uuyo9DRXcNJW2GHSo
-ag/HtPQTxORb7QrSpJdMKu0vbBKJPfEncKpqA1Ihn0CoZ1Dy81of398j9tx4TuaY
-T1U6U+Pv8vSfx3zYWK8pIpe44L2RLrB27FcRz+8pRPPphXpgY+RdM4kX2TGq2tbz
-GDVyz4crL2MjhF2EjD9XoIj8mZEoJmmZ1I+XRL6O1UixpCgp8RW04eWe3fiPpm8m
-1wk8OhwRDqZsN/etRIcsKMfYdIKz0G9KV7s1KSegi+ghp4dkNl3M2Basx7InQJJV
-OCiNUW7dFGdTbHFcJoRNdVq2fmBWqU2t+5sel/MN2dKXVHfaPRK34B7vCAas+YWH
-6aLcr34YEoP9VhdBLtUpgn2Z9DH2canPLAEnpQW5qrJITirvn5NSUZU8UnOOVkwX
-QMAJKOSLakhT2+zNVVXxxvjpoixMptEmX36vWkzaH6byHCx+rgIW0lbQL1dTR+iS
------END CERTIFICATE-----
-
-# Issuer: CN=America Online Root Certification Authority 1 O=America Online Inc.
-# Subject: CN=America Online Root Certification Authority 1 O=America Online Inc.
-# Label: "America Online Root Certification Authority 1"
-# Serial: 1
-# MD5 Fingerprint: 14:f1:08:ad:9d:fa:64:e2:89:e7:1c:cf:a8:ad:7d:5e
-# SHA1 Fingerprint: 39:21:c1:15:c1:5d:0e:ca:5c:cb:5b:c4:f0:7d:21:d8:05:0b:56:6a
-# SHA256 Fingerprint: 77:40:73:12:c6:3a:15:3d:5b:c0:0b:4e:51:75:9c:df:da:c2:37:dc:2a:33:b6:79:46:e9:8e:9b:fa:68:0a:e3
------BEGIN CERTIFICATE-----
-MIIDpDCCAoygAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEc
-MBoGA1UEChMTQW1lcmljYSBPbmxpbmUgSW5jLjE2MDQGA1UEAxMtQW1lcmljYSBP
-bmxpbmUgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAxMB4XDTAyMDUyODA2
-MDAwMFoXDTM3MTExOTIwNDMwMFowYzELMAkGA1UEBhMCVVMxHDAaBgNVBAoTE0Ft
-ZXJpY2EgT25saW5lIEluYy4xNjA0BgNVBAMTLUFtZXJpY2EgT25saW5lIFJvb3Qg
-Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAKgv6KRpBgNHw+kqmP8ZonCaxlCyfqXfaE0bfA+2l2h9LaaLl+lk
-hsmj76CGv2BlnEtUiMJIxUo5vxTjWVXlGbR0yLQFOVwWpeKVBeASrlmLojNoWBym
-1BW32J/X3HGrfpq/m44zDyL9Hy7nBzbvYjnF3cu6JRQj3gzGPTzOggjmZj7aUTsW
-OqMFf6Dch9Wc/HKpoH145LcxVR5lu9RhsCFg7RAycsWSJR74kEoYeEfffjA3PlAb
-2xzTa5qGUwew76wGePiEmf4hjUyAtgyC9mZweRrTT6PP8c9GsEsPPt2IYriMqQko
-O3rHl+Ee5fSfwMCuJKDIodkP1nsmgmkyPacCAwEAAaNjMGEwDwYDVR0TAQH/BAUw
-AwEB/zAdBgNVHQ4EFgQUAK3Zo/Z59m50qX8zPYEX10zPM94wHwYDVR0jBBgwFoAU
-AK3Zo/Z59m50qX8zPYEX10zPM94wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEB
-BQUAA4IBAQB8itEfGDeC4Liwo+1WlchiYZwFos3CYiZhzRAW18y0ZTTQEYqtqKkF
-Zu90821fnZmv9ov761KyBZiibyrFVL0lvV+uyIbqRizBs73B6UlwGBaXCBOMIOAb
-LjpHyx7kADCVW/RFo8AasAFOq73AI25jP4BKxQft3OJvx8Fi8eNy1gTIdGcL+oir
-oQHIb/AUr9KZzVGTfu0uOMe9zkZQPXLjeSWdm4grECDdpbgyn43gKd8hdIaC2y+C
-MMbHNYaz+ZZfRtsMRf3zUMNvxsNIrUam4SdHCh0Om7bCd39j8uB9Gr784N/Xx6ds
-sPmuujz9dLQR6FgNgLzTqIA6me11zEZ7
------END CERTIFICATE-----
-
-# Issuer: CN=America Online Root Certification Authority 2 O=America Online Inc.
-# Subject: CN=America Online Root Certification Authority 2 O=America Online Inc.
-# Label: "America Online Root Certification Authority 2"
-# Serial: 1
-# MD5 Fingerprint: d6:ed:3c:ca:e2:66:0f:af:10:43:0d:77:9b:04:09:bf
-# SHA1 Fingerprint: 85:b5:ff:67:9b:0c:79:96:1f:c8:6e:44:22:00:46:13:db:17:92:84
-# SHA256 Fingerprint: 7d:3b:46:5a:60:14:e5:26:c0:af:fc:ee:21:27:d2:31:17:27:ad:81:1c:26:84:2d:00:6a:f3:73:06:cc:80:bd
------BEGIN CERTIFICATE-----
-MIIFpDCCA4ygAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEc
-MBoGA1UEChMTQW1lcmljYSBPbmxpbmUgSW5jLjE2MDQGA1UEAxMtQW1lcmljYSBP
-bmxpbmUgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAyMB4XDTAyMDUyODA2
-MDAwMFoXDTM3MDkyOTE0MDgwMFowYzELMAkGA1UEBhMCVVMxHDAaBgNVBAoTE0Ft
-ZXJpY2EgT25saW5lIEluYy4xNjA0BgNVBAMTLUFtZXJpY2EgT25saW5lIFJvb3Qg
-Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgMjCCAiIwDQYJKoZIhvcNAQEBBQADggIP
-ADCCAgoCggIBAMxBRR3pPU0Q9oyxQcngXssNt79Hc9PwVU3dxgz6sWYFas14tNwC
-206B89enfHG8dWOgXeMHDEjsJcQDIPT/DjsS/5uN4cbVG7RtIuOx238hZK+GvFci
-KtZHgVdEglZTvYYUAQv8f3SkWq7xuhG1m1hagLQ3eAkzfDJHA1zEpYNI9FdWboE2
-JxhP7JsowtS013wMPgwr38oE18aO6lhOqKSlGBxsRZijQdEt0sdtjRnxrXm3gT+9
-BoInLRBYBbV4Bbkv2wxrkJB+FFk4u5QkE+XRnRTf04JNRvCAOVIyD+OEsnpD8l7e
-Xz8d3eOyG6ChKiMDbi4BFYdcpnV1x5dhvt6G3NRI270qv0pV2uh9UPu0gBe4lL8B
-PeraunzgWGcXuVjgiIZGZ2ydEEdYMtA1fHkqkKJaEBEjNa0vzORKW6fIJ/KD3l67
-Xnfn6KVuY8INXWHQjNJsWiEOyiijzirplcdIz5ZvHZIlyMbGwcEMBawmxNJ10uEq
-Z8A9W6Wa6897GqidFEXlD6CaZd4vKL3Ob5Rmg0gp2OpljK+T2WSfVVcmv2/LNzGZ
-o2C7HK2JNDJiuEMhBnIMoVxtRsX6Kc8w3onccVvdtjc+31D1uAclJuW8tf48ArO3
-+L5DwYcRlJ4jbBeKuIonDFRH8KmzwICMoCfrHRnjB453cMor9H124HhnAgMBAAGj
-YzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFE1FwWg4u3OpaaEg5+31IqEj
-FNeeMB8GA1UdIwQYMBaAFE1FwWg4u3OpaaEg5+31IqEjFNeeMA4GA1UdDwEB/wQE
-AwIBhjANBgkqhkiG9w0BAQUFAAOCAgEAZ2sGuV9FOypLM7PmG2tZTiLMubekJcmn
-xPBUlgtk87FYT15R/LKXeydlwuXK5w0MJXti4/qftIe3RUavg6WXSIylvfEWK5t2
-LHo1YGwRgJfMqZJS5ivmae2p+DYtLHe/YUjRYwu5W1LtGLBDQiKmsXeu3mnFzccc
-obGlHBD7GL4acN3Bkku+KVqdPzW+5X1R+FXgJXUjhx5c3LqdsKyzadsXg8n33gy8
-CNyRnqjQ1xU3c6U1uPx+xURABsPr+CKAXEfOAuMRn0T//ZoyzH1kUQ7rVyZ2OuMe
-IjzCpjbdGe+n/BLzJsBZMYVMnNjP36TMzCmT/5RtdlwTCJfy7aULTd3oyWgOZtMA
-DjMSW7yV5TKQqLPGbIOtd+6Lfn6xqavT4fG2wLHqiMDn05DpKJKUe2h7lyoKZy2F
-AjgQ5ANh1NolNscIWC2hp1GvMApJ9aZphwctREZ2jirlmjvXGKL8nDgQzMY70rUX
-Om/9riW99XJZZLF0KjhfGEzfz3EEWjbUvy+ZnOjZurGV5gJLIaFb1cFPj65pbVPb
-AZO1XB4Y3WRayhgoPmMEEf0cjQAPuDffZ4qdZqkCapH/E8ovXYO8h5Ns3CRRFgQl
-Zvqz2cK6Kb6aSDiCmfS/O0oxGfm/jiEzFMpPVF/7zvuPcX/9XhmgD0uRuMRUvAaw
-RY8mkaKO/qk=
------END CERTIFICATE-----
-
-# Issuer: CN=Visa eCommerce Root O=VISA OU=Visa International Service Association
-# Subject: CN=Visa eCommerce Root O=VISA OU=Visa International Service Association
-# Label: "Visa eCommerce Root"
-# Serial: 25952180776285836048024890241505565794
-# MD5 Fingerprint: fc:11:b8:d8:08:93:30:00:6d:23:f9:7e:eb:52:1e:02
-# SHA1 Fingerprint: 70:17:9b:86:8c:00:a4:fa:60:91:52:22:3f:9f:3e:32:bd:e0:05:62
-# SHA256 Fingerprint: 69:fa:c9:bd:55:fb:0a:c7:8d:53:bb:ee:5c:f1:d5:97:98:9f:d0:aa:ab:20:a2:51:51:bd:f1:73:3e:e7:d1:22
------BEGIN CERTIFICATE-----
-MIIDojCCAoqgAwIBAgIQE4Y1TR0/BvLB+WUF1ZAcYjANBgkqhkiG9w0BAQUFADBr
-MQswCQYDVQQGEwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMmVmlzYSBJbnRl
-cm5hdGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNv
-bW1lcmNlIFJvb3QwHhcNMDIwNjI2MDIxODM2WhcNMjIwNjI0MDAxNjEyWjBrMQsw
-CQYDVQQGEwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMmVmlzYSBJbnRlcm5h
-dGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNvbW1l
-cmNlIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvV95WHm6h
-2mCxlCfLF9sHP4CFT8icttD0b0/Pmdjh28JIXDqsOTPHH2qLJj0rNfVIsZHBAk4E
-lpF7sDPwsRROEW+1QK8bRaVK7362rPKgH1g/EkZgPI2h4H3PVz4zHvtH8aoVlwdV
-ZqW1LS7YgFmypw23RuwhY/81q6UCzyr0TP579ZRdhE2o8mCP2w4lPJ9zcc+U30rq
-299yOIzzlr3xF7zSujtFWsan9sYXiwGd/BmoKoMWuDpI/k4+oKsGGelT84ATB+0t
-vz8KPFUgOSwsAGl0lUq8ILKpeeUYiZGo3BxN77t+Nwtd/jmliFKMAGzsGHxBvfaL
-dXe6YJ2E5/4tAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQD
-AgEGMB0GA1UdDgQWBBQVOIMPPyw/cDMezUb+B4wg4NfDtzANBgkqhkiG9w0BAQUF
-AAOCAQEAX/FBfXxcCLkr4NWSR/pnXKUTwwMhmytMiUbPWU3J/qVAtmPN3XEolWcR
-zCSs00Rsca4BIGsDoo8Ytyk6feUWYFN4PMCvFYP3j1IzJL1kk5fui/fbGKhtcbP3
-LBfQdCVp9/5rPJS+TUtBjE7ic9DjkCJzQ83z7+pzzkWKsKZJ/0x9nXGIxHYdkFsd
-7v3M9+79YKWxehZx0RbQfBI8bGmX265fOZpwLwU8GUYEmSA20GBuYQa7FkKMcPcw
-++DbZqMAAb3mLNqRX6BGi01qnD093QVG/na/oAo85ADmJ7f/hC3euiInlhBx6yLt
-398znM/jra6O1I7mT1GvFpLgXPYHDw==
------END CERTIFICATE-----
-
-# Issuer: CN=Certum CA O=Unizeto Sp. z o.o.
-# Subject: CN=Certum CA O=Unizeto Sp. z o.o.
-# Label: "Certum Root CA"
-# Serial: 65568
-# MD5 Fingerprint: 2c:8f:9f:66:1d:18:90:b1:47:26:9d:8e:86:82:8c:a9
-# SHA1 Fingerprint: 62:52:dc:40:f7:11:43:a2:2f:de:9e:f7:34:8e:06:42:51:b1:81:18
-# SHA256 Fingerprint: d8:e0:fe:bc:1d:b2:e3:8d:00:94:0f:37:d2:7d:41:34:4d:99:3e:73:4b:99:d5:65:6d:97:78:d4:d8:14:36:24
------BEGIN CERTIFICATE-----
-MIIDDDCCAfSgAwIBAgIDAQAgMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBM
-MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBD
-QTAeFw0wMjA2MTExMDQ2MzlaFw0yNzA2MTExMDQ2MzlaMD4xCzAJBgNVBAYTAlBM
-MRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBD
-QTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6xwS7TT3zNJc4YPk/E
-jG+AanPIW1H4m9LcuwBcsaD8dQPugfCI7iNS6eYVM42sLQnFdvkrOYCJ5JdLkKWo
-ePhzQ3ukYbDYWMzhbGZ+nPMJXlVjhNWo7/OxLjBos8Q82KxujZlakE403Daaj4GI
-ULdtlkIJ89eVgw1BS7Bqa/j8D35in2fE7SZfECYPCE/wpFcozo+47UX2bu4lXapu
-Ob7kky/ZR6By6/qmW6/KUz/iDsaWVhFu9+lmqSbYf5VT7QqFiLpPKaVCjF62/IUg
-AKpoC6EahQGcxEZjgoi2IrHu/qpGWX7PNSzVttpd90gzFFS269lvzs2I1qsb2pY7
-HVkCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEA
-uI3O7+cUus/usESSbLQ5PqKEbq24IXfS1HeCh+YgQYHu4vgRt2PRFze+GXYkHAQa
-TOs9qmdvLdTN/mUxcMUbpgIKumB7bVjCmkn+YzILa+M6wKyrO7Do0wlRjBCDxjTg
-xSvgGrZgFCdsMneMvLJymM/NzD+5yCRCFNZX/OYmQ6kd5YCQzgNUKD73P9P4Te1q
-CjqTE5s7FCMTY5w/0YcneeVMUeMBrYVdGjux1XMQpNPyvG5k9VpWkKjHDkx0Dy5x
-O/fIR/RpbxXyEV6DHpx8Uq79AtoSqFlnGNu8cN2bsWntgM6JQEhqDjXKKWYVIZQs
-6GAqm4VKQPNriiTsBhYscw==
------END CERTIFICATE-----
-
-# Issuer: CN=AAA Certificate Services O=Comodo CA Limited
-# Subject: CN=AAA Certificate Services O=Comodo CA Limited
-# Label: "Comodo AAA Services root"
-# Serial: 1
-# MD5 Fingerprint: 49:79:04:b0:eb:87:19:ac:47:b0:bc:11:51:9b:74:d0
-# SHA1 Fingerprint: d1:eb:23:a4:6d:17:d6:8f:d9:25:64:c2:f1:f1:60:17:64:d8:e3:49
-# SHA256 Fingerprint: d7:a7:a0:fb:5d:7e:27:31:d7:71:e9:48:4e:bc:de:f7:1d:5f:0c:3e:0a:29:48:78:2b:c8:3e:e0:ea:69:9e:f4
------BEGIN CERTIFICATE-----
-MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEb
-MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow
-GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmlj
-YXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVowezEL
-MAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE
-BwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNVBAMM
-GEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQua
-BtDFcCLNSS1UY8y2bmhGC1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe
-3M/vg4aijJRPn2jymJBGhCfHdr/jzDUsi14HZGWCwEiwqJH5YZ92IFCokcdmtet4
-YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszWY19zjNoFmag4qMsXeDZR
-rOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjHYpy+g8cm
-ez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQU
-oBEKIz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF
-MAMBAf8wewYDVR0fBHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20v
-QUFBQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29t
-b2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2VzLmNybDANBgkqhkiG9w0BAQUF
-AAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm7l3sAg9g1o1Q
-GE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz
-Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2
-G9w84FoVxp7Z8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsi
-l2D4kF501KKaU73yqWjgom7C12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3
-smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg==
------END CERTIFICATE-----
-
-# Issuer: CN=Secure Certificate Services O=Comodo CA Limited
-# Subject: CN=Secure Certificate Services O=Comodo CA Limited
-# Label: "Comodo Secure Services root"
-# Serial: 1
-# MD5 Fingerprint: d3:d9:bd:ae:9f:ac:67:24:b3:c8:1b:52:e1:b9:a9:bd
-# SHA1 Fingerprint: 4a:65:d5:f4:1d:ef:39:b8:b8:90:4a:4a:d3:64:81:33:cf:c7:a1:d1
-# SHA256 Fingerprint: bd:81:ce:3b:4f:65:91:d1:1a:67:b5:fc:7a:47:fd:ef:25:52:1b:f9:aa:4e:18:b9:e3:df:2e:34:a7:80:3b:e8
------BEGIN CERTIFICATE-----
-MIIEPzCCAyegAwIBAgIBATANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJHQjEb
-MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow
-GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEkMCIGA1UEAwwbU2VjdXJlIENlcnRp
-ZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAwMFoXDTI4MTIzMTIzNTk1OVow
-fjELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-A1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxJDAiBgNV
-BAMMG1NlY3VyZSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAMBxM4KK0HDrc4eCQNUd5MvJDkKQ+d40uaG6EfQlhfPM
-cm3ye5drswfxdySRXyWP9nQ95IDC+DwN879A6vfIUtFyb+/Iq0G4bi4XKpVpDM3S
-HpR7LZQdqnXXs5jLrLxkU0C8j6ysNstcrbvd4JQX7NFc0L/vpZXJkMWwrPsbQ996
-CF23uPJAGysnnlDOXmWCiIxe004MeuoIkbY2qitC++rCoznl2yY4rYsK7hljxxwk
-3wN42ubqwUcaCwtGCd0C/N7Lh1/XMGNooa7cMqG6vv5Eq2i2pRcV/b3Vp6ea5EQz
-6YiO/O1R65NxTq0B50SOqy3LqP4BSUjwwN3HaNiS/j0CAwEAAaOBxzCBxDAdBgNV
-HQ4EFgQUPNiTiMLAggnMAZkGkyDpnnAJY08wDgYDVR0PAQH/BAQDAgEGMA8GA1Ud
-EwEB/wQFMAMBAf8wgYEGA1UdHwR6MHgwO6A5oDeGNWh0dHA6Ly9jcmwuY29tb2Rv
-Y2EuY29tL1NlY3VyZUNlcnRpZmljYXRlU2VydmljZXMuY3JsMDmgN6A1hjNodHRw
-Oi8vY3JsLmNvbW9kby5uZXQvU2VjdXJlQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmww
-DQYJKoZIhvcNAQEFBQADggEBAIcBbSMdflsXfcFhMs+P5/OKlFlm4J4oqF7Tt/Q0
-5qo5spcWxYJvMqTpjOev/e/C6LlLqqP05tqNZSH7uoDrJiiFGv45jN5bBAS0VPmj
-Z55B+glSzAVIqMk/IQQezkhr/IXownuvf7fM+F86/TXGDe+X3EyrEeFryzHRbPtI
-gKvcnDe4IRRLDXE97IMzbtFuMhbsmMcWi1mmNKsFVy2T96oTy9IT4rcuO81rUBcJ
-aD61JlfutuC23bkpgHl9j6PwpCikFcSF9CfUa7/lXORlAnZUtOM3ZiTTGWHIUhDl
-izeauan5Hb/qmZJhlv8BzaFfDbxxvA6sCx1HRR3B7Hzs/Sk=
------END CERTIFICATE-----
-
-# Issuer: CN=Trusted Certificate Services O=Comodo CA Limited
-# Subject: CN=Trusted Certificate Services O=Comodo CA Limited
-# Label: "Comodo Trusted Services root"
-# Serial: 1
-# MD5 Fingerprint: 91:1b:3f:6e:cd:9e:ab:ee:07:fe:1f:71:d2:b3:61:27
-# SHA1 Fingerprint: e1:9f:e3:0e:8b:84:60:9e:80:9b:17:0d:72:a8:c5:ba:6e:14:09:bd
-# SHA256 Fingerprint: 3f:06:e5:56:81:d4:96:f5:be:16:9e:b5:38:9f:9f:2b:8f:f6:1e:17:08:df:68:81:72:48:49:cd:5d:27:cb:69
------BEGIN CERTIFICATE-----
-MIIEQzCCAyugAwIBAgIBATANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJHQjEb
-MBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRow
-GAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDElMCMGA1UEAwwcVHJ1c3RlZCBDZXJ0
-aWZpY2F0ZSBTZXJ2aWNlczAeFw0wNDAxMDEwMDAwMDBaFw0yODEyMzEyMzU5NTla
-MH8xCzAJBgNVBAYTAkdCMRswGQYDVQQIDBJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
-BgNVBAcMB1NhbGZvcmQxGjAYBgNVBAoMEUNvbW9kbyBDQSBMaW1pdGVkMSUwIwYD
-VQQDDBxUcnVzdGVkIENlcnRpZmljYXRlIFNlcnZpY2VzMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEA33FvNlhTWvI2VFeAxHQIIO0Yfyod5jWaHiWsnOWW
-fnJSoBVC21ndZHoa0Lh73TkVvFVIxO06AOoxEbrycXQaZ7jPM8yoMa+j49d/vzMt
-TGo87IvDktJTdyR0nAducPy9C1t2ul/y/9c3S0pgePfw+spwtOpZqqPOSC+pw7IL
-fhdyFgymBwwbOM/JYrc/oJOlh0Hyt3BAd9i+FHzjqMB6juljatEPmsbS9Is6FARW
-1O24zG71++IsWL1/T2sr92AkWCTOJu80kTrV44HQsvAEAtdbtz6SrGsSivnkBbA7
-kUlcsutT6vifR4buv5XAwAaf0lteERv0xwQ1KdJVXOTt6wIDAQABo4HJMIHGMB0G
-A1UdDgQWBBTFe1i97doladL3WRaoszLAeydb9DAOBgNVHQ8BAf8EBAMCAQYwDwYD
-VR0TAQH/BAUwAwEB/zCBgwYDVR0fBHwwejA8oDqgOIY2aHR0cDovL2NybC5jb21v
-ZG9jYS5jb20vVHJ1c3RlZENlcnRpZmljYXRlU2VydmljZXMuY3JsMDqgOKA2hjRo
-dHRwOi8vY3JsLmNvbW9kby5uZXQvVHJ1c3RlZENlcnRpZmljYXRlU2VydmljZXMu
-Y3JsMA0GCSqGSIb3DQEBBQUAA4IBAQDIk4E7ibSvuIQSTI3S8NtwuleGFTQQuS9/
-HrCoiWChisJ3DFBKmwCL2Iv0QeLQg4pKHBQGsKNoBXAxMKdTmw7pSqBYaWcOrp32
-pSxBvzwGa+RZzG0Q8ZZvH9/0BAKkn0U+yNj6NkZEUD+Cl5EfKNsYEYwq5GWDVxIS
-jBc/lDb+XbDABHcTuPQV1T84zJQ6VdCsmPW6AF/ghhmBeC8owH7TzEIK9a5QoNE+
-xqFx7D+gIIxmOom0jtTYsU0lR+4viMi14QVFwL4Ucd56/Y57fU0IlqUSc/Atyjcn
-dBInTMu2l+nZrghtWjlA3QVHdWpaIbOjGM9O9y5Xt5hwXsjEeLBi
------END CERTIFICATE-----
-
-# Issuer: CN=QuoVadis Root Certification Authority O=QuoVadis Limited OU=Root Certification Authority
-# Subject: CN=QuoVadis Root Certification Authority O=QuoVadis Limited OU=Root Certification Authority
-# Label: "QuoVadis Root CA"
-# Serial: 985026699
-# MD5 Fingerprint: 27:de:36:fe:72:b7:00:03:00:9d:f4:f0:1e:6c:04:24
-# SHA1 Fingerprint: de:3f:40:bd:50:93:d3:9b:6c:60:f6:da:bc:07:62:01:00:89:76:c9
-# SHA256 Fingerprint: a4:5e:de:3b:bb:f0:9c:8a:e1:5c:72:ef:c0:72:68:d6:93:a2:1c:99:6f:d5:1e:67:ca:07:94:60:fd:6d:88:73
------BEGIN CERTIFICATE-----
-MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJC
-TTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0
-aWZpY2F0aW9uIEF1dGhvcml0eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0
-aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAzMTkxODMzMzNaFw0yMTAzMTcxODMz
-MzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUw
-IwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQDEyVR
-dW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Yp
-li4kVEAkOPcahdxYTMukJ0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2D
-rOpm2RgbaIr1VxqYuvXtdj182d6UajtLF8HVj71lODqV0D1VNk7feVcxKh7YWWVJ
-WCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeLYzcS19Dsw3sgQUSj7cug
-F+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWenAScOospU
-xbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCC
-Ak4wPQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVv
-dmFkaXNvZmZzaG9yZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREw
-ggENMIIBCQYJKwYBBAG+WAABMIH7MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNl
-IG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmljYXRlIGJ5IGFueSBwYXJ0eSBh
-c3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJsZSBzdGFuZGFy
-ZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh
-Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYI
-KwYBBQUHAgEWFmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3T
-KbkGGew5Oanwl4Rqy+/fMIGuBgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rq
-y+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1p
-dGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYD
-VQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6tlCL
-MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSk
-fnIYj9lofFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf8
-7C9TqnN7Az10buYWnuulLsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1R
-cHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2xgI4JVrmcGmD+XcHXetwReNDWXcG31a0y
-mQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi5upZIof4l/UO/erMkqQW
-xFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi5nrQNiOK
-SnQ2+Q==
------END CERTIFICATE-----
-
-# Issuer: CN=QuoVadis Root CA 2 O=QuoVadis Limited
-# Subject: CN=QuoVadis Root CA 2 O=QuoVadis Limited
-# Label: "QuoVadis Root CA 2"
-# Serial: 1289
-# MD5 Fingerprint: 5e:39:7b:dd:f8:ba:ec:82:e9:ac:62:ba:0c:54:00:2b
-# SHA1 Fingerprint: ca:3a:fb:cf:12:40:36:4b:44:b2:16:20:88:80:48:39:19:93:7c:f7
-# SHA256 Fingerprint: 85:a0:dd:7d:d7:20:ad:b7:ff:05:f8:3d:54:2b:20:9d:c7:ff:45:28:f7:d6:77:b1:83:89:fe:a5:e5:c4:9e:86
------BEGIN CERTIFICATE-----
-MIIFtzCCA5+gAwIBAgICBQkwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0x
-GTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJv
-b3QgQ0EgMjAeFw0wNjExMjQxODI3MDBaFw0zMTExMjQxODIzMzNaMEUxCzAJBgNV
-BAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMRswGQYDVQQDExJRdW9W
-YWRpcyBSb290IENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCa
-GMpLlA0ALa8DKYrwD4HIrkwZhR0In6spRIXzL4GtMh6QRr+jhiYaHv5+HBg6XJxg
-Fyo6dIMzMH1hVBHL7avg5tKifvVrbxi3Cgst/ek+7wrGsxDp3MJGF/hd/aTa/55J
-WpzmM+Yklvc/ulsrHHo1wtZn/qtmUIttKGAr79dgw8eTvI02kfN/+NsRE8Scd3bB
-rrcCaoF6qUWD4gXmuVbBlDePSHFjIuwXZQeVikvfj8ZaCuWw419eaxGrDPmF60Tp
-+ARz8un+XJiM9XOva7R+zdRcAitMOeGylZUtQofX1bOQQ7dsE/He3fbE+Ik/0XX1
-ksOR1YqI0JDs3G3eicJlcZaLDQP9nL9bFqyS2+r+eXyt66/3FsvbzSUr5R/7mp/i
-Ucw6UwxI5g69ybR2BlLmEROFcmMDBOAENisgGQLodKcftslWZvB1JdxnwQ5hYIiz
-PtGo/KPaHbDRsSNU30R2be1B2MGyIrZTHN81Hdyhdyox5C315eXbyOD/5YDXC2Og
-/zOhD7osFRXql7PSorW+8oyWHhqPHWykYTe5hnMz15eWniN9gqRMgeKh0bpnX5UH
-oycR7hYQe7xFSkyyBNKr79X9DFHOUGoIMfmR2gyPZFwDwzqLID9ujWc9Otb+fVuI
-yV77zGHcizN300QyNQliBJIWENieJ0f7OyHj+OsdWwIDAQABo4GwMIGtMA8GA1Ud
-EwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1UdDgQWBBQahGK8SEwzJQTU7tD2
-A8QZRtGUazBuBgNVHSMEZzBlgBQahGK8SEwzJQTU7tD2A8QZRtGUa6FJpEcwRTEL
-MAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMT
-ElF1b1ZhZGlzIFJvb3QgQ0EgMoICBQkwDQYJKoZIhvcNAQEFBQADggIBAD4KFk2f
-BluornFdLwUvZ+YTRYPENvbzwCYMDbVHZF34tHLJRqUDGCdViXh9duqWNIAXINzn
-g/iN/Ae42l9NLmeyhP3ZRPx3UIHmfLTJDQtyU/h2BwdBR5YM++CCJpNVjP4iH2Bl
-fF/nJrP3MpCYUNQ3cVX2kiF495V5+vgtJodmVjB3pjd4M1IQWK4/YY7yarHvGH5K
-WWPKjaJW1acvvFYfzznB4vsKqBUsfU16Y8Zsl0Q80m/DShcK+JDSV6IZUaUtl0Ha
-B0+pUNqQjZRG4T7wlP0QADj1O+hA4bRuVhogzG9Yje0uRY/W6ZM/57Es3zrWIozc
-hLsib9D45MY56QSIPMO661V6bYCZJPVsAfv4l7CUW+v90m/xd2gNNWQjrLhVoQPR
-TUIZ3Ph1WVaj+ahJefivDrkRoHy3au000LYmYjgahwz46P0u05B/B5EqHdZ+XIWD
-mbA4CD/pXvk1B+TJYm5Xf6dQlfe6yJvmjqIBxdZmv3lh8zwc4bmCXF2gw+nYSL0Z
-ohEUGW6yhhtoPkg3Goi3XZZenMfvJ2II4pEZXNLxId26F0KCl3GBUzGpn/Z9Yr9y
-4aOTHcyKJloJONDO1w2AFrR4pTqHTI2KpdVGl/IsELm8VCLAAVBpQ570su9t+Oza
-8eOx79+Rj1QqCyXBJhnEUhAFZdWCEOrCMc0u
------END CERTIFICATE-----
-
-# Issuer: CN=QuoVadis Root CA 3 O=QuoVadis Limited
-# Subject: CN=QuoVadis Root CA 3 O=QuoVadis Limited
-# Label: "QuoVadis Root CA 3"
-# Serial: 1478
-# MD5 Fingerprint: 31:85:3c:62:94:97:63:b9:aa:fd:89:4e:af:6f:e0:cf
-# SHA1 Fingerprint: 1f:49:14:f7:d8:74:95:1d:dd:ae:02:c0:be:fd:3a:2d:82:75:51:85
-# SHA256 Fingerprint: 18:f1:fc:7f:20:5d:f8:ad:dd:eb:7f:e0:07:dd:57:e3:af:37:5a:9c:4d:8d:73:54:6b:f4:f1:fe:d1:e1:8d:35
------BEGIN CERTIFICATE-----
-MIIGnTCCBIWgAwIBAgICBcYwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0x
-GTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJv
-b3QgQ0EgMzAeFw0wNjExMjQxOTExMjNaFw0zMTExMjQxOTA2NDRaMEUxCzAJBgNV
-BAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMRswGQYDVQQDExJRdW9W
-YWRpcyBSb290IENBIDMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDM
-V0IWVJzmmNPTTe7+7cefQzlKZbPoFog02w1ZkXTPkrgEQK0CSzGrvI2RaNggDhoB
-4hp7Thdd4oq3P5kazethq8Jlph+3t723j/z9cI8LoGe+AaJZz3HmDyl2/7FWeUUr
-H556VOijKTVopAFPD6QuN+8bv+OPEKhyq1hX51SGyMnzW9os2l2ObjyjPtr7guXd
-8lyyBTNvijbO0BNO/79KDDRMpsMhvVAEVeuxu537RR5kFd5VAYwCdrXLoT9Cabwv
-vWhDFlaJKjdhkf2mrk7AyxRllDdLkgbvBNDInIjbC3uBr7E9KsRlOni27tyAsdLT
-mZw67mtaa7ONt9XOnMK+pUsvFrGeaDsGb659n/je7Mwpp5ijJUMv7/FfJuGITfhe
-btfZFG4ZM2mnO4SJk8RTVROhUXhA+LjJou57ulJCg54U7QVSWllWp5f8nT8KKdjc
-T5EOE7zelaTfi5m+rJsziO+1ga8bxiJTyPbH7pcUsMV8eFLI8M5ud2CEpukqdiDt
-WAEXMJPpGovgc2PZapKUSU60rUqFxKMiMPwJ7Wgic6aIDFUhWMXhOp8q3crhkODZ
-c6tsgLjoC2SToJyMGf+z0gzskSaHirOi4XCPLArlzW1oUevaPwV/izLmE1xr/l9A
-4iLItLRkT9a6fUg+qGkM17uGcclzuD87nSVL2v9A6wIDAQABo4IBlTCCAZEwDwYD
-VR0TAQH/BAUwAwEB/zCB4QYDVR0gBIHZMIHWMIHTBgkrBgEEAb5YAAMwgcUwgZMG
-CCsGAQUFBwICMIGGGoGDQW55IHVzZSBvZiB0aGlzIENlcnRpZmljYXRlIGNvbnN0
-aXR1dGVzIGFjY2VwdGFuY2Ugb2YgdGhlIFF1b1ZhZGlzIFJvb3QgQ0EgMyBDZXJ0
-aWZpY2F0ZSBQb2xpY3kgLyBDZXJ0aWZpY2F0aW9uIFByYWN0aWNlIFN0YXRlbWVu
-dC4wLQYIKwYBBQUHAgEWIWh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL2Nw
-czALBgNVHQ8EBAMCAQYwHQYDVR0OBBYEFPLAE+CCQz777i9nMpY1XNu4ywLQMG4G
-A1UdIwRnMGWAFPLAE+CCQz777i9nMpY1XNu4ywLQoUmkRzBFMQswCQYDVQQGEwJC
-TTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDEbMBkGA1UEAxMSUXVvVmFkaXMg
-Um9vdCBDQSAzggIFxjANBgkqhkiG9w0BAQUFAAOCAgEAT62gLEz6wPJv92ZVqyM0
-7ucp2sNbtrCD2dDQ4iH782CnO11gUyeim/YIIirnv6By5ZwkajGxkHon24QRiSem
-d1o417+shvzuXYO8BsbRd2sPbSQvS3pspweWyuOEn62Iix2rFo1bZhfZFvSLgNLd
-+LJ2w/w4E6oM3kJpK27zPOuAJ9v1pkQNn1pVWQvVDVJIxa6f8i+AxeoyUDUSly7B
-4f/xI4hROJ/yZlZ25w9Rl6VSDE1JUZU2Pb+iSwwQHYaZTKrzchGT5Or2m9qoXadN
-t54CrnMAyNojA+j56hl0YgCUyyIgvpSnWbWCar6ZeXqp8kokUvd0/bpO5qgdAm6x
-DYBEwa7TIzdfu4V8K5Iu6H6li92Z4b8nby1dqnuH/grdS/yO9SbkbnBCbjPsMZ57
-k8HkyWkaPcBrTiJt7qtYTcbQQcEr6k8Sh17rRdhs9ZgC06DYVYoGmRmioHfRMJ6s
-zHXug/WwYjnPbFfiTNKRCw51KBuav/0aQ/HKd/s7j2G4aSgWQgRecCocIdiP4b0j
-Wy10QJLZYxkNc91pvGJHvOB0K7Lrfb5BG7XARsWhIstfTsEokt4YutUqKLsRixeT
-mJlglFwjz1onl14LBQaTNx47aTbrqZ5hHY8y2o4M1nQ+ewkk2gF3R8Q7zTSMmfXK
-4SVhM7JZG+Ju1zdXtg2pEto=
------END CERTIFICATE-----
-
-# Issuer: O=SECOM Trust.net OU=Security Communication RootCA1
-# Subject: O=SECOM Trust.net OU=Security Communication RootCA1
-# Label: "Security Communication Root CA"
-# Serial: 0
-# MD5 Fingerprint: f1:bc:63:6a:54:e0:b5:27:f5:cd:e7:1a:e3:4d:6e:4a
-# SHA1 Fingerprint: 36:b1:2b:49:f9:81:9e:d7:4c:9e:bc:38:0f:c6:56:8f:5d:ac:b2:f7
-# SHA256 Fingerprint: e7:5e:72:ed:9f:56:0e:ec:6e:b4:80:00:73:a4:3f:c3:ad:19:19:5a:39:22:82:01:78:95:97:4a:99:02:6b:6c
------BEGIN CERTIFICATE-----
-MIIDWjCCAkKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQGEwJKUDEY
-MBYGA1UEChMPU0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21t
-dW5pY2F0aW9uIFJvb3RDQTEwHhcNMDMwOTMwMDQyMDQ5WhcNMjMwOTMwMDQyMDQ5
-WjBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMPU0VDT00gVHJ1c3QubmV0MScwJQYD
-VQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCzs/5/022x7xZ8V6UMbXaKL0u/ZPtM7orw8yl8
-9f/uKuDp6bpbZCKamm8sOiZpUQWZJtzVHGpxxpp9Hp3dfGzGjGdnSj74cbAZJ6kJ
-DKaVv0uMDPpVmDvY6CKhS3E4eayXkmmziX7qIWgGmBSWh9JhNrxtJ1aeV+7AwFb9
-Ms+k2Y7CI9eNqPPYJayX5HA49LY6tJ07lyZDo6G8SVlyTCMwhwFY9k6+HGhWZq/N
-QV3Is00qVUarH9oe4kA92819uZKAnDfdDJZkndwi92SL32HeFZRSFaB9UslLqCHJ
-xrHty8OVYNEP8Ktw+N/LTX7s1vqr2b1/VPKl6Xn62dZ2JChzAgMBAAGjPzA9MB0G
-A1UdDgQWBBSgc0mZaNyFW2XjmygvV5+9M7wHSDALBgNVHQ8EBAMCAQYwDwYDVR0T
-AQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaECpqLvkT115swW1F7NgE+vG
-kl3g0dNq/vu+m22/xwVtWSDEHPC32oRYAmP6SBbvT6UL90qY8j+eG61Ha2POCEfr
-Uj94nK9NrvjVT8+amCoQQTlSxN3Zmw7vkwGusi7KaEIkQmywszo+zenaSMQVy+n5
-Bw+SUEmK3TGXX8npN6o7WWWXlDLJs58+OmJYxUmtYg5xpTKqL8aJdkNAExNnPaJU
-JRDL8Try2frbSVa7pv6nQTXD4IhhyYjH3zYQIphZ6rBK+1YWc26sTfcioU+tHXot
-RSflMMFe8toTyyVCUZVHA4xsIcx0Qu1T/zOLjw9XARYvz6buyXAiFL39vmwLAw==
------END CERTIFICATE-----
-
-# Issuer: CN=Sonera Class2 CA O=Sonera
-# Subject: CN=Sonera Class2 CA O=Sonera
-# Label: "Sonera Class 2 Root CA"
-# Serial: 29
-# MD5 Fingerprint: a3:ec:75:0f:2e:88:df:fa:48:01:4e:0b:5c:48:6f:fb
-# SHA1 Fingerprint: 37:f7:6d:e6:07:7c:90:c5:b1:3e:93:1a:b7:41:10:b4:f2:e4:9a:27
-# SHA256 Fingerprint: 79:08:b4:03:14:c1:38:10:0b:51:8d:07:35:80:7f:fb:fc:f8:51:8a:00:95:33:71:05:ba:38:6b:15:3d:d9:27
------BEGIN CERTIFICATE-----
-MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEP
-MA0GA1UEChMGU29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAx
-MDQwNjA3Mjk0MFoXDTIxMDQwNjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNV
-BAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMiBDQTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3/Ei9vX+ALTU74W+o
-Z6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybTdXnt
-5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s
-3TmVToMGf+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2Ej
-vOr7nQKV0ba5cTppCD8PtOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu
-8nYybieDwnPz3BjotJPqdURrBGAgcVeHnfO+oJAjPYok4doh28MCAwEAAaMzMDEw
-DwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITTXjwwCwYDVR0PBAQDAgEG
-MA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt0jSv9zil
-zqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/
-3DEIcbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvD
-FNr450kkkdAdavphOe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6
-Tk6ezAyNlNzZRZxe7EJQY670XcSxEtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2
-ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLHllpwrN9M
------END CERTIFICATE-----
-
-# Issuer: CN=Staat der Nederlanden Root CA O=Staat der Nederlanden
-# Subject: CN=Staat der Nederlanden Root CA O=Staat der Nederlanden
-# Label: "Staat der Nederlanden Root CA"
-# Serial: 10000010
-# MD5 Fingerprint: 60:84:7c:5a:ce:db:0c:d4:cb:a7:e9:fe:02:c6:a9:c0
-# SHA1 Fingerprint: 10:1d:fa:3f:d5:0b:cb:bb:9b:b5:60:0c:19:55:a4:1a:f4:73:3a:04
-# SHA256 Fingerprint: d4:1d:82:9e:8c:16:59:82:2a:f9:3f:ce:62:bf:fc:de:26:4f:c8:4e:8b:95:0c:5f:f2:75:d0:52:35:46:95:a3
------BEGIN CERTIFICATE-----
-MIIDujCCAqKgAwIBAgIEAJiWijANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJO
-TDEeMBwGA1UEChMVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSYwJAYDVQQDEx1TdGFh
-dCBkZXIgTmVkZXJsYW5kZW4gUm9vdCBDQTAeFw0wMjEyMTcwOTIzNDlaFw0xNTEy
-MTYwOTE1MzhaMFUxCzAJBgNVBAYTAk5MMR4wHAYDVQQKExVTdGFhdCBkZXIgTmVk
-ZXJsYW5kZW4xJjAkBgNVBAMTHVN0YWF0IGRlciBOZWRlcmxhbmRlbiBSb290IENB
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmNK1URF6gaYUmHFtvszn
-ExvWJw56s2oYHLZhWtVhCb/ekBPHZ+7d89rFDBKeNVU+LCeIQGv33N0iYfXCxw71
-9tV2U02PjLwYdjeFnejKScfST5gTCaI+Ioicf9byEGW07l8Y1Rfj+MX94p2i71MO
-hXeiD+EwR+4A5zN9RGcaC1Hoi6CeUJhoNFIfLm0B8mBF8jHrqTFoKbt6QZ7GGX+U
-tFE5A3+y3qcym7RHjm+0Sq7lr7HcsBthvJly3uSJt3omXdozSVtSnA71iq3DuD3o
-BmrC1SoLbHuEvVYFy4ZlkuxEK7COudxwC0barbxjiDn622r+I/q85Ej0ZytqERAh
-SQIDAQABo4GRMIGOMAwGA1UdEwQFMAMBAf8wTwYDVR0gBEgwRjBEBgRVHSAAMDww
-OgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cucGtpb3ZlcmhlaWQubmwvcG9saWNpZXMv
-cm9vdC1wb2xpY3kwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSofeu8Y6R0E3QA
-7Jbg0zTBLL9s+DANBgkqhkiG9w0BAQUFAAOCAQEABYSHVXQ2YcG70dTGFagTtJ+k
-/rvuFbQvBgwp8qiSpGEN/KtcCFtREytNwiphyPgJWPwtArI5fZlmgb9uXJVFIGzm
-eafR2Bwp/MIgJ1HI8XxdNGdphREwxgDS1/PTfLbwMVcoEoJz6TMvplW0C5GUR5z6
-u3pCMuiufi3IvKwUv9kP2Vv8wfl6leF9fpb8cbDCTMjfRTTJzg3ynGQI0DvDKcWy
-7ZAEwbEpkcUwb8GpcjPM/l0WFywRaed+/sWDCN+83CI6LiBpIzlWYGeQiy52OfsR
-iJf2fL1LuCAWZwWN4jvBcj+UlTfHXbme2JOhF4//DGYVwSR8MnwDHTuhWEUykw==
------END CERTIFICATE-----
-
-# Issuer: O=TDC Internet OU=TDC Internet Root CA
-# Subject: O=TDC Internet OU=TDC Internet Root CA
-# Label: "TDC Internet Root CA"
-# Serial: 986490188
-# MD5 Fingerprint: 91:f4:03:55:20:a1:f8:63:2c:62:de:ac:fb:61:1c:8e
-# SHA1 Fingerprint: 21:fc:bd:8e:7f:6c:af:05:1b:d1:b3:43:ec:a8:e7:61:47:f2:0f:8a
-# SHA256 Fingerprint: 48:98:c6:88:8c:0c:ff:b0:d3:e3:1a:ca:8a:37:d4:e3:51:5f:f7:46:d0:26:35:d8:66:46:cf:a0:a3:18:5a:e7
------BEGIN CERTIFICATE-----
-MIIEKzCCAxOgAwIBAgIEOsylTDANBgkqhkiG9w0BAQUFADBDMQswCQYDVQQGEwJE
-SzEVMBMGA1UEChMMVERDIEludGVybmV0MR0wGwYDVQQLExRUREMgSW50ZXJuZXQg
-Um9vdCBDQTAeFw0wMTA0MDUxNjMzMTdaFw0yMTA0MDUxNzAzMTdaMEMxCzAJBgNV
-BAYTAkRLMRUwEwYDVQQKEwxUREMgSW50ZXJuZXQxHTAbBgNVBAsTFFREQyBJbnRl
-cm5ldCBSb290IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxLhA
-vJHVYx/XmaCLDEAedLdInUaMArLgJF/wGROnN4NrXceO+YQwzho7+vvOi20jxsNu
-Zp+Jpd/gQlBn+h9sHvTQBda/ytZO5GhgbEaqHF1j4QeGDmUApy6mcca8uYGoOn0a
-0vnRrEvLznWv3Hv6gXPU/Lq9QYjUdLP5Xjg6PEOo0pVOd20TDJ2PeAG3WiAfAzc1
-4izbSysseLlJ28TQx5yc5IogCSEWVmb/Bexb4/DPqyQkXsN/cHoSxNK1EKC2IeGN
-eGlVRGn1ypYcNIUXJXfi9i8nmHj9eQY6otZaQ8H/7AQ77hPv01ha/5Lr7K7a8jcD
-R0G2l8ktCkEiu7vmpwIDAQABo4IBJTCCASEwEQYJYIZIAYb4QgEBBAQDAgAHMGUG
-A1UdHwReMFwwWqBYoFakVDBSMQswCQYDVQQGEwJESzEVMBMGA1UEChMMVERDIElu
-dGVybmV0MR0wGwYDVQQLExRUREMgSW50ZXJuZXQgUm9vdCBDQTENMAsGA1UEAxME
-Q1JMMTArBgNVHRAEJDAigA8yMDAxMDQwNTE2MzMxN1qBDzIwMjEwNDA1MTcwMzE3
-WjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUbGQBx/2FbazI2p5QCIUItTxWqFAw
-HQYDVR0OBBYEFGxkAcf9hW2syNqeUAiFCLU8VqhQMAwGA1UdEwQFMAMBAf8wHQYJ
-KoZIhvZ9B0EABBAwDhsIVjUuMDo0LjADAgSQMA0GCSqGSIb3DQEBBQUAA4IBAQBO
-Q8zR3R0QGwZ/t6T609lN+yOfI1Rb5osvBCiLtSdtiaHsmGnc540mgwV5dOy0uaOX
-wTUA/RXaOYE6lTGQ3pfphqiZdwzlWqCE/xIWrG64jcN7ksKsLtB9KOy282A4aW8+
-2ARVPp7MVdK6/rtHBNcK2RYKNCn1WBPVT8+PVkuzHu7TmHnaCB4Mb7j4Fifvwm89
-9qNLPg7kbWzbO0ESm70NRyN/PErQr8Cv9u8btRXE64PECV90i9kR+8JWsTz4cMo0
-jUNAE4z9mQNUecYu6oah9jrUCbz0vGbMPVjQV0kK7iXiQe4T+Zs4NNEA9X7nlB38
-aQNiuJkFBT1reBK9sG9l
------END CERTIFICATE-----
-
-# Issuer: CN=UTN - DATACorp SGC O=The USERTRUST Network OU=http://www.usertrust.com
-# Subject: CN=UTN - DATACorp SGC O=The USERTRUST Network OU=http://www.usertrust.com
-# Label: "UTN DATACorp SGC Root CA"
-# Serial: 91374294542884689855167577680241077609
-# MD5 Fingerprint: b3:a5:3e:77:21:6d:ac:4a:c0:c9:fb:d5:41:3d:ca:06
-# SHA1 Fingerprint: 58:11:9f:0e:12:82:87:ea:50:fd:d9:87:45:6f:4f:78:dc:fa:d6:d4
-# SHA256 Fingerprint: 85:fb:2f:91:dd:12:27:5a:01:45:b6:36:53:4f:84:02:4a:d6:8b:69:b8:ee:88:68:4f:f7:11:37:58:05:b3:48
------BEGIN CERTIFICATE-----
-MIIEXjCCA0agAwIBAgIQRL4Mi1AAIbQR0ypoBqmtaTANBgkqhkiG9w0BAQUFADCB
-kzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug
-Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho
-dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xGzAZBgNVBAMTElVUTiAtIERBVEFDb3Jw
-IFNHQzAeFw05OTA2MjQxODU3MjFaFw0xOTA2MjQxOTA2MzBaMIGTMQswCQYDVQQG
-EwJVUzELMAkGA1UECBMCVVQxFzAVBgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4wHAYD
-VQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxITAfBgNVBAsTGGh0dHA6Ly93d3cu
-dXNlcnRydXN0LmNvbTEbMBkGA1UEAxMSVVROIC0gREFUQUNvcnAgU0dDMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3+5YEKIrblXEjr8uRgnn4AgPLit6
-E5Qbvfa2gI5lBZMAHryv4g+OGQ0SR+ysraP6LnD43m77VkIVni5c7yPeIbkFdicZ
-D0/Ww5y0vpQZY/KmEQrrU0icvvIpOxboGqBMpsn0GFlowHDyUwDAXlCCpVZvNvlK
-4ESGoE1O1kduSUrLZ9emxAW5jh70/P/N5zbgnAVssjMiFdC04MwXwLLA9P4yPykq
-lXvY8qdOD1R8oQ2AswkDwf9c3V6aPryuvEeKaq5xyh+xKrhfQgUL7EYw0XILyulW
-bfXv33i+Ybqypa4ETLyorGkVl73v67SMvzX41MPRKA5cOp9wGDMgd8SirwIDAQAB
-o4GrMIGoMAsGA1UdDwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRT
-MtGzz3/64PGgXYVOktKeRR20TzA9BgNVHR8ENjA0MDKgMKAuhixodHRwOi8vY3Js
-LnVzZXJ0cnVzdC5jb20vVVROLURBVEFDb3JwU0dDLmNybDAqBgNVHSUEIzAhBggr
-BgEFBQcDAQYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMA0GCSqGSIb3DQEBBQUAA4IB
-AQAnNZcAiosovcYzMB4p/OL31ZjUQLtgyr+rFywJNn9Q+kHcrpY6CiM+iVnJowft
-Gzet/Hy+UUla3joKVAgWRcKZsYfNjGjgaQPpxE6YsjuMFrMOoAyYUJuTqXAJyCyj
-j98C5OBxOvG0I3KgqgHf35g+FFCgMSa9KOlaMCZ1+XtgHI3zzVAmbQQnmt/VDUVH
-KWss5nbZqSl9Mt3JNjy9rjXxEZ4du5A/EkdOjtd+D2JzHVImOBwYSf0wdJrE5SIv
-2MCN7ZF6TACPcn9d2t0bi0Vr591pl6jFVkwPDPafepE39peC4N1xaf92P2BNPM/3
-mfnGV/TJVTl4uix5yaaIK/QI
------END CERTIFICATE-----
-
-# Issuer: CN=UTN-USERFirst-Hardware O=The USERTRUST Network OU=http://www.usertrust.com
-# Subject: CN=UTN-USERFirst-Hardware O=The USERTRUST Network OU=http://www.usertrust.com
-# Label: "UTN USERFirst Hardware Root CA"
-# Serial: 91374294542884704022267039221184531197
-# MD5 Fingerprint: 4c:56:41:e5:0d:bb:2b:e8:ca:a3:ed:18:08:ad:43:39
-# SHA1 Fingerprint: 04:83:ed:33:99:ac:36:08:05:87:22:ed:bc:5e:46:00:e3:be:f9:d7
-# SHA256 Fingerprint: 6e:a5:47:41:d0:04:66:7e:ed:1b:48:16:63:4a:a3:a7:9e:6e:4b:96:95:0f:82:79:da:fc:8d:9b:d8:81:21:37
------BEGIN CERTIFICATE-----
-MIIEdDCCA1ygAwIBAgIQRL4Mi1AAJLQR0zYq/mUK/TANBgkqhkiG9w0BAQUFADCB
-lzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2Ug
-Q2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExho
-dHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3Qt
-SGFyZHdhcmUwHhcNOTkwNzA5MTgxMDQyWhcNMTkwNzA5MTgxOTIyWjCBlzELMAkG
-A1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEe
-MBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8v
-d3d3LnVzZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdh
-cmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx98M4P7Sof885glFn
-0G2f0v9Y8+efK+wNiVSZuTiZFvfgIXlIwrthdBKWHTxqctU8EGc6Oe0rE81m65UJ
-M6Rsl7HoxuzBdXmcRl6Nq9Bq/bkqVRcQVLMZ8Jr28bFdtqdt++BxF2uiiPsA3/4a
-MXcMmgF6sTLjKwEHOG7DpV4jvEWbe1DByTCP2+UretNb+zNAHqDVmBe8i4fDidNd
-oI6yqqr2jmmIBsX6iSHzCJ1pLgkzmykNRg+MzEk0sGlRvfkGzWitZky8PqxhvQqI
-DsjfPe58BEydCl5rkdbux+0ojatNh4lz0G6k0B4WixThdkQDf2Os5M1JnMWS9Ksy
-oUhbAgMBAAGjgbkwgbYwCwYDVR0PBAQDAgHGMA8GA1UdEwEB/wQFMAMBAf8wHQYD
-VR0OBBYEFKFyXyYbKJhDlV0HN9WFlp1L0sNFMEQGA1UdHwQ9MDswOaA3oDWGM2h0
-dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9VVE4tVVNFUkZpcnN0LUhhcmR3YXJlLmNy
-bDAxBgNVHSUEKjAoBggrBgEFBQcDAQYIKwYBBQUHAwUGCCsGAQUFBwMGBggrBgEF
-BQcDBzANBgkqhkiG9w0BAQUFAAOCAQEARxkP3nTGmZev/K0oXnWO6y1n7k57K9cM
-//bey1WiCuFMVGWTYGufEpytXoMs61quwOQt9ABjHbjAbPLPSbtNk28Gpgoiskli
-CE7/yMgUsogWXecB5BKV5UU0s4tpvc+0hY91UZ59Ojg6FEgSxvunOxqNDYJAB+gE
-CJChicsZUN/KHAG8HQQZexB2lzvukJDKxA4fFm517zP4029bHpbj4HR3dHuKom4t
-3XbWOTCC8KucUvIqx69JXn7HaOWCgchqJ/kniCrVWFCVH/A7HFe7fRQ5YiuayZSS
-KqMiDP+JJn1fIytH1xUdqWqeUQ0qUZ6B+dQ7XnASfxAynB67nfhmqA==
------END CERTIFICATE-----
-
-# Issuer: CN=Chambers of Commerce Root O=AC Camerfirma SA CIF A82743287 OU=http://www.chambersign.org
-# Subject: CN=Chambers of Commerce Root O=AC Camerfirma SA CIF A82743287 OU=http://www.chambersign.org
-# Label: "Camerfirma Chambers of Commerce Root"
-# Serial: 0
-# MD5 Fingerprint: b0:01:ee:14:d9:af:29:18:94:76:8e:f1:69:33:2a:84
-# SHA1 Fingerprint: 6e:3a:55:a4:19:0c:19:5c:93:84:3c:c0:db:72:2e:31:30:61:f0:b1
-# SHA256 Fingerprint: 0c:25:8a:12:a5:67:4a:ef:25:f2:8b:a7:dc:fa:ec:ee:a3:48:e5:41:e6:f5:cc:4e:e6:3b:71:b3:61:60:6a:c3
------BEGIN CERTIFICATE-----
-MIIEvTCCA6WgAwIBAgIBADANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJFVTEn
-MCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQL
-ExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEiMCAGA1UEAxMZQ2hhbWJlcnMg
-b2YgQ29tbWVyY2UgUm9vdDAeFw0wMzA5MzAxNjEzNDNaFw0zNzA5MzAxNjEzNDRa
-MH8xCzAJBgNVBAYTAkVVMScwJQYDVQQKEx5BQyBDYW1lcmZpcm1hIFNBIENJRiBB
-ODI3NDMyODcxIzAhBgNVBAsTGmh0dHA6Ly93d3cuY2hhbWJlcnNpZ24ub3JnMSIw
-IAYDVQQDExlDaGFtYmVycyBvZiBDb21tZXJjZSBSb290MIIBIDANBgkqhkiG9w0B
-AQEFAAOCAQ0AMIIBCAKCAQEAtzZV5aVdGDDg2olUkfzIx1L4L1DZ77F1c2VHfRtb
-unXF/KGIJPov7coISjlUxFF6tdpg6jg8gbLL8bvZkSM/SAFwdakFKq0fcfPJVD0d
-BmpAPrMMhe5cG3nCYsS4No41XQEMIwRHNaqbYE6gZj3LJgqcQKH0XZi/caulAGgq
-7YN6D6IUtdQis4CwPAxaUWktWBiP7Zme8a7ileb2R6jWDA+wWFjbw2Y3npuRVDM3
-0pQcakjJyfKl2qUMI/cjDpwyVV5xnIQFUZot/eZOKjRa3spAN2cMVCFVd9oKDMyX
-roDclDZK9D7ONhMeU+SsTjoF7Nuucpw4i9A5O4kKPnf+dQIBA6OCAUQwggFAMBIG
-A1UdEwEB/wQIMAYBAf8CAQwwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5j
-aGFtYmVyc2lnbi5vcmcvY2hhbWJlcnNyb290LmNybDAdBgNVHQ4EFgQU45T1sU3p
-26EpW1eLTXYGduHRooowDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIA
-BzAnBgNVHREEIDAegRxjaGFtYmVyc3Jvb3RAY2hhbWJlcnNpZ24ub3JnMCcGA1Ud
-EgQgMB6BHGNoYW1iZXJzcm9vdEBjaGFtYmVyc2lnbi5vcmcwWAYDVR0gBFEwTzBN
-BgsrBgEEAYGHLgoDATA+MDwGCCsGAQUFBwIBFjBodHRwOi8vY3BzLmNoYW1iZXJz
-aWduLm9yZy9jcHMvY2hhbWJlcnNyb290Lmh0bWwwDQYJKoZIhvcNAQEFBQADggEB
-AAxBl8IahsAifJ/7kPMa0QOx7xP5IV8EnNrJpY0nbJaHkb5BkAFyk+cefV/2icZd
-p0AJPaxJRUXcLo0waLIJuvvDL8y6C98/d3tGfToSJI6WjzwFCm/SlCgdbQzALogi
-1djPHRPH8EjX1wWnz8dHnjs8NMiAT9QUu/wNUPf6s+xCX6ndbcj0dc97wXImsQEc
-XCz9ek60AcUFV7nnPKoF2YjpB0ZBzu9Bga5Y34OirsrXdx/nADydb47kMgkdTXg0
-eDQ8lJsm7U9xxhl6vSAiSFr+S30Dt+dYvsYyTnQeaN2oaFuzPu5ifdmA6Ap1erfu
-tGWaIZDgqtCYvDi1czyL+Nw=
------END CERTIFICATE-----
-
-# Issuer: CN=Global Chambersign Root O=AC Camerfirma SA CIF A82743287 OU=http://www.chambersign.org
-# Subject: CN=Global Chambersign Root O=AC Camerfirma SA CIF A82743287 OU=http://www.chambersign.org
-# Label: "Camerfirma Global Chambersign Root"
-# Serial: 0
-# MD5 Fingerprint: c5:e6:7b:bf:06:d0:4f:43:ed:c4:7a:65:8a:fb:6b:19
-# SHA1 Fingerprint: 33:9b:6b:14:50:24:9b:55:7a:01:87:72:84:d9:e0:2f:c3:d2:d8:e9
-# SHA256 Fingerprint: ef:3c:b4:17:fc:8e:bf:6f:97:87:6c:9e:4e:ce:39:de:1e:a5:fe:64:91:41:d1:02:8b:7d:11:c0:b2:29:8c:ed
------BEGIN CERTIFICATE-----
-MIIExTCCA62gAwIBAgIBADANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJFVTEn
-MCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQL
-ExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEgMB4GA1UEAxMXR2xvYmFsIENo
-YW1iZXJzaWduIFJvb3QwHhcNMDMwOTMwMTYxNDE4WhcNMzcwOTMwMTYxNDE4WjB9
-MQswCQYDVQQGEwJFVTEnMCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgy
-NzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEgMB4G
-A1UEAxMXR2xvYmFsIENoYW1iZXJzaWduIFJvb3QwggEgMA0GCSqGSIb3DQEBAQUA
-A4IBDQAwggEIAoIBAQCicKLQn0KuWxfH2H3PFIP8T8mhtxOviteePgQKkotgVvq0
-Mi+ITaFgCPS3CU6gSS9J1tPfnZdan5QEcOw/Wdm3zGaLmFIoCQLfxS+EjXqXd7/s
-QJ0lcqu1PzKY+7e3/HKE5TWH+VX6ox8Oby4o3Wmg2UIQxvi1RMLQQ3/bvOSiPGpV
-eAp3qdjqGTK3L/5cPxvusZjsyq16aUXjlg9V9ubtdepl6DJWk0aJqCWKZQbua795
-B9Dxt6/tLE2Su8CoX6dnfQTyFQhwrJLWfQTSM/tMtgsL+xrJxI0DqX5c8lCrEqWh
-z0hQpe/SyBoT+rB/sYIcd2oPX9wLlY/vQ37mRQklAgEDo4IBUDCCAUwwEgYDVR0T
-AQH/BAgwBgEB/wIBDDA/BgNVHR8EODA2MDSgMqAwhi5odHRwOi8vY3JsLmNoYW1i
-ZXJzaWduLm9yZy9jaGFtYmVyc2lnbnJvb3QuY3JsMB0GA1UdDgQWBBRDnDafsJ4w
-TcbOX60Qq+UDpfqpFDAOBgNVHQ8BAf8EBAMCAQYwEQYJYIZIAYb4QgEBBAQDAgAH
-MCoGA1UdEQQjMCGBH2NoYW1iZXJzaWducm9vdEBjaGFtYmVyc2lnbi5vcmcwKgYD
-VR0SBCMwIYEfY2hhbWJlcnNpZ25yb290QGNoYW1iZXJzaWduLm9yZzBbBgNVHSAE
-VDBSMFAGCysGAQQBgYcuCgEBMEEwPwYIKwYBBQUHAgEWM2h0dHA6Ly9jcHMuY2hh
-bWJlcnNpZ24ub3JnL2Nwcy9jaGFtYmVyc2lnbnJvb3QuaHRtbDANBgkqhkiG9w0B
-AQUFAAOCAQEAPDtwkfkEVCeR4e3t/mh/YV3lQWVPMvEYBZRqHN4fcNs+ezICNLUM
-bKGKfKX0j//U2K0X1S0E0T9YgOKBWYi+wONGkyT+kL0mojAt6JcmVzWJdJYY9hXi
-ryQZVgICsroPFOrGimbBhkVVi76SvpykBMdJPJ7oKXqJ1/6v/2j1pReQvayZzKWG
-VwlnRtvWFsJG8eSpUPWP0ZIV018+xgBJOm5YstHRJw0lyDL4IBHNfTIzSJRUTN3c
-ecQwn+uOuFW114hcxWokPbLTBQNRxgfvzBRydD1ucs4YKIxKoHflCStFREest2d/
-AYoFWpO+ocH/+OcOZ6RHSXZddZAa9SaP8A==
------END CERTIFICATE-----
-
-# Issuer: CN=NetLock Kozjegyzoi (Class A) Tanusitvanykiado O=NetLock Halozatbiztonsagi Kft. OU=Tanusitvanykiadok
-# Subject: CN=NetLock Kozjegyzoi (Class A) Tanusitvanykiado O=NetLock Halozatbiztonsagi Kft. OU=Tanusitvanykiadok
-# Label: "NetLock Notary (Class A) Root"
-# Serial: 259
-# MD5 Fingerprint: 86:38:6d:5e:49:63:6c:85:5c:db:6d:dc:94:b7:d0:f7
-# SHA1 Fingerprint: ac:ed:5f:65:53:fd:25:ce:01:5f:1f:7a:48:3b:6a:74:9f:61:78:c6
-# SHA256 Fingerprint: 7f:12:cd:5f:7e:5e:29:0e:c7:d8:51:79:d5:b7:2c:20:a5:be:75:08:ff:db:5b:f8:1a:b9:68:4a:7f:c9:f6:67
------BEGIN CERTIFICATE-----
-MIIGfTCCBWWgAwIBAgICAQMwDQYJKoZIhvcNAQEEBQAwga8xCzAJBgNVBAYTAkhV
-MRAwDgYDVQQIEwdIdW5nYXJ5MREwDwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMe
-TmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0
-dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9jayBLb3pqZWd5em9pIChDbGFzcyBB
-KSBUYW51c2l0dmFueWtpYWRvMB4XDTk5MDIyNDIzMTQ0N1oXDTE5MDIxOTIzMTQ0
-N1owga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQIEwdIdW5nYXJ5MREwDwYDVQQHEwhC
-dWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQu
-MRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9jayBL
-b3pqZWd5em9pIChDbGFzcyBBKSBUYW51c2l0dmFueWtpYWRvMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvHSMD7tM9DceqQWC2ObhbHDqeLVu0ThEDaiD
-zl3S1tWBxdRL51uUcCbbO51qTGL3cfNk1mE7PetzozfZz+qMkjvN9wfcZnSX9EUi
-3fRc4L9t875lM+QVOr/bmJBVOMTtplVjC7B4BPTjbsE/jvxReB+SnoPC/tmwqcm8
-WgD/qaiYdPv2LD4VOQ22BFWoDpggQrOxJa1+mm9dU7GrDPzr4PN6s6iz/0b2Y6LY
-Oph7tqyF/7AlT3Rj5xMHpQqPBffAZG9+pyeAlt7ULoZgx2srXnN7F+eRP2QM2Esi
-NCubMvJIH5+hCoR64sKtlz2O1cH5VqNQ6ca0+pii7pXmKgOM3wIDAQABo4ICnzCC
-ApswDgYDVR0PAQH/BAQDAgAGMBIGA1UdEwEB/wQIMAYBAf8CAQQwEQYJYIZIAYb4
-QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaCAk1GSUdZRUxFTSEgRXplbiB0
-YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFub3MgU3pvbGdhbHRhdGFz
-aSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBhbGFwamFuIGtlc3p1bHQu
-IEEgaGl0ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExvY2sgS2Z0LiB0ZXJtZWtm
-ZWxlbG9zc2VnLWJpenRvc2l0YXNhIHZlZGkuIEEgZGlnaXRhbGlzIGFsYWlyYXMg
-ZWxmb2dhZGFzYW5hayBmZWx0ZXRlbGUgYXogZWxvaXJ0IGVsbGVub3J6ZXNpIGVs
-amFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFzIGxlaXJhc2EgbWVndGFsYWxoYXRv
-IGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGphbiBhIGh0dHBzOi8vd3d3
-Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJoZXRvIGF6IGVsbGVub3J6
-ZXNAbmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBPUlRBTlQhIFRoZSBpc3N1
-YW5jZSBhbmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGlzIHN1YmplY3Qg
-dG8gdGhlIE5ldExvY2sgQ1BTIGF2YWlsYWJsZSBhdCBodHRwczovL3d3dy5uZXRs
-b2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFpbCBhdCBjcHNAbmV0bG9jay5uZXQuMA0G
-CSqGSIb3DQEBBAUAA4IBAQBIJEb3ulZv+sgoA0BO5TE5ayZrU3/b39/zcT0mwBQO
-xmd7I6gMc90Bu8bKbjc5VdXHjFYgDigKDtIqpLBJUsY4B/6+CgmM0ZjPytoUMaFP
-0jn8DxEsQ8Pdq5PHVT5HfBgaANzze9jyf1JsIPQLX2lS9O74silg6+NJMSEN1rUQ
-QeJBCWziGppWS3cC9qCbmieH6FUpccKQn0V4GuEVZD3QDtigdp+uxdAu6tYPVuxk
-f1qbFFgBJ34TUMdrKuZoPL9coAob4Q566eKAw+np9v1sEZ7Q5SgnK1QyQhSCdeZK
-8CtmdWOMovsEPoMOmzbwGOQmIMOM8CgHrTwXZoi1/baI
------END CERTIFICATE-----
-
-# Issuer: CN=NetLock Uzleti (Class B) Tanusitvanykiado O=NetLock Halozatbiztonsagi Kft. OU=Tanusitvanykiadok
-# Subject: CN=NetLock Uzleti (Class B) Tanusitvanykiado O=NetLock Halozatbiztonsagi Kft. OU=Tanusitvanykiadok
-# Label: "NetLock Business (Class B) Root"
-# Serial: 105
-# MD5 Fingerprint: 39:16:aa:b9:6a:41:e1:14:69:df:9e:6c:3b:72:dc:b6
-# SHA1 Fingerprint: 87:9f:4b:ee:05:df:98:58:3b:e3:60:d6:33:e7:0d:3f:fe:98:71:af
-# SHA256 Fingerprint: 39:df:7b:68:2b:7b:93:8f:84:71:54:81:cc:de:8d:60:d8:f2:2e:c5:98:87:7d:0a:aa:c1:2b:59:18:2b:03:12
------BEGIN CERTIFICATE-----
-MIIFSzCCBLSgAwIBAgIBaTANBgkqhkiG9w0BAQQFADCBmTELMAkGA1UEBhMCSFUx
-ETAPBgNVBAcTCEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0
-b25zYWdpIEtmdC4xGjAYBgNVBAsTEVRhbnVzaXR2YW55a2lhZG9rMTIwMAYDVQQD
-EylOZXRMb2NrIFV6bGV0aSAoQ2xhc3MgQikgVGFudXNpdHZhbnlraWFkbzAeFw05
-OTAyMjUxNDEwMjJaFw0xOTAyMjAxNDEwMjJaMIGZMQswCQYDVQQGEwJIVTERMA8G
-A1UEBxMIQnVkYXBlc3QxJzAlBgNVBAoTHk5ldExvY2sgSGFsb3phdGJpenRvbnNh
-Z2kgS2Z0LjEaMBgGA1UECxMRVGFudXNpdHZhbnlraWFkb2sxMjAwBgNVBAMTKU5l
-dExvY2sgVXpsZXRpIChDbGFzcyBCKSBUYW51c2l0dmFueWtpYWRvMIGfMA0GCSqG
-SIb3DQEBAQUAA4GNADCBiQKBgQCx6gTsIKAjwo84YM/HRrPVG/77uZmeBNwcf4xK
-gZjupNTKihe5In+DCnVMm8Bp2GQ5o+2So/1bXHQawEfKOml2mrriRBf8TKPV/riX
-iK+IA4kfpPIEPsgHC+b5sy96YhQJRhTKZPWLgLViqNhr1nGTLbO/CVRY7QbrqHvc
-Q7GhaQIDAQABo4ICnzCCApswEgYDVR0TAQH/BAgwBgEB/wIBBDAOBgNVHQ8BAf8E
-BAMCAAYwEQYJYIZIAYb4QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaCAk1G
-SUdZRUxFTSEgRXplbiB0YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFu
-b3MgU3pvbGdhbHRhdGFzaSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBh
-bGFwamFuIGtlc3p1bHQuIEEgaGl0ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExv
-Y2sgS2Z0LiB0ZXJtZWtmZWxlbG9zc2VnLWJpenRvc2l0YXNhIHZlZGkuIEEgZGln
-aXRhbGlzIGFsYWlyYXMgZWxmb2dhZGFzYW5hayBmZWx0ZXRlbGUgYXogZWxvaXJ0
-IGVsbGVub3J6ZXNpIGVsamFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFzIGxlaXJh
-c2EgbWVndGFsYWxoYXRvIGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGph
-biBhIGh0dHBzOi8vd3d3Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJo
-ZXRvIGF6IGVsbGVub3J6ZXNAbmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBP
-UlRBTlQhIFRoZSBpc3N1YW5jZSBhbmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmlj
-YXRlIGlzIHN1YmplY3QgdG8gdGhlIE5ldExvY2sgQ1BTIGF2YWlsYWJsZSBhdCBo
-dHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFpbCBhdCBjcHNA
-bmV0bG9jay5uZXQuMA0GCSqGSIb3DQEBBAUAA4GBAATbrowXr/gOkDFOzT4JwG06
-sPgzTEdM43WIEJessDgVkcYplswhwG08pXTP2IKlOcNl40JwuyKQ433bNXbhoLXa
-n3BukxowOR0w2y7jfLKRstE3Kfq51hdcR0/jHTjrn9V7lagonhVK0dHQKwCXoOKS
-NitjrFgBazMpUIaD8QFI
------END CERTIFICATE-----
-
-# Issuer: CN=NetLock Expressz (Class C) Tanusitvanykiado O=NetLock Halozatbiztonsagi Kft. OU=Tanusitvanykiadok
-# Subject: CN=NetLock Expressz (Class C) Tanusitvanykiado O=NetLock Halozatbiztonsagi Kft. OU=Tanusitvanykiadok
-# Label: "NetLock Express (Class C) Root"
-# Serial: 104
-# MD5 Fingerprint: 4f:eb:f1:f0:70:c2:80:63:5d:58:9f:da:12:3c:a9:c4
-# SHA1 Fingerprint: e3:92:51:2f:0a:cf:f5:05:df:f6:de:06:7f:75:37:e1:65:ea:57:4b
-# SHA256 Fingerprint: 0b:5e:ed:4e:84:64:03:cf:55:e0:65:84:84:40:ed:2a:82:75:8b:f5:b9:aa:1f:25:3d:46:13:cf:a0:80:ff:3f
------BEGIN CERTIFICATE-----
-MIIFTzCCBLigAwIBAgIBaDANBgkqhkiG9w0BAQQFADCBmzELMAkGA1UEBhMCSFUx
-ETAPBgNVBAcTCEJ1ZGFwZXN0MScwJQYDVQQKEx5OZXRMb2NrIEhhbG96YXRiaXp0
-b25zYWdpIEtmdC4xGjAYBgNVBAsTEVRhbnVzaXR2YW55a2lhZG9rMTQwMgYDVQQD
-EytOZXRMb2NrIEV4cHJlc3N6IChDbGFzcyBDKSBUYW51c2l0dmFueWtpYWRvMB4X
-DTk5MDIyNTE0MDgxMVoXDTE5MDIyMDE0MDgxMVowgZsxCzAJBgNVBAYTAkhVMREw
-DwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9u
-c2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE0MDIGA1UEAxMr
-TmV0TG9jayBFeHByZXNzeiAoQ2xhc3MgQykgVGFudXNpdHZhbnlraWFkbzCBnzAN
-BgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA6+ywbGGKIyWvYCDj2Z/8kwvbXY2wobNA
-OoLO/XXgeDIDhlqGlZHtU/qdQPzm6N3ZW3oDvV3zOwzDUXmbrVWg6dADEK8KuhRC
-2VImESLH0iDMgqSaqf64gXadarfSNnU+sYYJ9m5tfk63euyucYT2BDMIJTLrdKwW
-RMbkQJMdf60CAwEAAaOCAp8wggKbMBIGA1UdEwEB/wQIMAYBAf8CAQQwDgYDVR0P
-AQH/BAQDAgAGMBEGCWCGSAGG+EIBAQQEAwIABzCCAmAGCWCGSAGG+EIBDQSCAlEW
-ggJNRklHWUVMRU0hIEV6ZW4gdGFudXNpdHZhbnkgYSBOZXRMb2NrIEtmdC4gQWx0
-YWxhbm9zIFN6b2xnYWx0YXRhc2kgRmVsdGV0ZWxlaWJlbiBsZWlydCBlbGphcmFz
-b2sgYWxhcGphbiBrZXN6dWx0LiBBIGhpdGVsZXNpdGVzIGZvbHlhbWF0YXQgYSBO
-ZXRMb2NrIEtmdC4gdGVybWVrZmVsZWxvc3NlZy1iaXp0b3NpdGFzYSB2ZWRpLiBB
-IGRpZ2l0YWxpcyBhbGFpcmFzIGVsZm9nYWRhc2FuYWsgZmVsdGV0ZWxlIGF6IGVs
-b2lydCBlbGxlbm9yemVzaSBlbGphcmFzIG1lZ3RldGVsZS4gQXogZWxqYXJhcyBs
-ZWlyYXNhIG1lZ3RhbGFsaGF0byBhIE5ldExvY2sgS2Z0LiBJbnRlcm5ldCBob25s
-YXBqYW4gYSBodHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIGNpbWVuIHZhZ3kg
-a2VyaGV0byBheiBlbGxlbm9yemVzQG5ldGxvY2submV0IGUtbWFpbCBjaW1lbi4g
-SU1QT1JUQU5UISBUaGUgaXNzdWFuY2UgYW5kIHRoZSB1c2Ugb2YgdGhpcyBjZXJ0
-aWZpY2F0ZSBpcyBzdWJqZWN0IHRvIHRoZSBOZXRMb2NrIENQUyBhdmFpbGFibGUg
-YXQgaHR0cHM6Ly93d3cubmV0bG9jay5uZXQvZG9jcyBvciBieSBlLW1haWwgYXQg
-Y3BzQG5ldGxvY2submV0LjANBgkqhkiG9w0BAQQFAAOBgQAQrX/XDDKACtiG8XmY
-ta3UzbM2xJZIwVzNmtkFLp++UOv0JhQQLdRmF/iewSf98e3ke0ugbLWrmldwpu2g
-pO0u9f38vf5NNwgMvOOWgyL1SRt/Syu0VMGAfJlOHdCM7tCs5ZL6dVb+ZKATj7i4
-Fp1hBWeAyNDYpQcCNJgEjTME1A==
------END CERTIFICATE-----
-
-# Issuer: CN=XRamp Global Certification Authority O=XRamp Security Services Inc OU=www.xrampsecurity.com
-# Subject: CN=XRamp Global Certification Authority O=XRamp Security Services Inc OU=www.xrampsecurity.com
-# Label: "XRamp Global CA Root"
-# Serial: 107108908803651509692980124233745014957
-# MD5 Fingerprint: a1:0b:44:b3:ca:10:d8:00:6e:9d:0f:d8:0f:92:0a:d1
-# SHA1 Fingerprint: b8:01:86:d1:eb:9c:86:a5:41:04:cf:30:54:f3:4c:52:b7:e5:58:c6
-# SHA256 Fingerprint: ce:cd:dc:90:50:99:d8:da:df:c5:b1:d2:09:b7:37:cb:e2:c1:8c:fb:2c:10:c0:ff:0b:cf:0d:32:86:fc:1a:a2
------BEGIN CERTIFICATE-----
-MIIEMDCCAxigAwIBAgIQUJRs7Bjq1ZxN1ZfvdY+grTANBgkqhkiG9w0BAQUFADCB
-gjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEk
-MCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRY
-UmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQxMTAxMTcx
-NDA0WhcNMzUwMTAxMDUzNzE5WjCBgjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3
-dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2Vy
-dmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBB
-dXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYJB69FbS6
-38eMpSe2OAtp87ZOqCwuIR1cRN8hXX4jdP5efrRKt6atH67gBhbim1vZZ3RrXYCP
-KZ2GG9mcDZhtdhAoWORlsH9KmHmf4MMxfoArtYzAQDsRhtDLooY2YKTVMIJt2W7Q
-DxIEM5dfT2Fa8OT5kavnHTu86M/0ay00fOJIYRyO82FEzG+gSqmUsE3a56k0enI4
-qEHMPJQRfevIpoy3hsvKMzvZPTeL+3o+hiznc9cKV6xkmxnr9A8ECIqsAxcZZPRa
-JSKNNCyy9mgdEm3Tih4U2sSPpuIjhdV6Db1q4Ons7Be7QhtnqiXtRYMh/MHJfNVi
-PvryxS3T/dRlAgMBAAGjgZ8wgZwwEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0P
-BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFMZPoj0GY4QJnM5i5ASs
-jVy16bYbMDYGA1UdHwQvMC0wK6ApoCeGJWh0dHA6Ly9jcmwueHJhbXBzZWN1cml0
-eS5jb20vWEdDQS5jcmwwEAYJKwYBBAGCNxUBBAMCAQEwDQYJKoZIhvcNAQEFBQAD
-ggEBAJEVOQMBG2f7Shz5CmBbodpNl2L5JFMn14JkTpAuw0kbK5rc/Kh4ZzXxHfAR
-vbdI4xD2Dd8/0sm2qlWkSLoC295ZLhVbO50WfUfXN+pfTXYSNrsf16GBBEYgoyxt
-qZ4Bfj8pzgCT3/3JknOJiWSe5yvkHJEs0rnOfc5vMZnT5r7SHpDwCRR5XCOrTdLa
-IR9NmXmd4c8nnxCbHIgNsIpkQTG4DmyQJKSbXHGPurt+HBvbaoAPIbzp26a3QPSy
-i6mx5O+aGtA9aZnuqCij4Tyz8LIRnM98QObd50N9otg6tamN8jSZxNQQ4Qb9CYQQ
-O+7ETPTsJ3xCwnR8gooJybQDJbw=
------END CERTIFICATE-----
-
-# Issuer: O=The Go Daddy Group, Inc. OU=Go Daddy Class 2 Certification Authority
-# Subject: O=The Go Daddy Group, Inc. OU=Go Daddy Class 2 Certification Authority
-# Label: "Go Daddy Class 2 CA"
-# Serial: 0
-# MD5 Fingerprint: 91:de:06:25:ab:da:fd:32:17:0c:bb:25:17:2a:84:67
-# SHA1 Fingerprint: 27:96:ba:e6:3f:18:01:e2:77:26:1b:a0:d7:77:70:02:8f:20:ee:e4
-# SHA256 Fingerprint: c3:84:6b:f2:4b:9e:93:ca:64:27:4c:0e:c6:7c:1e:cc:5e:02:4f:fc:ac:d2:d7:40:19:35:0e:81:fe:54:6a:e4
------BEGIN CERTIFICATE-----
-MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEh
-MB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBE
-YWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA0MDYyOTE3
-MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkGA1UEBhMCVVMxITAfBgNVBAoTGFRo
-ZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28gRGFkZHkgQ2xhc3Mg
-MiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQADggEN
-ADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCA
-PVYYYwhv2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6w
-wdhFJ2+qN1j3hybX2C32qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXi
-EqITLdiOr18SPaAIBQi2XKVlOARFmR6jYGB0xUGlcmIbYsUfb18aQr4CUWWoriMY
-avx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmYvLEHZ6IVDd2gWMZEewo+
-YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0OBBYEFNLE
-sNKR1EwRcbNhyz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h
-/t2oatTjoWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5
-IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmlj
-YXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
-ggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wimPQoZ+YeAEW5p5JYXMP80kWNy
-OO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKtI3lpjbi2Tc7P
-TMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheabIZ0KbIIOqPjCDPoQ
-HmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzrTia2cyvk0/ZM/iZx4mER
-dEr/VxqHD3VILs9RaRegAhJhldXRQLIQTO7ErBBDpqWeCtWVYpoNz4iCxTIM5Cuf
-ReYNnyicsbkqWletNw+vHX/bvZ8=
------END CERTIFICATE-----
-
-# Issuer: O=Starfield Technologies, Inc. OU=Starfield Class 2 Certification Authority
-# Subject: O=Starfield Technologies, Inc. OU=Starfield Class 2 Certification Authority
-# Label: "Starfield Class 2 CA"
-# Serial: 0
-# MD5 Fingerprint: 32:4a:4b:bb:c8:63:69:9b:be:74:9a:c6:dd:1d:46:24
-# SHA1 Fingerprint: ad:7e:1c:28:b0:64:ef:8f:60:03:40:20:14:c3:d0:e3:37:0e:b5:8a
-# SHA256 Fingerprint: 14:65:fa:20:53:97:b8:76:fa:a6:f0:a9:95:8e:55:90:e4:0f:cc:7f:aa:4f:b7:c2:c8:67:75:21:fb:5f:b6:58
------BEGIN CERTIFICATE-----
-MIIEDzCCAvegAwIBAgIBADANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJVUzEl
-MCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMp
-U3RhcmZpZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQw
-NjI5MTczOTE2WhcNMzQwNjI5MTczOTE2WjBoMQswCQYDVQQGEwJVUzElMCMGA1UE
-ChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMpU3RhcmZp
-ZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEgMA0GCSqGSIb3
-DQEBAQUAA4IBDQAwggEIAoIBAQC3Msj+6XGmBIWtDBFk385N78gDGIc/oav7PKaf
-8MOh2tTYbitTkPskpD6E8J7oX+zlJ0T1KKY/e97gKvDIr1MvnsoFAZMej2YcOadN
-+lq2cwQlZut3f+dZxkqZJRRU6ybH838Z1TBwj6+wRir/resp7defqgSHo9T5iaU0
-X9tDkYI22WY8sbi5gv2cOj4QyDvvBmVmepsZGD3/cVE8MC5fvj13c7JdBmzDI1aa
-K4UmkhynArPkPw2vCHmCuDY96pzTNbO8acr1zJ3o/WSNF4Azbl5KXZnJHoe0nRrA
-1W4TNSNe35tfPe/W93bC6j67eA0cQmdrBNj41tpvi/JEoAGrAgEDo4HFMIHCMB0G
-A1UdDgQWBBS/X7fRzt0fhvRbVazc1xDCDqmI5zCBkgYDVR0jBIGKMIGHgBS/X7fR
-zt0fhvRbVazc1xDCDqmI56FspGowaDELMAkGA1UEBhMCVVMxJTAjBgNVBAoTHFN0
-YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xMjAwBgNVBAsTKVN0YXJmaWVsZCBD
-bGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8w
-DQYJKoZIhvcNAQEFBQADggEBAAWdP4id0ckaVaGsafPzWdqbAYcaT1epoXkJKtv3
-L7IezMdeatiDh6GX70k1PncGQVhiv45YuApnP+yz3SFmH8lU+nLMPUxA2IGvd56D
-eruix/U0F47ZEUD0/CwqTRV/p2JdLiXTAAsgGh1o+Re49L2L7ShZ3U0WixeDyLJl
-xy16paq8U4Zt3VekyvggQQto8PT7dL5WXXp59fkdheMtlb71cZBDzI0fmgAKhynp
-VSJYACPq4xJDKVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEY
-WQPJIrSPnNVeKtelttQKbfi3QBFGmh95DmK/D5fs4C8fF5Q=
------END CERTIFICATE-----
-
-# Issuer: CN=StartCom Certification Authority O=StartCom Ltd. OU=Secure Digital Certificate Signing
-# Subject: CN=StartCom Certification Authority O=StartCom Ltd. OU=Secure Digital Certificate Signing
-# Label: "StartCom Certification Authority"
-# Serial: 1
-# MD5 Fingerprint: 22:4d:8f:8a:fc:f7:35:c2:bb:57:34:90:7b:8b:22:16
-# SHA1 Fingerprint: 3e:2b:f7:f2:03:1b:96:f3:8c:e6:c4:d8:a8:5d:3e:2d:58:47:6a:0f
-# SHA256 Fingerprint: c7:66:a9:be:f2:d4:07:1c:86:3a:31:aa:49:20:e8:13:b2:d1:98:60:8c:b7:b7:cf:e2:11:43:b8:36:df:09:ea
------BEGIN CERTIFICATE-----
-MIIHyTCCBbGgAwIBAgIBATANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJJTDEW
-MBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwg
-Q2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0NjM2WhcNMzYwOTE3MTk0NjM2WjB9
-MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMi
-U2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3Rh
-cnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUA
-A4ICDwAwggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZk
-pMyONvg45iPwbm2xPN1yo4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rf
-OQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/C
-Ji/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/deMotHweXMAEtcnn6RtYT
-Kqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt2PZE4XNi
-HzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMM
-Av+Z6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w
-+2OqqGwaVLRcJXrJosmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+
-Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3
-Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVcUjyJthkqcwEKDwOzEmDyei+B
-26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT37uMdBNSSwID
-AQABo4ICUjCCAk4wDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAa4wHQYDVR0OBBYE
-FE4L7xqkQFulF2mHMMo0aEPQQa7yMGQGA1UdHwRdMFswLKAqoCiGJmh0dHA6Ly9j
-ZXJ0LnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMCugKaAnhiVodHRwOi8vY3Js
-LnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMIIBXQYDVR0gBIIBVDCCAVAwggFM
-BgsrBgEEAYG1NwEBATCCATswLwYIKwYBBQUHAgEWI2h0dHA6Ly9jZXJ0LnN0YXJ0
-Y29tLm9yZy9wb2xpY3kucGRmMDUGCCsGAQUFBwIBFilodHRwOi8vY2VydC5zdGFy
-dGNvbS5vcmcvaW50ZXJtZWRpYXRlLnBkZjCB0AYIKwYBBQUHAgIwgcMwJxYgU3Rh
-cnQgQ29tbWVyY2lhbCAoU3RhcnRDb20pIEx0ZC4wAwIBARqBl0xpbWl0ZWQgTGlh
-YmlsaXR5LCByZWFkIHRoZSBzZWN0aW9uICpMZWdhbCBMaW1pdGF0aW9ucyogb2Yg
-dGhlIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFBvbGljeSBhdmFp
-bGFibGUgYXQgaHR0cDovL2NlcnQuc3RhcnRjb20ub3JnL3BvbGljeS5wZGYwEQYJ
-YIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilTdGFydENvbSBGcmVlIFNT
-TCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQUFAAOCAgEAFmyZ
-9GYMNPXQhV59CuzaEE44HF7fpiUFS5Eyweg78T3dRAlbB0mKKctmArexmvclmAk8
-jhvh3TaHK0u7aNM5Zj2gJsfyOZEdUauCe37Vzlrk4gNXcGmXCPleWKYK34wGmkUW
-FjgKXlf2Ysd6AgXmvB618p70qSmD+LIU424oh0TDkBreOKk8rENNZEXO3SipXPJz
-ewT4F+irsfMuXGRuczE6Eri8sxHkfY+BUZo7jYn0TZNmezwD7dOaHZrzZVD1oNB1
-ny+v8OqCQ5j4aZyJecRDjkZy42Q2Eq/3JR44iZB3fsNrarnDy0RLrHiQi+fHLB5L
-EUTINFInzQpdn4XBidUaePKVEFMy3YCEZnXZtWgo+2EuvoSoOMCZEoalHmdkrQYu
-L6lwhceWD3yJZfWOQ1QOq92lgDmUYMA0yZZwLKMS9R9Ie70cfmu3nZD0Ijuu+Pwq
-yvqCUqDvr0tVk+vBtfAii6w0TiYiBKGHLHVKt+V9E9e4DGTANtLJL4YSjCMJwRuC
-O3NJo2pXh5Tl1njFmUNj403gdy3hZZlyaQQaRwnmDwFWJPsfvw55qVguucQJAX6V
-um0ABj6y6koQOdjQK/W/7HW/lwLFCRsI3FU34oH7N4RDYiDK51ZLZer+bMEkkySh
-NOsF/5oirpt9P/FlUQqmMGqz9IgcgA38corog14=
------END CERTIFICATE-----
-
-# Issuer: O=Government Root Certification Authority
-# Subject: O=Government Root Certification Authority
-# Label: "Taiwan GRCA"
-# Serial: 42023070807708724159991140556527066870
-# MD5 Fingerprint: 37:85:44:53:32:45:1f:20:f0:f3:95:e1:25:c4:43:4e
-# SHA1 Fingerprint: f4:8b:11:bf:de:ab:be:94:54:20:71:e6:41:de:6b:be:88:2b:40:b9
-# SHA256 Fingerprint: 76:00:29:5e:ef:e8:5b:9e:1f:d6:24:db:76:06:2a:aa:ae:59:81:8a:54:d2:77:4c:d4:c0:b2:c0:11:31:e1:b3
------BEGIN CERTIFICATE-----
-MIIFcjCCA1qgAwIBAgIQH51ZWtcvwgZEpYAIaeNe9jANBgkqhkiG9w0BAQUFADA/
-MQswCQYDVQQGEwJUVzEwMC4GA1UECgwnR292ZXJubWVudCBSb290IENlcnRpZmlj
-YXRpb24gQXV0aG9yaXR5MB4XDTAyMTIwNTEzMjMzM1oXDTMyMTIwNTEzMjMzM1ow
-PzELMAkGA1UEBhMCVFcxMDAuBgNVBAoMJ0dvdmVybm1lbnQgUm9vdCBDZXJ0aWZp
-Y2F0aW9uIEF1dGhvcml0eTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB
-AJoluOzMonWoe/fOW1mKydGGEghU7Jzy50b2iPN86aXfTEc2pBsBHH8eV4qNw8XR
-IePaJD9IK/ufLqGU5ywck9G/GwGHU5nOp/UKIXZ3/6m3xnOUT0b3EEk3+qhZSV1q
-gQdW8or5BtD3cCJNtLdBuTK4sfCxw5w/cP1T3YGq2GN49thTbqGsaoQkclSGxtKy
-yhwOeYHWtXBiCAEuTk8O1RGvqa/lmr/czIdtJuTJV6L7lvnM4T9TjGxMfptTCAts
-F/tnyMKtsc2AtJfcdgEWFelq16TheEfOhtX7MfP6Mb40qij7cEwdScevLJ1tZqa2
-jWR+tSBqnTuBto9AAGdLiYa4zGX+FVPpBMHWXx1E1wovJ5pGfaENda1UhhXcSTvx
-ls4Pm6Dso3pdvtUqdULle96ltqqvKKyskKw4t9VoNSZ63Pc78/1Fm9G7Q3hub/FC
-VGqY8A2tl+lSXunVanLeavcbYBT0peS2cWeqH+riTcFCQP5nRhc4L0c/cZyu5SHK
-YS1tB6iEfC3uUSXxY5Ce/eFXiGvviiNtsea9P63RPZYLhY3Naye7twWb7LuRqQoH
-EgKXTiCQ8P8NHuJBO9NAOueNXdpm5AKwB1KYXA6OM5zCppX7VRluTI6uSw+9wThN
-Xo+EHWbNxWCWtFJaBYmOlXqYwZE8lSOyDvR5tMl8wUohAgMBAAGjajBoMB0GA1Ud
-DgQWBBTMzO/MKWCkO7GStjz6MmKPrCUVOzAMBgNVHRMEBTADAQH/MDkGBGcqBwAE
-MTAvMC0CAQAwCQYFKw4DAhoFADAHBgVnKgMAAAQUA5vwIhP/lSg209yewDL7MTqK
-UWUwDQYJKoZIhvcNAQEFBQADggIBAECASvomyc5eMN1PhnR2WPWus4MzeKR6dBcZ
-TulStbngCnRiqmjKeKBMmo4sIy7VahIkv9Ro04rQ2JyftB8M3jh+Vzj8jeJPXgyf
-qzvS/3WXy6TjZwj/5cAWtUgBfen5Cv8b5Wppv3ghqMKnI6mGq3ZW6A4M9hPdKmaK
-ZEk9GhiHkASfQlK3T8v+R0F2Ne//AHY2RTKbxkaFXeIksB7jSJaYV0eUVXoPQbFE
-JPPB/hprv4j9wabak2BegUqZIJxIZhm1AHlUD7gsL0u8qV1bYH+Mh6XgUmMqvtg7
-hUAV/h62ZT/FS9p+tXo1KaMuephgIqP0fSdOLeq0dDzpD6QzDxARvBMB1uUO07+1
-EqLhRSPAzAhuYbeJq4PjJB7mXQfnHyA+z2fI56wwbSdLaG5LKlwCCDTb+HbkZ6Mm
-nD+iMsJKxYEYMRBWqoTvLQr/uB930r+lWKBi5NdLkXWNiYCYfm3LU05er/ayl4WX
-udpVBrkk7tfGOB5jGxI7leFYrPLfhNVfmS8NVVvmONsuP3LpSIXLuykTjx44Vbnz
-ssQwmSNOXfJIoRIM3BKQCZBUkQM8R+XVyWXgt0t97EfTsws+rZ7QdAAO671RrcDe
-LMDDav7v3Aun+kbfYNucpllQdSNpc5Oy+fwC00fmcc4QAu4njIT/rEUNE1yDMuAl
-pYYsfPQS
------END CERTIFICATE-----
-
-# Issuer: CN=Autoridad de Certificacion Firmaprofesional CIF A62634068
-# Subject: CN=Autoridad de Certificacion Firmaprofesional CIF A62634068
-# Label: "Firmaprofesional Root CA"
-# Serial: 1
-# MD5 Fingerprint: 11:92:79:40:3c:b1:83:40:e5:ab:66:4a:67:92:80:df
-# SHA1 Fingerprint: a9:62:8f:4b:98:a9:1b:48:35:ba:d2:c1:46:32:86:bb:66:64:6a:8c
-# SHA256 Fingerprint: c1:cf:0b:52:09:64:35:e3:f1:b7:1d:aa:ec:45:5a:23:11:c8:40:4f:55:83:a9:e2:13:c6:9d:85:7d:94:33:05
------BEGIN CERTIFICATE-----
-MIIEVzCCAz+gAwIBAgIBATANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMCRVMx
-IjAgBgNVBAcTGUMvIE11bnRhbmVyIDI0NCBCYXJjZWxvbmExQjBABgNVBAMTOUF1
-dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2
-MjYzNDA2ODEmMCQGCSqGSIb3DQEJARYXY2FAZmlybWFwcm9mZXNpb25hbC5jb20w
-HhcNMDExMDI0MjIwMDAwWhcNMTMxMDI0MjIwMDAwWjCBnTELMAkGA1UEBhMCRVMx
-IjAgBgNVBAcTGUMvIE11bnRhbmVyIDI0NCBCYXJjZWxvbmExQjBABgNVBAMTOUF1
-dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2
-MjYzNDA2ODEmMCQGCSqGSIb3DQEJARYXY2FAZmlybWFwcm9mZXNpb25hbC5jb20w
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDnIwNvbyOlXnjOlSztlB5u
-Cp4Bx+ow0Syd3Tfom5h5VtP8c9/Qit5Vj1H5WuretXDE7aTt/6MNbg9kUDGvASdY
-rv5sp0ovFy3Tc9UTHI9ZpTQsHVQERc1ouKDAA6XPhUJHlShbz++AbOCQl4oBPB3z
-hxAwJkh91/zpnZFx/0GaqUC1N5wpIE8fUuOgfRNtVLcK3ulqTgesrBlf3H5idPay
-BQC6haD9HThuy1q7hryUZzM1gywfI834yJFxzJeL764P3CkDG8A563DtwW4O2GcL
-iam8NeTvtjS0pbbELaW+0MOUJEjb35bTALVmGotmBQ/dPz/LP6pemkr4tErvlTcb
-AgMBAAGjgZ8wgZwwKgYDVR0RBCMwIYYfaHR0cDovL3d3dy5maXJtYXByb2Zlc2lv
-bmFsLmNvbTASBgNVHRMBAf8ECDAGAQH/AgEBMCsGA1UdEAQkMCKADzIwMDExMDI0
-MjIwMDAwWoEPMjAxMzEwMjQyMjAwMDBaMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4E
-FgQUMwugZtHq2s7eYpMEKFK1FH84aLcwDQYJKoZIhvcNAQEFBQADggEBAEdz/o0n
-VPD11HecJ3lXV7cVVuzH2Fi3AQL0M+2TUIiefEaxvT8Ub/GzR0iLjJcG1+p+o1wq
-u00vR+L4OQbJnC4xGgN49Lw4xiKLMzHwFgQEffl25EvXwOaD7FnMP97/T2u3Z36m
-hoEyIwOdyPdfwUpgpZKpsaSgYMN4h7Mi8yrrW6ntBas3D7Hi05V2Y1Z0jFhyGzfl
-ZKG+TQyTmAyX9odtsz/ny4Cm7YjHX1BiAuiZdBbQ5rQ58SfLyEDW44YQqSMSkuBp
-QWOnryULwMWSyx6Yo1q6xTMPoJcB3X/ge9YGVM+h4k0460tQtcsm9MracEpqoeJ5
-quGnM/b9Sh/22WA=
------END CERTIFICATE-----
-
-# Issuer: CN=Swisscom Root CA 1 O=Swisscom OU=Digital Certificate Services
-# Subject: CN=Swisscom Root CA 1 O=Swisscom OU=Digital Certificate Services
-# Label: "Swisscom Root CA 1"
-# Serial: 122348795730808398873664200247279986742
-# MD5 Fingerprint: f8:38:7c:77:88:df:2c:16:68:2e:c2:e2:52:4b:b8:f9
-# SHA1 Fingerprint: 5f:3a:fc:0a:8b:64:f6:86:67:34:74:df:7e:a9:a2:fe:f9:fa:7a:51
-# SHA256 Fingerprint: 21:db:20:12:36:60:bb:2e:d4:18:20:5d:a1:1e:e7:a8:5a:65:e2:bc:6e:55:b5:af:7e:78:99:c8:a2:66:d9:2e
------BEGIN CERTIFICATE-----
-MIIF2TCCA8GgAwIBAgIQXAuFXAvnWUHfV8w/f52oNjANBgkqhkiG9w0BAQUFADBk
-MQswCQYDVQQGEwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsTHERpZ2l0
-YWwgQ2VydGlmaWNhdGUgU2VydmljZXMxGzAZBgNVBAMTElN3aXNzY29tIFJvb3Qg
-Q0EgMTAeFw0wNTA4MTgxMjA2MjBaFw0yNTA4MTgyMjA2MjBaMGQxCzAJBgNVBAYT
-AmNoMREwDwYDVQQKEwhTd2lzc2NvbTElMCMGA1UECxMcRGlnaXRhbCBDZXJ0aWZp
-Y2F0ZSBTZXJ2aWNlczEbMBkGA1UEAxMSU3dpc3Njb20gUm9vdCBDQSAxMIICIjAN
-BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0LmwqAzZuz8h+BvVM5OAFmUgdbI9
-m2BtRsiMMW8Xw/qabFbtPMWRV8PNq5ZJkCoZSx6jbVfd8StiKHVFXqrWW/oLJdih
-FvkcxC7mlSpnzNApbjyFNDhhSbEAn9Y6cV9Nbc5fuankiX9qUvrKm/LcqfmdmUc/
-TilftKaNXXsLmREDA/7n29uj/x2lzZAeAR81sH8A25Bvxn570e56eqeqDFdvpG3F
-EzuwpdntMhy0XmeLVNxzh+XTF3xmUHJd1BpYwdnP2IkCb6dJtDZd0KTeByy2dbco
-kdaXvij1mB7qWybJvbCXc9qukSbraMH5ORXWZ0sKbU/Lz7DkQnGMU3nn7uHbHaBu
-HYwadzVcFh4rUx80i9Fs/PJnB3r1re3WmquhsUvhzDdf/X/NTa64H5xD+SpYVUNF
-vJbNcA78yeNmuk6NO4HLFWR7uZToXTNShXEuT46iBhFRyePLoW4xCGQMwtI89Tbo
-19AOeCMgkckkKmUpWyL3Ic6DXqTz3kvTaI9GdVyDCW4pa8RwjPWd1yAv/0bSKzjC
-L3UcPX7ape8eYIVpQtPM+GP+HkM5haa2Y0EQs3MevNP6yn0WR+Kn1dCjigoIlmJW
-bjTb2QK5MHXjBNLnj8KwEUAKrNVxAmKLMb7dxiNYMUJDLXT5xp6mig/p/r+D5kNX
-JLrvRjSq1xIBOO0CAwEAAaOBhjCBgzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0hBBYw
-FDASBgdghXQBUwABBgdghXQBUwABMBIGA1UdEwEB/wQIMAYBAf8CAQcwHwYDVR0j
-BBgwFoAUAyUv3m+CATpcLNwroWm1Z9SM0/0wHQYDVR0OBBYEFAMlL95vggE6XCzc
-K6FptWfUjNP9MA0GCSqGSIb3DQEBBQUAA4ICAQA1EMvspgQNDQ/NwNurqPKIlwzf
-ky9NfEBWMXrrpA9gzXrzvsMnjgM+pN0S734edAY8PzHyHHuRMSG08NBsl9Tpl7Ik
-Vh5WwzW9iAUPWxAaZOHHgjD5Mq2eUCzneAXQMbFamIp1TpBcahQq4FJHgmDmHtqB
-sfsUC1rxn9KVuj7QG9YVHaO+htXbD8BJZLsuUBlL0iT43R4HVtA4oJVwIHaM190e
-3p9xxCPvgxNcoyQVTSlAPGrEqdi3pkSlDfTgnXceQHAm/NrZNuR55LU/vJtlvrsR
-ls/bxig5OgjOR1tTWsWZ/l2p3e9M1MalrQLmjAcSHm8D0W+go/MpvRLHUKKwf4ip
-mXeascClOS5cfGniLLDqN2qk4Vrh9VDlg++luyqI54zb/W1elxmofmZ1a3Hqv7HH
-b6D0jqTsNFFbjCYDcKF31QESVwA12yPeDooomf2xEG9L/zgtYE4snOtnta1J7ksf
-rK/7DZBaZmBwXarNeNQk7shBoJMBkpxqnvy5JMWzFYJ+vq6VK+uxwNrjAWALXmms
-hFZhvnEX/h0TD/7Gh0Xp/jKgGg0TpJRVcaUWi7rKibCyx/yP2FS1k2Kdzs9Z+z0Y
-zirLNRWCXf9UIltxUvu3yf5gmwBBZPCqKuy2QkPOiWaByIufOVQDJdMWNY6E0F/6
-MBr1mmz0DlP5OlvRHA==
------END CERTIFICATE-----
-
-# Issuer: CN=DigiCert Assured ID Root CA O=DigiCert Inc OU=www.digicert.com
-# Subject: CN=DigiCert Assured ID Root CA O=DigiCert Inc OU=www.digicert.com
-# Label: "DigiCert Assured ID Root CA"
-# Serial: 17154717934120587862167794914071425081
-# MD5 Fingerprint: 87:ce:0b:7b:2a:0e:49:00:e1:58:71:9b:37:a8:93:72
-# SHA1 Fingerprint: 05:63:b8:63:0d:62:d7:5a:bb:c8:ab:1e:4b:df:b5:a8:99:b2:4d:43
-# SHA256 Fingerprint: 3e:90:99:b5:01:5e:8f:48:6c:00:bc:ea:9d:11:1e:e7:21:fa:ba:35:5a:89:bc:f1:df:69:56:1e:3d:c6:32:5c
------BEGIN CERTIFICATE-----
-MIIDtzCCAp+gAwIBAgIQDOfg5RfYRv6P5WD8G/AwOTANBgkqhkiG9w0BAQUFADBl
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJv
-b3QgQ0EwHhcNMDYxMTEwMDAwMDAwWhcNMzExMTEwMDAwMDAwWjBlMQswCQYDVQQG
-EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNl
-cnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0EwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtDhXO5EOAXLGH87dg+XESpa7c
-JpSIqvTO9SA5KFhgDPiA2qkVlTJhPLWxKISKityfCgyDF3qPkKyK53lTXDGEKvYP
-mDI2dsze3Tyoou9q+yHyUmHfnyDXH+Kx2f4YZNISW1/5WBg1vEfNoTb5a3/UsDg+
-wRvDjDPZ2C8Y/igPs6eD1sNuRMBhNZYW/lmci3Zt1/GiSw0r/wty2p5g0I6QNcZ4
-VYcgoc/lbQrISXwxmDNsIumH0DJaoroTghHtORedmTpyoeb6pNnVFzF1roV9Iq4/
-AUaG9ih5yLHa5FcXxH4cDrC0kqZWs72yl+2qp/C3xag/lRbQ/6GW6whfGHdPAgMB
-AAGjYzBhMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQW
-BBRF66Kv9JLLgjEtUYunpyGd823IDzAfBgNVHSMEGDAWgBRF66Kv9JLLgjEtUYun
-pyGd823IDzANBgkqhkiG9w0BAQUFAAOCAQEAog683+Lt8ONyc3pklL/3cmbYMuRC
-dWKuh+vy1dneVrOfzM4UKLkNl2BcEkxY5NM9g0lFWJc1aRqoR+pWxnmrEthngYTf
-fwk8lOa4JiwgvT2zKIn3X/8i4peEH+ll74fg38FnSbNd67IJKusm7Xi+fT8r87cm
-NW1fiQG2SVufAQWbqz0lwcy2f8Lxb4bG+mRo64EtlOtCt/qMHt1i8b5QZ7dsvfPx
-H2sMNgcWfzd8qVttevESRmCD1ycEvkvOl77DZypoEd+A5wwzZr8TDRRu838fYxAe
-+o0bJW1sj6W3YQGx0qMmoRBxna3iw/nDmVG3KwcIzi7mULKn+gpFL6Lw8g==
------END CERTIFICATE-----
-
-# Issuer: CN=DigiCert Global Root CA O=DigiCert Inc OU=www.digicert.com
-# Subject: CN=DigiCert Global Root CA O=DigiCert Inc OU=www.digicert.com
-# Label: "DigiCert Global Root CA"
-# Serial: 10944719598952040374951832963794454346
-# MD5 Fingerprint: 79:e4:a9:84:0d:7d:3a:96:d7:c0:4f:e2:43:4c:89:2e
-# SHA1 Fingerprint: a8:98:5d:3a:65:e5:e5:c4:b2:d7:d6:6d:40:c6:dd:2f:b1:9c:54:36
-# SHA256 Fingerprint: 43:48:a0:e9:44:4c:78:cb:26:5e:05:8d:5e:89:44:b4:d8:4f:96:62:bd:26:db:25:7f:89:34:a4:43:c7:01:61
------BEGIN CERTIFICATE-----
-MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBh
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD
-QTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAwMDAwMDBaMGExCzAJBgNVBAYTAlVT
-MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
-b20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsB
-CSDMAZOnTjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97
-nh6Vfe63SKMI2tavegw5BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt
-43C/dxC//AH2hdmoRBBYMql1GNXRor5H4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7P
-T19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y7vrTC0LUq7dBMtoM1O/4
-gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQABo2MwYTAO
-BgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbR
-TLtm8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUw
-DQYJKoZIhvcNAQEFBQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/Esr
-hMAtudXH/vTBH1jLuG2cenTnmCmrEbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg
-06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIttep3Sp+dWOIrWcBAI+0tKIJF
-PnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886UAb3LujEV0ls
-YSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk
-CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=
------END CERTIFICATE-----
-
-# Issuer: CN=DigiCert High Assurance EV Root CA O=DigiCert Inc OU=www.digicert.com
-# Subject: CN=DigiCert High Assurance EV Root CA O=DigiCert Inc OU=www.digicert.com
-# Label: "DigiCert High Assurance EV Root CA"
-# Serial: 3553400076410547919724730734378100087
-# MD5 Fingerprint: d4:74:de:57:5c:39:b2:d3:9c:85:83:c5:c0:65:49:8a
-# SHA1 Fingerprint: 5f:b7:ee:06:33:e2:59:db:ad:0c:4c:9a:e6:d3:8f:1a:61:c7:dc:25
-# SHA256 Fingerprint: 74:31:e5:f4:c3:c1:ce:46:90:77:4f:0b:61:e0:54:40:88:3b:a9:a0:1e:d0:0b:a6:ab:d7:80:6e:d3:b1:18:cf
------BEGIN CERTIFICATE-----
-MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBs
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSswKQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5j
-ZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAwMFoXDTMxMTExMDAwMDAwMFowbDEL
-MAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZMBcGA1UECxMQd3d3
-LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFuY2Ug
-RVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm
-+9S75S0tMqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTW
-PNt0OKRKzE0lgvdKpVMSOO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEM
-xChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFB
-Ik5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQNAQTXKFx01p8VdteZOE3
-hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUeh10aUAsg
-EsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQF
-MAMBAf8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaA
-FLE+w2kD+L9HAdSYJhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3Nec
-nzyIZgYIVyHbIUf4KmeqvxgydkAQV8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6z
-eM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFpmyPInngiK3BD41VHMWEZ71jF
-hS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkKmNEVX58Svnw2
-Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe
-vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep
-+OkuE6N36B9K
------END CERTIFICATE-----
-
-# Issuer: CN=Class 2 Primary CA O=Certplus
-# Subject: CN=Class 2 Primary CA O=Certplus
-# Label: "Certplus Class 2 Primary CA"
-# Serial: 177770208045934040241468760488327595043
-# MD5 Fingerprint: 88:2c:8c:52:b8:a2:3c:f3:f7:bb:03:ea:ae:ac:42:0b
-# SHA1 Fingerprint: 74:20:74:41:72:9c:dd:92:ec:79:31:d8:23:10:8d:c2:81:92:e2:bb
-# SHA256 Fingerprint: 0f:99:3c:8a:ef:97:ba:af:56:87:14:0e:d5:9a:d1:82:1b:b4:af:ac:f0:aa:9a:58:b5:d5:7a:33:8a:3a:fb:cb
------BEGIN CERTIFICATE-----
-MIIDkjCCAnqgAwIBAgIRAIW9S/PY2uNp9pTXX8OlRCMwDQYJKoZIhvcNAQEFBQAw
-PTELMAkGA1UEBhMCRlIxETAPBgNVBAoTCENlcnRwbHVzMRswGQYDVQQDExJDbGFz
-cyAyIFByaW1hcnkgQ0EwHhcNOTkwNzA3MTcwNTAwWhcNMTkwNzA2MjM1OTU5WjA9
-MQswCQYDVQQGEwJGUjERMA8GA1UEChMIQ2VydHBsdXMxGzAZBgNVBAMTEkNsYXNz
-IDIgUHJpbWFyeSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANxQ
-ltAS+DXSCHh6tlJw/W/uz7kRy1134ezpfgSN1sxvc0NXYKwzCkTsA18cgCSR5aiR
-VhKC9+Ar9NuuYS6JEI1rbLqzAr3VNsVINyPi8Fo3UjMXEuLRYE2+L0ER4/YXJQyL
-kcAbmXuZVg2v7tK8R1fjeUl7NIknJITesezpWE7+Tt9avkGtrAjFGA7v0lPubNCd
-EgETjdyAYveVqUSISnFOYFWe2yMZeVYHDD9jC1yw4r5+FfyUM1hBOHTE4Y+L3yas
-H7WLO7dDWWuwJKZtkIvEcupdM5i3y95ee++U8Rs+yskhwcWYAqqi9lt3m/V+llU0
-HGdpwPFC40es/CgcZlUCAwEAAaOBjDCBiTAPBgNVHRMECDAGAQH/AgEKMAsGA1Ud
-DwQEAwIBBjAdBgNVHQ4EFgQU43Mt38sOKAze3bOkynm4jrvoMIkwEQYJYIZIAYb4
-QgEBBAQDAgEGMDcGA1UdHwQwMC4wLKAqoCiGJmh0dHA6Ly93d3cuY2VydHBsdXMu
-Y29tL0NSTC9jbGFzczIuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQCnVM+IRBnL39R/
-AN9WM2K191EBkOvDP9GIROkkXe/nFL0gt5o8AP5tn9uQ3Nf0YtaLcF3n5QRIqWh8
-yfFC82x/xXp8HVGIutIKPidd3i1RTtMTZGnkLuPT55sJmabglZvOGtd/vjzOUrMR
-FcEPF80Du5wlFbqidon8BvEY0JNLDnyCt6X09l/+7UCmnYR0ObncHoUW2ikbhiMA
-ybuJfm6AiB4vFLQDJKgybwOaRywwvlbGp0ICcBvqQNi6BQNwB6SW//1IMwrh3KWB
-kJtN3X3n57LNXMhqlfil9o3EXXgIvnsG1knPGTZQIy4I5p4FTUcY1Rbpsda2ENW7
-l7+ijrRU
------END CERTIFICATE-----
-
-# Issuer: CN=DST Root CA X3 O=Digital Signature Trust Co.
-# Subject: CN=DST Root CA X3 O=Digital Signature Trust Co.
-# Label: "DST Root CA X3"
-# Serial: 91299735575339953335919266965803778155
-# MD5 Fingerprint: 41:03:52:dc:0f:f7:50:1b:16:f0:02:8e:ba:6f:45:c5
-# SHA1 Fingerprint: da:c9:02:4f:54:d8:f6:df:94:93:5f:b1:73:26:38:ca:6a:d7:7c:13
-# SHA256 Fingerprint: 06:87:26:03:31:a7:24:03:d9:09:f1:05:e6:9b:cf:0d:32:e1:bd:24:93:ff:c6:d9:20:6d:11:bc:d6:77:07:39
------BEGIN CERTIFICATE-----
-MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/
-MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
-DkRTVCBSb290IENBIFgzMB4XDTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVow
-PzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRcwFQYDVQQD
-Ew5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmTrE4O
-rz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEq
-OLl5CjH9UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9b
-xiqKqy69cK3FCxolkHRyxXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw
-7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40dutolucbY38EVAjqr2m7xPi71XAicPNaD
-aeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV
-HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQMA0GCSqG
-SIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69
-ikugdB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXr
-AvHRAosZy5Q6XkjEGB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZz
-R8srzJmwN0jP41ZL9c8PDHIyh8bwRLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5
-JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubSfZGL+T0yjWW06XyxV3bqxbYo
-Ob8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
------END CERTIFICATE-----
-
-# Issuer: CN=DST ACES CA X6 O=Digital Signature Trust OU=DST ACES
-# Subject: CN=DST ACES CA X6 O=Digital Signature Trust OU=DST ACES
-# Label: "DST ACES CA X6"
-# Serial: 17771143917277623872238992636097467865
-# MD5 Fingerprint: 21:d8:4c:82:2b:99:09:33:a2:eb:14:24:8d:8e:5f:e8
-# SHA1 Fingerprint: 40:54:da:6f:1c:3f:40:74:ac:ed:0f:ec:cd:db:79:d1:53:fb:90:1d
-# SHA256 Fingerprint: 76:7c:95:5a:76:41:2c:89:af:68:8e:90:a1:c7:0f:55:6c:fd:6b:60:25:db:ea:10:41:6d:7e:b6:83:1f:8c:40
------BEGIN CERTIFICATE-----
-MIIECTCCAvGgAwIBAgIQDV6ZCtadt3js2AdWO4YV2TANBgkqhkiG9w0BAQUFADBb
-MQswCQYDVQQGEwJVUzEgMB4GA1UEChMXRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3Qx
-ETAPBgNVBAsTCERTVCBBQ0VTMRcwFQYDVQQDEw5EU1QgQUNFUyBDQSBYNjAeFw0w
-MzExMjAyMTE5NThaFw0xNzExMjAyMTE5NThaMFsxCzAJBgNVBAYTAlVTMSAwHgYD
-VQQKExdEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdDERMA8GA1UECxMIRFNUIEFDRVMx
-FzAVBgNVBAMTDkRTVCBBQ0VTIENBIFg2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAuT31LMmU3HWKlV1j6IR3dma5WZFcRt2SPp/5DgO0PWGSvSMmtWPu
-ktKe1jzIDZBfZIGxqAgNTNj50wUoUrQBJcWVHAx+PhCEdc/BGZFjz+iokYi5Q1K7
-gLFViYsx+tC3dr5BPTCapCIlF3PoHuLTrCq9Wzgh1SpL11V94zpVvddtawJXa+ZH
-fAjIgrrep4c9oW24MFbCswKBXy314powGCi4ZtPLAZZv6opFVdbgnf9nKxcCpk4a
-ahELfrd755jWjHZvwTvbUJN+5dCOHze4vbrGn2zpfDPyMjwmR/onJALJfh1biEIT
-ajV8fTXpLmaRcpPVMibEdPVTo7NdmvYJywIDAQABo4HIMIHFMA8GA1UdEwEB/wQF
-MAMBAf8wDgYDVR0PAQH/BAQDAgHGMB8GA1UdEQQYMBaBFHBraS1vcHNAdHJ1c3Rk
-c3QuY29tMGIGA1UdIARbMFkwVwYKYIZIAWUDAgEBATBJMEcGCCsGAQUFBwIBFjto
-dHRwOi8vd3d3LnRydXN0ZHN0LmNvbS9jZXJ0aWZpY2F0ZXMvcG9saWN5L0FDRVMt
-aW5kZXguaHRtbDAdBgNVHQ4EFgQUCXIGThhDD+XWzMNqizF7eI+og7gwDQYJKoZI
-hvcNAQEFBQADggEBAKPYjtay284F5zLNAdMEA+V25FYrnJmQ6AgwbN99Pe7lv7Uk
-QIRJ4dEorsTCOlMwiPH1d25Ryvr/ma8kXxug/fKshMrfqfBfBC6tFr8hlxCBPeP/
-h40y3JTlR4peahPJlJU90u7INJXQgNStMgiAVDzgvVJT11J8smk/f3rPanTK+gQq
-nExaBqXpIK1FZg9p8d2/6eMyi/rgwYZNcjwu2JN4Cir42NInPRmJX1p7ijvMDNpR
-rscL9yuwNwXsvFcj4jjSm2jzVhKIT0J8uDHEtdvkyCE06UgRNe76x5JXxZ805Mf2
-9w4LTJxoeHtxMcfrHuBnQfO3oKfN5XozNmr6mis=
------END CERTIFICATE-----
-
-# Issuer: CN=TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı O=(c) 2005 TÜRKTRUST Bilgi İletişim ve Bilişim Güvenliği Hizmetleri A.Ş.
-# Subject: CN=TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı O=(c) 2005 TÜRKTRUST Bilgi İletişim ve Bilişim Güvenliği Hizmetleri A.Ş.
-# Label: "TURKTRUST Certificate Services Provider Root 1"
-# Serial: 1
-# MD5 Fingerprint: f1:6a:22:18:c9:cd:df:ce:82:1d:1d:b7:78:5c:a9:a5
-# SHA1 Fingerprint: 79:98:a3:08:e1:4d:65:85:e6:c2:1e:15:3a:71:9f:ba:5a:d3:4a:d9
-# SHA256 Fingerprint: 44:04:e3:3b:5e:14:0d:cf:99:80:51:fd:fc:80:28:c7:c8:16:15:c5:ee:73:7b:11:1b:58:82:33:a9:b5:35:a0
------BEGIN CERTIFICATE-----
-MIID+zCCAuOgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBtzE/MD0GA1UEAww2VMOc
-UktUUlVTVCBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sx
-c8SxMQswCQYDVQQGDAJUUjEPMA0GA1UEBwwGQU5LQVJBMVYwVAYDVQQKDE0oYykg
-MjAwNSBUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8
-dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLjAeFw0wNTA1MTMxMDI3MTdaFw0xNTAz
-MjIxMDI3MTdaMIG3MT8wPQYDVQQDDDZUw5xSS1RSVVNUIEVsZWt0cm9uaWsgU2Vy
-dGlmaWthIEhpem1ldCBTYcSfbGF5xLFjxLFzxLExCzAJBgNVBAYMAlRSMQ8wDQYD
-VQQHDAZBTktBUkExVjBUBgNVBAoMTShjKSAyMDA1IFTDnFJLVFJVU1QgQmlsZ2kg
-xLBsZXRpxZ9pbSB2ZSBCaWxpxZ9pbSBHw7x2ZW5sacSfaSBIaXptZXRsZXJpIEEu
-xZ4uMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAylIF1mMD2Bxf3dJ7
-XfIMYGFbazt0K3gNfUW9InTojAPBxhEqPZW8qZSwu5GXyGl8hMW0kWxsE2qkVa2k
-heiVfrMArwDCBRj1cJ02i67L5BuBf5OI+2pVu32Fks66WJ/bMsW9Xe8iSi9BB35J
-YbOG7E6mQW6EvAPs9TscyB/C7qju6hJKjRTP8wrgUDn5CDX4EVmt5yLqS8oUBt5C
-urKZ8y1UiBAG6uEaPj1nH/vO+3yC6BFdSsG5FOpU2WabfIl9BJpiyelSPJ6c79L1
-JuTm5Rh8i27fbMx4W09ysstcP4wFjdFMjK2Sx+F4f2VsSQZQLJ4ywtdKxnWKWU51
-b0dewQIDAQABoxAwDjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAV
-9VX/N5aAWSGk/KEVTCD21F/aAyT8z5Aa9CEKmu46sWrv7/hg0Uw2ZkUd82YCdAR7
-kjCo3gp2D++Vbr3JN+YaDayJSFvMgzbC9UZcWYJWtNX+I7TYVBxEq8Sn5RTOPEFh
-fEPmzcSBCYsk+1Ql1haolgxnB2+zUEfjHCQo3SqYpGH+2+oSN7wBGjSFvW5P55Fy
-B0SFHljKVETd96y5y4khctuPwGkplyqjrhgjlxxBKot8KsF8kOipKMDTkcatKIdA
-aLX/7KfS0zgYnNN9aV3wxqUeJBujR/xpB2jn5Jq07Q+hh4cCzofSSE7hvP/L8XKS
-RGQDJereW26fyfJOrN3H
------END CERTIFICATE-----
-
-# Issuer: CN=TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı O=TÜRKTRUST Bilgi İletişim ve Bilişim Güvenliği Hizmetleri A.Ş. (c) Kasım 2005
-# Subject: CN=TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı O=TÜRKTRUST Bilgi İletişim ve Bilişim Güvenliği Hizmetleri A.Ş. (c) Kasım 2005
-# Label: "TURKTRUST Certificate Services Provider Root 2"
-# Serial: 1
-# MD5 Fingerprint: 37:a5:6e:d4:b1:25:84:97:b7:fd:56:15:7a:f9:a2:00
-# SHA1 Fingerprint: b4:35:d4:e1:11:9d:1c:66:90:a7:49:eb:b3:94:bd:63:7b:a7:82:b7
-# SHA256 Fingerprint: c4:70:cf:54:7e:23:02:b9:77:fb:29:dd:71:a8:9a:7b:6c:1f:60:77:7b:03:29:f5:60:17:f3:28:bf:4f:6b:e6
------BEGIN CERTIFICATE-----
-MIIEPDCCAySgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBvjE/MD0GA1UEAww2VMOc
-UktUUlVTVCBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sx
-c8SxMQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xS
-S1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kg
-SGl6bWV0bGVyaSBBLsWeLiAoYykgS2FzxLFtIDIwMDUwHhcNMDUxMTA3MTAwNzU3
-WhcNMTUwOTE2MTAwNzU3WjCBvjE/MD0GA1UEAww2VMOcUktUUlVTVCBFbGVrdHJv
-bmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGEwJU
-UjEPMA0GA1UEBwwGQW5rYXJhMV0wWwYDVQQKDFRUw5xSS1RSVVNUIEJpbGdpIMSw
-bGV0acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWe
-LiAoYykgS2FzxLFtIDIwMDUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQCpNn7DkUNMwxmYCMjHWHtPFoylzkkBH3MOrHUTpvqeLCDe2JAOCtFp0if7qnef
-J1Il4std2NiDUBd9irWCPwSOtNXwSadktx4uXyCcUHVPr+G1QRT0mJKIx+XlZEdh
-R3n9wFHxwZnn3M5q+6+1ATDcRhzviuyV79z/rxAc653YsKpqhRgNF8k+v/Gb0AmJ
-Qv2gQrSdiVFVKc8bcLyEVK3BEx+Y9C52YItdP5qtygy/p1Zbj3e41Z55SZI/4PGX
-JHpsmxcPbe9TmJEr5A++WXkHeLuXlfSfadRYhwqp48y2WBmfJiGxxFmNskF1wK1p
-zpwACPI2/z7woQ8arBT9pmAPAgMBAAGjQzBBMB0GA1UdDgQWBBTZN7NOBf3Zz58S
-Fq62iS/rJTqIHDAPBgNVHQ8BAf8EBQMDBwYAMA8GA1UdEwEB/wQFMAMBAf8wDQYJ
-KoZIhvcNAQEFBQADggEBAHJglrfJ3NgpXiOFX7KzLXb7iNcX/nttRbj2hWyfIvwq
-ECLsqrkw9qtY1jkQMZkpAL2JZkH7dN6RwRgLn7Vhy506vvWolKMiVW4XSf/SKfE4
-Jl3vpao6+XF75tpYHdN0wgH6PmlYX63LaL4ULptswLbcoCb6dxriJNoaN+BnrdFz
-gw2lGh1uEpJ+hGIAF728JRhX8tepb1mIvDS3LoV4nZbcFMMsilKbloxSZj2GFotH
-uFEJjOp9zYhys2AzsfAKRO8P9Qk3iCQOLGsgOqL6EfJANZxEaGM7rDNvY7wsu/LS
-y3Z9fYjYHcgFHW68lKlmjHdxx/qR+i9Rnuk5UrbnBEI=
------END CERTIFICATE-----
-
-# Issuer: CN=SwissSign Gold CA - G2 O=SwissSign AG
-# Subject: CN=SwissSign Gold CA - G2 O=SwissSign AG
-# Label: "SwissSign Gold CA - G2"
-# Serial: 13492815561806991280
-# MD5 Fingerprint: 24:77:d9:a8:91:d1:3b:fa:88:2d:c2:ff:f8:cd:33:93
-# SHA1 Fingerprint: d8:c5:38:8a:b7:30:1b:1b:6e:d4:7a:e6:45:25:3a:6f:9f:1a:27:61
-# SHA256 Fingerprint: 62:dd:0b:e9:b9:f5:0a:16:3e:a0:f8:e7:5c:05:3b:1e:ca:57:ea:55:c8:68:8f:64:7c:68:81:f2:c8:35:7b:95
------BEGIN CERTIFICATE-----
-MIIFujCCA6KgAwIBAgIJALtAHEP1Xk+wMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV
-BAYTAkNIMRUwEwYDVQQKEwxTd2lzc1NpZ24gQUcxHzAdBgNVBAMTFlN3aXNzU2ln
-biBHb2xkIENBIC0gRzIwHhcNMDYxMDI1MDgzMDM1WhcNMzYxMDI1MDgzMDM1WjBF
-MQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dpc3NTaWduIEFHMR8wHQYDVQQDExZT
-d2lzc1NpZ24gR29sZCBDQSAtIEcyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC
-CgKCAgEAr+TufoskDhJuqVAtFkQ7kpJcyrhdhJJCEyq8ZVeCQD5XJM1QiyUqt2/8
-76LQwB8CJEoTlo8jE+YoWACjR8cGp4QjK7u9lit/VcyLwVcfDmJlD909Vopz2q5+
-bbqBHH5CjCA12UNNhPqE21Is8w4ndwtrvxEvcnifLtg+5hg3Wipy+dpikJKVyh+c
-6bM8K8vzARO/Ws/BtQpgvd21mWRTuKCWs2/iJneRjOBiEAKfNA+k1ZIzUd6+jbqE
-emA8atufK+ze3gE/bk3lUIbLtK/tREDFylqM2tIrfKjuvqblCqoOpd8FUrdVxyJd
-MmqXl2MT28nbeTZ7hTpKxVKJ+STnnXepgv9VHKVxaSvRAiTysybUa9oEVeXBCsdt
-MDeQKuSeFDNeFhdVxVu1yzSJkvGdJo+hB9TGsnhQ2wwMC3wLjEHXuendjIj3o02y
-MszYF9rNt85mndT9Xv+9lz4pded+p2JYryU0pUHHPbwNUMoDAw8IWh+Vc3hiv69y
-FGkOpeUDDniOJihC8AcLYiAQZzlG+qkDzAQ4embvIIO1jEpWjpEA/I5cgt6IoMPi
-aG59je883WX0XaxR7ySArqpWl2/5rX3aYT+YdzylkbYcjCbaZaIJbcHiVOO5ykxM
-gI93e2CaHt+28kgeDrpOVG2Y4OGiGqJ3UM/EY5LsRxmd6+ZrzsECAwEAAaOBrDCB
-qTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUWyV7
-lqRlUX64OfPAeGZe6Drn8O4wHwYDVR0jBBgwFoAUWyV7lqRlUX64OfPAeGZe6Drn
-8O4wRgYDVR0gBD8wPTA7BglghXQBWQECAQEwLjAsBggrBgEFBQcCARYgaHR0cDov
-L3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBACe6
-45R88a7A3hfm5djV9VSwg/S7zV4Fe0+fdWavPOhWfvxyeDgD2StiGwC5+OlgzczO
-UYrHUDFu4Up+GC9pWbY9ZIEr44OE5iKHjn3g7gKZYbge9LgriBIWhMIxkziWMaa5
-O1M/wySTVltpkuzFwbs4AOPsF6m43Md8AYOfMke6UiI0HTJ6CVanfCU2qT1L2sCC
-bwq7EsiHSycR+R4tx5M/nttfJmtS2S6K8RTGRI0Vqbe/vd6mGu6uLftIdxf+u+yv
-GPUqUfA5hJeVbG4bwyvEdGB5JbAKJ9/fXtI5z0V9QkvfsywexcZdylU6oJxpmo/a
-77KwPJ+HbBIrZXAVUjEaJM9vMSNQH4xPjyPDdEFjHFWoFN0+4FFQz/EbMFYOkrCC
-hdiDyyJkvC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmttqtKay20EIhid3
-92qgQmwLOM7XdVAyksLfKzAiSNDVQTglXaTpXZ/GlHXQRf0wl0OPkKsKx4ZzYEpp
-Ld6leNcG2mqeSz53OiATIgHQv2ieY2BrNU0LbbqhPcCT4H8js1WtciVORvnSFu+w
-ZMEBnunKoGqYDs/YYPIvSbjkQuE4NRb0yG5P94FW6LqjviOvrv1vA+ACOzB2+htt
-Qc8Bsem4yWb02ybzOqR08kkkW8mw0FfB+j564ZfJ
------END CERTIFICATE-----
-
-# Issuer: CN=SwissSign Silver CA - G2 O=SwissSign AG
-# Subject: CN=SwissSign Silver CA - G2 O=SwissSign AG
-# Label: "SwissSign Silver CA - G2"
-# Serial: 5700383053117599563
-# MD5 Fingerprint: e0:06:a1:c9:7d:cf:c9:fc:0d:c0:56:75:96:d8:62:13
-# SHA1 Fingerprint: 9b:aa:e5:9f:56:ee:21:cb:43:5a:be:25:93:df:a7:f0:40:d1:1d:cb
-# SHA256 Fingerprint: be:6c:4d:a2:bb:b9:ba:59:b6:f3:93:97:68:37:42:46:c3:c0:05:99:3f:a9:8f:02:0d:1d:ed:be:d4:8a:81:d5
------BEGIN CERTIFICATE-----
-MIIFvTCCA6WgAwIBAgIITxvUL1S7L0swDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UE
-BhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWdu
-IFNpbHZlciBDQSAtIEcyMB4XDTA2MTAyNTA4MzI0NloXDTM2MTAyNTA4MzI0Nlow
-RzELMAkGA1UEBhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMY
-U3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
-MIICCgKCAgEAxPGHf9N4Mfc4yfjDmUO8x/e8N+dOcbpLj6VzHVxumK4DV644N0Mv
-Fz0fyM5oEMF4rhkDKxD6LHmD9ui5aLlV8gREpzn5/ASLHvGiTSf5YXu6t+WiE7br
-YT7QbNHm+/pe7R20nqA1W6GSy/BJkv6FCgU+5tkL4k+73JU3/JHpMjUi0R86TieF
-nbAVlDLaYQ1HTWBCrpJH6INaUFjpiou5XaHc3ZlKHzZnu0jkg7Y360g6rw9njxcH
-6ATK72oxh9TAtvmUcXtnZLi2kUpCe2UuMGoM9ZDulebyzYLs2aFK7PayS+VFheZt
-eJMELpyCbTapxDFkH4aDCyr0NQp4yVXPQbBH6TCfmb5hqAaEuSh6XzjZG6k4sIN/
-c8HDO0gqgg8hm7jMqDXDhBuDsz6+pJVpATqJAHgE2cn0mRmrVn5bi4Y5FZGkECwJ
-MoBgs5PAKrYYC51+jUnyEEp/+dVGLxmSo5mnJqy7jDzmDrxHB9xzUfFwZC8I+bRH
-HTBsROopN4WSaGa8gzj+ezku01DwH/teYLappvonQfGbGHLy9YR0SslnxFSuSGTf
-jNFusB3hB48IHpmccelM2KX3RxIfdNFRnobzwqIjQAtz20um53MGjMGg6cFZrEb6
-5i/4z3GcRm25xBWNOHkDRUjvxF3XCO6HOSKGsg0PWEP3calILv3q1h8CAwEAAaOB
-rDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU
-F6DNweRBtjpbO8tFnb0cwpj6hlgwHwYDVR0jBBgwFoAUF6DNweRBtjpbO8tFnb0c
-wpj6hlgwRgYDVR0gBD8wPTA7BglghXQBWQEDAQEwLjAsBggrBgEFBQcCARYgaHR0
-cDovL3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIB
-AHPGgeAn0i0P4JUw4ppBf1AsX19iYamGamkYDHRJ1l2E6kFSGG9YrVBWIGrGvShp
-WJHckRE1qTodvBqlYJ7YH39FkWnZfrt4csEGDyrOj4VwYaygzQu4OSlWhDJOhrs9
-xCrZ1x9y7v5RoSJBsXECYxqCsGKrXlcSH9/L3XWgwF15kIwb4FDm3jH+mHtwX6WQ
-2K34ArZv02DdQEsixT2tOnqfGhpHkXkzuoLcMmkDlm4fS/Bx/uNncqCxv1yL5PqZ
-IseEuRuNI5c/7SXgz2W79WEE790eslpBIlqhn10s6FvJbakMDHiqYMZWjwFaDGi8
-aRl5xB9+lwW/xekkUV7U1UtT7dkjWjYDZaPBA61BMPNGG4WQr2W11bHkFlt4dR2X
-em1ZqSqPe97Dh4kQmUlzeMg9vVE1dCrV8X5pGyq7O70luJpaPXJhkGaH7gzWTdQR
-dAtq/gsD/KNVV4n+SsuuWxcFyPKNIzFTONItaj+CuY0IavdeQXRuwxF+B6wpYJE/
-OMpXEA29MC/HpeZBoNquBYeaoKRlbEwJDIm6uNO5wJOKMPqN5ZprFQFOZ6raYlY+
-hAhm0sQ2fac+EPyI4NSA5QC9qvNOBqN6avlicuMJT+ubDgEj8Z+7fNzcbBGXJbLy
-tGMU0gYqZ4yD9c7qB9iaah7s5Aq7KkzrCWA5zspi2C5u
------END CERTIFICATE-----
-
-# Issuer: CN=GeoTrust Primary Certification Authority O=GeoTrust Inc.
-# Subject: CN=GeoTrust Primary Certification Authority O=GeoTrust Inc.
-# Label: "GeoTrust Primary Certification Authority"
-# Serial: 32798226551256963324313806436981982369
-# MD5 Fingerprint: 02:26:c3:01:5e:08:30:37:43:a9:d0:7d:cf:37:e6:bf
-# SHA1 Fingerprint: 32:3c:11:8e:1b:f7:b8:b6:52:54:e2:e2:10:0d:d6:02:90:37:f0:96
-# SHA256 Fingerprint: 37:d5:10:06:c5:12:ea:ab:62:64:21:f1:ec:8c:92:01:3f:c5:f8:2a:e9:8e:e5:33:eb:46:19:b8:de:b4:d0:6c
------BEGIN CERTIFICATE-----
-MIIDfDCCAmSgAwIBAgIQGKy1av1pthU6Y2yv2vrEoTANBgkqhkiG9w0BAQUFADBY
-MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjExMC8GA1UEAxMo
-R2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjEx
-MjcwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMFgxCzAJBgNVBAYTAlVTMRYwFAYDVQQK
-Ew1HZW9UcnVzdCBJbmMuMTEwLwYDVQQDEyhHZW9UcnVzdCBQcmltYXJ5IENlcnRp
-ZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAvrgVe//UfH1nrYNke8hCUy3f9oQIIGHWAVlqnEQRr+92/ZV+zmEwu3qDXwK9
-AWbK7hWNb6EwnL2hhZ6UOvNWiAAxz9juapYC2e0DjPt1befquFUWBRaa9OBesYjA
-ZIVcFU2Ix7e64HXprQU9nceJSOC7KMgD4TCTZF5SwFlwIjVXiIrxlQqD17wxcwE0
-7e9GceBrAqg1cmuXm2bgyxx5X9gaBGgeRwLmnWDiNpcB3841kt++Z8dtd1k7j53W
-kBWUvEI0EME5+bEnPn7WinXFsq+W06Lem+SYvn3h6YGttm/81w7a4DSwDRp35+MI
-mO9Y+pyEtzavwt+s0vQQBnBxNQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4G
-A1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQULNVQQZcVi/CPNmFbSvtr2ZnJM5IwDQYJ
-KoZIhvcNAQEFBQADggEBAFpwfyzdtzRP9YZRqSa+S7iq8XEN3GHHoOo0Hnp3DwQ1
-6CePbJC/kRYkRj5KTs4rFtULUh38H2eiAkUxT87z+gOneZ1TatnaYzr4gNfTmeGl
-4b7UVXGYNTq+k+qurUKykG/g/CFNNWMziUnWm07Kx+dOCQD32sfvmWKZd7aVIl6K
-oKv0uHiYyjgZmclynnjNS6yvGaBzEi38wkG6gZHaFloxt/m0cYASSJlyc1pZU8Fj
-UjPtp8nSOQJw+uCxQmYpqptR7TBUIhRf2asdweSU8Pj1K/fqynhG1riR/aYNKxoU
-AT6A8EKglQdebc3MS6RFjasS6LPeWuWgfOgPIh1a6Vk=
------END CERTIFICATE-----
-
-# Issuer: CN=thawte Primary Root CA O=thawte, Inc. OU=Certification Services Division/(c) 2006 thawte, Inc. - For authorized use only
-# Subject: CN=thawte Primary Root CA O=thawte, Inc. OU=Certification Services Division/(c) 2006 thawte, Inc. - For authorized use only
-# Label: "thawte Primary Root CA"
-# Serial: 69529181992039203566298953787712940909
-# MD5 Fingerprint: 8c:ca:dc:0b:22:ce:f5:be:72:ac:41:1a:11:a8:d8:12
-# SHA1 Fingerprint: 91:c6:d6:ee:3e:8a:c8:63:84:e5:48:c2:99:29:5c:75:6c:81:7b:81
-# SHA256 Fingerprint: 8d:72:2f:81:a9:c1:13:c0:79:1d:f1:36:a2:96:6d:b2:6c:95:0a:97:1d:b4:6b:41:99:f4:ea:54:b7:8b:fb:9f
------BEGIN CERTIFICATE-----
-MIIEIDCCAwigAwIBAgIQNE7VVyDV7exJ9C/ON9srbTANBgkqhkiG9w0BAQUFADCB
-qTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMf
-Q2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIw
-MDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNV
-BAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwHhcNMDYxMTE3MDAwMDAwWhcNMzYw
-NzE2MjM1OTU5WjCBqTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5j
-LjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYG
-A1UECxMvKGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
-IG9ubHkxHzAdBgNVBAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCsoPD7gFnUnMekz52hWXMJEEUMDSxuaPFs
-W0hoSVk3/AszGcJ3f8wQLZU0HObrTQmnHNK4yZc2AreJ1CRfBsDMRJSUjQJib+ta
-3RGNKJpchJAQeg29dGYvajig4tVUROsdB58Hum/u6f1OCyn1PoSgAfGcq/gcfomk
-6KHYcWUNo1F77rzSImANuVud37r8UVsLr5iy6S7pBOhih94ryNdOwUxkHt3Ph1i6
-Sk/KaAcdHJ1KxtUvkcx8cXIcxcBn6zL9yZJclNqFwJu/U30rCfSMnZEfl2pSy94J
-NqR32HuHUETVPm4pafs5SSYeCaWAe0At6+gnhcn+Yf1+5nyXHdWdAgMBAAGjQjBA
-MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR7W0XP
-r87Lev0xkhpqtvNG61dIUDANBgkqhkiG9w0BAQUFAAOCAQEAeRHAS7ORtvzw6WfU
-DW5FvlXok9LOAz/t2iWwHVfLHjp2oEzsUHboZHIMpKnxuIvW1oeEuzLlQRHAd9mz
-YJ3rG9XRbkREqaYB7FViHXe4XI5ISXycO1cRrK1zN44veFyQaEfZYGDm/Ac9IiAX
-xPcW6cTYcvnIc3zfFi8VqT79aie2oetaupgf1eNNZAqdE8hhuvU5HIe6uL17In/2
-/qxAeeWsEG89jxt5dovEN7MhGITlNgDrYyCZuen+MwS7QcjBAvlEYyCegc5C09Y/
-LHbTY5xZ3Y+m4Q6gLkH3LpVHz7z9M/P2C2F+fpErgUfCJzDupxBdN49cOSvkBPB7
-jVaMaA==
------END CERTIFICATE-----
-
-# Issuer: CN=VeriSign Class 3 Public Primary Certification Authority - G5 O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 2006 VeriSign, Inc. - For authorized use only
-# Subject: CN=VeriSign Class 3 Public Primary Certification Authority - G5 O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 2006 VeriSign, Inc. - For authorized use only
-# Label: "VeriSign Class 3 Public Primary Certification Authority - G5"
-# Serial: 33037644167568058970164719475676101450
-# MD5 Fingerprint: cb:17:e4:31:67:3e:e2:09:fe:45:57:93:f3:0a:fa:1c
-# SHA1 Fingerprint: 4e:b6:d5:78:49:9b:1c:cf:5f:58:1e:ad:56:be:3d:9b:67:44:a5:e5
-# SHA256 Fingerprint: 9a:cf:ab:7e:43:c8:d8:80:d0:6b:26:2a:94:de:ee:e4:b4:65:99:89:c3:d0:ca:f1:9b:af:64:05:e4:1a:b7:df
------BEGIN CERTIFICATE-----
-MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCB
-yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp
-U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW
-ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0
-aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCByjEL
-MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW
-ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2ln
-biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp
-U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y
-aXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJAgIKXo1
-nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKzj/i5Vbex
-t0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIz
-SdhDY2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQG
-BO+QueQA5N06tRn/Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+
-rCpSx4/VBEnkjWNHiDxpg8v+R70rfk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/
-NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8E
-BAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEwHzAH
-BgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy
-aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKv
-MzEzMA0GCSqGSIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzE
-p6B4Eq1iDkVwZMXnl2YtmAl+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y
-5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKEKQsTb47bDN0lAtukixlE0kF6BWlK
-WE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiCKm0oHw0LxOXnGiYZ
-4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vEZV8N
-hnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq
------END CERTIFICATE-----
-
-# Issuer: CN=SecureTrust CA O=SecureTrust Corporation
-# Subject: CN=SecureTrust CA O=SecureTrust Corporation
-# Label: "SecureTrust CA"
-# Serial: 17199774589125277788362757014266862032
-# MD5 Fingerprint: dc:32:c3:a7:6d:25:57:c7:68:09:9d:ea:2d:a9:a2:d1
-# SHA1 Fingerprint: 87:82:c6:c3:04:35:3b:cf:d2:96:92:d2:59:3e:7d:44:d9:34:ff:11
-# SHA256 Fingerprint: f1:c1:b5:0a:e5:a2:0d:d8:03:0e:c9:f6:bc:24:82:3d:d3:67:b5:25:57:59:b4:e7:1b:61:fc:e9:f7:37:5d:73
------BEGIN CERTIFICATE-----
-MIIDuDCCAqCgAwIBAgIQDPCOXAgWpa1Cf/DrJxhZ0DANBgkqhkiG9w0BAQUFADBI
-MQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24x
-FzAVBgNVBAMTDlNlY3VyZVRydXN0IENBMB4XDTA2MTEwNzE5MzExOFoXDTI5MTIz
-MTE5NDA1NVowSDELMAkGA1UEBhMCVVMxIDAeBgNVBAoTF1NlY3VyZVRydXN0IENv
-cnBvcmF0aW9uMRcwFQYDVQQDEw5TZWN1cmVUcnVzdCBDQTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAKukgeWVzfX2FI7CT8rU4niVWJxB4Q2ZQCQXOZEz
-Zum+4YOvYlyJ0fwkW2Gz4BERQRwdbvC4u/jep4G6pkjGnx29vo6pQT64lO0pGtSO
-0gMdA+9tDWccV9cGrcrI9f4Or2YlSASWC12juhbDCE/RRvgUXPLIXgGZbf2IzIao
-wW8xQmxSPmjL8xk037uHGFaAJsTQ3MBv396gwpEWoGQRS0S8Hvbn+mPeZqx2pHGj
-7DaUaHp3pLHnDi+BeuK1cobvomuL8A/b01k/unK8RCSc43Oz969XL0Imnal0ugBS
-8kvNU3xHCzaFDmapCJcWNFfBZveA4+1wVMeT4C4oFVmHursCAwEAAaOBnTCBmjAT
-BgkrBgEEAYI3FAIEBh4EAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB
-/zAdBgNVHQ4EFgQUQjK2FvoE/f5dS3rD/fdMQB1aQ68wNAYDVR0fBC0wKzApoCeg
-JYYjaHR0cDovL2NybC5zZWN1cmV0cnVzdC5jb20vU1RDQS5jcmwwEAYJKwYBBAGC
-NxUBBAMCAQAwDQYJKoZIhvcNAQEFBQADggEBADDtT0rhWDpSclu1pqNlGKa7UTt3
-6Z3q059c4EVlew3KW+JwULKUBRSuSceNQQcSc5R+DCMh/bwQf2AQWnL1mA6s7Ll/
-3XpvXdMc9P+IBWlCqQVxyLesJugutIxq/3HcuLHfmbx8IVQr5Fiiu1cprp6poxkm
-D5kuCLDv/WnPmRoJjeOnnyvJNjR7JLN4TJUXpAYmHrZkUjZfYGfZnMUFdAvnZyPS
-CPyI6a6Lf+Ew9Dd+/cYy2i2eRDAwbO4H3tI0/NL/QPZL9GZGBlSm8jIKYyYwa5vR
-3ItHuuG51WLQoqD0ZwV4KWMabwTW+MZMo5qxN7SN5ShLHZ4swrhovO0C7jE=
------END CERTIFICATE-----
-
-# Issuer: CN=Secure Global CA O=SecureTrust Corporation
-# Subject: CN=Secure Global CA O=SecureTrust Corporation
-# Label: "Secure Global CA"
-# Serial: 9751836167731051554232119481456978597
-# MD5 Fingerprint: cf:f4:27:0d:d4:ed:dc:65:16:49:6d:3d:da:bf:6e:de
-# SHA1 Fingerprint: 3a:44:73:5a:e5:81:90:1f:24:86:61:46:1e:3b:9c:c4:5f:f5:3a:1b
-# SHA256 Fingerprint: 42:00:f5:04:3a:c8:59:0e:bb:52:7d:20:9e:d1:50:30:29:fb:cb:d4:1c:a1:b5:06:ec:27:f1:5a:de:7d:ac:69
------BEGIN CERTIFICATE-----
-MIIDvDCCAqSgAwIBAgIQB1YipOjUiolN9BPI8PjqpTANBgkqhkiG9w0BAQUFADBK
-MQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24x
-GTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwgQ0EwHhcNMDYxMTA3MTk0MjI4WhcNMjkx
-MjMxMTk1MjA2WjBKMQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3Qg
-Q29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwgQ0EwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvNS7YrGxVaQZx5RNoJLNP2MwhR/jxYDiJ
-iQPpvepeRlMJ3Fz1Wuj3RSoC6zFh1ykzTM7HfAo3fg+6MpjhHZevj8fcyTiW89sa
-/FHtaMbQbqR8JNGuQsiWUGMu4P51/pinX0kuleM5M2SOHqRfkNJnPLLZ/kG5VacJ
-jnIFHovdRIWCQtBJwB1g8NEXLJXr9qXBkqPFwqcIYA1gBBCWeZ4WNOaptvolRTnI
-HmX5k/Wq8VLcmZg9pYYaDDUz+kulBAYVHDGA76oYa8J719rO+TMg1fW9ajMtgQT7
-sFzUnKPiXB3jqUJ1XnvUd+85VLrJChgbEplJL4hL/VBi0XPnj3pDAgMBAAGjgZ0w
-gZowEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1UdEwEB/wQF
-MAMBAf8wHQYDVR0OBBYEFK9EBMJBfkiD2045AuzshHrmzsmkMDQGA1UdHwQtMCsw
-KaAnoCWGI2h0dHA6Ly9jcmwuc2VjdXJldHJ1c3QuY29tL1NHQ0EuY3JsMBAGCSsG
-AQQBgjcVAQQDAgEAMA0GCSqGSIb3DQEBBQUAA4IBAQBjGghAfaReUw132HquHw0L
-URYD7xh8yOOvaliTFGCRsoTciE6+OYo68+aCiV0BN7OrJKQVDpI1WkpEXk5X+nXO
-H0jOZvQ8QCaSmGwb7iRGDBezUqXbpZGRzzfTb+cnCDpOGR86p1hcF895P4vkp9Mm
-I50mD1hp/Ed+stCNi5O/KU9DaXR2Z0vPB4zmAve14bRDtUstFJ/53CYNv6ZHdAbY
-iNE6KTCEztI5gGIbqMdXSbxqVVFnFUq+NQfk1XWYN3kwFNspnWzFacxHVaIw98xc
-f8LDmBxrThaA63p4ZUWiABqvDA1VZDRIuJK58bRQKfJPIx/abKwfROHdI3hRW8cW
------END CERTIFICATE-----
-
-# Issuer: CN=COMODO Certification Authority O=COMODO CA Limited
-# Subject: CN=COMODO Certification Authority O=COMODO CA Limited
-# Label: "COMODO Certification Authority"
-# Serial: 104350513648249232941998508985834464573
-# MD5 Fingerprint: 5c:48:dc:f7:42:72:ec:56:94:6d:1c:cc:71:35:80:75
-# SHA1 Fingerprint: 66:31:bf:9e:f7:4f:9e:b6:c9:d5:a6:0c:ba:6a:be:d1:f7:bd:ef:7b
-# SHA256 Fingerprint: 0c:2c:d6:3d:f7:80:6f:a3:99:ed:e8:09:11:6b:57:5b:f8:79:89:f0:65:18:f9:80:8c:86:05:03:17:8b:af:66
------BEGIN CERTIFICATE-----
-MIIEHTCCAwWgAwIBAgIQToEtioJl4AsC7j41AkblPTANBgkqhkiG9w0BAQUFADCB
-gTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
-A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxJzAlBgNV
-BAMTHkNPTU9ETyBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjEyMDEwMDAw
-MDBaFw0yOTEyMzEyMzU5NTlaMIGBMQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3Jl
-YXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01P
-RE8gQ0EgTGltaXRlZDEnMCUGA1UEAxMeQ09NT0RPIENlcnRpZmljYXRpb24gQXV0
-aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0ECLi3LjkRv3
-UcEbVASY06m/weaKXTuH+7uIzg3jLz8GlvCiKVCZrts7oVewdFFxze1CkU1B/qnI
-2GqGd0S7WWaXUF601CxwRM/aN5VCaTwwxHGzUvAhTaHYujl8HJ6jJJ3ygxaYqhZ8
-Q5sVW7euNJH+1GImGEaaP+vB+fGQV+useg2L23IwambV4EajcNxo2f8ESIl33rXp
-+2dtQem8Ob0y2WIC8bGoPW43nOIv4tOiJovGuFVDiOEjPqXSJDlqR6sA1KGzqSX+
-DT+nHbrTUcELpNqsOO9VUCQFZUaTNE8tja3G1CEZ0o7KBWFxB3NH5YoZEr0ETc5O
-nKVIrLsm9wIDAQABo4GOMIGLMB0GA1UdDgQWBBQLWOWLxkwVN6RAqTCpIb5HNlpW
-/zAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zBJBgNVHR8EQjBAMD6g
-PKA6hjhodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9DT01PRE9DZXJ0aWZpY2F0aW9u
-QXV0aG9yaXR5LmNybDANBgkqhkiG9w0BAQUFAAOCAQEAPpiem/Yb6dc5t3iuHXIY
-SdOH5EOC6z/JqvWote9VfCFSZfnVDeFs9D6Mk3ORLgLETgdxb8CPOGEIqB6BCsAv
-IC9Bi5HcSEW88cbeunZrM8gALTFGTO3nnc+IlP8zwFboJIYmuNg4ON8qa90SzMc/
-RxdMosIGlgnW2/4/PEZB31jiVg88O8EckzXZOFKs7sjsLjBOlDW0JB9LeGna8gI4
-zJVSk/BwJVmcIGfE7vmLV2H0knZ9P4SNVbfo5azV8fUZVqZa+5Acr5Pr5RzUZ5dd
-BA6+C4OmF4O5MBKgxTMVBbkN+8cFduPYSo38NBejxiEovjBFMR7HeL5YYTisO+IB
-ZQ==
------END CERTIFICATE-----
-
-# Issuer: CN=Network Solutions Certificate Authority O=Network Solutions L.L.C.
-# Subject: CN=Network Solutions Certificate Authority O=Network Solutions L.L.C.
-# Label: "Network Solutions Certificate Authority"
-# Serial: 116697915152937497490437556386812487904
-# MD5 Fingerprint: d3:f3:a6:16:c0:fa:6b:1d:59:b1:2d:96:4d:0e:11:2e
-# SHA1 Fingerprint: 74:f8:a3:c3:ef:e7:b3:90:06:4b:83:90:3c:21:64:60:20:e5:df:ce
-# SHA256 Fingerprint: 15:f0:ba:00:a3:ac:7a:f3:ac:88:4c:07:2b:10:11:a0:77:bd:77:c0:97:f4:01:64:b2:f8:59:8a:bd:83:86:0c
------BEGIN CERTIFICATE-----
-MIID5jCCAs6gAwIBAgIQV8szb8JcFuZHFhfjkDFo4DANBgkqhkiG9w0BAQUFADBi
-MQswCQYDVQQGEwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMu
-MTAwLgYDVQQDEydOZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
-dHkwHhcNMDYxMjAxMDAwMDAwWhcNMjkxMjMxMjM1OTU5WjBiMQswCQYDVQQGEwJV
-UzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMuMTAwLgYDVQQDEydO
-ZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkvH6SMG3G2I4rC7xGzuAnlt7e+foS0zwz
-c7MEL7xxjOWftiJgPl9dzgn/ggwbmlFQGiaJ3dVhXRncEg8tCqJDXRfQNJIg6nPP
-OCwGJgl6cvf6UDL4wpPTaaIjzkGxzOTVHzbRijr4jGPiFFlp7Q3Tf2vouAPlT2rl
-mGNpSAW+Lv8ztumXWWn4Zxmuk2GWRBXTcrA/vGp97Eh/jcOrqnErU2lBUzS1sLnF
-BgrEsEX1QV1uiUV7PTsmjHTC5dLRfbIR1PtYMiKagMnc/Qzpf14Dl847ABSHJ3A4
-qY5usyd2mFHgBeMhqxrVhSI8KbWaFsWAqPS7azCPL0YCorEMIuDTAgMBAAGjgZcw
-gZQwHQYDVR0OBBYEFCEwyfsA106Y2oeqKtCnLrFAMadMMA4GA1UdDwEB/wQEAwIB
-BjAPBgNVHRMBAf8EBTADAQH/MFIGA1UdHwRLMEkwR6BFoEOGQWh0dHA6Ly9jcmwu
-bmV0c29sc3NsLmNvbS9OZXR3b3JrU29sdXRpb25zQ2VydGlmaWNhdGVBdXRob3Jp
-dHkuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQC7rkvnt1frf6ott3NHhWrB5KUd5Oc8
-6fRZZXe1eltajSU24HqXLjjAV2CDmAaDn7l2em5Q4LqILPxFzBiwmZVRDuwduIj/
-h1AcgsLj4DKAv6ALR8jDMe+ZZzKATxcheQxpXN5eNK4CtSbqUN9/GGUsyfJj4akH
-/nxxH2szJGoeBfcFaMBqEssuXmHLrijTfsK0ZpEmXzwuJF/LWA/rKOyvEZbz3Htv
-wKeI8lN3s2Berq4o2jUsbzRF0ybh3uxbTydrFny9RAQYgrOJeRcQcT16ohZO9QHN
-pGxlaKFJdlxDydi8NmdspZS11My5vWo1ViHe2MPr+8ukYEywVaCge1ey
------END CERTIFICATE-----
-
-# Issuer: CN=WellsSecure Public Root Certificate Authority O=Wells Fargo WellsSecure OU=Wells Fargo Bank NA
-# Subject: CN=WellsSecure Public Root Certificate Authority O=Wells Fargo WellsSecure OU=Wells Fargo Bank NA
-# Label: "WellsSecure Public Root Certificate Authority"
-# Serial: 1
-# MD5 Fingerprint: 15:ac:a5:c2:92:2d:79:bc:e8:7f:cb:67:ed:02:cf:36
-# SHA1 Fingerprint: e7:b4:f6:9d:61:ec:90:69:db:7e:90:a7:40:1a:3c:f4:7d:4f:e8:ee
-# SHA256 Fingerprint: a7:12:72:ae:aa:a3:cf:e8:72:7f:7f:b3:9f:0f:b3:d1:e5:42:6e:90:60:b0:6e:e6:f1:3e:9a:3c:58:33:cd:43
------BEGIN CERTIFICATE-----
-MIIEvTCCA6WgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMCVVMx
-IDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxs
-cyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9v
-dCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDcxMjEzMTcwNzU0WhcNMjIxMjE0
-MDAwNzU0WjCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdl
-bGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQD
-DC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDub7S9eeKPCCGeOARBJe+r
-WxxTkqxtnt3CxC5FlAM1iGd0V+PfjLindo8796jE2yljDpFoNoqXjopxaAkH5OjU
-Dk/41itMpBb570OYj7OeUt9tkTmPOL13i0Nj67eT/DBMHAGTthP796EfvyXhdDcs
-HqRePGj4S78NuR4uNuip5Kf4D8uCdXw1LSLWwr8L87T8bJVhHlfXBIEyg1J55oNj
-z7fLY4sR4r1e6/aN7ZVyKLSsEmLpSjPmgzKuBXWVvYSV2ypcm44uDLiBK0HmOFaf
-SZtsdvqKXfcBeYF8wYNABf5x/Qw/zE5gCQ5lRxAvAcAFP4/4s0HvWkJ+We/Slwxl
-AgMBAAGjggE0MIIBMDAPBgNVHRMBAf8EBTADAQH/MDkGA1UdHwQyMDAwLqAsoCqG
-KGh0dHA6Ly9jcmwucGtpLndlbGxzZmFyZ28uY29tL3dzcHJjYS5jcmwwDgYDVR0P
-AQH/BAQDAgHGMB0GA1UdDgQWBBQmlRkQ2eihl5H/3BnZtQQ+0nMKajCBsgYDVR0j
-BIGqMIGngBQmlRkQ2eihl5H/3BnZtQQ+0nMKaqGBi6SBiDCBhTELMAkGA1UEBhMC
-VVMxIDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNX
-ZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMg
-Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHmCAQEwDQYJKoZIhvcNAQEFBQADggEB
-ALkVsUSRzCPIK0134/iaeycNzXK7mQDKfGYZUMbVmO2rvwNa5U3lHshPcZeG1eMd
-/ZDJPHV3V3p9+N701NX3leZ0bh08rnyd2wIDBSxxSyU+B+NemvVmFymIGjifz6pB
-A4SXa5M4esowRBskRDPQ5NHcKDj0E0M1NSljqHyita04pO2t/caaH/+Xc/77szWn
-k4bGdpEA5qxRFsQnMlzbc9qlk1eOPm01JghZ1edE13YgY+esE2fDbbFwRnzVlhE9
-iW9dqKHrjQrawx0zbKPqZxmamX9LPYNRKh3KL4YMon4QLSvUFpULB6ouFJJJtylv
-2G0xffX8oRAHh84vWdw+WNs=
------END CERTIFICATE-----
-
-# Issuer: CN=COMODO ECC Certification Authority O=COMODO CA Limited
-# Subject: CN=COMODO ECC Certification Authority O=COMODO CA Limited
-# Label: "COMODO ECC Certification Authority"
-# Serial: 41578283867086692638256921589707938090
-# MD5 Fingerprint: 7c:62:ff:74:9d:31:53:5e:68:4a:d5:78:aa:1e:bf:23
-# SHA1 Fingerprint: 9f:74:4e:9f:2b:4d:ba:ec:0f:31:2c:50:b6:56:3b:8e:2d:93:c3:11
-# SHA256 Fingerprint: 17:93:92:7a:06:14:54:97:89:ad:ce:2f:8f:34:f7:f0:b6:6d:0f:3a:e3:a3:b8:4d:21:ec:15:db:ba:4f:ad:c7
------BEGIN CERTIFICATE-----
-MIICiTCCAg+gAwIBAgIQH0evqmIAcFBUTAGem2OZKjAKBggqhkjOPQQDAzCBhTEL
-MAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UE
-BxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMT
-IkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDgwMzA2MDAw
-MDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdy
-ZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09N
-T0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlv
-biBBdXRob3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQDR3svdcmCFYX7deSR
-FtSrYpn1PlILBs5BAH+X4QokPB0BBO490o0JlwzgdeT6+3eKKvUDYEs2ixYjFq0J
-cfRK9ChQtP6IHG4/bC8vCVlbpVsLM5niwz2J+Wos77LTBumjQjBAMB0GA1UdDgQW
-BBR1cacZSBm8nZ3qQUfflMRId5nTeTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/
-BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjEA7wNbeqy3eApyt4jf/7VGFAkK+qDm
-fQjGGoe9GKhzvSbKYAydzpmfz1wPMOG+FDHqAjAU9JM8SaczepBGR7NjfRObTrdv
-GDeAU/7dIOA1mjbRxwG55tzd8/8dLDoWV9mSOdY=
------END CERTIFICATE-----
-
-# Issuer: CN=IGC/A O=PM/SGDN OU=DCSSI
-# Subject: CN=IGC/A O=PM/SGDN OU=DCSSI
-# Label: "IGC/A"
-# Serial: 245102874772
-# MD5 Fingerprint: 0c:7f:dd:6a:f4:2a:b9:c8:9b:bd:20:7e:a9:db:5c:37
-# SHA1 Fingerprint: 60:d6:89:74:b5:c2:65:9e:8a:0f:c1:88:7c:88:d2:46:69:1b:18:2c
-# SHA256 Fingerprint: b9:be:a7:86:0a:96:2e:a3:61:1d:ab:97:ab:6d:a3:e2:1c:10:68:b9:7d:55:57:5e:d0:e1:12:79:c1:1c:89:32
------BEGIN CERTIFICATE-----
-MIIEAjCCAuqgAwIBAgIFORFFEJQwDQYJKoZIhvcNAQEFBQAwgYUxCzAJBgNVBAYT
-AkZSMQ8wDQYDVQQIEwZGcmFuY2UxDjAMBgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQ
-TS9TR0ROMQ4wDAYDVQQLEwVEQ1NTSTEOMAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG
-9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2LmZyMB4XDTAyMTIxMzE0MjkyM1oXDTIw
-MTAxNzE0MjkyMlowgYUxCzAJBgNVBAYTAkZSMQ8wDQYDVQQIEwZGcmFuY2UxDjAM
-BgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQTS9TR0ROMQ4wDAYDVQQLEwVEQ1NTSTEO
-MAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2
-LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsh/R0GLFMzvABIaI
-s9z4iPf930Pfeo2aSVz2TqrMHLmh6yeJ8kbpO0px1R2OLc/mratjUMdUC24SyZA2
-xtgv2pGqaMVy/hcKshd+ebUyiHDKcMCWSo7kVc0dJ5S/znIq7Fz5cyD+vfcuiWe4
-u0dzEvfRNWk68gq5rv9GQkaiv6GFGvm/5P9JhfejcIYyHF2fYPepraX/z9E0+X1b
-F8bc1g4oa8Ld8fUzaJ1O/Id8NhLWo4DoQw1VYZTqZDdH6nfK0LJYBcNdfrGoRpAx
-Vs5wKpayMLh35nnAvSk7/ZR3TL0gzUEl4C7HG7vupARB0l2tEmqKm0f7yd1GQOGd
-PDPQtQIDAQABo3cwdTAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBRjAVBgNV
-HSAEDjAMMAoGCCqBegF5AQEBMB0GA1UdDgQWBBSjBS8YYFDCiQrdKyFP/45OqDAx
-NjAfBgNVHSMEGDAWgBSjBS8YYFDCiQrdKyFP/45OqDAxNjANBgkqhkiG9w0BAQUF
-AAOCAQEABdwm2Pp3FURo/C9mOnTgXeQp/wYHE4RKq89toB9RlPhJy3Q2FLwV3duJ
-L92PoF189RLrn544pEfMs5bZvpwlqwN+Mw+VgQ39FuCIvjfwbF3QMZsyK10XZZOY
-YLxuj7GoPB7ZHPOpJkL5ZB3C55L29B5aqhlSXa/oovdgoPaN8In1buAKBQGVyYsg
-Crpa/JosPL3Dt8ldeCUFP1YUmwza+zpI/pdpXsoQhvdOlgQITeywvl3cO45Pwf2a
-NjSaTFR+FwNIlQgRHAdvhQh+XU3Endv7rs6y0bO4g2wdsrN58dhwmX7wEwLOXt1R
-0982gaEbeC9xs/FZTEYYKKuF0mBWWg==
------END CERTIFICATE-----
-
-# Issuer: O=SECOM Trust Systems CO.,LTD. OU=Security Communication EV RootCA1
-# Subject: O=SECOM Trust Systems CO.,LTD. OU=Security Communication EV RootCA1
-# Label: "Security Communication EV RootCA1"
-# Serial: 0
-# MD5 Fingerprint: 22:2d:a6:01:ea:7c:0a:f7:f0:6c:56:43:3f:77:76:d3
-# SHA1 Fingerprint: fe:b8:c4:32:dc:f9:76:9a:ce:ae:3d:d8:90:8f:fd:28:86:65:64:7d
-# SHA256 Fingerprint: a2:2d:ba:68:1e:97:37:6e:2d:39:7d:72:8a:ae:3a:9b:62:96:b9:fd:ba:60:bc:2e:11:f6:47:f2:c6:75:fb:37
------BEGIN CERTIFICATE-----
-MIIDfTCCAmWgAwIBAgIBADANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJKUDEl
-MCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMh
-U2VjdXJpdHkgQ29tbXVuaWNhdGlvbiBFViBSb290Q0ExMB4XDTA3MDYwNjAyMTIz
-MloXDTM3MDYwNjAyMTIzMlowYDELMAkGA1UEBhMCSlAxJTAjBgNVBAoTHFNFQ09N
-IFRydXN0IFN5c3RlbXMgQ08uLExURC4xKjAoBgNVBAsTIVNlY3VyaXR5IENvbW11
-bmljYXRpb24gRVYgUm9vdENBMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBALx/7FebJOD+nLpCeamIivqA4PUHKUPqjgo0No0c+qe1OXj/l3X3L+SqawSE
-RMqm4miO/VVQYg+kcQ7OBzgtQoVQrTyWb4vVog7P3kmJPdZkLjjlHmy1V4qe70gO
-zXppFodEtZDkBp2uoQSXWHnvIEqCa4wiv+wfD+mEce3xDuS4GBPMVjZd0ZoeUWs5
-bmB2iDQL87PRsJ3KYeJkHcFGB7hj3R4zZbOOCVVSPbW9/wfrrWFVGCypaZhKqkDF
-MxRldAD5kd6vA0jFQFTcD4SQaCDFkpbcLuUCRarAX1T4bepJz11sS6/vmsJWXMY1
-VkJqMF/Cq/biPT+zyRGPMUzXn0kCAwEAAaNCMEAwHQYDVR0OBBYEFDVK9U2vP9eC
-OKyrcWUXdYydVZPmMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0G
-CSqGSIb3DQEBBQUAA4IBAQCoh+ns+EBnXcPBZsdAS5f8hxOQWsTvoMpfi7ent/HW
-tWS3irO4G8za+6xmiEHO6Pzk2x6Ipu0nUBsCMCRGef4Eh3CXQHPRwMFXGZpppSeZ
-q51ihPZRwSzJIxXYKLerJRO1RuGGAv8mjMSIkh1W/hln8lXkgKNrnKt34VFxDSDb
-EJrbvXZ5B3eZKK2aXtqxT0QsNY6llsf9g/BYxnnWmHyojf6GPgcWkuF75x3sM3Z+
-Qi5KhfmRiWiEA4Glm5q+4zfFVKtWOxgtQaQM+ELbmaDgcm+7XeEWT1MKZPlO9L9O
-VL14bIjqv5wTJMJwaaJ/D8g8rQjJsJhAoyrniIPtd490
------END CERTIFICATE-----
-
-# Issuer: CN=OISTE WISeKey Global Root GA CA O=WISeKey OU=Copyright (c) 2005/OISTE Foundation Endorsed
-# Subject: CN=OISTE WISeKey Global Root GA CA O=WISeKey OU=Copyright (c) 2005/OISTE Foundation Endorsed
-# Label: "OISTE WISeKey Global Root GA CA"
-# Serial: 86718877871133159090080555911823548314
-# MD5 Fingerprint: bc:6c:51:33:a7:e9:d3:66:63:54:15:72:1b:21:92:93
-# SHA1 Fingerprint: 59:22:a1:e1:5a:ea:16:35:21:f8:98:39:6a:46:46:b0:44:1b:0f:a9
-# SHA256 Fingerprint: 41:c9:23:86:6a:b4:ca:d6:b7:ad:57:80:81:58:2e:02:07:97:a6:cb:df:4f:ff:78:ce:83:96:b3:89:37:d7:f5
------BEGIN CERTIFICATE-----
-MIID8TCCAtmgAwIBAgIQQT1yx/RrH4FDffHSKFTfmjANBgkqhkiG9w0BAQUFADCB
-ijELMAkGA1UEBhMCQ0gxEDAOBgNVBAoTB1dJU2VLZXkxGzAZBgNVBAsTEkNvcHly
-aWdodCAoYykgMjAwNTEiMCAGA1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNl
-ZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBHbG9iYWwgUm9vdCBHQSBDQTAeFw0w
-NTEyMTExNjAzNDRaFw0zNzEyMTExNjA5NTFaMIGKMQswCQYDVQQGEwJDSDEQMA4G
-A1UEChMHV0lTZUtleTEbMBkGA1UECxMSQ29weXJpZ2h0IChjKSAyMDA1MSIwIAYD
-VQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBX
-SVNlS2V5IEdsb2JhbCBSb290IEdBIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAy0+zAJs9Nt350UlqaxBJH+zYK7LG+DKBKUOVTJoZIyEVRd7jyBxR
-VVuuk+g3/ytr6dTqvirdqFEr12bDYVxgAsj1znJ7O7jyTmUIms2kahnBAbtzptf2
-w93NvKSLtZlhuAGio9RN1AU9ka34tAhxZK9w8RxrfvbDd50kc3vkDIzh2TbhmYsF
-mQvtRTEJysIA2/dyoJaqlYfQjse2YXMNdmaM3Bu0Y6Kff5MTMPGhJ9vZ/yxViJGg
-4E8HsChWjBgbl0SOid3gF27nKu+POQoxhILYQBRJLnpB5Kf+42TMwVlxSywhp1t9
-4B3RLoGbw9ho972WG6xwsRYUC9tguSYBBQIDAQABo1EwTzALBgNVHQ8EBAMCAYYw
-DwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUswN+rja8sHnR3JQmthG+IbJphpQw
-EAYJKwYBBAGCNxUBBAMCAQAwDQYJKoZIhvcNAQEFBQADggEBAEuh/wuHbrP5wUOx
-SPMowB0uyQlB+pQAHKSkq0lPjz0e701vvbyk9vImMMkQyh2I+3QZH4VFvbBsUfk2
-ftv1TDI6QU9bR8/oCy22xBmddMVHxjtqD6wU2zz0c5ypBd8A3HR4+vg1YFkCExh8
-vPtNsCBtQ7tgMHpnM1zFmdH4LTlSc/uMqpclXHLZCB6rTjzjgTGfA6b7wP4piFXa
-hNVQA7bihKOmNqoROgHhGEvWRGizPflTdISzRpFGlgC3gCy24eMQ4tui5yiPAZZi
-Fj4A4xylNoEYokxSdsARo27mHbrjWr42U8U+dY+GaSlYU7Wcu2+fXMUY7N0v4ZjJ
-/L7fCg0=
------END CERTIFICATE-----
-
-# Issuer: CN=Microsec e-Szigno Root CA O=Microsec Ltd. OU=e-Szigno CA
-# Subject: CN=Microsec e-Szigno Root CA O=Microsec Ltd. OU=e-Szigno CA
-# Label: "Microsec e-Szigno Root CA"
-# Serial: 272122594155480254301341951808045322001
-# MD5 Fingerprint: f0:96:b6:2f:c5:10:d5:67:8e:83:25:32:e8:5e:2e:e5
-# SHA1 Fingerprint: 23:88:c9:d3:71:cc:9e:96:3d:ff:7d:3c:a7:ce:fc:d6:25:ec:19:0d
-# SHA256 Fingerprint: 32:7a:3d:76:1a:ba:de:a0:34:eb:99:84:06:27:5c:b1:a4:77:6e:fd:ae:2f:df:6d:01:68:ea:1c:4f:55:67:d0
------BEGIN CERTIFICATE-----
-MIIHqDCCBpCgAwIBAgIRAMy4579OKRr9otxmpRwsDxEwDQYJKoZIhvcNAQEFBQAw
-cjELMAkGA1UEBhMCSFUxETAPBgNVBAcTCEJ1ZGFwZXN0MRYwFAYDVQQKEw1NaWNy
-b3NlYyBMdGQuMRQwEgYDVQQLEwtlLVN6aWdubyBDQTEiMCAGA1UEAxMZTWljcm9z
-ZWMgZS1Temlnbm8gUm9vdCBDQTAeFw0wNTA0MDYxMjI4NDRaFw0xNzA0MDYxMjI4
-NDRaMHIxCzAJBgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVzdDEWMBQGA1UEChMN
-TWljcm9zZWMgTHRkLjEUMBIGA1UECxMLZS1Temlnbm8gQ0ExIjAgBgNVBAMTGU1p
-Y3Jvc2VjIGUtU3ppZ25vIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDtyADVgXvNOABHzNuEwSFpLHSQDCHZU4ftPkNEU6+r+ICbPHiN1I2u
-uO/TEdyB5s87lozWbxXGd36hL+BfkrYn13aaHUM86tnsL+4582pnS4uCzyL4ZVX+
-LMsvfUh6PXX5qqAnu3jCBspRwn5mS6/NoqdNAoI/gqyFxuEPkEeZlApxcpMqyabA
-vjxWTHOSJ/FrtfX9/DAFYJLG65Z+AZHCabEeHXtTRbjcQR/Ji3HWVBTji1R4P770
-Yjtb9aPs1ZJ04nQw7wHb4dSrmZsqa/i9phyGI0Jf7Enemotb9HI6QMVJPqW+jqpx
-62z69Rrkav17fVVA71hu5tnVvCSrwe+3AgMBAAGjggQ3MIIEMzBnBggrBgEFBQcB
-AQRbMFkwKAYIKwYBBQUHMAGGHGh0dHBzOi8vcmNhLmUtc3ppZ25vLmh1L29jc3Aw
-LQYIKwYBBQUHMAKGIWh0dHA6Ly93d3cuZS1zemlnbm8uaHUvUm9vdENBLmNydDAP
-BgNVHRMBAf8EBTADAQH/MIIBcwYDVR0gBIIBajCCAWYwggFiBgwrBgEEAYGoGAIB
-AQEwggFQMCgGCCsGAQUFBwIBFhxodHRwOi8vd3d3LmUtc3ppZ25vLmh1L1NaU1ov
-MIIBIgYIKwYBBQUHAgIwggEUHoIBEABBACAAdABhAG4A+gBzAO0AdAB2AOEAbgB5
-ACAA6QByAHQAZQBsAG0AZQB6AOkAcwDpAGgAZQB6ACAA6QBzACAAZQBsAGYAbwBn
-AGEAZADhAHMA4QBoAG8AegAgAGEAIABTAHoAbwBsAGcA4QBsAHQAYQB0APMAIABT
-AHoAbwBsAGcA4QBsAHQAYQB0AOEAcwBpACAAUwB6AGEAYgDhAGwAeQB6AGEAdABh
-ACAAcwB6AGUAcgBpAG4AdAAgAGsAZQBsAGwAIABlAGwAagDhAHIAbgBpADoAIABo
-AHQAdABwADoALwAvAHcAdwB3AC4AZQAtAHMAegBpAGcAbgBvAC4AaAB1AC8AUwBa
-AFMAWgAvMIHIBgNVHR8EgcAwgb0wgbqggbeggbSGIWh0dHA6Ly93d3cuZS1zemln
-bm8uaHUvUm9vdENBLmNybIaBjmxkYXA6Ly9sZGFwLmUtc3ppZ25vLmh1L0NOPU1p
-Y3Jvc2VjJTIwZS1Temlnbm8lMjBSb290JTIwQ0EsT1U9ZS1Temlnbm8lMjBDQSxP
-PU1pY3Jvc2VjJTIwTHRkLixMPUJ1ZGFwZXN0LEM9SFU/Y2VydGlmaWNhdGVSZXZv
-Y2F0aW9uTGlzdDtiaW5hcnkwDgYDVR0PAQH/BAQDAgEGMIGWBgNVHREEgY4wgYuB
-EGluZm9AZS1zemlnbm8uaHWkdzB1MSMwIQYDVQQDDBpNaWNyb3NlYyBlLVN6aWdu
-w7MgUm9vdCBDQTEWMBQGA1UECwwNZS1TemlnbsOzIEhTWjEWMBQGA1UEChMNTWlj
-cm9zZWMgS2Z0LjERMA8GA1UEBxMIQnVkYXBlc3QxCzAJBgNVBAYTAkhVMIGsBgNV
-HSMEgaQwgaGAFMegSXUWYYTbMUuE0vE3QJDvTtz3oXakdDByMQswCQYDVQQGEwJI
-VTERMA8GA1UEBxMIQnVkYXBlc3QxFjAUBgNVBAoTDU1pY3Jvc2VjIEx0ZC4xFDAS
-BgNVBAsTC2UtU3ppZ25vIENBMSIwIAYDVQQDExlNaWNyb3NlYyBlLVN6aWdubyBS
-b290IENBghEAzLjnv04pGv2i3GalHCwPETAdBgNVHQ4EFgQUx6BJdRZhhNsxS4TS
-8TdAkO9O3PcwDQYJKoZIhvcNAQEFBQADggEBANMTnGZjWS7KXHAM/IO8VbH0jgds
-ZifOwTsgqRy7RlRw7lrMoHfqaEQn6/Ip3Xep1fvj1KcExJW4C+FEaGAHQzAxQmHl
-7tnlJNUb3+FKG6qfx1/4ehHqE5MAyopYse7tDk2016g2JnzgOsHVV4Lxdbb9iV/a
-86g4nzUGCM4ilb7N1fy+W955a9x6qWVmvrElWl/tftOsRm1M9DKHtCAE4Gx4sHfR
-hUZLphK3dehKyVZs15KrnfVJONJPU+NVkBHbmJbGSfI+9J8b4PeI3CVimUTYc78/
-MPMMNz7UwiiAc7EBt51alhQBS6kRnSlqLtBdgcDPsiBDxwPgN05dCtxZICU=
------END CERTIFICATE-----
-
-# Issuer: CN=Certigna O=Dhimyotis
-# Subject: CN=Certigna O=Dhimyotis
-# Label: "Certigna"
-# Serial: 18364802974209362175
-# MD5 Fingerprint: ab:57:a6:5b:7d:42:82:19:b5:d8:58:26:28:5e:fd:ff
-# SHA1 Fingerprint: b1:2e:13:63:45:86:a4:6f:1a:b2:60:68:37:58:2d:c4:ac:fd:94:97
-# SHA256 Fingerprint: e3:b6:a2:db:2e:d7:ce:48:84:2f:7a:c5:32:41:c7:b7:1d:54:14:4b:fb:40:c1:1f:3f:1d:0b:42:f5:ee:a1:2d
------BEGIN CERTIFICATE-----
-MIIDqDCCApCgAwIBAgIJAP7c4wEPyUj/MA0GCSqGSIb3DQEBBQUAMDQxCzAJBgNV
-BAYTAkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hMB4X
-DTA3MDYyOTE1MTMwNVoXDTI3MDYyOTE1MTMwNVowNDELMAkGA1UEBhMCRlIxEjAQ
-BgNVBAoMCURoaW15b3RpczERMA8GA1UEAwwIQ2VydGlnbmEwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDIaPHJ1tazNHUmgh7stL7qXOEm7RFHYeGifBZ4
-QCHkYJ5ayGPhxLGWkv8YbWkj4Sti993iNi+RB7lIzw7sebYs5zRLcAglozyHGxny
-gQcPOJAZ0xH+hrTy0V4eHpbNgGzOOzGTtvKg0KmVEn2lmsxryIRWijOp5yIVUxbw
-zBfsV1/pogqYCd7jX5xv3EjjhQsVWqa6n6xI4wmy9/Qy3l40vhx4XUJbzg4ij02Q
-130yGLMLLGq/jj8UEYkgDncUtT2UCIf3JR7VsmAA7G8qKCVuKj4YYxclPz5EIBb2
-JsglrgVKtOdjLPOMFlN+XPsRGgjBRmKfIrjxwo1p3Po6WAbfAgMBAAGjgbwwgbkw
-DwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUGu3+QTmQtCRZvgHyUtVF9lo53BEw
-ZAYDVR0jBF0wW4AUGu3+QTmQtCRZvgHyUtVF9lo53BGhOKQ2MDQxCzAJBgNVBAYT
-AkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hggkA/tzj
-AQ/JSP8wDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzANBgkqhkiG
-9w0BAQUFAAOCAQEAhQMeknH2Qq/ho2Ge6/PAD/Kl1NqV5ta+aDY9fm4fTIrv0Q8h
-bV6lUmPOEvjvKtpv6zf+EwLHyzs+ImvaYS5/1HI93TDhHkxAGYwP15zRgzB7mFnc
-fca5DClMoTOi62c6ZYTTluLtdkVwj7Ur3vkj1kluPBS1xp81HlDQwY9qcEQCYsuu
-HWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY1gkIl2PlwS6w
-t0QmwCbAr1UwnjvVNioZBPRcHv/PLLf/0P2HQBHVESO7SMAhqaQoLf0V+LBOK/Qw
-WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg==
------END CERTIFICATE-----
-
-# Issuer: CN=AC Raíz Certicámara S.A. O=Sociedad Cameral de Certificación Digital - Certicámara S.A.
-# Subject: CN=AC Raíz Certicámara S.A. O=Sociedad Cameral de Certificación Digital - Certicámara S.A.
-# Label: "AC Ra\xC3\xADz Certic\xC3\xA1mara S.A."
-# Serial: 38908203973182606954752843738508300
-# MD5 Fingerprint: 93:2a:3e:f6:fd:23:69:0d:71:20:d4:2b:47:99:2b:a6
-# SHA1 Fingerprint: cb:a1:c5:f8:b0:e3:5e:b8:b9:45:12:d3:f9:34:a2:e9:06:10:d3:36
-# SHA256 Fingerprint: a6:c5:1e:0d:a5:ca:0a:93:09:d2:e4:c0:e4:0c:2a:f9:10:7a:ae:82:03:85:7f:e1:98:e3:e7:69:e3:43:08:5c
------BEGIN CERTIFICATE-----
-MIIGZjCCBE6gAwIBAgIPB35Sk3vgFeNX8GmMy+wMMA0GCSqGSIb3DQEBBQUAMHsx
-CzAJBgNVBAYTAkNPMUcwRQYDVQQKDD5Tb2NpZWRhZCBDYW1lcmFsIGRlIENlcnRp
-ZmljYWNpw7NuIERpZ2l0YWwgLSBDZXJ0aWPDoW1hcmEgUy5BLjEjMCEGA1UEAwwa
-QUMgUmHDrXogQ2VydGljw6FtYXJhIFMuQS4wHhcNMDYxMTI3MjA0NjI5WhcNMzAw
-NDAyMjE0MjAyWjB7MQswCQYDVQQGEwJDTzFHMEUGA1UECgw+U29jaWVkYWQgQ2Ft
-ZXJhbCBkZSBDZXJ0aWZpY2FjacOzbiBEaWdpdGFsIC0gQ2VydGljw6FtYXJhIFMu
-QS4xIzAhBgNVBAMMGkFDIFJhw616IENlcnRpY8OhbWFyYSBTLkEuMIICIjANBgkq
-hkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAq2uJo1PMSCMI+8PPUZYILrgIem08kBeG
-qentLhM0R7LQcNzJPNCNyu5LF6vQhbCnIwTLqKL85XXbQMpiiY9QngE9JlsYhBzL
-fDe3fezTf3MZsGqy2IiKLUV0qPezuMDU2s0iiXRNWhU5cxh0T7XrmafBHoi0wpOQ
-Y5fzp6cSsgkiBzPZkc0OnB8OIMfuuzONj8LSWKdf/WU34ojC2I+GdV75LaeHM/J4
-Ny+LvB2GNzmxlPLYvEqcgxhaBvzz1NS6jBUJJfD5to0EfhcSM2tXSExP2yYe68yQ
-54v5aHxwD6Mq0Do43zeX4lvegGHTgNiRg0JaTASJaBE8rF9ogEHMYELODVoqDA+b
-MMCm8Ibbq0nXl21Ii/kDwFJnmxL3wvIumGVC2daa49AZMQyth9VXAnow6IYm+48j
-ilSH5L887uvDdUhfHjlvgWJsxS3EF1QZtzeNnDeRyPYL1epjb4OsOMLzP96a++Ej
-YfDIJss2yKHzMI+ko6Kh3VOz3vCaMh+DkXkwwakfU5tTohVTP92dsxA7SH2JD/zt
-A/X7JWR1DhcZDY8AFmd5ekD8LVkH2ZD6mq093ICK5lw1omdMEWux+IBkAC1vImHF
-rEsm5VoQgpukg3s0956JkSCXjrdCx2bD0Omk1vUgjcTDlaxECp1bczwmPS9KvqfJ
-pxAe+59QafMCAwEAAaOB5jCB4zAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE
-AwIBBjAdBgNVHQ4EFgQU0QnQ6dfOeXRU+Tows/RtLAMDG2gwgaAGA1UdIASBmDCB
-lTCBkgYEVR0gADCBiTArBggrBgEFBQcCARYfaHR0cDovL3d3dy5jZXJ0aWNhbWFy
-YS5jb20vZHBjLzBaBggrBgEFBQcCAjBOGkxMaW1pdGFjaW9uZXMgZGUgZ2FyYW50
-7WFzIGRlIGVzdGUgY2VydGlmaWNhZG8gc2UgcHVlZGVuIGVuY29udHJhciBlbiBs
-YSBEUEMuMA0GCSqGSIb3DQEBBQUAA4ICAQBclLW4RZFNjmEfAygPU3zmpFmps4p6
-xbD/CHwso3EcIRNnoZUSQDWDg4902zNc8El2CoFS3UnUmjIz75uny3XlesuXEpBc
-unvFm9+7OSPI/5jOCk0iAUgHforA1SBClETvv3eiiWdIG0ADBaGJ7M9i4z0ldma/
-Jre7Ir5v/zlXdLp6yQGVwZVR6Kss+LGGIOk/yzVb0hfpKv6DExdA7ohiZVvVO2Dp
-ezy4ydV/NgIlqmjCMRW3MGXrfx1IebHPOeJCgBbT9ZMj/EyXyVo3bHwi2ErN0o42
-gzmRkBDI8ck1fj+404HGIGQatlDCIaR43NAvO2STdPCWkPHv+wlaNECW8DYSwaN0
-jJN+Qd53i+yG2dIPPy3RzECiiWZIHiCznCNZc6lEc7wkeZBWN7PGKX6jD/EpOe9+
-XCgycDWs2rjIdWb8m0w5R44bb5tNAlQiM+9hup4phO9OSzNHdpdqy35f/RWmnkJD
-W2ZaiogN9xa5P1FlK2Zqi9E4UqLWRhH6/JocdJ6PlwsCT2TG9WjTSy3/pDceiz+/
-RL5hRqGEPQgnTIEgd4kI6mdAXmwIUV80WoyWaM3X94nCHNMyAK9Sy9NgWyo6R35r
-MDOhYil/SrnhLecUIw4OGEfhefwVVdCx/CVxY3UzHCMrr1zZ7Ud3YA47Dx7SwNxk
-BYn8eNZcLCZDqQ==
------END CERTIFICATE-----
-
-# Issuer: CN=TC TrustCenter Class 2 CA II O=TC TrustCenter GmbH OU=TC TrustCenter Class 2 CA
-# Subject: CN=TC TrustCenter Class 2 CA II O=TC TrustCenter GmbH OU=TC TrustCenter Class 2 CA
-# Label: "TC TrustCenter Class 2 CA II"
-# Serial: 941389028203453866782103406992443
-# MD5 Fingerprint: ce:78:33:5c:59:78:01:6e:18:ea:b9:36:a0:b9:2e:23
-# SHA1 Fingerprint: ae:50:83:ed:7c:f4:5c:bc:8f:61:c6:21:fe:68:5d:79:42:21:15:6e
-# SHA256 Fingerprint: e6:b8:f8:76:64:85:f8:07:ae:7f:8d:ac:16:70:46:1f:07:c0:a1:3e:ef:3a:1f:f7:17:53:8d:7a:ba:d3:91:b4
------BEGIN CERTIFICATE-----
-MIIEqjCCA5KgAwIBAgIOLmoAAQACH9dSISwRXDswDQYJKoZIhvcNAQEFBQAwdjEL
-MAkGA1UEBhMCREUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNV
-BAsTGVRDIFRydXN0Q2VudGVyIENsYXNzIDIgQ0ExJTAjBgNVBAMTHFRDIFRydXN0
-Q2VudGVyIENsYXNzIDIgQ0EgSUkwHhcNMDYwMTEyMTQzODQzWhcNMjUxMjMxMjI1
-OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1c3RDZW50ZXIgR21i
-SDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQTElMCMGA1UEAxMc
-VEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMiBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAKuAh5uO8MN8h9foJIIRszzdQ2Lu+MNF2ujhoF/RKrLqk2jf
-tMjWQ+nEdVl//OEd+DFwIxuInie5e/060smp6RQvkL4DUsFJzfb95AhmC1eKokKg
-uNV/aVyQMrKXDcpK3EY+AlWJU+MaWss2xgdW94zPEfRMuzBwBJWl9jmM/XOBCH2J
-XjIeIqkiRUuwZi4wzJ9l/fzLganx4Duvo4bRierERXlQXa7pIXSSTYtZgo+U4+lK
-8edJsBTj9WLL1XK9H7nSn6DNqPoByNkN39r8R52zyFTfSUrxIan+GE7uSNQZu+99
-5OKdy1u2bv/jzVrndIIFuoAlOMvkaZ6vQaoahPUCAwEAAaOCATQwggEwMA8GA1Ud
-EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTjq1RMgKHbVkO3
-kUrL84J6E1wIqzCB7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRy
-dXN0Y2VudGVyLmRlL2NybC92Mi90Y19jbGFzc18yX2NhX0lJLmNybIaBn2xkYXA6
-Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBUcnVzdENlbnRlciUyMENsYXNz
-JTIwMiUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21iSCxPVT1yb290
-Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u
-TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEAjNfffu4bgBCzg/XbEeprS6iS
-GNn3Bzn1LL4GdXpoUxUc6krtXvwjshOg0wn/9vYua0Fxec3ibf2uWWuFHbhOIprt
-ZjluS5TmVfwLG4t3wVMTZonZKNaL80VKY7f9ewthXbhtvsPcW3nS7Yblok2+XnR8
-au0WOB9/WIFaGusyiC2y8zl3gK9etmF1KdsjTYjKUCjLhdLTEKJZbtOTVAB6okaV
-hgWcqRmY5TFyDADiZ9lA4CQze28suVyrZZ0srHbqNZn1l7kPJOzHdiEoZa5X6AeI
-dUpWoNIFOqTmjZKILPPy4cHGYdtBxceb9w4aUUXCYWvcZCcXjFq32nQozZfkvQ==
------END CERTIFICATE-----
-
-# Issuer: CN=TC TrustCenter Class 3 CA II O=TC TrustCenter GmbH OU=TC TrustCenter Class 3 CA
-# Subject: CN=TC TrustCenter Class 3 CA II O=TC TrustCenter GmbH OU=TC TrustCenter Class 3 CA
-# Label: "TC TrustCenter Class 3 CA II"
-# Serial: 1506523511417715638772220530020799
-# MD5 Fingerprint: 56:5f:aa:80:61:12:17:f6:67:21:e6:2b:6d:61:56:8e
-# SHA1 Fingerprint: 80:25:ef:f4:6e:70:c8:d4:72:24:65:84:fe:40:3b:8a:8d:6a:db:f5
-# SHA256 Fingerprint: 8d:a0:84:fc:f9:9c:e0:77:22:f8:9b:32:05:93:98:06:fa:5c:b8:11:e1:c8:13:f6:a1:08:c7:d3:36:b3:40:8e
------BEGIN CERTIFICATE-----
-MIIEqjCCA5KgAwIBAgIOSkcAAQAC5aBd1j8AUb8wDQYJKoZIhvcNAQEFBQAwdjEL
-MAkGA1UEBhMCREUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNV
-BAsTGVRDIFRydXN0Q2VudGVyIENsYXNzIDMgQ0ExJTAjBgNVBAMTHFRDIFRydXN0
-Q2VudGVyIENsYXNzIDMgQ0EgSUkwHhcNMDYwMTEyMTQ0MTU3WhcNMjUxMjMxMjI1
-OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1c3RDZW50ZXIgR21i
-SDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQTElMCMGA1UEAxMc
-VEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBALTgu1G7OVyLBMVMeRwjhjEQY0NVJz/GRcekPewJDRoeIMJW
-Ht4bNwcwIi9v8Qbxq63WyKthoy9DxLCyLfzDlml7forkzMA5EpBCYMnMNWju2l+Q
-Vl/NHE1bWEnrDgFPZPosPIlY2C8u4rBo6SI7dYnWRBpl8huXJh0obazovVkdKyT2
-1oQDZogkAHhg8fir/gKya/si+zXmFtGt9i4S5Po1auUZuV3bOx4a+9P/FRQI2Alq
-ukWdFHlgfa9Aigdzs5OW03Q0jTo3Kd5c7PXuLjHCINy+8U9/I1LZW+Jk2ZyqBwi1
-Rb3R0DHBq1SfqdLDYmAD8bs5SpJKPQq5ncWg/jcCAwEAAaOCATQwggEwMA8GA1Ud
-EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTUovyfs8PYA9NX
-XAek0CSnwPIA1DCB7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRy
-dXN0Y2VudGVyLmRlL2NybC92Mi90Y19jbGFzc18zX2NhX0lJLmNybIaBn2xkYXA6
-Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBUcnVzdENlbnRlciUyMENsYXNz
-JTIwMyUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21iSCxPVT1yb290
-Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u
-TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEANmDkcPcGIEPZIxpC8vijsrlN
-irTzwppVMXzEO2eatN9NDoqTSheLG43KieHPOh6sHfGcMrSOWXaiQYUlN6AT0PV8
-TtXqluJucsG7Kv5sbviRmEb8yRtXW+rIGjs/sFGYPAfaLFkB2otE6OF0/ado3VS6
-g0bsyEa1+K+XwDsJHI/OcpY9M1ZwvJbL2NV9IJqDnxrcOfHFcqMRA/07QlIp2+gB
-95tejNaNhk4Z+rwcvsUhpYeeeC422wlxo3I0+GzjBgnyXlal092Y+tTmBvTwtiBj
-S+opvaqCZh77gaqnN60TGOaSw4HBM7uIHqHn4rS9MWwOUT1v+5ZWgOI2F9Hc5A==
------END CERTIFICATE-----
-
-# Issuer: CN=TC TrustCenter Universal CA I O=TC TrustCenter GmbH OU=TC TrustCenter Universal CA
-# Subject: CN=TC TrustCenter Universal CA I O=TC TrustCenter GmbH OU=TC TrustCenter Universal CA
-# Label: "TC TrustCenter Universal CA I"
-# Serial: 601024842042189035295619584734726
-# MD5 Fingerprint: 45:e1:a5:72:c5:a9:36:64:40:9e:f5:e4:58:84:67:8c
-# SHA1 Fingerprint: 6b:2f:34:ad:89:58:be:62:fd:b0:6b:5c:ce:bb:9d:d9:4f:4e:39:f3
-# SHA256 Fingerprint: eb:f3:c0:2a:87:89:b1:fb:7d:51:19:95:d6:63:b7:29:06:d9:13:ce:0d:5e:10:56:8a:8a:77:e2:58:61:67:e7
------BEGIN CERTIFICATE-----
-MIID3TCCAsWgAwIBAgIOHaIAAQAC7LdggHiNtgYwDQYJKoZIhvcNAQEFBQAweTEL
-MAkGA1UEBhMCREUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxJDAiBgNV
-BAsTG1RDIFRydXN0Q2VudGVyIFVuaXZlcnNhbCBDQTEmMCQGA1UEAxMdVEMgVHJ1
-c3RDZW50ZXIgVW5pdmVyc2FsIENBIEkwHhcNMDYwMzIyMTU1NDI4WhcNMjUxMjMx
-MjI1OTU5WjB5MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1c3RDZW50ZXIg
-R21iSDEkMCIGA1UECxMbVEMgVHJ1c3RDZW50ZXIgVW5pdmVyc2FsIENBMSYwJAYD
-VQQDEx1UQyBUcnVzdENlbnRlciBVbml2ZXJzYWwgQ0EgSTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAKR3I5ZEr5D0MacQ9CaHnPM42Q9e3s9B6DGtxnSR
-JJZ4Hgmgm5qVSkr1YnwCqMqs+1oEdjneX/H5s7/zA1hV0qq34wQi0fiU2iIIAI3T
-fCZdzHd55yx4Oagmcw6iXSVphU9VDprvxrlE4Vc93x9UIuVvZaozhDrzznq+VZeu
-jRIPFDPiUHDDSYcTvFHe15gSWu86gzOSBnWLknwSaHtwag+1m7Z3W0hZneTvWq3z
-wZ7U10VOylY0Ibw+F1tvdwxIAUMpsN0/lm7mlaoMwCC2/T42J5zjXM9OgdwZu5GQ
-fezmlwQek8wiSdeXhrYTCjxDI3d+8NzmzSQfO4ObNDqDNOMCAwEAAaNjMGEwHwYD
-VR0jBBgwFoAUkqR1LKSevoFE63n8isWVpesQdXMwDwYDVR0TAQH/BAUwAwEB/zAO
-BgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFJKkdSyknr6BROt5/IrFlaXrEHVzMA0G
-CSqGSIb3DQEBBQUAA4IBAQAo0uCG1eb4e/CX3CJrO5UUVg8RMKWaTzqwOuAGy2X1
-7caXJ/4l8lfmXpWMPmRgFVp/Lw0BxbFg/UU1z/CyvwbZ71q+s2IhtNerNXxTPqYn
-8aEt2hojnczd7Dwtnic0XQ/CNnm8yUpiLe1r2X1BQ3y2qsrtYbE3ghUJGooWMNjs
-ydZHcnhLEEYUjl8Or+zHL6sQ17bxbuyGssLoDZJz3KL0Dzq/YSMQiZxIQG5wALPT
-ujdEWBF6AmqI8Dc08BnprNRlc/ZpjGSUOnmFKbAWKwyCPwacx/0QK54PLLae4xW/
-2TYcuiUaUj0a7CIMHOCkoj3w6DnPgcB77V0fb8XQC9eY
------END CERTIFICATE-----
-
-# Issuer: CN=Deutsche Telekom Root CA 2 O=Deutsche Telekom AG OU=T-TeleSec Trust Center
-# Subject: CN=Deutsche Telekom Root CA 2 O=Deutsche Telekom AG OU=T-TeleSec Trust Center
-# Label: "Deutsche Telekom Root CA 2"
-# Serial: 38
-# MD5 Fingerprint: 74:01:4a:91:b1:08:c4:58:ce:47:cd:f0:dd:11:53:08
-# SHA1 Fingerprint: 85:a4:08:c0:9c:19:3e:5d:51:58:7d:cd:d6:13:30:fd:8c:de:37:bf
-# SHA256 Fingerprint: b6:19:1a:50:d0:c3:97:7f:7d:a9:9b:cd:aa:c8:6a:22:7d:ae:b9:67:9e:c7:0b:a3:b0:c9:d9:22:71:c1:70:d3
------BEGIN CERTIFICATE-----
-MIIDnzCCAoegAwIBAgIBJjANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJERTEc
-MBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxlU2Vj
-IFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290IENB
-IDIwHhcNOTkwNzA5MTIxMTAwWhcNMTkwNzA5MjM1OTAwWjBxMQswCQYDVQQGEwJE
-RTEcMBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxl
-U2VjIFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290
-IENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrC6M14IspFLEU
-ha88EOQ5bzVdSq7d6mGNlUn0b2SjGmBmpKlAIoTZ1KXleJMOaAGtuU1cOs7TuKhC
-QN/Po7qCWWqSG6wcmtoIKyUn+WkjR/Hg6yx6m/UTAtB+NHzCnjwAWav12gz1Mjwr
-rFDa1sPeg5TKqAyZMg4ISFZbavva4VhYAUlfckE8FQYBjl2tqriTtM2e66foai1S
-NNs671x1Udrb8zH57nGYMsRUFUQM+ZtV7a3fGAigo4aKSe5TBY8ZTNXeWHmb0moc
-QqvF1afPaA+W5OFhmHZhyJF81j4A4pFQh+GdCuatl9Idxjp9y7zaAzTVjlsB9WoH
-txa2bkp/AgMBAAGjQjBAMB0GA1UdDgQWBBQxw3kbuvVT1xfgiXotF2wKsyudMzAP
-BgNVHRMECDAGAQH/AgEFMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOC
-AQEAlGRZrTlk5ynrE/5aw4sTV8gEJPB0d8Bg42f76Ymmg7+Wgnxu1MM9756Abrsp
-tJh6sTtU6zkXR34ajgv8HzFZMQSyzhfzLMdiNlXiItiJVbSYSKpk+tYcNthEeFpa
-IzpXl/V6ME+un2pMSyuOoAPjPuCp1NJ70rOo4nI8rZ7/gFnkm0W09juwzTkZmDLl
-6iFhkOQxIY40sfcvNUqFENrnijchvllj4PKFiDFT1FQUhXB59C4Gdyd1Lx+4ivn+
-xbrYNuSD7Odlt79jWvNGr4GUN9RBjNYj1h7P9WgbRGOiWrqnNVmh5XAFmw4jV5mU
-Cm26OWMohpLzGITY+9HPBVZkVw==
------END CERTIFICATE-----
-
-# Issuer: CN=ComSign Secured CA O=ComSign
-# Subject: CN=ComSign Secured CA O=ComSign
-# Label: "ComSign Secured CA"
-# Serial: 264725503855295744117309814499492384489
-# MD5 Fingerprint: 40:01:25:06:8d:21:43:6a:0e:43:00:9c:e7:43:f3:d5
-# SHA1 Fingerprint: f9:cd:0e:2c:da:76:24:c1:8f:bd:f0:f0:ab:b6:45:b8:f7:fe:d5:7a
-# SHA256 Fingerprint: 50:79:41:c7:44:60:a0:b4:70:86:22:0d:4e:99:32:57:2a:b5:d1:b5:bb:cb:89:80:ab:1c:b1:76:51:a8:44:d2
------BEGIN CERTIFICATE-----
-MIIDqzCCApOgAwIBAgIRAMcoRwmzuGxFjB36JPU2TukwDQYJKoZIhvcNAQEFBQAw
-PDEbMBkGA1UEAxMSQ29tU2lnbiBTZWN1cmVkIENBMRAwDgYDVQQKEwdDb21TaWdu
-MQswCQYDVQQGEwJJTDAeFw0wNDAzMjQxMTM3MjBaFw0yOTAzMTYxNTA0NTZaMDwx
-GzAZBgNVBAMTEkNvbVNpZ24gU2VjdXJlZCBDQTEQMA4GA1UEChMHQ29tU2lnbjEL
-MAkGA1UEBhMCSUwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGtWhf
-HZQVw6QIVS3joFd67+l0Kru5fFdJGhFeTymHDEjWaueP1H5XJLkGieQcPOqs49oh
-gHMhCu95mGwfCP+hUH3ymBvJVG8+pSjsIQQPRbsHPaHA+iqYHU4Gk/v1iDurX8sW
-v+bznkqH7Rnqwp9D5PGBpX8QTz7RSmKtUxvLg/8HZaWSLWapW7ha9B20IZFKF3ue
-Mv5WJDmyVIRD9YTC2LxBkMyd1mja6YJQqTtoz7VdApRgFrFD2UNd3V2Hbuq7s8lr
-9gOUCXDeFhF6K+h2j0kQmHe5Y1yLM5d19guMsqtb3nQgJT/j8xH5h2iGNXHDHYwt
-6+UarA9z1YJZQIDTAgMBAAGjgacwgaQwDAYDVR0TBAUwAwEB/zBEBgNVHR8EPTA7
-MDmgN6A1hjNodHRwOi8vZmVkaXIuY29tc2lnbi5jby5pbC9jcmwvQ29tU2lnblNl
-Y3VyZWRDQS5jcmwwDgYDVR0PAQH/BAQDAgGGMB8GA1UdIwQYMBaAFMFL7XC29z58
-ADsAj8c+DkWfHl3sMB0GA1UdDgQWBBTBS+1wtvc+fAA7AI/HPg5Fnx5d7DANBgkq
-hkiG9w0BAQUFAAOCAQEAFs/ukhNQq3sUnjO2QiBq1BW9Cav8cujvR3qQrFHBZE7p
-iL1DRYHjZiM/EoZNGeQFsOY3wo3aBijJD4mkU6l1P7CW+6tMM1X5eCZGbxs2mPtC
-dsGCuY7e+0X5YxtiOzkGynd6qDwJz2w2PQ8KRUtpFhpFfTMDZflScZAmlaxMDPWL
-kz/MdXSFmLr/YnpNH4n+rr2UAJm/EaXc4HnFFgt9AmEd6oX5AhVP51qJThRv4zdL
-hfXBPGHg/QVBspJ/wx2g0K5SZGBrGMYmnNj1ZOQ2GmKfig8+/21OGVZOIJFsnzQz
-OjRXUDpvgV4GxvU+fE6OK85lBi5d0ipTdF7Tbieejw==
------END CERTIFICATE-----
-
-# Issuer: CN=Cybertrust Global Root O=Cybertrust, Inc
-# Subject: CN=Cybertrust Global Root O=Cybertrust, Inc
-# Label: "Cybertrust Global Root"
-# Serial: 4835703278459682877484360
-# MD5 Fingerprint: 72:e4:4a:87:e3:69:40:80:77:ea:bc:e3:f4:ff:f0:e1
-# SHA1 Fingerprint: 5f:43:e5:b1:bf:f8:78:8c:ac:1c:c7:ca:4a:9a:c6:22:2b:cc:34:c6
-# SHA256 Fingerprint: 96:0a:df:00:63:e9:63:56:75:0c:29:65:dd:0a:08:67:da:0b:9c:bd:6e:77:71:4a:ea:fb:23:49:ab:39:3d:a3
------BEGIN CERTIFICATE-----
-MIIDoTCCAomgAwIBAgILBAAAAAABD4WqLUgwDQYJKoZIhvcNAQEFBQAwOzEYMBYG
-A1UEChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2Jh
-bCBSb290MB4XDTA2MTIxNTA4MDAwMFoXDTIxMTIxNTA4MDAwMFowOzEYMBYGA1UE
-ChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2JhbCBS
-b290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+Mi8vRRQZhP/8NN5
-7CPytxrHjoXxEnOmGaoQ25yiZXRadz5RfVb23CO21O1fWLE3TdVJDm71aofW0ozS
-J8bi/zafmGWgE07GKmSb1ZASzxQG9Dvj1Ci+6A74q05IlG2OlTEQXO2iLb3VOm2y
-HLtgwEZLAfVJrn5GitB0jaEMAs7u/OePuGtm839EAL9mJRQr3RAwHQeWP032a7iP
-t3sMpTjr3kfb1V05/Iin89cqdPHoWqI7n1C6poxFNcJQZZXcY4Lv3b93TZxiyWNz
-FtApD0mpSPCzqrdsxacwOUBdrsTiXSZT8M4cIwhhqJQZugRiQOwfOHB3EgZxpzAY
-XSUnpQIDAQABo4GlMIGiMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/
-MB0GA1UdDgQWBBS2CHsNesysIEyGVjJez6tuhS1wVzA/BgNVHR8EODA2MDSgMqAw
-hi5odHRwOi8vd3d3Mi5wdWJsaWMtdHJ1c3QuY29tL2NybC9jdC9jdHJvb3QuY3Js
-MB8GA1UdIwQYMBaAFLYIew16zKwgTIZWMl7Pq26FLXBXMA0GCSqGSIb3DQEBBQUA
-A4IBAQBW7wojoFROlZfJ+InaRcHUowAl9B8Tq7ejhVhpwjCt2BWKLePJzYFa+HMj
-Wqd8BfP9IjsO0QbE2zZMcwSO5bAi5MXzLqXZI+O4Tkogp24CJJ8iYGd7ix1yCcUx
-XOl5n4BHPa2hCwcUPUf/A2kaDAtE52Mlp3+yybh2hO0j9n0Hq0V+09+zv+mKts2o
-omcrUtW3ZfA5TGOgkXmTUg9U3YO7n9GPp1Nzw8v/MOx8BLjYRB+TX3EJIrduPuoc
-A06dGiBh+4E37F78CkWr1+cXVdCg6mCbpvbjjFspwgZgFJ0tl0ypkxWdYcQBX0jW
-WL1WMRJOEcgh4LMRkWXbtKaIOM5V
------END CERTIFICATE-----
-
-# Issuer: O=Chunghwa Telecom Co., Ltd. OU=ePKI Root Certification Authority
-# Subject: O=Chunghwa Telecom Co., Ltd. OU=ePKI Root Certification Authority
-# Label: "ePKI Root Certification Authority"
-# Serial: 28956088682735189655030529057352760477
-# MD5 Fingerprint: 1b:2e:00:ca:26:06:90:3d:ad:fe:6f:15:68:d3:6b:b3
-# SHA1 Fingerprint: 67:65:0d:f1:7e:8e:7e:5b:82:40:a4:f4:56:4b:cf:e2:3d:69:c6:f0
-# SHA256 Fingerprint: c0:a6:f4:dc:63:a2:4b:fd:cf:54:ef:2a:6a:08:2a:0a:72:de:35:80:3e:2f:f5:ff:52:7a:e5:d8:72:06:df:d5
------BEGIN CERTIFICATE-----
-MIIFsDCCA5igAwIBAgIQFci9ZUdcr7iXAF7kBtK8nTANBgkqhkiG9w0BAQUFADBe
-MQswCQYDVQQGEwJUVzEjMCEGA1UECgwaQ2h1bmdod2EgVGVsZWNvbSBDby4sIEx0
-ZC4xKjAoBgNVBAsMIWVQS0kgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAe
-Fw0wNDEyMjAwMjMxMjdaFw0zNDEyMjAwMjMxMjdaMF4xCzAJBgNVBAYTAlRXMSMw
-IQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEqMCgGA1UECwwhZVBL
-SSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0BAQEF
-AAOCAg8AMIICCgKCAgEA4SUP7o3biDN1Z82tH306Tm2d0y8U82N0ywEhajfqhFAH
-SyZbCUNsIZ5qyNUD9WBpj8zwIuQf5/dqIjG3LBXy4P4AakP/h2XGtRrBp0xtInAh
-ijHyl3SJCRImHJ7K2RKilTza6We/CKBk49ZCt0Xvl/T29de1ShUCWH2YWEtgvM3X
-DZoTM1PRYfl61dd4s5oz9wCGzh1NlDivqOx4UXCKXBCDUSH3ET00hl7lSM2XgYI1
-TBnsZfZrxQWh7kcT1rMhJ5QQCtkkO7q+RBNGMD+XPNjX12ruOzjjK9SXDrkb5wdJ
-fzcq+Xd4z1TtW0ado4AOkUPB1ltfFLqfpo0kR0BZv3I4sjZsN/+Z0V0OWQqraffA
-sgRFelQArr5T9rXn4fg8ozHSqf4hUmTFpmfwdQcGlBSBVcYn5AGPF8Fqcde+S/uU
-WH1+ETOxQvdibBjWzwloPn9s9h6PYq2lY9sJpx8iQkEeb5mKPtf5P0B6ebClAZLS
-nT0IFaUQAS2zMnaolQ2zepr7BxB4EW/hj8e6DyUadCrlHJhBmd8hh+iVBmoKs2pH
-dmX2Os+PYhcZewoozRrSgx4hxyy/vv9haLdnG7t4TY3OZ+XkwY63I2binZB1NJip
-NiuKmpS5nezMirH4JYlcWrYvjB9teSSnUmjDhDXiZo1jDiVN1Rmy5nk3pyKdVDEC
-AwEAAaNqMGgwHQYDVR0OBBYEFB4M97Zn8uGSJglFwFU5Lnc/QkqiMAwGA1UdEwQF
-MAMBAf8wOQYEZyoHAAQxMC8wLQIBADAJBgUrDgMCGgUAMAcGBWcqAwAABBRFsMLH
-ClZ87lt4DJX5GFPBphzYEDANBgkqhkiG9w0BAQUFAAOCAgEACbODU1kBPpVJufGB
-uvl2ICO1J2B01GqZNF5sAFPZn/KmsSQHRGoqxqWOeBLoR9lYGxMqXnmbnwoqZ6Yl
-PwZpVnPDimZI+ymBV3QGypzqKOg4ZyYr8dW1P2WT+DZdjo2NQCCHGervJ8A9tDkP
-JXtoUHRVnAxZfVo9QZQlUgjgRywVMRnVvwdVxrsStZf0X4OFunHB2WyBEXYKCrC/
-gpf36j36+uwtqSiUO1bd0lEursC9CBWMd1I0ltabrNMdjmEPNXubrjlpC2JgQCA2
-j6/7Nu4tCEoduL+bXPjqpRugc6bY+G7gMwRfaKonh+3ZwZCc7b3jajWvY9+rGNm6
-5ulK6lCKD2GTHuItGeIwlDWSXQ62B68ZgI9HkFFLLk3dheLSClIKF5r8GrBQAuUB
-o2M3IUxExJtRmREOc5wGj1QupyheRDmHVi03vYVElOEMSyycw5KFNGHLD7ibSkNS
-/jQ6fbjpKdx2qcgw+BRxgMYeNkh0IkFch4LoGHGLQYlE535YW6i4jRPpp2zDR+2z
-Gp1iro2C6pSe3VkQw63d4k3jMdXH7OjysP6SHhYKGvzZ8/gntsm+HbRsZJB/9OTE
-W9c3rkIO3aQab3yIVMUWbuF6aC74Or8NpDyJO3inTmODBCEIZ43ygknQW/2xzQ+D
-hNQ+IIX3Sj0rnP0qCglN6oH4EZw=
------END CERTIFICATE-----
-
-# Issuer: CN=TÜBİTAK UEKAE Kök Sertifika Hizmet Sağlayıcısı - Sürüm 3 O=Türkiye Bilimsel ve Teknolojik Araştırma Kurumu - TÜBİTAK OU=Ulusal Elektronik ve Kriptoloji Araştırma Enstitüsü - UEKAE/Kamu Sertifikasyon Merkezi
-# Subject: CN=TÜBİTAK UEKAE Kök Sertifika Hizmet Sağlayıcısı - Sürüm 3 O=Türkiye Bilimsel ve Teknolojik Araştırma Kurumu - TÜBİTAK OU=Ulusal Elektronik ve Kriptoloji Araştırma Enstitüsü - UEKAE/Kamu Sertifikasyon Merkezi
-# Label: "T\xc3\x9c\x42\xC4\xB0TAK UEKAE K\xC3\xB6k Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1 - S\xC3\xBCr\xC3\xBCm 3"
-# Serial: 17
-# MD5 Fingerprint: ed:41:f5:8c:50:c5:2b:9c:73:e6:ee:6c:eb:c2:a8:26
-# SHA1 Fingerprint: 1b:4b:39:61:26:27:6b:64:91:a2:68:6d:d7:02:43:21:2d:1f:1d:96
-# SHA256 Fingerprint: e4:c7:34:30:d7:a5:b5:09:25:df:43:37:0a:0d:21:6e:9a:79:b9:d6:db:83:73:a0:c6:9e:b1:cc:31:c7:c5:2a
------BEGIN CERTIFICATE-----
-MIIFFzCCA/+gAwIBAgIBETANBgkqhkiG9w0BAQUFADCCASsxCzAJBgNVBAYTAlRS
-MRgwFgYDVQQHDA9HZWJ6ZSAtIEtvY2FlbGkxRzBFBgNVBAoMPlTDvHJraXllIEJp
-bGltc2VsIHZlIFRla25vbG9qaWsgQXJhxZ90xLFybWEgS3VydW11IC0gVMOcQsSw
-VEFLMUgwRgYDVQQLDD9VbHVzYWwgRWxla3Ryb25payB2ZSBLcmlwdG9sb2ppIEFy
-YcWfdMSxcm1hIEVuc3RpdMO8c8O8IC0gVUVLQUUxIzAhBgNVBAsMGkthbXUgU2Vy
-dGlmaWthc3lvbiBNZXJrZXppMUowSAYDVQQDDEFUw5xCxLBUQUsgVUVLQUUgS8O2
-ayBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsSAtIFPDvHLDvG0gMzAe
-Fw0wNzA4MjQxMTM3MDdaFw0xNzA4MjExMTM3MDdaMIIBKzELMAkGA1UEBhMCVFIx
-GDAWBgNVBAcMD0dlYnplIC0gS29jYWVsaTFHMEUGA1UECgw+VMO8cmtpeWUgQmls
-aW1zZWwgdmUgVGVrbm9sb2ppayBBcmHFn3TEsXJtYSBLdXJ1bXUgLSBUw5xCxLBU
-QUsxSDBGBgNVBAsMP1VsdXNhbCBFbGVrdHJvbmlrIHZlIEtyaXB0b2xvamkgQXJh
-xZ90xLFybWEgRW5zdGl0w7xzw7wgLSBVRUtBRTEjMCEGA1UECwwaS2FtdSBTZXJ0
-aWZpa2FzeW9uIE1lcmtlemkxSjBIBgNVBAMMQVTDnELEsFRBSyBVRUtBRSBLw7Zr
-IFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIC0gU8O8csO8bSAzMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAim1L/xCIOsP2fpTo6iBkcK4h
-gb46ezzb8R1Sf1n68yJMlaCQvEhOEav7t7WNeoMojCZG2E6VQIdhn8WebYGHV2yK
-O7Rm6sxA/OOqbLLLAdsyv9Lrhc+hDVXDWzhXcLh1xnnRFDDtG1hba+818qEhTsXO
-fJlfbLm4IpNQp81McGq+agV/E5wrHur+R84EpW+sky58K5+eeROR6Oqeyjh1jmKw
-lZMq5d/pXpduIF9fhHpEORlAHLpVK/swsoHvhOPc7Jg4OQOFCKlUAwUp8MmPi+oL
-hmUZEdPpCSPeaJMDyTYcIW7OjGbxmTDY17PDHfiBLqi9ggtm/oLL4eAagsNAgQID
-AQABo0IwQDAdBgNVHQ4EFgQUvYiHyY/2pAoLquvF/pEjnatKijIwDgYDVR0PAQH/
-BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAB18+kmP
-NOm3JpIWmgV050vQbTlswyb2zrgxvMTfvCr4N5EY3ATIZJkrGG2AA1nJrvhY0D7t
-wyOfaTyGOBye79oneNGEN3GKPEs5z35FBtYt2IpNeBLWrcLTy9LQQfMmNkqblWwM
-7uXRQydmwYj3erMgbOqwaSvHIOgMA8RBBZniP+Rr+KCGgceExh/VS4ESshYhLBOh
-gLJeDEoTniDYYkCrkOpkSi+sDQESeUWoL4cZaMjihccwsnX5OD+ywJO0a+IDRM5n
-oN+J1q2MdqMTw5RhK2vZbMEHCiIHhWyFJEapvj+LeISCfiQMnf2BN+MlqO02TpUs
-yZyQ2uypQjyttgI=
------END CERTIFICATE-----
-
-# Issuer: CN=Buypass Class 2 CA 1 O=Buypass AS-983163327
-# Subject: CN=Buypass Class 2 CA 1 O=Buypass AS-983163327
-# Label: "Buypass Class 2 CA 1"
-# Serial: 1
-# MD5 Fingerprint: b8:08:9a:f0:03:cc:1b:0d:c8:6c:0b:76:a1:75:64:23
-# SHA1 Fingerprint: a0:a1:ab:90:c9:fc:84:7b:3b:12:61:e8:97:7d:5f:d3:22:61:d3:cc
-# SHA256 Fingerprint: 0f:4e:9c:dd:26:4b:02:55:50:d1:70:80:63:40:21:4f:e9:44:34:c9:b0:2f:69:7e:c7:10:fc:5f:ea:fb:5e:38
------BEGIN CERTIFICATE-----
-MIIDUzCCAjugAwIBAgIBATANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEd
-MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3Mg
-Q2xhc3MgMiBDQSAxMB4XDTA2MTAxMzEwMjUwOVoXDTE2MTAxMzEwMjUwOVowSzEL
-MAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MR0wGwYD
-VQQDDBRCdXlwYXNzIENsYXNzIDIgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAIs8B0XY9t/mx8q6jUPFR42wWsE425KEHK8T1A9vNkYgxC7McXA0
-ojTTNy7Y3Tp3L8DrKehc0rWpkTSHIln+zNvnma+WwajHQN2lFYxuyHyXA8vmIPLX
-l18xoS830r7uvqmtqEyeIWZDO6i88wmjONVZJMHCR3axiFyCO7srpgTXjAePzdVB
-HfCuuCkslFJgNJQ72uA40Z0zPhX0kzLFANq1KWYOOngPIVJfAuWSeyXTkh4vFZ2B
-5J2O6O+JzhRMVB0cgRJNcKi+EAUXfh/RuFdV7c27UsKwHnjCTTZoy1YmwVLBvXb3
-WNVyfh9EdrsAiR0WnVE1703CVu9r4Iw7DekCAwEAAaNCMEAwDwYDVR0TAQH/BAUw
-AwEB/zAdBgNVHQ4EFgQUP42aWYv8e3uco684sDntkHGA1sgwDgYDVR0PAQH/BAQD
-AgEGMA0GCSqGSIb3DQEBBQUAA4IBAQAVGn4TirnoB6NLJzKyQJHyIdFkhb5jatLP
-gcIV1Xp+DCmsNx4cfHZSldq1fyOhKXdlyTKdqC5Wq2B2zha0jX94wNWZUYN/Xtm+
-DKhQ7SLHrQVMdvvt7h5HZPb3J31cKA9FxVxiXqaakZG3Uxcu3K1gnZZkOb1naLKu
-BctN518fV4bVIJwo+28TOPX2EZL2fZleHwzoq0QkKXJAPTZSr4xYkHPB7GEseaHs
-h7U/2k3ZIQAw3pDaDtMaSKk+hQsUi4y8QZ5q9w5wwDX3OaJdZtB7WZ+oRxKaJyOk
-LY4ng5IgodcVf/EuGO70SH8vf/GhGLWhC5SgYiAynB321O+/TIho
------END CERTIFICATE-----
-
-# Issuer: CN=Buypass Class 3 CA 1 O=Buypass AS-983163327
-# Subject: CN=Buypass Class 3 CA 1 O=Buypass AS-983163327
-# Label: "Buypass Class 3 CA 1"
-# Serial: 2
-# MD5 Fingerprint: df:3c:73:59:81:e7:39:50:81:04:4c:34:a2:cb:b3:7b
-# SHA1 Fingerprint: 61:57:3a:11:df:0e:d8:7e:d5:92:65:22:ea:d0:56:d7:44:b3:23:71
-# SHA256 Fingerprint: b7:b1:2b:17:1f:82:1d:aa:99:0c:d0:fe:50:87:b1:28:44:8b:a8:e5:18:4f:84:c5:1e:02:b5:c8:fb:96:2b:24
------BEGIN CERTIFICATE-----
-MIIDUzCCAjugAwIBAgIBAjANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEd
-MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3Mg
-Q2xhc3MgMyBDQSAxMB4XDTA1MDUwOTE0MTMwM1oXDTE1MDUwOTE0MTMwM1owSzEL
-MAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MR0wGwYD
-VQQDDBRCdXlwYXNzIENsYXNzIDMgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAKSO13TZKWTeXx+HgJHqTjnmGcZEC4DVC69TB4sSveZn8AKxifZg
-isRbsELRwCGoy+Gb72RRtqfPFfV0gGgEkKBYouZ0plNTVUhjP5JW3SROjvi6K//z
-NIqeKNc0n6wv1g/xpC+9UrJJhW05NfBEMJNGJPO251P7vGGvqaMU+8IXF4Rs4HyI
-+MkcVyzwPX6UvCWThOiaAJpFBUJXgPROztmuOfbIUxAMZTpHe2DC1vqRycZxbL2R
-hzyRhkmr8w+gbCZ2Xhysm3HljbybIR6c1jh+JIAVMYKWsUnTYjdbiAwKYjT+p0h+
-mbEwi5A3lRyoH6UsjfRVyNvdWQrCrXig9IsCAwEAAaNCMEAwDwYDVR0TAQH/BAUw
-AwEB/zAdBgNVHQ4EFgQUOBTmyPCppAP0Tj4io1vy1uCtQHQwDgYDVR0PAQH/BAQD
-AgEGMA0GCSqGSIb3DQEBBQUAA4IBAQABZ6OMySU9E2NdFm/soT4JXJEVKirZgCFP
-Bdy7pYmrEzMqnji3jG8CcmPHc3ceCQa6Oyh7pEfJYWsICCD8igWKH7y6xsL+z27s
-EzNxZy5p+qksP2bAEllNC1QCkoS72xLvg3BweMhT+t/Gxv/ciC8HwEmdMldg0/L2
-mSlf56oBzKwzqBwKu5HEA6BvtjT5htOzdlSY9EqBs1OdTUDs5XcTRa9bqh/YL0yC
-e/4qxFi7T/ye/QNlGioOw6UgFpRreaaiErS7GqQjel/wroQk5PMr+4okoyeYZdow
-dXb8GZHo2+ubPzK/QJcHJrrM85SFSnonk8+QQtS4Wxam58tAA915
------END CERTIFICATE-----
-
-# Issuer: CN=EBG Elektronik Sertifika Hizmet Sağlayıcısı O=EBG Bilişim Teknolojileri ve Hizmetleri A.Ş.
-# Subject: CN=EBG Elektronik Sertifika Hizmet Sağlayıcısı O=EBG Bilişim Teknolojileri ve Hizmetleri A.Ş.
-# Label: "EBG Elektronik Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1"
-# Serial: 5525761995591021570
-# MD5 Fingerprint: 2c:20:26:9d:cb:1a:4a:00:85:b5:b7:5a:ae:c2:01:37
-# SHA1 Fingerprint: 8c:96:ba:eb:dd:2b:07:07:48:ee:30:32:66:a0:f3:98:6e:7c:ae:58
-# SHA256 Fingerprint: 35:ae:5b:dd:d8:f7:ae:63:5c:ff:ba:56:82:a8:f0:0b:95:f4:84:62:c7:10:8e:e9:a0:e5:29:2b:07:4a:af:b2
------BEGIN CERTIFICATE-----
-MIIF5zCCA8+gAwIBAgIITK9zQhyOdAIwDQYJKoZIhvcNAQEFBQAwgYAxODA2BgNV
-BAMML0VCRyBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sx
-c8SxMTcwNQYDVQQKDC5FQkcgQmlsacWfaW0gVGVrbm9sb2ppbGVyaSB2ZSBIaXpt
-ZXRsZXJpIEEuxZ4uMQswCQYDVQQGEwJUUjAeFw0wNjA4MTcwMDIxMDlaFw0xNjA4
-MTQwMDMxMDlaMIGAMTgwNgYDVQQDDC9FQkcgRWxla3Ryb25payBTZXJ0aWZpa2Eg
-SGl6bWV0IFNhxJ9sYXnEsWPEsXPEsTE3MDUGA1UECgwuRUJHIEJpbGnFn2ltIFRl
-a25vbG9qaWxlcmkgdmUgSGl6bWV0bGVyaSBBLsWeLjELMAkGA1UEBhMCVFIwggIi
-MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDuoIRh0DpqZhAy2DE4f6en5f2h
-4fuXd7hxlugTlkaDT7byX3JWbhNgpQGR4lvFzVcfd2NR/y8927k/qqk153nQ9dAk
-tiHq6yOU/im/+4mRDGSaBUorzAzu8T2bgmmkTPiab+ci2hC6X5L8GCcKqKpE+i4s
-tPtGmggDg3KriORqcsnlZR9uKg+ds+g75AxuetpX/dfreYteIAbTdgtsApWjluTL
-dlHRKJ2hGvxEok3MenaoDT2/F08iiFD9rrbskFBKW5+VQarKD7JK/oCZTqNGFav4
-c0JqwmZ2sQomFd2TkuzbqV9UIlKRcF0T6kjsbgNs2d1s/OsNA/+mgxKb8amTD8Um
-TDGyY5lhcucqZJnSuOl14nypqZoaqsNW2xCaPINStnuWt6yHd6i58mcLlEOzrz5z
-+kI2sSXFCjEmN1ZnuqMLfdb3ic1nobc6HmZP9qBVFCVMLDMNpkGMvQQxahByCp0O
-Lna9XvNRiYuoP1Vzv9s6xiQFlpJIqkuNKgPlV5EQ9GooFW5Hd4RcUXSfGenmHmMW
-OeMRFeNYGkS9y8RsZteEBt8w9DeiQyJ50hBs37vmExH8nYQKE3vwO9D8owrXieqW
-fo1IhR5kX9tUoqzVegJ5a9KK8GfaZXINFHDk6Y54jzJ0fFfy1tb0Nokb+Clsi7n2
-l9GkLqq+CxnCRelwXQIDAJ3Zo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB
-/wQEAwIBBjAdBgNVHQ4EFgQU587GT/wWZ5b6SqMHwQSny2re2kcwHwYDVR0jBBgw
-FoAU587GT/wWZ5b6SqMHwQSny2re2kcwDQYJKoZIhvcNAQEFBQADggIBAJuYml2+
-8ygjdsZs93/mQJ7ANtyVDR2tFcU22NU57/IeIl6zgrRdu0waypIN30ckHrMk2pGI
-6YNw3ZPX6bqz3xZaPt7gyPvT/Wwp+BVGoGgmzJNSroIBk5DKd8pNSe/iWtkqvTDO
-TLKBtjDOWU/aWR1qeqRFsIImgYZ29fUQALjuswnoT4cCB64kXPBfrAowzIpAoHME
-wfuJJPaaHFy3PApnNgUIMbOv2AFoKuB4j3TeuFGkjGwgPaL7s9QJ/XvCgKqTbCmY
-Iai7FvOpEl90tYeY8pUm3zTvilORiF0alKM/fCL414i6poyWqD1SNGKfAB5UVUJn
-xk1Gj7sURT0KlhaOEKGXmdXTMIXM3rRyt7yKPBgpaP3ccQfuJDlq+u2lrDgv+R4Q
-DgZxGhBM/nV+/x5XOULK1+EVoVZVWRvRo68R2E7DpSvvkL/A7IITW43WciyTTo9q
-Kd+FPNMN4KIYEsxVL0e3p5sC/kH2iExt2qkBR4NkJ2IQgtYSe14DHzSpyZH+r11t
-hie3I6p1GMog57AP14kOpmciY/SDQSsGS7tY1dHXt7kQY9iJSrSq3RZj9W6+YKH4
-7ejWkE8axsWgKdOnIaj1Wjz3x0miIZpKlVIglnKaZsv30oZDfCK+lvm9AahH3eU7
-QPl1K5srRmSGjR70j/sHd9DqSaIcjVIUpgqT
------END CERTIFICATE-----
-
-# Issuer: O=certSIGN OU=certSIGN ROOT CA
-# Subject: O=certSIGN OU=certSIGN ROOT CA
-# Label: "certSIGN ROOT CA"
-# Serial: 35210227249154
-# MD5 Fingerprint: 18:98:c0:d6:e9:3a:fc:f9:b0:f5:0c:f7:4b:01:44:17
-# SHA1 Fingerprint: fa:b7:ee:36:97:26:62:fb:2d:b0:2a:f6:bf:03:fd:e8:7c:4b:2f:9b
-# SHA256 Fingerprint: ea:a9:62:c4:fa:4a:6b:af:eb:e4:15:19:6d:35:1c:cd:88:8d:4f:53:f3:fa:8a:e6:d7:c4:66:a9:4e:60:42:bb
------BEGIN CERTIFICATE-----
-MIIDODCCAiCgAwIBAgIGIAYFFnACMA0GCSqGSIb3DQEBBQUAMDsxCzAJBgNVBAYT
-AlJPMREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBD
-QTAeFw0wNjA3MDQxNzIwMDRaFw0zMTA3MDQxNzIwMDRaMDsxCzAJBgNVBAYTAlJP
-MREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBDQTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALczuX7IJUqOtdu0KBuqV5Do
-0SLTZLrTk+jUrIZhQGpgV2hUhE28alQCBf/fm5oqrl0Hj0rDKH/v+yv6efHHrfAQ
-UySQi2bJqIirr1qjAOm+ukbuW3N7LBeCgV5iLKECZbO9xSsAfsT8AzNXDe3i+s5d
-RdY4zTW2ssHQnIFKquSyAVwdj1+ZxLGt24gh65AIgoDzMKND5pCCrlUoSe1b16kQ
-OA7+j0xbm0bqQfWwCHTD0IgztnzXdN/chNFDDnU5oSVAKOp4yw4sLjmdjItuFhwv
-JoIQ4uNllAoEwF73XVv4EOLQunpL+943AAAaWyjj0pxzPjKHmKHJUS/X3qwzs08C
-AwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAcYwHQYDVR0O
-BBYEFOCMm9slSbPxfIbWskKHC9BroNnkMA0GCSqGSIb3DQEBBQUAA4IBAQA+0hyJ
-LjX8+HXd5n9liPRyTMks1zJO890ZeUe9jjtbkw9QSSQTaxQGcu8J06Gh40CEyecY
-MnQ8SG4Pn0vU9x7Tk4ZkVJdjclDVVc/6IJMCopvDI5NOFlV2oHB5bc0hH88vLbwZ
-44gx+FkagQnIl6Z0x2DEW8xXjrJ1/RsCCdtZb3KTafcxQdaIOL+Hsr0Wefmq5L6I
-Jd1hJyMctTEHBDa0GpC9oHRxUIltvBTjD4au8as+x6AJzKNI0eDbZOeStc+vckNw
-i/nDhDwTqn6Sm1dTk/pwwpEOMfmbZ13pljheX7NzTogVZ96edhBiIL5VaZVDADlN
-9u6wWk5JRFRYX0KD
------END CERTIFICATE-----
-
-# Issuer: CN=CNNIC ROOT O=CNNIC
-# Subject: CN=CNNIC ROOT O=CNNIC
-# Label: "CNNIC ROOT"
-# Serial: 1228079105
-# MD5 Fingerprint: 21:bc:82:ab:49:c4:13:3b:4b:b2:2b:5c:6b:90:9c:19
-# SHA1 Fingerprint: 8b:af:4c:9b:1d:f0:2a:92:f7:da:12:8e:b9:1b:ac:f4:98:60:4b:6f
-# SHA256 Fingerprint: e2:83:93:77:3d:a8:45:a6:79:f2:08:0c:c7:fb:44:a3:b7:a1:c3:79:2c:b7:eb:77:29:fd:cb:6a:8d:99:ae:a7
------BEGIN CERTIFICATE-----
-MIIDVTCCAj2gAwIBAgIESTMAATANBgkqhkiG9w0BAQUFADAyMQswCQYDVQQGEwJD
-TjEOMAwGA1UEChMFQ05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1QwHhcNMDcwNDE2
-MDcwOTE0WhcNMjcwNDE2MDcwOTE0WjAyMQswCQYDVQQGEwJDTjEOMAwGA1UEChMF
-Q05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1QwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDTNfc/c3et6FtzF8LRb+1VvG7q6KR5smzDo+/hn7E7SIX1mlwh
-IhAsxYLO2uOabjfhhyzcuQxauohV3/2q2x8x6gHx3zkBwRP9SFIhxFXf2tizVHa6
-dLG3fdfA6PZZxU3Iva0fFNrfWEQlMhkqx35+jq44sDB7R3IJMfAw28Mbdim7aXZO
-V/kbZKKTVrdvmW7bCgScEeOAH8tjlBAKqeFkgjH5jCftppkA9nCTGPihNIaj3XrC
-GHn2emU1z5DrvTOTn1OrczvmmzQgLx3vqR1jGqCA2wMv+SYahtKNu6m+UjqHZ0gN
-v7Sg2Ca+I19zN38m5pIEo3/PIKe38zrKy5nLAgMBAAGjczBxMBEGCWCGSAGG+EIB
-AQQEAwIABzAfBgNVHSMEGDAWgBRl8jGtKvf33VKWCscCwQ7vptU7ETAPBgNVHRMB
-Af8EBTADAQH/MAsGA1UdDwQEAwIB/jAdBgNVHQ4EFgQUZfIxrSr3991SlgrHAsEO
-76bVOxEwDQYJKoZIhvcNAQEFBQADggEBAEs17szkrr/Dbq2flTtLP1se31cpolnK
-OOK5Gv+e5m4y3R6u6jW39ZORTtpC4cMXYFDy0VwmuYK36m3knITnA3kXr5g9lNvH
-ugDnuL8BV8F3RTIMO/G0HAiw/VGgod2aHRM2mm23xzy54cXZF/qD1T0VoDy7Hgvi
-yJA/qIYM/PmLXoXLT1tLYhFHxUV8BS9BsZ4QaRuZluBVeftOhpm4lNqGOGqTo+fL
-buXf6iFViZx9fX+Y9QCJ7uOEwFyWtcVG6kbghVW2G8kS1sHNzYDzAgE8yGnLRUhj
-2JTQ7IUOO04RZfSCjKY9ri4ilAnIXOo8gV0WKgOXFlUJ24pBgp5mmxE=
------END CERTIFICATE-----
-
-# Issuer: O=Japanese Government OU=ApplicationCA
-# Subject: O=Japanese Government OU=ApplicationCA
-# Label: "ApplicationCA - Japanese Government"
-# Serial: 49
-# MD5 Fingerprint: 7e:23:4e:5b:a7:a5:b4:25:e9:00:07:74:11:62:ae:d6
-# SHA1 Fingerprint: 7f:8a:b0:cf:d0:51:87:6a:66:f3:36:0f:47:c8:8d:8c:d3:35:fc:74
-# SHA256 Fingerprint: 2d:47:43:7d:e1:79:51:21:5a:12:f3:c5:8e:51:c7:29:a5:80:26:ef:1f:cc:0a:5f:b3:d9:dc:01:2f:60:0d:19
------BEGIN CERTIFICATE-----
-MIIDoDCCAoigAwIBAgIBMTANBgkqhkiG9w0BAQUFADBDMQswCQYDVQQGEwJKUDEc
-MBoGA1UEChMTSmFwYW5lc2UgR292ZXJubWVudDEWMBQGA1UECxMNQXBwbGljYXRp
-b25DQTAeFw0wNzEyMTIxNTAwMDBaFw0xNzEyMTIxNTAwMDBaMEMxCzAJBgNVBAYT
-AkpQMRwwGgYDVQQKExNKYXBhbmVzZSBHb3Zlcm5tZW50MRYwFAYDVQQLEw1BcHBs
-aWNhdGlvbkNBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAp23gdE6H
-j6UG3mii24aZS2QNcfAKBZuOquHMLtJqO8F6tJdhjYq+xpqcBrSGUeQ3DnR4fl+K
-f5Sk10cI/VBaVuRorChzoHvpfxiSQE8tnfWuREhzNgaeZCw7NCPbXCbkcXmP1G55
-IrmTwcrNwVbtiGrXoDkhBFcsovW8R0FPXjQilbUfKW1eSvNNcr5BViCH/OlQR9cw
-FO5cjFW6WY2H/CPek9AEjP3vbb3QesmlOmpyM8ZKDQUXKi17safY1vC+9D/qDiht
-QWEjdnjDuGWk81quzMKq2edY3rZ+nYVunyoKb58DKTCXKB28t89UKU5RMfkntigm
-/qJj5kEW8DOYRwIDAQABo4GeMIGbMB0GA1UdDgQWBBRUWssmP3HMlEYNllPqa0jQ
-k/5CdTAOBgNVHQ8BAf8EBAMCAQYwWQYDVR0RBFIwUKROMEwxCzAJBgNVBAYTAkpQ
-MRgwFgYDVQQKDA/ml6XmnKzlm73mlL/lupwxIzAhBgNVBAsMGuOCouODl+ODquOC
-seODvOOCt+ODp+ODs0NBMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
-ggEBADlqRHZ3ODrso2dGD/mLBqj7apAxzn7s2tGJfHrrLgy9mTLnsCTWw//1sogJ
-hyzjVOGjprIIC8CFqMjSnHH2HZ9g/DgzE+Ge3Atf2hZQKXsvcJEPmbo0NI2VdMV+
-eKlmXb3KIXdCEKxmJj3ekav9FfBv7WxfEPjzFvYDio+nEhEMy/0/ecGc/WLuo89U
-DNErXxc+4z6/wCs+CZv+iKZ+tJIX/COUgb1up8WMwusRRdv4QcmWdupwX3kSa+Sj
-B1oF7ydJzyGfikwJcGapJsErEU4z0g781mzSDjJkaP+tBXhfAx2o45CsJOAPQKdL
-rosot4LKGAfmt1t06SAZf7IbiVQ=
------END CERTIFICATE-----
-
-# Issuer: CN=GeoTrust Primary Certification Authority - G3 O=GeoTrust Inc. OU=(c) 2008 GeoTrust Inc. - For authorized use only
-# Subject: CN=GeoTrust Primary Certification Authority - G3 O=GeoTrust Inc. OU=(c) 2008 GeoTrust Inc. - For authorized use only
-# Label: "GeoTrust Primary Certification Authority - G3"
-# Serial: 28809105769928564313984085209975885599
-# MD5 Fingerprint: b5:e8:34:36:c9:10:44:58:48:70:6d:2e:83:d4:b8:05
-# SHA1 Fingerprint: 03:9e:ed:b8:0b:e7:a0:3c:69:53:89:3b:20:d2:d9:32:3a:4c:2a:fd
-# SHA256 Fingerprint: b4:78:b8:12:25:0d:f8:78:63:5c:2a:a7:ec:7d:15:5e:aa:62:5e:e8:29:16:e2:cd:29:43:61:88:6c:d1:fb:d4
------BEGIN CERTIFICATE-----
-MIID/jCCAuagAwIBAgIQFaxulBmyeUtB9iepwxgPHzANBgkqhkiG9w0BAQsFADCB
-mDELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsT
-MChjKSAyMDA4IEdlb1RydXN0IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25s
-eTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhv
-cml0eSAtIEczMB4XDTA4MDQwMjAwMDAwMFoXDTM3MTIwMTIzNTk1OVowgZgxCzAJ
-BgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykg
-MjAwOCBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0
-BgNVBAMTLUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
-LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANziXmJYHTNXOTIz
-+uvLh4yn1ErdBojqZI4xmKU4kB6Yzy5jK/BGvESyiaHAKAxJcCGVn2TAppMSAmUm
-hsalifD614SgcK9PGpc/BkTVyetyEH3kMSj7HGHmKAdEc5IiaacDiGydY8hS2pgn
-5whMcD60yRLBxWeDXTPzAxHsatBT4tG6NmCUgLthY2xbF37fQJQeqw3CIShwiP/W
-JmxsYAQlTlV+fe+/lEjetx3dcI0FX4ilm/LC7urRQEFtYjgdVgbFA0dRIBn8exAL
-DmKudlW/X3e+PkkBUz2YJQN2JFodtNuJ6nnltrM7P7pMKEF/BqxqjsHQ9gUdfeZC
-huOl1UcCAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw
-HQYDVR0OBBYEFMR5yo6hTgMdHNxr2zFblD4/MH8tMA0GCSqGSIb3DQEBCwUAA4IB
-AQAtxRPPVoB7eni9n64smefv2t+UXglpp+duaIy9cr5HqQ6XErhK8WTTOd8lNNTB
-zU6B8A8ExCSzNJbGpqow32hhc9f5joWJ7w5elShKKiePEI4ufIbEAp7aDHdlDkQN
-kv39sxY2+hENHYwOB4lqKVb3cvTdFZx3NWZXqxNT2I7BQMXXExZacse3aQHEerGD
-AWh9jUGhlBjBJVz88P6DAod8DQ3PLghcSkANPuyBYeYk28rgDi0Hsj5W3I31QYUH
-SJsMC8tJP33st/3LjWeJGqvtux6jAAgIFyqCXDFdRootD4abdNlF+9RAsXqqaC2G
-spki4cErx5z481+oghLrGREt
------END CERTIFICATE-----
-
-# Issuer: CN=thawte Primary Root CA - G2 O=thawte, Inc. OU=(c) 2007 thawte, Inc. - For authorized use only
-# Subject: CN=thawte Primary Root CA - G2 O=thawte, Inc. OU=(c) 2007 thawte, Inc. - For authorized use only
-# Label: "thawte Primary Root CA - G2"
-# Serial: 71758320672825410020661621085256472406
-# MD5 Fingerprint: 74:9d:ea:60:24:c4:fd:22:53:3e:cc:3a:72:d9:29:4f
-# SHA1 Fingerprint: aa:db:bc:22:23:8f:c4:01:a1:27:bb:38:dd:f4:1d:db:08:9e:f0:12
-# SHA256 Fingerprint: a4:31:0d:50:af:18:a6:44:71:90:37:2a:86:af:af:8b:95:1f:fb:43:1d:83:7f:1e:56:88:b4:59:71:ed:15:57
------BEGIN CERTIFICATE-----
-MIICiDCCAg2gAwIBAgIQNfwmXNmET8k9Jj1Xm67XVjAKBggqhkjOPQQDAzCBhDEL
-MAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjE4MDYGA1UECxMvKGMp
-IDIwMDcgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAi
-BgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMjAeFw0wNzExMDUwMDAw
-MDBaFw0zODAxMTgyMzU5NTlaMIGEMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhh
-d3RlLCBJbmMuMTgwNgYDVQQLEy8oYykgMjAwNyB0aGF3dGUsIEluYy4gLSBGb3Ig
-YXV0aG9yaXplZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9v
-dCBDQSAtIEcyMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEotWcgnuVnfFSeIf+iha/
-BebfowJPDQfGAFG6DAJSLSKkQjnE/o/qycG+1E3/n3qe4rF8mq2nhglzh9HnmuN6
-papu+7qzcMBniKI11KOasf2twu8x+qi58/sIxpHR+ymVo0IwQDAPBgNVHRMBAf8E
-BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUmtgAMADna3+FGO6Lts6K
-DPgR4bswCgYIKoZIzj0EAwMDaQAwZgIxAN344FdHW6fmCsO99YCKlzUNG4k8VIZ3
-KMqh9HneteY4sPBlcIx/AlTCv//YoT7ZzwIxAMSNlPzcU9LcnXgWHxUzI1NS41ox
-XZ3Krr0TKUQNJ1uo52icEvdYPy5yAlejj6EULg==
------END CERTIFICATE-----
-
-# Issuer: CN=thawte Primary Root CA - G3 O=thawte, Inc. OU=Certification Services Division/(c) 2008 thawte, Inc. - For authorized use only
-# Subject: CN=thawte Primary Root CA - G3 O=thawte, Inc. OU=Certification Services Division/(c) 2008 thawte, Inc. - For authorized use only
-# Label: "thawte Primary Root CA - G3"
-# Serial: 127614157056681299805556476275995414779
-# MD5 Fingerprint: fb:1b:5d:43:8a:94:cd:44:c6:76:f2:43:4b:47:e7:31
-# SHA1 Fingerprint: f1:8b:53:8d:1b:e9:03:b6:a6:f0:56:43:5b:17:15:89:ca:f3:6b:f2
-# SHA256 Fingerprint: 4b:03:f4:58:07:ad:70:f2:1b:fc:2c:ae:71:c9:fd:e4:60:4c:06:4c:f5:ff:b6:86:ba:e5:db:aa:d7:fd:d3:4c
------BEGIN CERTIFICATE-----
-MIIEKjCCAxKgAwIBAgIQYAGXt0an6rS0mtZLL/eQ+zANBgkqhkiG9w0BAQsFADCB
-rjELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMf
-Q2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIw
-MDggdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAiBgNV
-BAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMzAeFw0wODA0MDIwMDAwMDBa
-Fw0zNzEyMDEyMzU5NTlaMIGuMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhhd3Rl
-LCBJbmMuMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNlcnZpY2VzIERpdmlzaW9u
-MTgwNgYDVQQLEy8oYykgMjAwOCB0aGF3dGUsIEluYy4gLSBGb3IgYXV0aG9yaXpl
-ZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAtIEcz
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsr8nLPvb2FvdeHsbnndm
-gcs+vHyu86YnmjSjaDFxODNi5PNxZnmxqWWjpYvVj2AtP0LMqmsywCPLLEHd5N/8
-YZzic7IilRFDGF/Eth9XbAoFWCLINkw6fKXRz4aviKdEAhN0cXMKQlkC+BsUa0Lf
-b1+6a4KinVvnSr0eAXLbS3ToO39/fR8EtCab4LRarEc9VbjXsCZSKAExQGbY2SS9
-9irY7CFJXJv2eul/VTV+lmuNk5Mny5K76qxAwJ/C+IDPXfRa3M50hqY+bAtTyr2S
-zhkGcuYMXDhpxwTWvGzOW/b3aJzcJRVIiKHpqfiYnODz1TEoYRFsZ5aNOZnLwkUk
-OQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNV
-HQ4EFgQUrWyqlGCc7eT/+j4KdCtjA/e2Wb8wDQYJKoZIhvcNAQELBQADggEBABpA
-2JVlrAmSicY59BDlqQ5mU1143vokkbvnRFHfxhY0Cu9qRFHqKweKA3rD6z8KLFIW
-oCtDuSWQP3CpMyVtRRooOyfPqsMpQhvfO0zAMzRbQYi/aytlryjvsvXDqmbOe1bu
-t8jLZ8HJnBoYuMTDSQPxYA5QzUbF83d597YV4Djbxy8ooAw/dyZ02SUS2jHaGh7c
-KUGRIjxpp7sC8rZcJwOJ9Abqm+RyguOhCcHpABnTPtRwa7pxpqpYrvS76Wy274fM
-m7v/OeZWYdMKp8RcTGB7BXcmer/YB1IsYvdwY9k5vG8cwnncdimvzsUsZAReiDZu
-MdRAGmI0Nj81Aa6sY6A=
------END CERTIFICATE-----
-
-# Issuer: CN=GeoTrust Primary Certification Authority - G2 O=GeoTrust Inc. OU=(c) 2007 GeoTrust Inc. - For authorized use only
-# Subject: CN=GeoTrust Primary Certification Authority - G2 O=GeoTrust Inc. OU=(c) 2007 GeoTrust Inc. - For authorized use only
-# Label: "GeoTrust Primary Certification Authority - G2"
-# Serial: 80682863203381065782177908751794619243
-# MD5 Fingerprint: 01:5e:d8:6b:bd:6f:3d:8e:a1:31:f8:12:e0:98:73:6a
-# SHA1 Fingerprint: 8d:17:84:d5:37:f3:03:7d:ec:70:fe:57:8b:51:9a:99:e6:10:d7:b0
-# SHA256 Fingerprint: 5e:db:7a:c4:3b:82:a0:6a:87:61:e8:d7:be:49:79:eb:f2:61:1f:7d:d7:9b:f9:1c:1c:6b:56:6a:21:9e:d7:66
------BEGIN CERTIFICATE-----
-MIICrjCCAjWgAwIBAgIQPLL0SAoA4v7rJDteYD7DazAKBggqhkjOPQQDAzCBmDEL
-MAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChj
-KSAyMDA3IEdlb1RydXN0IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2
-MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
-eSAtIEcyMB4XDTA3MTEwNTAwMDAwMFoXDTM4MDExODIzNTk1OVowgZgxCzAJBgNV
-BAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykgMjAw
-NyBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNV
-BAMTLUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBH
-MjB2MBAGByqGSM49AgEGBSuBBAAiA2IABBWx6P0DFUPlrOuHNxFi79KDNlJ9RVcL
-So17VDs6bl8VAsBQps8lL33KSLjHUGMcKiEIfJo22Av+0SbFWDEwKCXzXV2juLal
-tJLtbCyf691DiaI8S0iRHVDsJt/WYC69IaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAO
-BgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBVfNVdRVfslsq0DafwBo/q+EVXVMAoG
-CCqGSM49BAMDA2cAMGQCMGSWWaboCd6LuvpaiIjwH5HTRqjySkwCY/tsXzjbLkGT
-qQ7mndwxHLKgpxgceeHHNgIwOlavmnRs9vuD4DPTCF+hnMJbn0bWtsuRBmOiBucz
-rD6ogRLQy7rQkgu2npaqBA+K
------END CERTIFICATE-----
-
-# Issuer: CN=VeriSign Universal Root Certification Authority O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 2008 VeriSign, Inc. - For authorized use only
-# Subject: CN=VeriSign Universal Root Certification Authority O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 2008 VeriSign, Inc. - For authorized use only
-# Label: "VeriSign Universal Root Certification Authority"
-# Serial: 85209574734084581917763752644031726877
-# MD5 Fingerprint: 8e:ad:b5:01:aa:4d:81:e4:8c:1d:d1:e1:14:00:95:19
-# SHA1 Fingerprint: 36:79:ca:35:66:87:72:30:4d:30:a5:fb:87:3b:0f:a7:7b:b7:0d:54
-# SHA256 Fingerprint: 23:99:56:11:27:a5:71:25:de:8c:ef:ea:61:0d:df:2f:a0:78:b5:c8:06:7f:4e:82:82:90:bf:b8:60:e8:4b:3c
------BEGIN CERTIFICATE-----
-MIIEuTCCA6GgAwIBAgIQQBrEZCGzEyEDDrvkEhrFHTANBgkqhkiG9w0BAQsFADCB
-vTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwOCBWZXJp
-U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MTgwNgYDVQQDEy9W
-ZXJpU2lnbiBVbml2ZXJzYWwgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAe
-Fw0wODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIG9MQswCQYDVQQGEwJVUzEX
-MBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0
-IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAyMDA4IFZlcmlTaWduLCBJbmMuIC0gRm9y
-IGF1dGhvcml6ZWQgdXNlIG9ubHkxODA2BgNVBAMTL1ZlcmlTaWduIFVuaXZlcnNh
-bCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAx2E3XrEBNNti1xWb/1hajCMj1mCOkdeQmIN65lgZOIzF
-9uVkhbSicfvtvbnazU0AtMgtc6XHaXGVHzk8skQHnOgO+k1KxCHfKWGPMiJhgsWH
-H26MfF8WIFFE0XBPV+rjHOPMee5Y2A7Cs0WTwCznmhcrewA3ekEzeOEz4vMQGn+H
-LL729fdC4uW/h2KJXwBL38Xd5HVEMkE6HnFuacsLdUYI0crSK5XQz/u5QGtkjFdN
-/BMReYTtXlT2NJ8IAfMQJQYXStrxHXpma5hgZqTZ79IugvHw7wnqRMkVauIDbjPT
-rJ9VAMf2CGqUuV/c4DPxhGD5WycRtPwW8rtWaoAljQIDAQABo4GyMIGvMA8GA1Ud
-EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMG0GCCsGAQUFBwEMBGEwX6FdoFsw
-WTBXMFUWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFI/l0xqGrI2Oa8PPgGrUSBgs
-exkuMCUWI2h0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28uZ2lmMB0GA1Ud
-DgQWBBS2d/ppSEefUxLVwuoHMnYH0ZcHGTANBgkqhkiG9w0BAQsFAAOCAQEASvj4
-sAPmLGd75JR3Y8xuTPl9Dg3cyLk1uXBPY/ok+myDjEedO2Pzmvl2MpWRsXe8rJq+
-seQxIcaBlVZaDrHC1LGmWazxY8u4TB1ZkErvkBYoH1quEPuBUDgMbMzxPcP1Y+Oz
-4yHJJDnp/RVmRvQbEdBNc6N9Rvk97ahfYtTxP/jgdFcrGJ2BtMQo2pSXpXDrrB2+
-BxHw1dvd5Yzw1TKwg+ZX4o+/vqGqvz0dtdQ46tewXDpPaj+PwGZsY6rp2aQW9IHR
-lRQOfc2VNNnSj3BzgXucfr2YYdhFh5iQxeuGMMY1v/D/w1WIg0vvBZIGcfK4mJO3
-7M2CYfE45k+XmCpajQ==
------END CERTIFICATE-----
-
-# Issuer: CN=VeriSign Class 3 Public Primary Certification Authority - G4 O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 2007 VeriSign, Inc. - For authorized use only
-# Subject: CN=VeriSign Class 3 Public Primary Certification Authority - G4 O=VeriSign, Inc. OU=VeriSign Trust Network/(c) 2007 VeriSign, Inc. - For authorized use only
-# Label: "VeriSign Class 3 Public Primary Certification Authority - G4"
-# Serial: 63143484348153506665311985501458640051
-# MD5 Fingerprint: 3a:52:e1:e7:fd:6f:3a:e3:6f:f3:6f:99:1b:f9:22:41
-# SHA1 Fingerprint: 22:d5:d8:df:8f:02:31:d1:8d:f7:9d:b7:cf:8a:2d:64:c9:3f:6c:3a
-# SHA256 Fingerprint: 69:dd:d7:ea:90:bb:57:c9:3e:13:5d:c8:5e:a6:fc:d5:48:0b:60:32:39:bd:c4:54:fc:75:8b:2a:26:cf:7f:79
------BEGIN CERTIFICATE-----
-MIIDhDCCAwqgAwIBAgIQL4D+I4wOIg9IZxIokYesszAKBggqhkjOPQQDAzCByjEL
-MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW
-ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2ln
-biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp
-U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y
-aXR5IC0gRzQwHhcNMDcxMTA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCByjELMAkG
-A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJp
-U2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwg
-SW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2ln
-biBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5
-IC0gRzQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAASnVnp8Utpkmw4tXNherJI9/gHm
-GUo9FANL+mAnINmDiWn6VMaaGF5VKmTeBvaNSjutEDxlPZCIBIngMGGzrl0Bp3ve
-fLK+ymVhAIau2o970ImtTR1ZmkGxvEeA3J5iw/mjgbIwga8wDwYDVR0TAQH/BAUw
-AwEB/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJ
-aW1hZ2UvZ2lmMCEwHzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYj
-aHR0cDovL2xvZ28udmVyaXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFLMW
-kf3upm7ktS5Jj4d4gYDs5bG1MAoGCCqGSM49BAMDA2gAMGUCMGYhDBgmYFo4e1ZC
-4Kf8NoRRkSAsdk1DPcQdhCPQrNZ8NQbOzWm9kA3bbEhCHQ6qQgIxAJw9SDkjOVga
-FRJZap7v1VmyHVIsmXHNxynfGyphe3HR3vPA5Q06Sqotp9iGKt0uEA==
------END CERTIFICATE-----
-
-# Issuer: CN=NetLock Arany (Class Gold) Főtanúsítvány O=NetLock Kft. OU=Tanúsítványkiadók (Certification Services)
-# Subject: CN=NetLock Arany (Class Gold) Főtanúsítvány O=NetLock Kft. OU=Tanúsítványkiadók (Certification Services)
-# Label: "NetLock Arany (Class Gold) Főtanúsítvány"
-# Serial: 80544274841616
-# MD5 Fingerprint: c5:a1:b7:ff:73:dd:d6:d7:34:32:18:df:fc:3c:ad:88
-# SHA1 Fingerprint: 06:08:3f:59:3f:15:a1:04:a0:69:a4:6b:a9:03:d0:06:b7:97:09:91
-# SHA256 Fingerprint: 6c:61:da:c3:a2:de:f0:31:50:6b:e0:36:d2:a6:fe:40:19:94:fb:d1:3d:f9:c8:d4:66:59:92:74:c4:46:ec:98
------BEGIN CERTIFICATE-----
-MIIEFTCCAv2gAwIBAgIGSUEs5AAQMA0GCSqGSIb3DQEBCwUAMIGnMQswCQYDVQQG
-EwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3
-MDUGA1UECwwuVGFuw7pzw610dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNl
-cnZpY2VzKTE1MDMGA1UEAwwsTmV0TG9jayBBcmFueSAoQ2xhc3MgR29sZCkgRsWR
-dGFuw7pzw610dsOhbnkwHhcNMDgxMjExMTUwODIxWhcNMjgxMjA2MTUwODIxWjCB
-pzELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MRUwEwYDVQQKDAxOZXRM
-b2NrIEtmdC4xNzA1BgNVBAsMLlRhbsO6c8OtdHbDoW55a2lhZMOzayAoQ2VydGlm
-aWNhdGlvbiBTZXJ2aWNlcykxNTAzBgNVBAMMLE5ldExvY2sgQXJhbnkgKENsYXNz
-IEdvbGQpIEbFkXRhbsO6c8OtdHbDoW55MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAxCRec75LbRTDofTjl5Bu0jBFHjzuZ9lk4BqKf8owyoPjIMHj9DrT
-lF8afFttvzBPhCf2nx9JvMaZCpDyD/V/Q4Q3Y1GLeqVw/HpYzY6b7cNGbIRwXdrz
-AZAj/E4wqX7hJ2Pn7WQ8oLjJM2P+FpD/sLj916jAwJRDC7bVWaaeVtAkH3B5r9s5
-VA1lddkVQZQBr17s9o3x/61k/iCa11zr/qYfCGSji3ZVrR47KGAuhyXoqq8fxmRG
-ILdwfzzeSNuWU7c5d+Qa4scWhHaXWy+7GRWF+GmF9ZmnqfI0p6m2pgP8b4Y9VHx2
-BJtr+UBdADTHLpl1neWIA6pN+APSQnbAGwIDAKiLo0UwQzASBgNVHRMBAf8ECDAG
-AQH/AgEEMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUzPpnk/C2uNClwB7zU/2M
-U9+D15YwDQYJKoZIhvcNAQELBQADggEBAKt/7hwWqZw8UQCgwBEIBaeZ5m8BiFRh
-bvG5GK1Krf6BQCOUL/t1fC8oS2IkgYIL9WHxHG64YTjrgfpioTtaYtOUZcTh5m2C
-+C8lcLIhJsFyUR+MLMOEkMNaj7rP9KdlpeuY0fsFskZ1FSNqb4VjMIDw1Z4fKRzC
-bLBQWV2QWzuoDTDPv31/zvGdg73JRm4gpvlhUbohL3u+pRVjodSVh/GeufOJ8z2F
-uLjbvrW5KfnaNwUASZQDhETnv0Mxz3WLJdH0pmT1kvarBes96aULNmLazAZfNou2
-XjG4Kvte9nHfRCaexOYNkbQudZWAUWpLMKawYqGT8ZvYzsRjdT9ZR7E=
------END CERTIFICATE-----
-
-# Issuer: CN=Staat der Nederlanden Root CA - G2 O=Staat der Nederlanden
-# Subject: CN=Staat der Nederlanden Root CA - G2 O=Staat der Nederlanden
-# Label: "Staat der Nederlanden Root CA - G2"
-# Serial: 10000012
-# MD5 Fingerprint: 7c:a5:0f:f8:5b:9a:7d:6d:30:ae:54:5a:e3:42:a2:8a
-# SHA1 Fingerprint: 59:af:82:79:91:86:c7:b4:75:07:cb:cf:03:57:46:eb:04:dd:b7:16
-# SHA256 Fingerprint: 66:8c:83:94:7d:a6:3b:72:4b:ec:e1:74:3c:31:a0:e6:ae:d0:db:8e:c5:b3:1b:e3:77:bb:78:4f:91:b6:71:6f
------BEGIN CERTIFICATE-----
-MIIFyjCCA7KgAwIBAgIEAJiWjDANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJO
-TDEeMBwGA1UECgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFh
-dCBkZXIgTmVkZXJsYW5kZW4gUm9vdCBDQSAtIEcyMB4XDTA4MDMyNjExMTgxN1oX
-DTIwMDMyNTExMDMxMFowWjELMAkGA1UEBhMCTkwxHjAcBgNVBAoMFVN0YWF0IGRl
-ciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5lZGVybGFuZGVuIFJv
-b3QgQ0EgLSBHMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMVZ5291
-qj5LnLW4rJ4L5PnZyqtdj7U5EILXr1HgO+EASGrP2uEGQxGZqhQlEq0i6ABtQ8Sp
-uOUfiUtnvWFI7/3S4GCI5bkYYCjDdyutsDeqN95kWSpGV+RLufg3fNU254DBtvPU
-Z5uW6M7XxgpT0GtJlvOjCwV3SPcl5XCsMBQgJeN/dVrlSPhOewMHBPqCYYdu8DvE
-pMfQ9XQ+pV0aCPKbJdL2rAQmPlU6Yiile7Iwr/g3wtG61jj99O9JMDeZJiFIhQGp
-5Rbn3JBV3w/oOM2ZNyFPXfUib2rFEhZgF1XyZWampzCROME4HYYEhLoaJXhena/M
-UGDWE4dS7WMfbWV9whUYdMrhfmQpjHLYFhN9C0lK8SgbIHRrxT3dsKpICT0ugpTN
-GmXZK4iambwYfp/ufWZ8Pr2UuIHOzZgweMFvZ9C+X+Bo7d7iscksWXiSqt8rYGPy
-5V6548r6f1CGPqI0GAwJaCgRHOThuVw+R7oyPxjMW4T182t0xHJ04eOLoEq9jWYv
-6q012iDTiIJh8BIitrzQ1aTsr1SIJSQ8p22xcik/Plemf1WvbibG/ufMQFxRRIEK
-eN5KzlW/HdXZt1bv8Hb/C3m1r737qWmRRpdogBQ2HbN/uymYNqUg+oJgYjOk7Na6
-B6duxc8UpufWkjTYgfX8HV2qXB72o007uPc5AgMBAAGjgZcwgZQwDwYDVR0TAQH/
-BAUwAwEB/zBSBgNVHSAESzBJMEcGBFUdIAAwPzA9BggrBgEFBQcCARYxaHR0cDov
-L3d3dy5wa2lvdmVyaGVpZC5ubC9wb2xpY2llcy9yb290LXBvbGljeS1HMjAOBgNV
-HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJFoMocVHYnitfGsNig0jQt8YojrMA0GCSqG
-SIb3DQEBCwUAA4ICAQCoQUpnKpKBglBu4dfYszk78wIVCVBR7y29JHuIhjv5tLyS
-CZa59sCrI2AGeYwRTlHSeYAz+51IvuxBQ4EffkdAHOV6CMqqi3WtFMTC6GY8ggen
-5ieCWxjmD27ZUD6KQhgpxrRW/FYQoAUXvQwjf/ST7ZwaUb7dRUG/kSS0H4zpX897
-IZmflZ85OkYcbPnNe5yQzSipx6lVu6xiNGI1E0sUOlWDuYaNkqbG9AclVMwWVxJK
-gnjIFNkXgiYtXSAfea7+1HAWFpWD2DU5/1JddRwWxRNVz0fMdWVSSt7wsKfkCpYL
-+63C4iWEst3kvX5ZbJvw8NjnyvLplzh+ib7M+zkXYT9y2zqR2GUBGR2tUKRXCnxL
-vJxxcypFURmFzI79R6d0lR2o0a9OF7FpJsKqeFdbxU2n5Z4FF5TKsl+gSRiNNOkm
-bEgeqmiSBeGCc1qb3AdbCG19ndeNIdn8FCCqwkXfP+cAslHkwvgFuXkajDTznlvk
-N1trSt8sV4pAWja63XVECDdCcAz+3F4hoKOKwJCcaNpQ5kUQR3i2TtJlycM33+FC
-Y7BXN0Ute4qcvwXqZVUz9zkQxSgqIXobisQk+T8VyJoVIPVVYpbtbZNQvOSqeK3Z
-ywplh6ZmwcSBo3c6WB4L7oOLnR7SUqTMHW+wmG2UMbX4cQrcufx9MmDm66+KAQ==
------END CERTIFICATE-----
-
-# Issuer: CN=CA Disig O=Disig a.s.
-# Subject: CN=CA Disig O=Disig a.s.
-# Label: "CA Disig"
-# Serial: 1
-# MD5 Fingerprint: 3f:45:96:39:e2:50:87:f7:bb:fe:98:0c:3c:20:98:e6
-# SHA1 Fingerprint: 2a:c8:d5:8b:57:ce:bf:2f:49:af:f2:fc:76:8f:51:14:62:90:7a:41
-# SHA256 Fingerprint: 92:bf:51:19:ab:ec:ca:d0:b1:33:2d:c4:e1:d0:5f:ba:75:b5:67:90:44:ee:0c:a2:6e:93:1f:74:4f:2f:33:cf
------BEGIN CERTIFICATE-----
-MIIEDzCCAvegAwIBAgIBATANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQGEwJTSzET
-MBEGA1UEBxMKQnJhdGlzbGF2YTETMBEGA1UEChMKRGlzaWcgYS5zLjERMA8GA1UE
-AxMIQ0EgRGlzaWcwHhcNMDYwMzIyMDEzOTM0WhcNMTYwMzIyMDEzOTM0WjBKMQsw
-CQYDVQQGEwJTSzETMBEGA1UEBxMKQnJhdGlzbGF2YTETMBEGA1UEChMKRGlzaWcg
-YS5zLjERMA8GA1UEAxMIQ0EgRGlzaWcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCS9jHBfYj9mQGp2HvycXXxMcbzdWb6UShGhJd4NLxs/LxFWYgmGErE
-Nx+hSkS943EE9UQX4j/8SFhvXJ56CbpRNyIjZkMhsDxkovhqFQ4/61HhVKndBpnX
-mjxUizkDPw/Fzsbrg3ICqB9x8y34dQjbYkzo+s7552oftms1grrijxaSfQUMbEYD
-XcDtab86wYqg6I7ZuUUohwjstMoVvoLdtUSLLa2GDGhibYVW8qwUYzrG0ZmsNHhW
-S8+2rT+MitcE5eN4TPWGqvWP+j1scaMtymfraHtuM6kMgiioTGohQBUgDCZbg8Kp
-FhXAJIJdKxatymP2dACw30PEEGBWZ2NFAgMBAAGjgf8wgfwwDwYDVR0TAQH/BAUw
-AwEB/zAdBgNVHQ4EFgQUjbJJaJ1yCCW5wCf1UJNWSEZx+Y8wDgYDVR0PAQH/BAQD
-AgEGMDYGA1UdEQQvMC2BE2Nhb3BlcmF0b3JAZGlzaWcuc2uGFmh0dHA6Ly93d3cu
-ZGlzaWcuc2svY2EwZgYDVR0fBF8wXTAtoCugKYYnaHR0cDovL3d3dy5kaXNpZy5z
-ay9jYS9jcmwvY2FfZGlzaWcuY3JsMCygKqAohiZodHRwOi8vY2EuZGlzaWcuc2sv
-Y2EvY3JsL2NhX2Rpc2lnLmNybDAaBgNVHSAEEzARMA8GDSuBHpGT5goAAAABAQEw
-DQYJKoZIhvcNAQEFBQADggEBAF00dGFMrzvY/59tWDYcPQuBDRIrRhCA/ec8J9B6
-yKm2fnQwM6M6int0wHl5QpNt/7EpFIKrIYwvF/k/Ji/1WcbvgAa3mkkp7M5+cTxq
-EEHA9tOasnxakZzArFvITV734VP/Q3f8nktnbNfzg9Gg4H8l37iYC5oyOGwwoPP/
-CBUz91BKez6jPiCp3C9WgArtQVCwyfTssuMmRAAOb54GvCKWU3BlxFAKRmukLyeB
-EicTXxChds6KezfqwzlhA5WYOudsiCUI/HloDYd9Yvi0X/vF2Ey9WLw/Q1vUHgFN
-PGO+I++MzVpQuGhU+QqZMxEA4Z7CRneC9VkGjCFMhwnN5ag=
------END CERTIFICATE-----
-
-# Issuer: CN=Juur-SK O=AS Sertifitseerimiskeskus
-# Subject: CN=Juur-SK O=AS Sertifitseerimiskeskus
-# Label: "Juur-SK"
-# Serial: 999181308
-# MD5 Fingerprint: aa:8e:5d:d9:f8:db:0a:58:b7:8d:26:87:6c:82:35:55
-# SHA1 Fingerprint: 40:9d:4b:d9:17:b5:5c:27:b6:9b:64:cb:98:22:44:0d:cd:09:b8:89
-# SHA256 Fingerprint: ec:c3:e9:c3:40:75:03:be:e0:91:aa:95:2f:41:34:8f:f8:8b:aa:86:3b:22:64:be:fa:c8:07:90:15:74:e9:39
------BEGIN CERTIFICATE-----
-MIIE5jCCA86gAwIBAgIEO45L/DANBgkqhkiG9w0BAQUFADBdMRgwFgYJKoZIhvcN
-AQkBFglwa2lAc2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZp
-dHNlZXJpbWlza2Vza3VzMRAwDgYDVQQDEwdKdXVyLVNLMB4XDTAxMDgzMDE0MjMw
-MVoXDTE2MDgyNjE0MjMwMVowXTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMQsw
-CQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEQ
-MA4GA1UEAxMHSnV1ci1TSzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AIFxNj4zB9bjMI0TfncyRsvPGbJgMUaXhvSYRqTCZUXP00B841oiqBB4M8yIsdOB
-SvZiF3tfTQou0M+LI+5PAk676w7KvRhj6IAcjeEcjT3g/1tf6mTll+g/mX8MCgkz
-ABpTpyHhOEvWgxutr2TC+Rx6jGZITWYfGAriPrsfB2WThbkasLnE+w0R9vXW+RvH
-LCu3GFH+4Hv2qEivbDtPL+/40UceJlfwUR0zlv/vWT3aTdEVNMfqPxZIe5EcgEMP
-PbgFPtGzlc3Yyg/CQ2fbt5PgIoIuvvVoKIO5wTtpeyDaTpxt4brNj3pssAki14sL
-2xzVWiZbDcDq5WDQn/413z8CAwEAAaOCAawwggGoMA8GA1UdEwEB/wQFMAMBAf8w
-ggEWBgNVHSAEggENMIIBCTCCAQUGCisGAQQBzh8BAQEwgfYwgdAGCCsGAQUFBwIC
-MIHDHoHAAFMAZQBlACAAcwBlAHIAdABpAGYAaQBrAGEAYQB0ACAAbwBuACAAdgDk
-AGwAagBhAHMAdABhAHQAdQBkACAAQQBTAC0AaQBzACAAUwBlAHIAdABpAGYAaQB0
-AHMAZQBlAHIAaQBtAGkAcwBrAGUAcwBrAHUAcwAgAGEAbABhAG0ALQBTAEsAIABz
-AGUAcgB0AGkAZgBpAGsAYQBhAHQAaQBkAGUAIABrAGkAbgBuAGkAdABhAG0AaQBz
-AGUAawBzMCEGCCsGAQUFBwIBFhVodHRwOi8vd3d3LnNrLmVlL2Nwcy8wKwYDVR0f
-BCQwIjAgoB6gHIYaaHR0cDovL3d3dy5zay5lZS9qdXVyL2NybC8wHQYDVR0OBBYE
-FASqekej5ImvGs8KQKcYP2/v6X2+MB8GA1UdIwQYMBaAFASqekej5ImvGs8KQKcY
-P2/v6X2+MA4GA1UdDwEB/wQEAwIB5jANBgkqhkiG9w0BAQUFAAOCAQEAe8EYlFOi
-CfP+JmeaUOTDBS8rNXiRTHyoERF5TElZrMj3hWVcRrs7EKACr81Ptcw2Kuxd/u+g
-kcm2k298gFTsxwhwDY77guwqYHhpNjbRxZyLabVAyJRld/JXIWY7zoVAtjNjGr95
-HvxcHdMdkxuLDF2FvZkwMhgJkVLpfKG6/2SSmuz+Ne6ML678IIbsSt4beDI3poHS
-na9aEhbKmVv8b20OxaAehsmR0FyYgl9jDIpaq9iVpszLita/ZEuOyoqysOkhMp6q
-qIWYNIE5ITuoOlIyPfZrN4YGWhWY3PARZv40ILcD9EEQfTmEeZZyY7aWAuVrua0Z
-TbvGRNs2yyqcjg==
------END CERTIFICATE-----
-
-# Issuer: CN=Hongkong Post Root CA 1 O=Hongkong Post
-# Subject: CN=Hongkong Post Root CA 1 O=Hongkong Post
-# Label: "Hongkong Post Root CA 1"
-# Serial: 1000
-# MD5 Fingerprint: a8:0d:6f:39:78:b9:43:6d:77:42:6d:98:5a:cc:23:ca
-# SHA1 Fingerprint: d6:da:a8:20:8d:09:d2:15:4d:24:b5:2f:cb:34:6e:b2:58:b2:8a:58
-# SHA256 Fingerprint: f9:e6:7d:33:6c:51:00:2a:c0:54:c6:32:02:2d:66:dd:a2:e7:e3:ff:f1:0a:d0:61:ed:31:d8:bb:b4:10:cf:b2
------BEGIN CERTIFICATE-----
-MIIDMDCCAhigAwIBAgICA+gwDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCSEsx
-FjAUBgNVBAoTDUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3Qg
-Um9vdCBDQSAxMB4XDTAzMDUxNTA1MTMxNFoXDTIzMDUxNTA0NTIyOVowRzELMAkG
-A1UEBhMCSEsxFjAUBgNVBAoTDUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdr
-b25nIFBvc3QgUm9vdCBDQSAxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEArP84tulmAknjorThkPlAj3n54r15/gK97iSSHSL22oVyaf7XPwnU3ZG1ApzQ
-jVrhVcNQhrkpJsLj2aDxaQMoIIBFIi1WpztUlVYiWR8o3x8gPW2iNr4joLFutbEn
-PzlTCeqrauh0ssJlXI6/fMN4hM2eFvz1Lk8gKgifd/PFHsSaUmYeSF7jEAaPIpjh
-ZY4bXSNmO7ilMlHIhqqhqZ5/dpTCpmy3QfDVyAY45tQM4vM7TG1QjMSDJ8EThFk9
-nnV0ttgCXjqQesBCNnLsak3c78QA3xMYV18meMjWCnl3v/evt3a5pQuEF10Q6m/h
-q5URX208o1xNg1vysxmKgIsLhwIDAQABoyYwJDASBgNVHRMBAf8ECDAGAQH/AgED
-MA4GA1UdDwEB/wQEAwIBxjANBgkqhkiG9w0BAQUFAAOCAQEADkbVPK7ih9legYsC
-mEEIjEy82tvuJxuC52pF7BaLT4Wg87JwvVqWuspube5Gi27nKi6Wsxkz67SfqLI3
-7piol7Yutmcn1KZJ/RyTZXaeQi/cImyaT/JaFTmxcdcrUehtHJjA2Sr0oYJ71clB
-oiMBdDhViw+5LmeiIAQ32pwL0xch4I+XeTRvhEgCIDMb5jREn5Fw9IBehEPCKdJs
-EhTkYY2sEJCehFC78JZvRZ+K88psT/oROhUVRsPNH4NbLUES7VBnQRM9IauUiqpO
-fMGx+6fWtScvl6tu4B3i0RwsH0Ti/L6RoZz71ilTc4afU9hDDl3WY4JxHYB0yvbi
-AmvZWg==
------END CERTIFICATE-----
-
-# Issuer: CN=SecureSign RootCA11 O=Japan Certification Services, Inc.
-# Subject: CN=SecureSign RootCA11 O=Japan Certification Services, Inc.
-# Label: "SecureSign RootCA11"
-# Serial: 1
-# MD5 Fingerprint: b7:52:74:e2:92:b4:80:93:f2:75:e4:cc:d7:f2:ea:26
-# SHA1 Fingerprint: 3b:c4:9f:48:f8:f3:73:a0:9c:1e:bd:f8:5b:b1:c3:65:c7:d8:11:b3
-# SHA256 Fingerprint: bf:0f:ee:fb:9e:3a:58:1a:d5:f9:e9:db:75:89:98:57:43:d2:61:08:5c:4d:31:4f:6f:5d:72:59:aa:42:16:12
------BEGIN CERTIFICATE-----
-MIIDbTCCAlWgAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJKUDEr
-MCkGA1UEChMiSmFwYW4gQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcywgSW5jLjEcMBoG
-A1UEAxMTU2VjdXJlU2lnbiBSb290Q0ExMTAeFw0wOTA0MDgwNDU2NDdaFw0yOTA0
-MDgwNDU2NDdaMFgxCzAJBgNVBAYTAkpQMSswKQYDVQQKEyJKYXBhbiBDZXJ0aWZp
-Y2F0aW9uIFNlcnZpY2VzLCBJbmMuMRwwGgYDVQQDExNTZWN1cmVTaWduIFJvb3RD
-QTExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/XeqpRyQBTvLTJsz
-i1oURaTnkBbR31fSIRCkF/3frNYfp+TbfPfs37gD2pRY/V1yfIw/XwFndBWW4wI8
-h9uuywGOwvNmxoVF9ALGOrVisq/6nL+k5tSAMJjzDbaTj6nU2DbysPyKyiyhFTOV
-MdrAG/LuYpmGYz+/3ZMqg6h2uRMft85OQoWPIucuGvKVCbIFtUROd6EgvanyTgp9
-UK31BQ1FT0Zx/Sg+U/sE2C3XZR1KG/rPO7AxmjVuyIsG0wCR8pQIZUyxNAYAeoni
-8McDWc/V1uinMrPmmECGxc0nEovMe863ETxiYAcjPitAbpSACW22s293bzUIUPsC
-h8U+iQIDAQABo0IwQDAdBgNVHQ4EFgQUW/hNT7KlhtQ60vFjmqC+CfZXt94wDgYD
-VR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB
-AKChOBZmLqdWHyGcBvod7bkixTgm2E5P7KN/ed5GIaGHd48HCJqypMWvDzKYC3xm
-KbabfSVSSUOrTC4rbnpwrxYO4wJs+0LmGJ1F2FXI6Dvd5+H0LgscNFxsWEr7jIhQ
-X5Ucv+2rIrVls4W6ng+4reV6G4pQOh29Dbx7VFALuUKvVaAYga1lme++5Jy/xIWr
-QbJUb9wlze144o4MjQlJ3WN7WmmWAiGovVJZ6X01y8hSyn+B/tlr0/cR7SXf+Of5
-pPpyl4RTDaXQMhhRdlkUbA/r7F+AjHVDg8OFmP9Mni0N5HeDk061lgeLKBObjBmN
-QSdJQO7e5iNEOdyhIta6A/I=
------END CERTIFICATE-----
-
-# Issuer: CN=ACEDICOM Root O=EDICOM OU=PKI
-# Subject: CN=ACEDICOM Root O=EDICOM OU=PKI
-# Label: "ACEDICOM Root"
-# Serial: 7029493972724711941
-# MD5 Fingerprint: 42:81:a0:e2:1c:e3:55:10:de:55:89:42:65:96:22:e6
-# SHA1 Fingerprint: e0:b4:32:2e:b2:f6:a5:68:b6:54:53:84:48:18:4a:50:36:87:43:84
-# SHA256 Fingerprint: 03:95:0f:b4:9a:53:1f:3e:19:91:94:23:98:df:a9:e0:ea:32:d7:ba:1c:dd:9b:c8:5d:b5:7e:d9:40:0b:43:4a
------BEGIN CERTIFICATE-----
-MIIFtTCCA52gAwIBAgIIYY3HhjsBggUwDQYJKoZIhvcNAQEFBQAwRDEWMBQGA1UE
-AwwNQUNFRElDT00gUm9vdDEMMAoGA1UECwwDUEtJMQ8wDQYDVQQKDAZFRElDT00x
-CzAJBgNVBAYTAkVTMB4XDTA4MDQxODE2MjQyMloXDTI4MDQxMzE2MjQyMlowRDEW
-MBQGA1UEAwwNQUNFRElDT00gUm9vdDEMMAoGA1UECwwDUEtJMQ8wDQYDVQQKDAZF
-RElDT00xCzAJBgNVBAYTAkVTMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
-AgEA/5KV4WgGdrQsyFhIyv2AVClVYyT/kGWbEHV7w2rbYgIB8hiGtXxaOLHkWLn7
-09gtn70yN78sFW2+tfQh0hOR2QetAQXW8713zl9CgQr5auODAKgrLlUTY4HKRxx7
-XBZXehuDYAQ6PmXDzQHe3qTWDLqO3tkE7hdWIpuPY/1NFgu3e3eM+SW10W2ZEi5P
-Grjm6gSSrj0RuVFCPYewMYWveVqc/udOXpJPQ/yrOq2lEiZmueIM15jO1FillUAK
-t0SdE3QrwqXrIhWYENiLxQSfHY9g5QYbm8+5eaA9oiM/Qj9r+hwDezCNzmzAv+Yb
-X79nuIQZ1RXve8uQNjFiybwCq0Zfm/4aaJQ0PZCOrfbkHQl/Sog4P75n/TSW9R28
-MHTLOO7VbKvU/PQAtwBbhTIWdjPp2KOZnQUAqhbm84F9b32qhm2tFXTTxKJxqvQU
-fecyuB+81fFOvW8XAjnXDpVCOscAPukmYxHqC9FK/xidstd7LzrZlvvoHpKuE1XI
-2Sf23EgbsCTBheN3nZqk8wwRHQ3ItBTutYJXCb8gWH8vIiPYcMt5bMlL8qkqyPyH
-K9caUPgn6C9D4zq92Fdx/c6mUlv53U3t5fZvie27k5x2IXXwkkwp9y+cAS7+UEae
-ZAwUswdbxcJzbPEHXEUkFDWug/FqTYl6+rPYLWbwNof1K1MCAwEAAaOBqjCBpzAP
-BgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFKaz4SsrSbbXc6GqlPUB53NlTKxQ
-MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUprPhKytJttdzoaqU9QHnc2VMrFAw
-RAYDVR0gBD0wOzA5BgRVHSAAMDEwLwYIKwYBBQUHAgEWI2h0dHA6Ly9hY2VkaWNv
-bS5lZGljb21ncm91cC5jb20vZG9jMA0GCSqGSIb3DQEBBQUAA4ICAQDOLAtSUWIm
-fQwng4/F9tqgaHtPkl7qpHMyEVNEskTLnewPeUKzEKbHDZ3Ltvo/Onzqv4hTGzz3
-gvoFNTPhNahXwOf9jU8/kzJPeGYDdwdY6ZXIfj7QeQCM8htRM5u8lOk6e25SLTKe
-I6RF+7YuE7CLGLHdztUdp0J/Vb77W7tH1PwkzQSulgUV1qzOMPPKC8W64iLgpq0i
-5ALudBF/TP94HTXa5gI06xgSYXcGCRZj6hitoocf8seACQl1ThCojz2GuHURwCRi
-ipZ7SkXp7FnFvmuD5uHorLUwHv4FB4D54SMNUI8FmP8sX+g7tq3PgbUhh8oIKiMn
-MCArz+2UW6yyetLHKKGKC5tNSixthT8Jcjxn4tncB7rrZXtaAWPWkFtPF2Y9fwsZ
-o5NjEFIqnxQWWOLcpfShFosOkYuByptZ+thrkQdlVV9SH686+5DdaaVbnG0OLLb6
-zqylfDJKZ0DcMDQj3dcEI2bw/FWAp/tmGYI1Z2JwOV5vx+qQQEQIHriy1tvuWacN
-GHk0vFQYXlPKNFHtRQrmjseCNj6nOGOpMCwXEGCSn1WHElkQwg9naRHMTh5+Spqt
-r0CodaxWkHS4oJyleW/c6RrIaQXpuvoDs3zk4E7Czp3otkYNbn5XOmeUwssfnHdK
-Z05phkOTOPu220+DkdRgfks+KzgHVZhepA==
------END CERTIFICATE-----
-
-# Issuer: O=VeriSign, Inc. OU=Class 3 Public Primary Certification Authority
-# Subject: O=VeriSign, Inc. OU=Class 3 Public Primary Certification Authority
-# Label: "Verisign Class 3 Public Primary Certification Authority"
-# Serial: 80507572722862485515306429940691309246
-# MD5 Fingerprint: ef:5a:f1:33:ef:f1:cd:bb:51:02:ee:12:14:4b:96:c4
-# SHA1 Fingerprint: a1:db:63:93:91:6f:17:e4:18:55:09:40:04:15:c7:02:40:b0:ae:6b
-# SHA256 Fingerprint: a4:b6:b3:99:6f:c2:f3:06:b3:fd:86:81:bd:63:41:3d:8c:50:09:cc:4f:a3:29:c2:cc:f0:e2:fa:1b:14:03:05
------BEGIN CERTIFICATE-----
-MIICPDCCAaUCEDyRMcsf9tAbDpq40ES/Er4wDQYJKoZIhvcNAQEFBQAwXzELMAkG
-A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz
-cyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2
-MDEyOTAwMDAwMFoXDTI4MDgwMjIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV
-BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmlt
-YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN
-ADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhE
-BarsAx94f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/is
-I19wKTakyYbnsZogy1Olhec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0G
-CSqGSIb3DQEBBQUAA4GBABByUqkFFBkyCEHwxWsKzH4PIRnN5GfcX6kb5sroc50i
-2JhucwNhkcV8sEVAbkSdjbCxlnRhLQ2pRdKkkirWmnWXbj9T/UWZYB2oK0z5XqcJ
-2HUw19JlYD1n1khVdWk/kfVIC0dpImmClr7JyDiGSnoscxlIaU5rfGW/D/xwzoiQ
------END CERTIFICATE-----
-
-# Issuer: CN=Microsec e-Szigno Root CA 2009 O=Microsec Ltd.
-# Subject: CN=Microsec e-Szigno Root CA 2009 O=Microsec Ltd.
-# Label: "Microsec e-Szigno Root CA 2009"
-# Serial: 14014712776195784473
-# MD5 Fingerprint: f8:49:f4:03:bc:44:2d:83:be:48:69:7d:29:64:fc:b1
-# SHA1 Fingerprint: 89:df:74:fe:5c:f4:0f:4a:80:f9:e3:37:7d:54:da:91:e1:01:31:8e
-# SHA256 Fingerprint: 3c:5f:81:fe:a5:fa:b8:2c:64:bf:a2:ea:ec:af:cd:e8:e0:77:fc:86:20:a7:ca:e5:37:16:3d:f3:6e:db:f3:78
------BEGIN CERTIFICATE-----
-MIIECjCCAvKgAwIBAgIJAMJ+QwRORz8ZMA0GCSqGSIb3DQEBCwUAMIGCMQswCQYD
-VQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0
-ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUtU3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0G
-CSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odTAeFw0wOTA2MTYxMTMwMThaFw0y
-OTEyMzAxMTMwMThaMIGCMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3Qx
-FjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUtU3pp
-Z25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5o
-dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOn4j/NjrdqG2KfgQvvP
-kd6mJviZpWNwrZuuyjNAfW2WbqEORO7hE52UQlKavXWFdCyoDh2Tthi3jCyoz/tc
-cbna7P7ofo/kLx2yqHWH2Leh5TvPmUpG0IMZfcChEhyVbUr02MelTTMuhTlAdX4U
-fIASmFDHQWe4oIBhVKZsTh/gnQ4H6cm6M+f+wFUoLAKApxn1ntxVUwOXewdI/5n7
-N4okxFnMUBBjjqqpGrCEGob5X7uxUG6k0QrM1XF+H6cbfPVTbiJfyyvm1HxdrtbC
-xkzlBQHZ7Vf8wSN5/PrIJIOV87VqUQHQd9bpEqH5GoP7ghu5sJf0dgYzQ0mg/wu1
-+rUCAwEAAaOBgDB+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0G
-A1UdDgQWBBTLD8bfQkPMPcu1SCOhGnqmKrs0aDAfBgNVHSMEGDAWgBTLD8bfQkPM
-Pcu1SCOhGnqmKrs0aDAbBgNVHREEFDASgRBpbmZvQGUtc3ppZ25vLmh1MA0GCSqG
-SIb3DQEBCwUAA4IBAQDJ0Q5eLtXMs3w+y/w9/w0olZMEyL/azXm4Q5DwpL7v8u8h
-mLzU1F0G9u5C7DBsoKqpyvGvivo/C3NqPuouQH4frlRheesuCDfXI/OMn74dseGk
-ddug4lQUsbocKaQY9hK6ohQU4zE1yED/t+AFdlfBHFny+L/k7SViXITwfn4fs775
-tyERzAMBVnCnEJIeGzSBHq2cGsMEPO0CYdYeBvNfOofyK/FFh+U9rNHHV4S9a67c
-2Pm2G2JwCz02yULyMtd6YebS2z3PyKnJm9zbWETXbzivf3jTo60adbocwTZ8jx5t
-HMN1Rq41Bab2XD0h7lbwyYIiLXpUq3DDfSJlgnCW
------END CERTIFICATE-----
-
-# Issuer: CN=e-Guven Kok Elektronik Sertifika Hizmet Saglayicisi O=Elektronik Bilgi Guvenligi A.S.
-# Subject: CN=e-Guven Kok Elektronik Sertifika Hizmet Saglayicisi O=Elektronik Bilgi Guvenligi A.S.
-# Label: "E-Guven Kok Elektronik Sertifika Hizmet Saglayicisi"
-# Serial: 91184789765598910059173000485363494069
-# MD5 Fingerprint: 3d:41:29:cb:1e:aa:11:74:cd:5d:b0:62:af:b0:43:5b
-# SHA1 Fingerprint: dd:e1:d2:a9:01:80:2e:1d:87:5e:84:b3:80:7e:4b:b1:fd:99:41:34
-# SHA256 Fingerprint: e6:09:07:84:65:a4:19:78:0c:b6:ac:4c:1c:0b:fb:46:53:d9:d9:cc:6e:b3:94:6e:b7:f3:d6:99:97:ba:d5:98
------BEGIN CERTIFICATE-----
-MIIDtjCCAp6gAwIBAgIQRJmNPMADJ72cdpW56tustTANBgkqhkiG9w0BAQUFADB1
-MQswCQYDVQQGEwJUUjEoMCYGA1UEChMfRWxla3Ryb25payBCaWxnaSBHdXZlbmxp
-Z2kgQS5TLjE8MDoGA1UEAxMzZS1HdXZlbiBLb2sgRWxla3Ryb25payBTZXJ0aWZp
-a2EgSGl6bWV0IFNhZ2xheWljaXNpMB4XDTA3MDEwNDExMzI0OFoXDTE3MDEwNDEx
-MzI0OFowdTELMAkGA1UEBhMCVFIxKDAmBgNVBAoTH0VsZWt0cm9uaWsgQmlsZ2kg
-R3V2ZW5saWdpIEEuUy4xPDA6BgNVBAMTM2UtR3V2ZW4gS29rIEVsZWt0cm9uaWsg
-U2VydGlmaWthIEhpem1ldCBTYWdsYXlpY2lzaTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAMMSIJ6wXgBljU5Gu4Bc6SwGl9XzcslwuedLZYDBS75+PNdU
-MZTe1RK6UxYC6lhj71vY8+0qGqpxSKPcEC1fX+tcS5yWCEIlKBHMilpiAVDV6wlT
-L/jDj/6z/P2douNffb7tC+Bg62nsM+3YjfsSSYMAyYuXjDtzKjKzEve5TfL0TW3H
-5tYmNwjy2f1rXKPlSFxYvEK+A1qBuhw1DADT9SN+cTAIJjjcJRFHLfO6IxClv7wC
-90Nex/6wN1CZew+TzuZDLMN+DfIcQ2Zgy2ExR4ejT669VmxMvLz4Bcpk9Ok0oSy1
-c+HCPujIyTQlCFzz7abHlJ+tiEMl1+E5YP6sOVkCAwEAAaNCMEAwDgYDVR0PAQH/
-BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ/uRLOU1fqRTy7ZVZoE
-VtstxNulMA0GCSqGSIb3DQEBBQUAA4IBAQB/X7lTW2M9dTLn+sR0GstG30ZpHFLP
-qk/CaOv/gKlR6D1id4k9CnU58W5dF4dvaAXBlGzZXd/aslnLpRCKysw5zZ/rTt5S
-/wzw9JKp8mxTq5vSR6AfdPebmvEvFZ96ZDAYBzwqD2fK/A+JYZ1lpTzlvBNbCNvj
-/+27BrtqBrF6T2XGgv0enIu1De5Iu7i9qgi0+6N8y5/NkHZchpZ4Vwpm+Vganf2X
-KWDeEaaQHBkc7gGWIjQ0LpH5t8Qn0Xvmv/uARFoW5evg1Ao4vOSR49XrXMGs3xtq
-fJ7lddK2l4fbzIcrQzqECK+rPNv3PGYxhrCdU3nt+CPeQuMtgvEP5fqX
------END CERTIFICATE-----
-
-# Issuer: CN=GlobalSign O=GlobalSign OU=GlobalSign Root CA - R3
-# Subject: CN=GlobalSign O=GlobalSign OU=GlobalSign Root CA - R3
-# Label: "GlobalSign Root CA - R3"
-# Serial: 4835703278459759426209954
-# MD5 Fingerprint: c5:df:b8:49:ca:05:13:55:ee:2d:ba:1a:c3:3e:b0:28
-# SHA1 Fingerprint: d6:9b:56:11:48:f0:1c:77:c5:45:78:c1:09:26:df:5b:85:69:76:ad
-# SHA256 Fingerprint: cb:b5:22:d7:b7:f1:27:ad:6a:01:13:86:5b:df:1c:d4:10:2e:7d:07:59:af:63:5a:7c:f4:72:0d:c9:63:c5:3b
------BEGIN CERTIFICATE-----
-MIIDXzCCAkegAwIBAgILBAAAAAABIVhTCKIwDQYJKoZIhvcNAQELBQAwTDEgMB4G
-A1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2JhbFNp
-Z24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMDkwMzE4MTAwMDAwWhcNMjkwMzE4
-MTAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSMzETMBEG
-A1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAMwldpB5BngiFvXAg7aEyiie/QV2EcWtiHL8
-RgJDx7KKnQRfJMsuS+FggkbhUqsMgUdwbN1k0ev1LKMPgj0MK66X17YUhhB5uzsT
-gHeMCOFJ0mpiLx9e+pZo34knlTifBtc+ycsmWQ1z3rDI6SYOgxXG71uL0gRgykmm
-KPZpO/bLyCiR5Z2KYVc3rHQU3HTgOu5yLy6c+9C7v/U9AOEGM+iCK65TpjoWc4zd
-QQ4gOsC0p6Hpsk+QLjJg6VfLuQSSaGjlOCZgdbKfd/+RFO+uIEn8rUAVSNECMWEZ
-XriX7613t2Saer9fwRPvm2L7DWzgVGkWqQPabumDk3F2xmmFghcCAwEAAaNCMEAw
-DgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFI/wS3+o
-LkUkrk1Q+mOai97i3Ru8MA0GCSqGSIb3DQEBCwUAA4IBAQBLQNvAUKr+yAzv95ZU
-RUm7lgAJQayzE4aGKAczymvmdLm6AC2upArT9fHxD4q/c2dKg8dEe3jgr25sbwMp
-jjM5RcOO5LlXbKr8EpbsU8Yt5CRsuZRj+9xTaGdWPoO4zzUhw8lo/s7awlOqzJCK
-6fBdRoyV3XpYKBovHd7NADdBj+1EbddTKJd+82cEHhXXipa0095MJ6RMG3NzdvQX
-mcIfeg7jLQitChws/zyrVQ4PkX4268NXSb7hLi18YIvDQVETI53O9zJrlAGomecs
-Mx86OyXShkDOOyyGeMlhLxS67ttVb9+E7gUJTb0o2HLO02JQZR7rkpeDMdmztcpH
-WD9f
------END CERTIFICATE-----
-
-# Issuer: CN=Autoridad de Certificacion Firmaprofesional CIF A62634068
-# Subject: CN=Autoridad de Certificacion Firmaprofesional CIF A62634068
-# Label: "Autoridad de Certificacion Firmaprofesional CIF A62634068"
-# Serial: 6047274297262753887
-# MD5 Fingerprint: 73:3a:74:7a:ec:bb:a3:96:a6:c2:e4:e2:c8:9b:c0:c3
-# SHA1 Fingerprint: ae:c5:fb:3f:c8:e1:bf:c4:e5:4f:03:07:5a:9a:e8:00:b7:f7:b6:fa
-# SHA256 Fingerprint: 04:04:80:28:bf:1f:28:64:d4:8f:9a:d4:d8:32:94:36:6a:82:88:56:55:3f:3b:14:30:3f:90:14:7f:5d:40:ef
------BEGIN CERTIFICATE-----
-MIIGFDCCA/ygAwIBAgIIU+w77vuySF8wDQYJKoZIhvcNAQEFBQAwUTELMAkGA1UE
-BhMCRVMxQjBABgNVBAMMOUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1h
-cHJvZmVzaW9uYWwgQ0lGIEE2MjYzNDA2ODAeFw0wOTA1MjAwODM4MTVaFw0zMDEy
-MzEwODM4MTVaMFExCzAJBgNVBAYTAkVTMUIwQAYDVQQDDDlBdXRvcmlkYWQgZGUg
-Q2VydGlmaWNhY2lvbiBGaXJtYXByb2Zlc2lvbmFsIENJRiBBNjI2MzQwNjgwggIi
-MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKlmuO6vj78aI14H9M2uDDUtd9
-thDIAl6zQyrET2qyyhxdKJp4ERppWVevtSBC5IsP5t9bpgOSL/UR5GLXMnE42QQM
-cas9UX4PB99jBVzpv5RvwSmCwLTaUbDBPLutN0pcyvFLNg4kq7/DhHf9qFD0sefG
-L9ItWY16Ck6WaVICqjaY7Pz6FIMMNx/Jkjd/14Et5cS54D40/mf0PmbR0/RAz15i
-NA9wBj4gGFrO93IbJWyTdBSTo3OxDqqHECNZXyAFGUftaI6SEspd/NYrspI8IM/h
-X68gvqB2f3bl7BqGYTM+53u0P6APjqK5am+5hyZvQWyIplD9amML9ZMWGxmPsu2b
-m8mQ9QEM3xk9Dz44I8kvjwzRAv4bVdZO0I08r0+k8/6vKtMFnXkIoctXMbScyJCy
-Z/QYFpM6/EfY0XiWMR+6KwxfXZmtY4laJCB22N/9q06mIqqdXuYnin1oKaPnirja
-EbsXLZmdEyRG98Xi2J+Of8ePdG1asuhy9azuJBCtLxTa/y2aRnFHvkLfuwHb9H/T
-KI8xWVvTyQKmtFLKbpf7Q8UIJm+K9Lv9nyiqDdVF8xM6HdjAeI9BZzwelGSuewvF
-6NkBiDkal4ZkQdU7hwxu+g/GvUgUvzlN1J5Bto+WHWOWk9mVBngxaJ43BjuAiUVh
-OSPHG0SjFeUc+JIwuwIDAQABo4HvMIHsMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRlzeurNR4APn7VdMActHNHDhpkLzCBpgYD
-VR0gBIGeMIGbMIGYBgRVHSAAMIGPMC8GCCsGAQUFBwIBFiNodHRwOi8vd3d3LmZp
-cm1hcHJvZmVzaW9uYWwuY29tL2NwczBcBggrBgEFBQcCAjBQHk4AUABhAHMAZQBv
-ACAAZABlACAAbABhACAAQgBvAG4AYQBuAG8AdgBhACAANAA3ACAAQgBhAHIAYwBl
-AGwAbwBuAGEAIAAwADgAMAAxADcwDQYJKoZIhvcNAQEFBQADggIBABd9oPm03cXF
-661LJLWhAqvdpYhKsg9VSytXjDvlMd3+xDLx51tkljYyGOylMnfX40S2wBEqgLk9
-am58m9Ot/MPWo+ZkKXzR4Tgegiv/J2Wv+xYVxC5xhOW1//qkR71kMrv2JYSiJ0L1
-ILDCExARzRAVukKQKtJE4ZYm6zFIEv0q2skGz3QeqUvVhyj5eTSSPi5E6PaPT481
-PyWzOdxjKpBrIF/EUhJOlywqrJ2X3kjyo2bbwtKDlaZmp54lD+kLM5FlClrD2VQS
-3a/DTg4fJl4N3LON7NWBcN7STyQF82xO9UxJZo3R/9ILJUFI/lGExkKvgATP0H5k
-SeTy36LssUzAKh3ntLFlosS88Zj0qnAHY7S42jtM+kAiMFsRpvAFDsYCA0irhpuF
-3dvd6qJ2gHN99ZwExEWN57kci57q13XRcrHedUTnQn3iV2t93Jm8PYMo6oCTjcVM
-ZcFwgbg4/EMxsvYDNEeyrPsiBsse3RdHHF9mudMaotoRsaS8I8nkvof/uZS2+F0g
-StRf571oe2XyFR7SOqkt6dhrJKyXWERHrVkY8SFlcN7ONGCoQPHzPKTDKCOM/icz
-Q0CgFzzr6juwcqajuUpLXhZI9LK8yIySxZ2frHI2vDSANGupi5LAuBft7HZT9SQB
-jLMi6Et8Vcad+qMUu2WFbm5PEn4KPJ2V
------END CERTIFICATE-----
-
-# Issuer: CN=Izenpe.com O=IZENPE S.A.
-# Subject: CN=Izenpe.com O=IZENPE S.A.
-# Label: "Izenpe.com"
-# Serial: 917563065490389241595536686991402621
-# MD5 Fingerprint: a6:b0:cd:85:80:da:5c:50:34:a3:39:90:2f:55:67:73
-# SHA1 Fingerprint: 2f:78:3d:25:52:18:a7:4a:65:39:71:b5:2c:a2:9c:45:15:6f:e9:19
-# SHA256 Fingerprint: 25:30:cc:8e:98:32:15:02:ba:d9:6f:9b:1f:ba:1b:09:9e:2d:29:9e:0f:45:48:bb:91:4f:36:3b:c0:d4:53:1f
------BEGIN CERTIFICATE-----
-MIIF8TCCA9mgAwIBAgIQALC3WhZIX7/hy/WL1xnmfTANBgkqhkiG9w0BAQsFADA4
-MQswCQYDVQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xEzARBgNVBAMMCkl6
-ZW5wZS5jb20wHhcNMDcxMjEzMTMwODI4WhcNMzcxMjEzMDgyNzI1WjA4MQswCQYD
-VQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xEzARBgNVBAMMCkl6ZW5wZS5j
-b20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJ03rKDx6sp4boFmVq
-scIbRTJxldn+EFvMr+eleQGPicPK8lVx93e+d5TzcqQsRNiekpsUOqHnJJAKClaO
-xdgmlOHZSOEtPtoKct2jmRXagaKH9HtuJneJWK3W6wyyQXpzbm3benhB6QiIEn6H
-LmYRY2xU+zydcsC8Lv/Ct90NduM61/e0aL6i9eOBbsFGb12N4E3GVFWJGjMxCrFX
-uaOKmMPsOzTFlUFpfnXCPCDFYbpRR6AgkJOhkEvzTnyFRVSa0QUmQbC1TR0zvsQD
-yCV8wXDbO/QJLVQnSKwv4cSsPsjLkkxTOTcj7NMB+eAJRE1NZMDhDVqHIrytG6P+
-JrUV86f8hBnp7KGItERphIPzidF0BqnMC9bC3ieFUCbKF7jJeodWLBoBHmy+E60Q
-rLUk9TiRodZL2vG70t5HtfG8gfZZa88ZU+mNFctKy6lvROUbQc/hhqfK0GqfvEyN
-BjNaooXlkDWgYlwWTvDjovoDGrQscbNYLN57C9saD+veIR8GdwYDsMnvmfzAuU8L
-hij+0rnq49qlw0dpEuDb8PYZi+17cNcC1u2HGCgsBCRMd+RIihrGO5rUD8r6ddIB
-QFqNeb+Lz0vPqhbBleStTIo+F5HUsWLlguWABKQDfo2/2n+iD5dPDNMN+9fR5XJ+
-HMh3/1uaD7euBUbl8agW7EekFwIDAQABo4H2MIHzMIGwBgNVHREEgagwgaWBD2lu
-Zm9AaXplbnBlLmNvbaSBkTCBjjFHMEUGA1UECgw+SVpFTlBFIFMuQS4gLSBDSUYg
-QTAxMzM3MjYwLVJNZXJjLlZpdG9yaWEtR2FzdGVpeiBUMTA1NSBGNjIgUzgxQzBB
-BgNVBAkMOkF2ZGEgZGVsIE1lZGl0ZXJyYW5lbyBFdG9yYmlkZWEgMTQgLSAwMTAx
-MCBWaXRvcmlhLUdhc3RlaXowDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
-AQYwHQYDVR0OBBYEFB0cZQ6o8iV7tJHP5LGx5r1VdGwFMA0GCSqGSIb3DQEBCwUA
-A4ICAQB4pgwWSp9MiDrAyw6lFn2fuUhfGI8NYjb2zRlrrKvV9pF9rnHzP7MOeIWb
-laQnIUdCSnxIOvVFfLMMjlF4rJUT3sb9fbgakEyrkgPH7UIBzg/YsfqikuFgba56
-awmqxinuaElnMIAkejEWOVt+8Rwu3WwJrfIxwYJOubv5vr8qhT/AQKM6WfxZSzwo
-JNu0FXWuDYi6LnPAvViH5ULy617uHjAimcs30cQhbIHsvm0m5hzkQiCeR7Csg1lw
-LDXWrzY0tM07+DKo7+N4ifuNRSzanLh+QBxh5z6ikixL8s36mLYp//Pye6kfLqCT
-VyvehQP5aTfLnnhqBbTFMXiJ7HqnheG5ezzevh55hM6fcA5ZwjUukCox2eRFekGk
-LhObNA5me0mrZJfQRsN5nXJQY6aYWwa9SG3YOYNw6DXwBdGqvOPbyALqfP2C2sJb
-UjWumDqtujWTI6cfSN01RpiyEGjkpTHCClguGYEQyVB1/OpaFs4R1+7vUIgtYf8/
-QnMFlEPVjjxOAToZpR9GTnfQXeWBIiGH/pR9hNiTrdZoQ0iy2+tzJOeRf1SktoA+
-naM8THLCV8Sg1Mw4J87VBp6iSNnpn86CcDaTmjvfliHjWbcM2pE38P1ZWrOZyGls
-QyYBNWNgVYkDOnXYukrZVP/u3oDYLdE41V4tC5h9Pmzb/CaIxw==
------END CERTIFICATE-----
-
-# Issuer: CN=Chambers of Commerce Root - 2008 O=AC Camerfirma S.A.
-# Subject: CN=Chambers of Commerce Root - 2008 O=AC Camerfirma S.A.
-# Label: "Chambers of Commerce Root - 2008"
-# Serial: 11806822484801597146
-# MD5 Fingerprint: 5e:80:9e:84:5a:0e:65:0b:17:02:f3:55:18:2a:3e:d7
-# SHA1 Fingerprint: 78:6a:74:ac:76:ab:14:7f:9c:6a:30:50:ba:9e:a8:7e:fe:9a:ce:3c
-# SHA256 Fingerprint: 06:3e:4a:fa:c4:91:df:d3:32:f3:08:9b:85:42:e9:46:17:d8:93:d7:fe:94:4e:10:a7:93:7e:e2:9d:96:93:c0
------BEGIN CERTIFICATE-----
-MIIHTzCCBTegAwIBAgIJAKPaQn6ksa7aMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD
-VQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0
-IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3
-MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xKTAnBgNVBAMTIENoYW1iZXJz
-IG9mIENvbW1lcmNlIFJvb3QgLSAyMDA4MB4XDTA4MDgwMTEyMjk1MFoXDTM4MDcz
-MTEyMjk1MFowga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNlZSBj
-dXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29tL2FkZHJlc3MpMRIw
-EAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVyZmlybWEgUy5BLjEp
-MCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDgwggIiMA0G
-CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCvAMtwNyuAWko6bHiUfaN/Gh/2NdW9
-28sNRHI+JrKQUrpjOyhYb6WzbZSm891kDFX29ufyIiKAXuFixrYp4YFs8r/lfTJq
-VKAyGVn+H4vXPWCGhSRv4xGzdz4gljUha7MI2XAuZPeEklPWDrCQiorjh40G072Q
-DuKZoRuGDtqaCrsLYVAGUvGef3bsyw/QHg3PmTA9HMRFEFis1tPo1+XqxQEHd9ZR
-5gN/ikilTWh1uem8nk4ZcfUyS5xtYBkL+8ydddy/Js2Pk3g5eXNeJQ7KXOt3EgfL
-ZEFHcpOrUMPrCXZkNNI5t3YRCQ12RcSprj1qr7V9ZS+UWBDsXHyvfuK2GNnQm05a
-Sd+pZgvMPMZ4fKecHePOjlO+Bd5gD2vlGts/4+EhySnB8esHnFIbAURRPHsl18Tl
-UlRdJQfKFiC4reRB7noI/plvg6aRArBsNlVq5331lubKgdaX8ZSD6e2wsWsSaR6s
-+12pxZjptFtYer49okQ6Y1nUCyXeG0+95QGezdIp1Z8XGQpvvwyQ0wlf2eOKNcx5
-Wk0ZN5K3xMGtr/R5JJqyAQuxr1yW84Ay+1w9mPGgP0revq+ULtlVmhduYJ1jbLhj
-ya6BXBg14JC7vjxPNyK5fuvPnnchpj04gftI2jE9K+OJ9dC1vX7gUMQSibMjmhAx
-hduub+84Mxh2EQIDAQABo4IBbDCCAWgwEgYDVR0TAQH/BAgwBgEB/wIBDDAdBgNV
-HQ4EFgQU+SSsD7K1+HnA+mCIG8TZTQKeFxkwgeMGA1UdIwSB2zCB2IAU+SSsD7K1
-+HnA+mCIG8TZTQKeFxmhgbSkgbEwga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpN
-YWRyaWQgKHNlZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29t
-L2FkZHJlc3MpMRIwEAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVy
-ZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAt
-IDIwMDiCCQCj2kJ+pLGu2jAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRV
-HSAAMCowKAYIKwYBBQUHAgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20w
-DQYJKoZIhvcNAQEFBQADggIBAJASryI1wqM58C7e6bXpeHxIvj99RZJe6dqxGfwW
-PJ+0W2aeaufDuV2I6A+tzyMP3iU6XsxPpcG1Lawk0lgH3qLPaYRgM+gQDROpI9CF
-5Y57pp49chNyM/WqfcZjHwj0/gF/JM8rLFQJ3uIrbZLGOU8W6jx+ekbURWpGqOt1
-glanq6B8aBMz9p0w8G8nOSQjKpD9kCk18pPfNKXG9/jvjA9iSnyu0/VU+I22mlaH
-FoI6M6taIgj3grrqLuBHmrS1RaMFO9ncLkVAO+rcf+g769HsJtg1pDDFOqxXnrN2
-pSB7+R5KBWIBpih1YJeSDW4+TTdDDZIVnBgizVGZoCkaPF+KMjNbMMeJL0eYD6MD
-xvbxrN8y8NmBGuScvfaAFPDRLLmF9dijscilIeUcE5fuDr3fKanvNFNb0+RqE4QG
-tjICxFKuItLcsiFCGtpA8CnJ7AoMXOLQusxI0zcKzBIKinmwPQN/aUv0NCB9szTq
-jktk9T79syNnFQ0EuPAtwQlRPLJsFfClI9eDdOTlLsn+mCdCxqvGnrDQWzilm1De
-fhiYtUU79nm06PcaewaD+9CL2rvHvRirCG88gGtAPxkZumWK5r7VXNM21+9AUiRg
-OGcEMeyP84LG3rlV8zsxkVrctQgVrXYlCg17LofiDKYGvCYQbTed7N14jHyAxfDZ
-d0jQ
------END CERTIFICATE-----
-
-# Issuer: CN=Global Chambersign Root - 2008 O=AC Camerfirma S.A.
-# Subject: CN=Global Chambersign Root - 2008 O=AC Camerfirma S.A.
-# Label: "Global Chambersign Root - 2008"
-# Serial: 14541511773111788494
-# MD5 Fingerprint: 9e:80:ff:78:01:0c:2e:c1:36:bd:fe:96:90:6e:08:f3
-# SHA1 Fingerprint: 4a:bd:ee:ec:95:0d:35:9c:89:ae:c7:52:a1:2c:5b:29:f6:d6:aa:0c
-# SHA256 Fingerprint: 13:63:35:43:93:34:a7:69:80:16:a0:d3:24:de:72:28:4e:07:9d:7b:52:20:bb:8f:bd:74:78:16:ee:be:ba:ca
------BEGIN CERTIFICATE-----
-MIIHSTCCBTGgAwIBAgIJAMnN0+nVfSPOMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYD
-VQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0
-IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3
-MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAlBgNVBAMTHkdsb2JhbCBD
-aGFtYmVyc2lnbiBSb290IC0gMjAwODAeFw0wODA4MDExMjMxNDBaFw0zODA3MzEx
-MjMxNDBaMIGsMQswCQYDVQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3Vy
-cmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAG
-A1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAl
-BgNVBAMTHkdsb2JhbCBDaGFtYmVyc2lnbiBSb290IC0gMjAwODCCAiIwDQYJKoZI
-hvcNAQEBBQADggIPADCCAgoCggIBAMDfVtPkOpt2RbQT2//BthmLN0EYlVJH6xed
-KYiONWwGMi5HYvNJBL99RDaxccy9Wglz1dmFRP+RVyXfXjaOcNFccUMd2drvXNL7
-G706tcuto8xEpw2uIRU/uXpbknXYpBI4iRmKt4DS4jJvVpyR1ogQC7N0ZJJ0YPP2
-zxhPYLIj0Mc7zmFLmY/CDNBAspjcDahOo7kKrmCgrUVSY7pmvWjg+b4aqIG7HkF4
-ddPB/gBVsIdU6CeQNR1MM62X/JcumIS/LMmjv9GYERTtY/jKmIhYF5ntRQOXfjyG
-HoiMvvKRhI9lNNgATH23MRdaKXoKGCQwoze1eqkBfSbW+Q6OWfH9GzO1KTsXO0G2
-Id3UwD2ln58fQ1DJu7xsepeY7s2MH/ucUa6LcL0nn3HAa6x9kGbo1106DbDVwo3V
-yJ2dwW3Q0L9R5OP4wzg2rtandeavhENdk5IMagfeOx2YItaswTXbo6Al/3K1dh3e
-beksZixShNBFks4c5eUzHdwHU1SjqoI7mjcv3N2gZOnm3b2u/GSFHTynyQbehP9r
-6GsaPMWis0L7iwk+XwhSx2LE1AVxv8Rk5Pihg+g+EpuoHtQ2TS9x9o0o9oOpE9Jh
-wZG7SMA0j0GMS0zbaRL/UJScIINZc+18ofLx/d33SdNDWKBWY8o9PeU1VlnpDsog
-zCtLkykPAgMBAAGjggFqMIIBZjASBgNVHRMBAf8ECDAGAQH/AgEMMB0GA1UdDgQW
-BBS5CcqcHtvTbDprru1U8VuTBjUuXjCB4QYDVR0jBIHZMIHWgBS5CcqcHtvTbDpr
-ru1U8VuTBjUuXqGBsqSBrzCBrDELMAkGA1UEBhMCRVUxQzBBBgNVBAcTOk1hZHJp
-ZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuY2FtZXJmaXJtYS5jb20vYWRk
-cmVzcykxEjAQBgNVBAUTCUE4Mjc0MzI4NzEbMBkGA1UEChMSQUMgQ2FtZXJmaXJt
-YSBTLkEuMScwJQYDVQQDEx5HbG9iYWwgQ2hhbWJlcnNpZ24gUm9vdCAtIDIwMDiC
-CQDJzdPp1X0jzjAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCow
-KAYIKwYBBQUHAgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZI
-hvcNAQEFBQADggIBAICIf3DekijZBZRG/5BXqfEv3xoNa/p8DhxJJHkn2EaqbylZ
-UohwEurdPfWbU1Rv4WCiqAm57OtZfMY18dwY6fFn5a+6ReAJ3spED8IXDneRRXoz
-X1+WLGiLwUePmJs9wOzL9dWCkoQ10b42OFZyMVtHLaoXpGNR6woBrX/sdZ7LoR/x
-fxKxueRkf2fWIyr0uDldmOghp+G9PUIadJpwr2hsUF1Jz//7Dl3mLEfXgTpZALVz
-a2Mg9jFFCDkO9HB+QHBaP9BrQql0PSgvAm11cpUJjUhjxsYjV5KTXjXBjfkK9yyd
-Yhz2rXzdpjEetrHHfoUm+qRqtdpjMNHvkzeyZi99Bffnt0uYlDXA2TopwZ2yUDMd
-SqlapskD7+3056huirRXhOukP9DuqqqHW2Pok+JrqNS4cnhrG+055F3Lm6qH1U9O
-AP7Zap88MQ8oAgF9mOinsKJknnn4SPIVqczmyETrP3iZ8ntxPjzxmKfFGBI/5rso
-M0LpRQp8bfKGeS/Fghl9CYl8slR2iK7ewfPM4W7bMdaTrpmg7yVqc5iJWzouE4ge
-v8CSlDQb4ye3ix5vQv/n6TebUB0tovkC7stYWDpxvGjjqsGvHCgfotwjZT+B6q6Z
-09gwzxMNTxXJhLynSC34MCN32EZLeW32jO06f2ARePTpm67VVMB0gNELQp/B
------END CERTIFICATE-----
-
-# Issuer: CN=Go Daddy Root Certificate Authority - G2 O=GoDaddy.com, Inc.
-# Subject: CN=Go Daddy Root Certificate Authority - G2 O=GoDaddy.com, Inc.
-# Label: "Go Daddy Root Certificate Authority - G2"
-# Serial: 0
-# MD5 Fingerprint: 80:3a:bc:22:c1:e6:fb:8d:9b:3b:27:4a:32:1b:9a:01
-# SHA1 Fingerprint: 47:be:ab:c9:22:ea:e8:0e:78:78:34:62:a7:9f:45:c2:54:fd:e6:8b
-# SHA256 Fingerprint: 45:14:0b:32:47:eb:9c:c8:c5:b4:f0:d7:b5:30:91:f7:32:92:08:9e:6e:5a:63:e2:74:9d:d3:ac:a9:19:8e:da
------BEGIN CERTIFICATE-----
-MIIDxTCCAq2gAwIBAgIBADANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UEBhMCVVMx
-EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAYBgNVBAoT
-EUdvRGFkZHkuY29tLCBJbmMuMTEwLwYDVQQDEyhHbyBEYWRkeSBSb290IENlcnRp
-ZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIz
-NTk1OVowgYMxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQH
-EwpTY290dHNkYWxlMRowGAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjExMC8GA1UE
-AxMoR28gRGFkZHkgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL9xYgjx+lk09xvJGKP3gElY6SKD
-E6bFIEMBO4Tx5oVJnyfq9oQbTqC023CYxzIBsQU+B07u9PpPL1kwIuerGVZr4oAH
-/PMWdYA5UXvl+TW2dE6pjYIT5LY/qQOD+qK+ihVqf94Lw7YZFAXK6sOoBJQ7Rnwy
-DfMAZiLIjWltNowRGLfTshxgtDj6AozO091GB94KPutdfMh8+7ArU6SSYmlRJQVh
-GkSBjCypQ5Yj36w6gZoOKcUcqeldHraenjAKOc7xiID7S13MMuyFYkMlNAJWJwGR
-tDtwKj9useiciAF9n9T521NtYJ2/LOdYq7hfRvzOxBsDPAnrSTFcaUaz4EcCAwEA
-AaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYE
-FDqahQcQZyi27/a9BUFuIMGU2g/eMA0GCSqGSIb3DQEBCwUAA4IBAQCZ21151fmX
-WWcDYfF+OwYxdS2hII5PZYe096acvNjpL9DbWu7PdIxztDhC2gV7+AJ1uP2lsdeu
-9tfeE8tTEH6KRtGX+rcuKxGrkLAngPnon1rpN5+r5N9ss4UXnT3ZJE95kTXWXwTr
-gIOrmgIttRD02JDHBHNA7XIloKmf7J6raBKZV8aPEjoJpL1E/QYVN8Gb5DKj7Tjo
-2GTzLH4U/ALqn83/B2gX2yKQOC16jdFU8WnjXzPKej17CuPKf1855eJ1usV2GDPO
-LPAvTK33sefOT6jEm0pUBsV/fdUID+Ic/n4XuKxe9tQWskMJDE32p2u0mYRlynqI
-4uJEvlz36hz1
------END CERTIFICATE-----
-
-# Issuer: CN=Starfield Root Certificate Authority - G2 O=Starfield Technologies, Inc.
-# Subject: CN=Starfield Root Certificate Authority - G2 O=Starfield Technologies, Inc.
-# Label: "Starfield Root Certificate Authority - G2"
-# Serial: 0
-# MD5 Fingerprint: d6:39:81:c6:52:7e:96:69:fc:fc:ca:66:ed:05:f2:96
-# SHA1 Fingerprint: b5:1c:06:7c:ee:2b:0c:3d:f8:55:ab:2d:92:f4:fe:39:d4:e7:0f:0e
-# SHA256 Fingerprint: 2c:e1:cb:0b:f9:d2:f9:e1:02:99:3f:be:21:51:52:c3:b2:dd:0c:ab:de:1c:68:e5:31:9b:83:91:54:db:b7:f5
------BEGIN CERTIFICATE-----
-MIID3TCCAsWgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBjzELMAkGA1UEBhMCVVMx
-EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoT
-HFN0YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xMjAwBgNVBAMTKVN0YXJmaWVs
-ZCBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAw
-MFoXDTM3MTIzMTIzNTk1OVowgY8xCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6
-b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQgVGVj
-aG5vbG9naWVzLCBJbmMuMTIwMAYDVQQDEylTdGFyZmllbGQgUm9vdCBDZXJ0aWZp
-Y2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAL3twQP89o/8ArFvW59I2Z154qK3A2FWGMNHttfKPTUuiUP3oWmb3ooa/RMg
-nLRJdzIpVv257IzdIvpy3Cdhl+72WoTsbhm5iSzchFvVdPtrX8WJpRBSiUZV9Lh1
-HOZ/5FSuS/hVclcCGfgXcVnrHigHdMWdSL5stPSksPNkN3mSwOxGXn/hbVNMYq/N
-Hwtjuzqd+/x5AJhhdM8mgkBj87JyahkNmcrUDnXMN/uLicFZ8WJ/X7NfZTD4p7dN
-dloedl40wOiWVpmKs/B/pM293DIxfJHP4F8R+GuqSVzRmZTRouNjWwl2tVZi4Ut0
-HZbUJtQIBFnQmA4O5t78w+wfkPECAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAO
-BgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFHwMMh+n2TB/xH1oo2Kooc6rB1snMA0G
-CSqGSIb3DQEBCwUAA4IBAQARWfolTwNvlJk7mh+ChTnUdgWUXuEok21iXQnCoKjU
-sHU48TRqneSfioYmUeYs0cYtbpUgSpIB7LiKZ3sx4mcujJUDJi5DnUox9g61DLu3
-4jd/IroAow57UvtruzvE03lRTs2Q9GcHGcg8RnoNAX3FWOdt5oUwF5okxBDgBPfg
-8n/Uqgr/Qh037ZTlZFkSIHc40zI+OIF1lnP6aI+xy84fxez6nH7PfrHxBy22/L/K
-pL/QlwVKvOoYKAKQvVR4CSFx09F9HdkWsKlhPdAKACL8x3vLCWRFCztAgfd9fDL1
-mMpYjn0q7pBZc2T5NnReJaH1ZgUufzkVqSr7UIuOhWn0
------END CERTIFICATE-----
-
-# Issuer: CN=Starfield Services Root Certificate Authority - G2 O=Starfield Technologies, Inc.
-# Subject: CN=Starfield Services Root Certificate Authority - G2 O=Starfield Technologies, Inc.
-# Label: "Starfield Services Root Certificate Authority - G2"
-# Serial: 0
-# MD5 Fingerprint: 17:35:74:af:7b:61:1c:eb:f4:f9:3c:e2:ee:40:f9:a2
-# SHA1 Fingerprint: 92:5a:8f:8d:2c:6d:04:e0:66:5f:59:6a:ff:22:d8:63:e8:25:6f:3f
-# SHA256 Fingerprint: 56:8d:69:05:a2:c8:87:08:a4:b3:02:51:90:ed:cf:ed:b1:97:4a:60:6a:13:c6:e5:29:0f:cb:2a:e6:3e:da:b5
------BEGIN CERTIFICATE-----
-MIID7zCCAtegAwIBAgIBADANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UEBhMCVVMx
-EDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoT
-HFN0YXJmaWVsZCBUZWNobm9sb2dpZXMsIEluYy4xOzA5BgNVBAMTMlN0YXJmaWVs
-ZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5
-MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgZgxCzAJBgNVBAYTAlVTMRAwDgYD
-VQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFy
-ZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTswOQYDVQQDEzJTdGFyZmllbGQgU2Vy
-dmljZXMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBANUMOsQq+U7i9b4Zl1+OiFOxHz/Lz58gE20p
-OsgPfTz3a3Y4Y9k2YKibXlwAgLIvWX/2h/klQ4bnaRtSmpDhcePYLQ1Ob/bISdm2
-8xpWriu2dBTrz/sm4xq6HZYuajtYlIlHVv8loJNwU4PahHQUw2eeBGg6345AWh1K
-Ts9DkTvnVtYAcMtS7nt9rjrnvDH5RfbCYM8TWQIrgMw0R9+53pBlbQLPLJGmpufe
-hRhJfGZOozptqbXuNC66DQO4M99H67FrjSXZm86B0UVGMpZwh94CDklDhbZsc7tk
-6mFBrMnUVN+HL8cisibMn1lUaJ/8viovxFUcdUBgF4UCVTmLfwUCAwEAAaNCMEAw
-DwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJxfAN+q
-AdcwKziIorhtSpzyEZGDMA0GCSqGSIb3DQEBCwUAA4IBAQBLNqaEd2ndOxmfZyMI
-bw5hyf2E3F/YNoHN2BtBLZ9g3ccaaNnRbobhiCPPE95Dz+I0swSdHynVv/heyNXB
-ve6SbzJ08pGCL72CQnqtKrcgfU28elUSwhXqvfdqlS5sdJ/PHLTyxQGjhdByPq1z
-qwubdQxtRbeOlKyWN7Wg0I8VRw7j6IPdj/3vQQF3zCepYoUz8jcI73HPdwbeyBkd
-iEDPfUYd/x7H4c7/I9vG+o1VTqkC50cRRj70/b17KSa7qWFiNyi2LSr2EIZkyXCn
-0q23KXB56jzaYyWf/Wi3MOxw+3WKt21gZ7IeyLnp2KhvAotnDU0mV3HaIPzBSlCN
-sSi6
------END CERTIFICATE-----
-
-# Issuer: CN=AffirmTrust Commercial O=AffirmTrust
-# Subject: CN=AffirmTrust Commercial O=AffirmTrust
-# Label: "AffirmTrust Commercial"
-# Serial: 8608355977964138876
-# MD5 Fingerprint: 82:92:ba:5b:ef:cd:8a:6f:a6:3d:55:f9:84:f6:d6:b7
-# SHA1 Fingerprint: f9:b5:b6:32:45:5f:9c:be:ec:57:5f:80:dc:e9:6e:2c:c7:b2:78:b7
-# SHA256 Fingerprint: 03:76:ab:1d:54:c5:f9:80:3c:e4:b2:e2:01:a0:ee:7e:ef:7b:57:b6:36:e8:a9:3c:9b:8d:48:60:c9:6f:5f:a7
------BEGIN CERTIFICATE-----
-MIIDTDCCAjSgAwIBAgIId3cGJyapsXwwDQYJKoZIhvcNAQELBQAwRDELMAkGA1UE
-BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVz
-dCBDb21tZXJjaWFsMB4XDTEwMDEyOTE0MDYwNloXDTMwMTIzMTE0MDYwNlowRDEL
-MAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZp
-cm1UcnVzdCBDb21tZXJjaWFsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEA9htPZwcroRX1BiLLHwGy43NFBkRJLLtJJRTWzsO3qyxPxkEylFf6EqdbDuKP
-Hx6GGaeqtS25Xw2Kwq+FNXkyLbscYjfysVtKPcrNcV/pQr6U6Mje+SJIZMblq8Yr
-ba0F8PrVC8+a5fBQpIs7R6UjW3p6+DM/uO+Zl+MgwdYoic+U+7lF7eNAFxHUdPAL
-MeIrJmqbTFeurCA+ukV6BfO9m2kVrn1OIGPENXY6BwLJN/3HR+7o8XYdcxXyl6S1
-yHp52UKqK39c/s4mT6NmgTWvRLpUHhwwMmWd5jyTXlBOeuM61G7MGvv50jeuJCqr
-VwMiKA1JdX+3KNp1v47j3A55MQIDAQABo0IwQDAdBgNVHQ4EFgQUnZPGU4teyq8/
-nx4P5ZmVvCT2lI8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJ
-KoZIhvcNAQELBQADggEBAFis9AQOzcAN/wr91LoWXym9e2iZWEnStB03TX8nfUYG
-XUPGhi4+c7ImfU+TqbbEKpqrIZcUsd6M06uJFdhrJNTxFq7YpFzUf1GO7RgBsZNj
-vbz4YYCanrHOQnDiqX0GJX0nof5v7LMeJNrjS1UaADs1tDvZ110w/YETifLCBivt
-Z8SOyUOyXGsViQK8YvxO8rUzqrJv0wqiUOP2O+guRMLbZjipM1ZI8W0bM40NjD9g
-N53Tym1+NH4Nn3J2ixufcv1SNUFFApYvHLKac0khsUlHRUe072o0EclNmsxZt9YC
-nlpOZbWUrhvfKbAW8b8Angc6F2S1BLUjIZkKlTuXfO8=
------END CERTIFICATE-----
-
-# Issuer: CN=AffirmTrust Networking O=AffirmTrust
-# Subject: CN=AffirmTrust Networking O=AffirmTrust
-# Label: "AffirmTrust Networking"
-# Serial: 8957382827206547757
-# MD5 Fingerprint: 42:65:ca:be:01:9a:9a:4c:a9:8c:41:49:cd:c0:d5:7f
-# SHA1 Fingerprint: 29:36:21:02:8b:20:ed:02:f5:66:c5:32:d1:d6:ed:90:9f:45:00:2f
-# SHA256 Fingerprint: 0a:81:ec:5a:92:97:77:f1:45:90:4a:f3:8d:5d:50:9f:66:b5:e2:c5:8f:cd:b5:31:05:8b:0e:17:f3:f0:b4:1b
------BEGIN CERTIFICATE-----
-MIIDTDCCAjSgAwIBAgIIfE8EORzUmS0wDQYJKoZIhvcNAQEFBQAwRDELMAkGA1UE
-BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVz
-dCBOZXR3b3JraW5nMB4XDTEwMDEyOTE0MDgyNFoXDTMwMTIzMTE0MDgyNFowRDEL
-MAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZp
-cm1UcnVzdCBOZXR3b3JraW5nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAtITMMxcua5Rsa2FSoOujz3mUTOWUgJnLVWREZY9nZOIG41w3SfYvm4SEHi3y
-YJ0wTsyEheIszx6e/jarM3c1RNg1lho9Nuh6DtjVR6FqaYvZ/Ls6rnla1fTWcbua
-kCNrmreIdIcMHl+5ni36q1Mr3Lt2PpNMCAiMHqIjHNRqrSK6mQEubWXLviRmVSRL
-QESxG9fhwoXA3hA/Pe24/PHxI1Pcv2WXb9n5QHGNfb2V1M6+oF4nI979ptAmDgAp
-6zxG8D1gvz9Q0twmQVGeFDdCBKNwV6gbh+0t+nvujArjqWaJGctB+d1ENmHP4ndG
-yH329JKBNv3bNPFyfvMMFr20FQIDAQABo0IwQDAdBgNVHQ4EFgQUBx/S55zawm6i
-QLSwelAQUHTEyL0wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJ
-KoZIhvcNAQEFBQADggEBAIlXshZ6qML91tmbmzTCnLQyFE2npN/svqe++EPbkTfO
-tDIuUFUaNU52Q3Eg75N3ThVwLofDwR1t3Mu1J9QsVtFSUzpE0nPIxBsFZVpikpzu
-QY0x2+c06lkh1QF612S4ZDnNye2v7UsDSKegmQGA3GWjNq5lWUhPgkvIZfFXHeVZ
-Lgo/bNjR9eUJtGxUAArgFU2HdW23WJZa3W3SAKD0m0i+wzekujbgfIeFlxoVot4u
-olu9rxj5kFDNcFn4J2dHy8egBzp90SxdbBk6ZrV9/ZFvgrG+CJPbFEfxojfHRZ48
-x3evZKiT3/Zpg4Jg8klCNO1aAFSFHBY2kgxc+qatv9s=
------END CERTIFICATE-----
-
-# Issuer: CN=AffirmTrust Premium O=AffirmTrust
-# Subject: CN=AffirmTrust Premium O=AffirmTrust
-# Label: "AffirmTrust Premium"
-# Serial: 7893706540734352110
-# MD5 Fingerprint: c4:5d:0e:48:b6:ac:28:30:4e:0a:bc:f9:38:16:87:57
-# SHA1 Fingerprint: d8:a6:33:2c:e0:03:6f:b1:85:f6:63:4f:7d:6a:06:65:26:32:28:27
-# SHA256 Fingerprint: 70:a7:3f:7f:37:6b:60:07:42:48:90:45:34:b1:14:82:d5:bf:0e:69:8e:cc:49:8d:f5:25:77:eb:f2:e9:3b:9a
------BEGIN CERTIFICATE-----
-MIIFRjCCAy6gAwIBAgIIbYwURrGmCu4wDQYJKoZIhvcNAQEMBQAwQTELMAkGA1UE
-BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVz
-dCBQcmVtaXVtMB4XDTEwMDEyOTE0MTAzNloXDTQwMTIzMTE0MTAzNlowQTELMAkG
-A1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1U
-cnVzdCBQcmVtaXVtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAxBLf
-qV/+Qd3d9Z+K4/as4Tx4mrzY8H96oDMq3I0gW64tb+eT2TZwamjPjlGjhVtnBKAQ
-JG9dKILBl1fYSCkTtuG+kU3fhQxTGJoeJKJPj/CihQvL9Cl/0qRY7iZNyaqoe5rZ
-+jjeRFcV5fiMyNlI4g0WJx0eyIOFJbe6qlVBzAMiSy2RjYvmia9mx+n/K+k8rNrS
-s8PhaJyJ+HoAVt70VZVs+7pk3WKL3wt3MutizCaam7uqYoNMtAZ6MMgpv+0GTZe5
-HMQxK9VfvFMSF5yZVylmd2EhMQcuJUmdGPLu8ytxjLW6OQdJd/zvLpKQBY0tL3d7
-70O/Nbua2Plzpyzy0FfuKE4mX4+QaAkvuPjcBukumj5Rp9EixAqnOEhss/n/fauG
-V+O61oV4d7pD6kh/9ti+I20ev9E2bFhc8e6kGVQa9QPSdubhjL08s9NIS+LI+H+S
-qHZGnEJlPqQewQcDWkYtuJfzt9WyVSHvutxMAJf7FJUnM7/oQ0dG0giZFmA7mn7S
-5u046uwBHjxIVkkJx0w3AJ6IDsBz4W9m6XJHMD4Q5QsDyZpCAGzFlH5hxIrff4Ia
-C1nEWTJ3s7xgaVY5/bQGeyzWZDbZvUjthB9+pSKPKrhC9IK31FOQeE4tGv2Bb0TX
-OwF0lkLgAOIua+rF7nKsu7/+6qqo+Nz2snmKtmcCAwEAAaNCMEAwHQYDVR0OBBYE
-FJ3AZ6YMItkm9UWrpmVSESfYRaxjMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/
-BAQDAgEGMA0GCSqGSIb3DQEBDAUAA4ICAQCzV00QYk465KzquByvMiPIs0laUZx2
-KI15qldGF9X1Uva3ROgIRL8YhNILgM3FEv0AVQVhh0HctSSePMTYyPtwni94loMg
-Nt58D2kTiKV1NpgIpsbfrM7jWNa3Pt668+s0QNiigfV4Py/VpfzZotReBA4Xrf5B
-8OWycvpEgjNC6C1Y91aMYj+6QrCcDFx+LmUmXFNPALJ4fqENmS2NuB2OosSw/WDQ
-MKSOyARiqcTtNd56l+0OOF6SL5Nwpamcb6d9Ex1+xghIsV5n61EIJenmJWtSKZGc
-0jlzCFfemQa0W50QBuHCAKi4HEoCChTQwUHK+4w1IX2COPKpVJEZNZOUbWo6xbLQ
-u4mGk+ibyQ86p3q4ofB4Rvr8Ny/lioTz3/4E2aFooC8k4gmVBtWVyuEklut89pMF
-u+1z6S3RdTnX5yTb2E5fQ4+e0BQ5v1VwSJlXMbSc7kqYA5YwH2AG7hsj/oFgIxpH
-YoWlzBk0gG+zrBrjn/B7SK3VAdlntqlyk+otZrWyuOQ9PLLvTIzq6we/qzWaVYa8
-GKa1qF60g2xraUDTn9zxw2lrueFtCfTxqlB2Cnp9ehehVZZCmTEJ3WARjQUwfuaO
-RtGdFNrHF+QFlozEJLUbzxQHskD4o55BhrwE0GuWyCqANP2/7waj3VjFhT0+j/6e
-KeC2uAloGRwYQw==
------END CERTIFICATE-----
-
-# Issuer: CN=AffirmTrust Premium ECC O=AffirmTrust
-# Subject: CN=AffirmTrust Premium ECC O=AffirmTrust
-# Label: "AffirmTrust Premium ECC"
-# Serial: 8401224907861490260
-# MD5 Fingerprint: 64:b0:09:55:cf:b1:d5:99:e2:be:13:ab:a6:5d:ea:4d
-# SHA1 Fingerprint: b8:23:6b:00:2f:1d:16:86:53:01:55:6c:11:a4:37:ca:eb:ff:c3:bb
-# SHA256 Fingerprint: bd:71:fd:f6:da:97:e4:cf:62:d1:64:7a:dd:25:81:b0:7d:79:ad:f8:39:7e:b4:ec:ba:9c:5e:84:88:82:14:23
------BEGIN CERTIFICATE-----
-MIIB/jCCAYWgAwIBAgIIdJclisc/elQwCgYIKoZIzj0EAwMwRTELMAkGA1UEBhMC
-VVMxFDASBgNVBAoMC0FmZmlybVRydXN0MSAwHgYDVQQDDBdBZmZpcm1UcnVzdCBQ
-cmVtaXVtIEVDQzAeFw0xMDAxMjkxNDIwMjRaFw00MDEyMzExNDIwMjRaMEUxCzAJ
-BgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1UcnVzdDEgMB4GA1UEAwwXQWZmaXJt
-VHJ1c3QgUHJlbWl1bSBFQ0MwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQNMF4bFZ0D
-0KF5Nbc6PJJ6yhUczWLznCZcBz3lVPqj1swS6vQUX+iOGasvLkjmrBhDeKzQN8O9
-ss0s5kfiGuZjuD0uL3jET9v0D6RoTFVya5UdThhClXjMNzyR4ptlKymjQjBAMB0G
-A1UdDgQWBBSaryl6wBE1NSZRMADDav5A1a7WPDAPBgNVHRMBAf8EBTADAQH/MA4G
-A1UdDwEB/wQEAwIBBjAKBggqhkjOPQQDAwNnADBkAjAXCfOHiFBar8jAQr9HX/Vs
-aobgxCd05DhT1wV/GzTjxi+zygk8N53X57hG8f2h4nECMEJZh0PUUd+60wkyWs6I
-flc9nF9Ca/UHLbXwgpP5WW+uZPpY5Yse42O+tYHNbwKMeQ==
------END CERTIFICATE-----
-
-# Issuer: CN=Certum Trusted Network CA O=Unizeto Technologies S.A. OU=Certum Certification Authority
-# Subject: CN=Certum Trusted Network CA O=Unizeto Technologies S.A. OU=Certum Certification Authority
-# Label: "Certum Trusted Network CA"
-# Serial: 279744
-# MD5 Fingerprint: d5:e9:81:40:c5:18:69:fc:46:2c:89:75:62:0f:aa:78
-# SHA1 Fingerprint: 07:e0:32:e0:20:b7:2c:3f:19:2f:06:28:a2:59:3a:19:a7:0f:06:9e
-# SHA256 Fingerprint: 5c:58:46:8d:55:f5:8e:49:7e:74:39:82:d2:b5:00:10:b6:d1:65:37:4a:cf:83:a7:d4:a3:2d:b7:68:c4:40:8e
------BEGIN CERTIFICATE-----
-MIIDuzCCAqOgAwIBAgIDBETAMA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAlBM
-MSIwIAYDVQQKExlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMScwJQYDVQQLEx5D
-ZXJ0dW0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxIjAgBgNVBAMTGUNlcnR1bSBU
-cnVzdGVkIE5ldHdvcmsgQ0EwHhcNMDgxMDIyMTIwNzM3WhcNMjkxMjMxMTIwNzM3
-WjB+MQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBUZWNobm9sb2dpZXMg
-Uy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MSIw
-IAYDVQQDExlDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENBMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEA4/t9o3K6wvDJFIf1awFO4W5AB7ptJ11/91sts1rH
-UV+rpDKmYYe2bg+G0jACl/jXaVehGDldamR5xgFZrDwxSjh80gTSSyjoIF87B6LM
-TXPb865Px1bVWqeWifrzq2jUI4ZZJ88JJ7ysbnKDHDBy3+Ci6dLhdHUZvSqeexVU
-BBvXQzmtVSjF4hq79MDkrjhJM8x2hZ85RdKknvISjFH4fOQtf/WsX+sWn7Et0brM
-kUJ3TCXJkDhv2/DM+44el1k+1WBO5gUo7Ul5E0u6SNsv+XLTOcr+H9g0cvW0QM8x
-AcPs3hEtF10fuFDRXhmnad4HMyjKUJX5p1TLVIZQRan5SQIDAQABo0IwQDAPBgNV
-HRMBAf8EBTADAQH/MB0GA1UdDgQWBBQIds3LB/8k9sXN7buQvOKEN0Z19zAOBgNV
-HQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQEFBQADggEBAKaorSLOAT2mo/9i0Eidi15y
-sHhE49wcrwn9I0j6vSrEuVUEtRCjjSfeC4Jj0O7eDDd5QVsisrCaQVymcODU0HfL
-I9MA4GxWL+FpDQ3Zqr8hgVDZBqWo/5U30Kr+4rP1mS1FhIrlQgnXdAIv94nYmem8
-J9RHjboNRhx3zxSkHLmkMcScKHQDNP8zGSal6Q10tz6XxnboJ5ajZt3hrvJBW8qY
-VoNzcOSGGtIxQbovvi0TWnZvTuhOgQ4/WwMioBK+ZlgRSssDxLQqKi2WF+A5VLxI
-03YnnZotBqbJ7DnSq9ufmgsnAjUpsUCV5/nonFWIGUbWtzT1fs45mtk48VH3Tyw=
------END CERTIFICATE-----
-
-# Issuer: CN=Certinomis - Autorité Racine O=Certinomis OU=0002 433998903
-# Subject: CN=Certinomis - Autorité Racine O=Certinomis OU=0002 433998903
-# Label: "Certinomis - Autorité Racine"
-# Serial: 1
-# MD5 Fingerprint: 7f:30:78:8c:03:e3:ca:c9:0a:e2:c9:ea:1e:aa:55:1a
-# SHA1 Fingerprint: 2e:14:da:ec:28:f0:fa:1e:8e:38:9a:4e:ab:eb:26:c0:0a:d3:83:c3
-# SHA256 Fingerprint: fc:bf:e2:88:62:06:f7:2b:27:59:3c:8b:07:02:97:e1:2d:76:9e:d1:0e:d7:93:07:05:a8:09:8e:ff:c1:4d:17
------BEGIN CERTIFICATE-----
-MIIFnDCCA4SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJGUjET
-MBEGA1UEChMKQ2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxJjAk
-BgNVBAMMHUNlcnRpbm9taXMgLSBBdXRvcml0w6kgUmFjaW5lMB4XDTA4MDkxNzA4
-Mjg1OVoXDTI4MDkxNzA4Mjg1OVowYzELMAkGA1UEBhMCRlIxEzARBgNVBAoTCkNl
-cnRpbm9taXMxFzAVBgNVBAsTDjAwMDIgNDMzOTk4OTAzMSYwJAYDVQQDDB1DZXJ0
-aW5vbWlzIC0gQXV0b3JpdMOpIFJhY2luZTCCAiIwDQYJKoZIhvcNAQEBBQADggIP
-ADCCAgoCggIBAJ2Fn4bT46/HsmtuM+Cet0I0VZ35gb5j2CN2DpdUzZlMGvE5x4jY
-F1AMnmHawE5V3udauHpOd4cN5bjr+p5eex7Ezyh0x5P1FMYiKAT5kcOrJ3NqDi5N
-8y4oH3DfVS9O7cdxbwlyLu3VMpfQ8Vh30WC8Tl7bmoT2R2FFK/ZQpn9qcSdIhDWe
-rP5pqZ56XjUl+rSnSTV3lqc2W+HN3yNw2F1MpQiD8aYkOBOo7C+ooWfHpi2GR+6K
-/OybDnT0K0kCe5B1jPyZOQE51kqJ5Z52qz6WKDgmi92NjMD2AR5vpTESOH2VwnHu
-7XSu5DaiQ3XV8QCb4uTXzEIDS3h65X27uK4uIJPT5GHfceF2Z5c/tt9qc1pkIuVC
-28+BA5PY9OMQ4HL2AHCs8MF6DwV/zzRpRbWT5BnbUhYjBYkOjUjkJW+zeL9i9Qf6
-lSTClrLooyPCXQP8w9PlfMl1I9f09bze5N/NgL+RiH2nE7Q5uiy6vdFrzPOlKO1E
-nn1So2+WLhl+HPNbxxaOu2B9d2ZHVIIAEWBsMsGoOBvrbpgT1u449fCfDu/+MYHB
-0iSVL1N6aaLwD4ZFjliCK0wi1F6g530mJ0jfJUaNSih8hp75mxpZuWW/Bd22Ql09
-5gBIgl4g9xGC3srYn+Y3RyYe63j3YcNBZFgCQfna4NH4+ej9Uji29YnfAgMBAAGj
-WzBZMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBQN
-jLZh2kS40RR9w759XkjwzspqsDAXBgNVHSAEEDAOMAwGCiqBegFWAgIAAQEwDQYJ
-KoZIhvcNAQEFBQADggIBACQ+YAZ+He86PtvqrxyaLAEL9MW12Ukx9F1BjYkMTv9s
-ov3/4gbIOZ/xWqndIlgVqIrTseYyCYIDbNc/CMf4uboAbbnW/FIyXaR/pDGUu7ZM
-OH8oMDX/nyNTt7buFHAAQCvaR6s0fl6nVjBhK4tDrP22iCj1a7Y+YEq6QpA0Z43q
-619FVDsXrIvkxmUP7tCMXWY5zjKn2BCXwH40nJ+U8/aGH88bc62UeYdocMMzpXDn
-2NU4lG9jeeu/Cg4I58UvD0KgKxRA/yHgBcUn4YQRE7rWhh1BCxMjidPJC+iKunqj
-o3M3NYB9Ergzd0A4wPpeMNLytqOx1qKVl4GbUu1pTP+A5FPbVFsDbVRfsbjvJL1v
-nxHDx2TCDyhihWZeGnuyt++uNckZM6i4J9szVb9o4XVIRFb7zdNIu0eJOqxp9YDG
-5ERQL1TEqkPFMTFYvZbF6nVsmnWxTfj3l/+WFvKXTej28xH5On2KOG4Ey+HTRRWq
-pdEdnV1j6CTmNhTih60bWfVEm/vXd3wfAXBioSAaosUaKPQhA+4u2cGA6rnZgtZb
-dsLLO7XSAPCjDuGtbkD326C00EauFddEwk01+dIL8hf2rGbVJLJP0RyZwG71fet0
-BLj5TXcJ17TPBzAJ8bgAVtkXFhYKK4bfjwEZGuW7gmP/vgt2Fl43N+bYdJeimUV5
------END CERTIFICATE-----
-
-# Issuer: CN=Root CA Generalitat Valenciana O=Generalitat Valenciana OU=PKIGVA
-# Subject: CN=Root CA Generalitat Valenciana O=Generalitat Valenciana OU=PKIGVA
-# Label: "Root CA Generalitat Valenciana"
-# Serial: 994436456
-# MD5 Fingerprint: 2c:8c:17:5e:b1:54:ab:93:17:b5:36:5a:db:d1:c6:f2
-# SHA1 Fingerprint: a0:73:e5:c5:bd:43:61:0d:86:4c:21:13:0a:85:58:57:cc:9c:ea:46
-# SHA256 Fingerprint: 8c:4e:df:d0:43:48:f3:22:96:9e:7e:29:a4:cd:4d:ca:00:46:55:06:1c:16:e1:b0:76:42:2e:f3:42:ad:63:0e
------BEGIN CERTIFICATE-----
-MIIGizCCBXOgAwIBAgIEO0XlaDANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJF
-UzEfMB0GA1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UECxMGUEtJ
-R1ZBMScwJQYDVQQDEx5Sb290IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmEwHhcN
-MDEwNzA2MTYyMjQ3WhcNMjEwNzAxMTUyMjQ3WjBoMQswCQYDVQQGEwJFUzEfMB0G
-A1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UECxMGUEtJR1ZBMScw
-JQYDVQQDEx5Sb290IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmEwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGKqtXETcvIorKA3Qdyu0togu8M1JAJke+
-WmmmO3I2F0zo37i7L3bhQEZ0ZQKQUgi0/6iMweDHiVYQOTPvaLRfX9ptI6GJXiKj
-SgbwJ/BXufjpTjJ3Cj9BZPPrZe52/lSqfR0grvPXdMIKX/UIKFIIzFVd0g/bmoGl
-u6GzwZTNVOAydTGRGmKy3nXiz0+J2ZGQD0EbtFpKd71ng+CT516nDOeB0/RSrFOy
-A8dEJvt55cs0YFAQexvba9dHq198aMpunUEDEO5rmXteJajCq+TA81yc477OMUxk
-Hl6AovWDfgzWyoxVjr7gvkkHD6MkQXpYHYTqWBLI4bft75PelAgxAgMBAAGjggM7
-MIIDNzAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0dHA6Ly9vY3NwLnBr
-aS5ndmEuZXMwEgYDVR0TAQH/BAgwBgEB/wIBAjCCAjQGA1UdIASCAiswggInMIIC
-IwYKKwYBBAG/VQIBADCCAhMwggHoBggrBgEFBQcCAjCCAdoeggHWAEEAdQB0AG8A
-cgBpAGQAYQBkACAAZABlACAAQwBlAHIAdABpAGYAaQBjAGEAYwBpAPMAbgAgAFIA
-YQDtAHoAIABkAGUAIABsAGEAIABHAGUAbgBlAHIAYQBsAGkAdABhAHQAIABWAGEA
-bABlAG4AYwBpAGEAbgBhAC4ADQAKAEwAYQAgAEQAZQBjAGwAYQByAGEAYwBpAPMA
-bgAgAGQAZQAgAFAAcgDhAGMAdABpAGMAYQBzACAAZABlACAAQwBlAHIAdABpAGYA
-aQBjAGEAYwBpAPMAbgAgAHEAdQBlACAAcgBpAGcAZQAgAGUAbAAgAGYAdQBuAGMA
-aQBvAG4AYQBtAGkAZQBuAHQAbwAgAGQAZQAgAGwAYQAgAHAAcgBlAHMAZQBuAHQA
-ZQAgAEEAdQB0AG8AcgBpAGQAYQBkACAAZABlACAAQwBlAHIAdABpAGYAaQBjAGEA
-YwBpAPMAbgAgAHMAZQAgAGUAbgBjAHUAZQBuAHQAcgBhACAAZQBuACAAbABhACAA
-ZABpAHIAZQBjAGMAaQDzAG4AIAB3AGUAYgAgAGgAdAB0AHAAOgAvAC8AdwB3AHcA
-LgBwAGsAaQAuAGcAdgBhAC4AZQBzAC8AYwBwAHMwJQYIKwYBBQUHAgEWGWh0dHA6
-Ly93d3cucGtpLmd2YS5lcy9jcHMwHQYDVR0OBBYEFHs100DSHHgZZu90ECjcPk+y
-eAT8MIGVBgNVHSMEgY0wgYqAFHs100DSHHgZZu90ECjcPk+yeAT8oWykajBoMQsw
-CQYDVQQGEwJFUzEfMB0GA1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0G
-A1UECxMGUEtJR1ZBMScwJQYDVQQDEx5Sb290IENBIEdlbmVyYWxpdGF0IFZhbGVu
-Y2lhbmGCBDtF5WgwDQYJKoZIhvcNAQEFBQADggEBACRhTvW1yEICKrNcda3Fbcrn
-lD+laJWIwVTAEGmiEi8YPyVQqHxK6sYJ2fR1xkDar1CdPaUWu20xxsdzCkj+IHLt
-b8zog2EWRpABlUt9jppSCS/2bxzkoXHPjCpaF3ODR00PNvsETUlR4hTJZGH71BTg
-9J63NI8KJr2XXPR5OkowGcytT6CYirQxlyric21+eLj4iIlPsSKRZEv1UN4D2+XF
-ducTZnV+ZfsBn5OHiJ35Rld8TWCvmHMTI6QgkYH60GFmuH3Rr9ZvHmw96RH9qfmC
-IoaZM3Fa6hlXPZHNqcCjbgcTpsnt+GijnsNacgmHKNHEc8RzGF9QdRYxn7fofMM=
------END CERTIFICATE-----
-
-# Issuer: CN=A-Trust-nQual-03 O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH OU=A-Trust-nQual-03
-# Subject: CN=A-Trust-nQual-03 O=A-Trust Ges. f. Sicherheitssysteme im elektr. Datenverkehr GmbH OU=A-Trust-nQual-03
-# Label: "A-Trust-nQual-03"
-# Serial: 93214
-# MD5 Fingerprint: 49:63:ae:27:f4:d5:95:3d:d8:db:24:86:b8:9c:07:53
-# SHA1 Fingerprint: d3:c0:63:f2:19:ed:07:3e:34:ad:5d:75:0b:32:76:29:ff:d5:9a:f2
-# SHA256 Fingerprint: 79:3c:bf:45:59:b9:fd:e3:8a:b2:2d:f1:68:69:f6:98:81:ae:14:c4:b0:13:9a:c7:88:a7:8a:1a:fc:ca:02:fb
------BEGIN CERTIFICATE-----
-MIIDzzCCAregAwIBAgIDAWweMA0GCSqGSIb3DQEBBQUAMIGNMQswCQYDVQQGEwJB
-VDFIMEYGA1UECgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBp
-bSBlbGVrdHIuIERhdGVudmVya2VociBHbWJIMRkwFwYDVQQLDBBBLVRydXN0LW5R
-dWFsLTAzMRkwFwYDVQQDDBBBLVRydXN0LW5RdWFsLTAzMB4XDTA1MDgxNzIyMDAw
-MFoXDTE1MDgxNzIyMDAwMFowgY0xCzAJBgNVBAYTAkFUMUgwRgYDVQQKDD9BLVRy
-dXN0IEdlcy4gZi4gU2ljaGVyaGVpdHNzeXN0ZW1lIGltIGVsZWt0ci4gRGF0ZW52
-ZXJrZWhyIEdtYkgxGTAXBgNVBAsMEEEtVHJ1c3QtblF1YWwtMDMxGTAXBgNVBAMM
-EEEtVHJ1c3QtblF1YWwtMDMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQCtPWFuA/OQO8BBC4SAzewqo51ru27CQoT3URThoKgtUaNR8t4j8DRE/5TrzAUj
-lUC5B3ilJfYKvUWG6Nm9wASOhURh73+nyfrBJcyFLGM/BWBzSQXgYHiVEEvc+RFZ
-znF/QJuKqiTfC0Li21a8StKlDJu3Qz7dg9MmEALP6iPESU7l0+m0iKsMrmKS1GWH
-2WrX9IWf5DMiJaXlyDO6w8dB3F/GaswADm0yqLaHNgBid5seHzTLkDx4iHQF63n1
-k3Flyp3HaxgtPVxO59X4PzF9j4fsCiIvI+n+u33J4PTs63zEsMMtYrWacdaxaujs
-2e3Vcuy+VwHOBVWf3tFgiBCzAgMBAAGjNjA0MA8GA1UdEwEB/wQFMAMBAf8wEQYD
-VR0OBAoECERqlWdVeRFPMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOC
-AQEAVdRU0VlIXLOThaq/Yy/kgM40ozRiPvbY7meIMQQDbwvUB/tOdQ/TLtPAF8fG
-KOwGDREkDg6lXb+MshOWcdzUzg4NCmgybLlBMRmrsQd7TZjTXLDR8KdCoLXEjq/+
-8T/0709GAHbrAvv5ndJAlseIOrifEXnzgGWovR/TeIGgUUw3tKZdJXDRZslo+S4R
-FGjxVJgIrCaSD96JntT6s3kr0qN51OyLrIdTaEJMUVF0HhsnLuP1Hyl0Te2v9+GS
-mYHovjrHF1D2t8b8m7CKa9aIA5GPBnc6hQLdmNVDeD/GMBWsm2vLV7eJUYs66MmE
-DNuxUCAKGkq6ahq97BvIxYSazQ==
------END CERTIFICATE-----
-
-# Issuer: CN=TWCA Root Certification Authority O=TAIWAN-CA OU=Root CA
-# Subject: CN=TWCA Root Certification Authority O=TAIWAN-CA OU=Root CA
-# Label: "TWCA Root Certification Authority"
-# Serial: 1
-# MD5 Fingerprint: aa:08:8f:f6:f9:7b:b7:f2:b1:a7:1e:9b:ea:ea:bd:79
-# SHA1 Fingerprint: cf:9e:87:6d:d3:eb:fc:42:26:97:a3:b5:a3:7a:a0:76:a9:06:23:48
-# SHA256 Fingerprint: bf:d8:8f:e1:10:1c:41:ae:3e:80:1b:f8:be:56:35:0e:e9:ba:d1:a6:b9:bd:51:5e:dc:5c:6d:5b:87:11:ac:44
------BEGIN CERTIFICATE-----
-MIIDezCCAmOgAwIBAgIBATANBgkqhkiG9w0BAQUFADBfMQswCQYDVQQGEwJUVzES
-MBAGA1UECgwJVEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFU
-V0NBIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDgwODI4MDcyNDMz
-WhcNMzAxMjMxMTU1OTU5WjBfMQswCQYDVQQGEwJUVzESMBAGA1UECgwJVEFJV0FO
-LUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NBIFJvb3QgQ2VydGlm
-aWNhdGlvbiBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQCwfnK4pAOU5qfeCTiRShFAh6d8WWQUe7UREN3+v9XAu1bihSX0NXIP+FPQQeFE
-AcK0HMMxQhZHhTMidrIKbw/lJVBPhYa+v5guEGcevhEFhgWQxFnQfHgQsIBct+HH
-K3XLfJ+utdGdIzdjp9xCoi2SBBtQwXu4PhvJVgSLL1KbralW6cH/ralYhzC2gfeX
-RfwZVzsrb+RH9JlF/h3x+JejiB03HFyP4HYlmlD4oFT/RJB2I9IyxsOrBr/8+7/z
-rX2SYgJbKdM1o5OaQ2RgXbL6Mv87BK9NQGr5x+PvI/1ry+UPizgN7gr8/g+YnzAx
-3WxSZfmLgb4i4RxYA7qRG4kHAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
-HRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqOFsmjd6LWvJPelSDGRjjCDWmujANBgkq
-hkiG9w0BAQUFAAOCAQEAPNV3PdrfibqHDAhUaiBQkr6wQT25JmSDCi/oQMCXKCeC
-MErJk/9q56YAf4lCmtYR5VPOL8zy2gXE/uJQxDqGfczafhAJO5I1KlOy/usrBdls
-XebQ79NqZp4VKIV66IIArB6nCWlWQtNoURi+VJq/REG6Sb4gumlc7rh3zc5sH62D
-lhh9DrUUOYTxKOkto557HnpyWoOzeW/vtPzQCqVYT0bf+215WfKEIlKuD8z7fDvn
-aspHYcN6+NOSBB+4IIThNlQWx0DeO4pz3N/GCUzf7Nr/1FNCocnyYh0igzyXxfkZ
-YiesZSLX0zzG5Y6yU8xJzrww/nsOM5D77dIUkR8Hrw==
------END CERTIFICATE-----
-
-# Issuer: O=SECOM Trust Systems CO.,LTD. OU=Security Communication RootCA2
-# Subject: O=SECOM Trust Systems CO.,LTD. OU=Security Communication RootCA2
-# Label: "Security Communication RootCA2"
-# Serial: 0
-# MD5 Fingerprint: 6c:39:7d:a4:0e:55:59:b2:3f:d6:41:b1:12:50:de:43
-# SHA1 Fingerprint: 5f:3b:8c:f2:f8:10:b3:7d:78:b4:ce:ec:19:19:c3:73:34:b9:c7:74
-# SHA256 Fingerprint: 51:3b:2c:ec:b8:10:d4:cd:e5:dd:85:39:1a:df:c6:c2:dd:60:d8:7b:b7:36:d2:b5:21:48:4a:a4:7a:0e:be:f6
------BEGIN CERTIFICATE-----
-MIIDdzCCAl+gAwIBAgIBADANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJKUDEl
-MCMGA1UEChMcU0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEnMCUGA1UECxMe
-U2VjdXJpdHkgQ29tbXVuaWNhdGlvbiBSb290Q0EyMB4XDTA5MDUyOTA1MDAzOVoX
-DTI5MDUyOTA1MDAzOVowXTELMAkGA1UEBhMCSlAxJTAjBgNVBAoTHFNFQ09NIFRy
-dXN0IFN5c3RlbXMgQ08uLExURC4xJzAlBgNVBAsTHlNlY3VyaXR5IENvbW11bmlj
-YXRpb24gUm9vdENBMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANAV
-OVKxUrO6xVmCxF1SrjpDZYBLx/KWvNs2l9amZIyoXvDjChz335c9S672XewhtUGr
-zbl+dp+++T42NKA7wfYxEUV0kz1XgMX5iZnK5atq1LXaQZAQwdbWQonCv/Q4EpVM
-VAX3NuRFg3sUZdbcDE3R3n4MqzvEFb46VqZab3ZpUql6ucjrappdUtAtCms1FgkQ
-hNBqyjoGADdH5H5XTz+L62e4iKrFvlNVspHEfbmwhRkGeC7bYRr6hfVKkaHnFtWO
-ojnflLhwHyg/i/xAXmODPIMqGplrz95Zajv8bxbXH/1KEOtOghY6rCcMU/Gt1SSw
-awNQwS08Ft1ENCcadfsCAwEAAaNCMEAwHQYDVR0OBBYEFAqFqXdlBZh8QIH4D5cs
-OPEK7DzPMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3
-DQEBCwUAA4IBAQBMOqNErLlFsceTfsgLCkLfZOoc7llsCLqJX2rKSpWeeo8HxdpF
-coJxDjrSzG+ntKEju/Ykn8sX/oymzsLS28yN/HH8AynBbF0zX2S2ZTuJbxh2ePXc
-okgfGT+Ok+vx+hfuzU7jBBJV1uXk3fs+BXziHV7Gp7yXT2g69ekuCkO2r1dcYmh8
-t/2jioSgrGK+KwmHNPBqAbubKVY8/gA3zyNs8U6qtnRGEmyR7jTV7JqR50S+kDFy
-1UkC9gLl9B/rfNmWVan/7Ir5mUf/NVoCqgTLiluHcSmRvaS0eg29mvVXIwAHIRc/
-SjnRBUkLp7Y3gaVdjKozXoEofKd9J+sAro03
------END CERTIFICATE-----
-
-# Issuer: CN=Hellenic Academic and Research Institutions RootCA 2011 O=Hellenic Academic and Research Institutions Cert. Authority
-# Subject: CN=Hellenic Academic and Research Institutions RootCA 2011 O=Hellenic Academic and Research Institutions Cert. Authority
-# Label: "Hellenic Academic and Research Institutions RootCA 2011"
-# Serial: 0
-# MD5 Fingerprint: 73:9f:4c:4b:73:5b:79:e9:fa:ba:1c:ef:6e:cb:d5:c9
-# SHA1 Fingerprint: fe:45:65:9b:79:03:5b:98:a1:61:b5:51:2e:ac:da:58:09:48:22:4d
-# SHA256 Fingerprint: bc:10:4f:15:a4:8b:e7:09:dc:a5:42:a7:e1:d4:b9:df:6f:05:45:27:e8:02:ea:a9:2d:59:54:44:25:8a:fe:71
------BEGIN CERTIFICATE-----
-MIIEMTCCAxmgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMCR1Ix
-RDBCBgNVBAoTO0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1
-dGlvbnMgQ2VydC4gQXV0aG9yaXR5MUAwPgYDVQQDEzdIZWxsZW5pYyBBY2FkZW1p
-YyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIFJvb3RDQSAyMDExMB4XDTExMTIw
-NjEzNDk1MloXDTMxMTIwMTEzNDk1MlowgZUxCzAJBgNVBAYTAkdSMUQwQgYDVQQK
-EztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENl
-cnQuIEF1dGhvcml0eTFAMD4GA1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJl
-c2VhcmNoIEluc3RpdHV0aW9ucyBSb290Q0EgMjAxMTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAKlTAOMupvaO+mDYLZU++CwqVE7NuYRhlFhPjz2L5EPz
-dYmNUeTDN9KKiE15HrcS3UN4SoqS5tdI1Q+kOilENbgH9mgdVc04UfCMJDGFr4PJ
-fel3r+0ae50X+bOdOFAPplp5kYCvN66m0zH7tSYJnTxa71HFK9+WXesyHgLacEns
-bgzImjeN9/E2YEsmLIKe0HjzDQ9jpFEw4fkrJxIH2Oq9GGKYsFk3fb7u8yBRQlqD
-75O6aRXxYp2fmTmCobd0LovUxQt7L/DICto9eQqakxylKHJzkUOap9FNhYS5qXSP
-FEDH3N6sQWRstBmbAmNtJGSPRLIl6s5ddAxjMlyNh+UCAwEAAaOBiTCBhjAPBgNV
-HRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQUppFC/RNhSiOeCKQp
-5dgTBCPuQSUwRwYDVR0eBEAwPqA8MAWCAy5ncjAFggMuZXUwBoIELmVkdTAGggQu
-b3JnMAWBAy5ncjAFgQMuZXUwBoEELmVkdTAGgQQub3JnMA0GCSqGSIb3DQEBBQUA
-A4IBAQAf73lB4XtuP7KMhjdCSk4cNx6NZrokgclPEg8hwAOXhiVtXdMiKahsog2p
-6z0GW5k6x8zDmjR/qw7IThzh+uTczQ2+vyT+bOdrwg3IBp5OjWEopmr95fZi6hg8
-TqBTnbI6nOulnJEWtk2C4AwFSKls9cz4y51JtPACpf1wA+2KIaWuE4ZJwzNzvoc7
-dIsXRSZMFpGD/md9zU1jZ/rzAxKWeAaNsWftjj++n08C9bMJL/NMh98qy5V8Acys
-Nnq/onN694/BtZqhFLKPM58N7yLcZnuEvUUXBj08yrl3NI/K6s8/MT7jiOOASSXI
-l7WdmplNsDz4SgCbZN2fOUvRJ9e4
------END CERTIFICATE-----
-
-# Issuer: CN=Actalis Authentication Root CA O=Actalis S.p.A./03358520967
-# Subject: CN=Actalis Authentication Root CA O=Actalis S.p.A./03358520967
-# Label: "Actalis Authentication Root CA"
-# Serial: 6271844772424770508
-# MD5 Fingerprint: 69:c1:0d:4f:07:a3:1b:c3:fe:56:3d:04:bc:11:f6:a6
-# SHA1 Fingerprint: f3:73:b3:87:06:5a:28:84:8a:f2:f3:4a:ce:19:2b:dd:c7:8e:9c:ac
-# SHA256 Fingerprint: 55:92:60:84:ec:96:3a:64:b9:6e:2a:be:01:ce:0b:a8:6a:64:fb:fe:bc:c7:aa:b5:af:c1:55:b3:7f:d7:60:66
------BEGIN CERTIFICATE-----
-MIIFuzCCA6OgAwIBAgIIVwoRl0LE48wwDQYJKoZIhvcNAQELBQAwazELMAkGA1UE
-BhMCSVQxDjAMBgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlzIFMucC5BLi8w
-MzM1ODUyMDk2NzEnMCUGA1UEAwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290
-IENBMB4XDTExMDkyMjExMjIwMloXDTMwMDkyMjExMjIwMlowazELMAkGA1UEBhMC
-SVQxDjAMBgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlzIFMucC5BLi8wMzM1
-ODUyMDk2NzEnMCUGA1UEAwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290IENB
-MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAp8bEpSmkLO/lGMWwUKNv
-UTufClrJwkg4CsIcoBh/kbWHuUA/3R1oHwiD1S0eiKD4j1aPbZkCkpAW1V8IbInX
-4ay8IMKx4INRimlNAJZaby/ARH6jDuSRzVju3PvHHkVH3Se5CAGfpiEd9UEtL0z9
-KK3giq0itFZljoZUj5NDKd45RnijMCO6zfB9E1fAXdKDa0hMxKufgFpbOr3JpyI/
-gCczWw63igxdBzcIy2zSekciRDXFzMwujt0q7bd9Zg1fYVEiVRvjRuPjPdA1Yprb
-rxTIW6HMiRvhMCb8oJsfgadHHwTrozmSBp+Z07/T6k9QnBn+locePGX2oxgkg4YQ
-51Q+qDp2JE+BIcXjDwL4k5RHILv+1A7TaLndxHqEguNTVHnd25zS8gebLra8Pu2F
-be8lEfKXGkJh90qX6IuxEAf6ZYGyojnP9zz/GPvG8VqLWeICrHuS0E4UT1lF9gxe
-KF+w6D9Fz8+vm2/7hNN3WpVvrJSEnu68wEqPSpP4RCHiMUVhUE4Q2OM1fEwZtN4F
-v6MGn8i1zeQf1xcGDXqVdFUNaBr8EBtiZJ1t4JWgw5QHVw0U5r0F+7if5t+L4sbn
-fpb2U8WANFAoWPASUHEXMLrmeGO89LKtmyuy/uE5jF66CyCU3nuDuP/jVo23Eek7
-jPKxwV2dpAtMK9myGPW1n0sCAwEAAaNjMGEwHQYDVR0OBBYEFFLYiDrIn3hm7Ynz
-ezhwlMkCAjbQMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUUtiIOsifeGbt
-ifN7OHCUyQICNtAwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBCwUAA4ICAQAL
-e3KHwGCmSUyIWOYdiPcUZEim2FgKDk8TNd81HdTtBjHIgT5q1d07GjLukD0R0i70
-jsNjLiNmsGe+b7bAEzlgqqI0JZN1Ut6nna0Oh4lScWoWPBkdg/iaKWW+9D+a2fDz
-WochcYBNy+A4mz+7+uAwTc+G02UQGRjRlwKxK3JCaKygvU5a2hi/a5iB0P2avl4V
-SM0RFbnAKVy06Ij3Pjaut2L9HmLecHgQHEhb2rykOLpn7VU+Xlff1ANATIGk0k9j
-pwlCCRT8AKnCgHNPLsBA2RF7SOp6AsDT6ygBJlh0wcBzIm2Tlf05fbsq4/aC4yyX
-X04fkZT6/iyj2HYauE2yOE+b+h1IYHkm4vP9qdCa6HCPSXrW5b0KDtst842/6+Ok
-fcvHlXHo2qN8xcL4dJIEG4aspCJTQLas/kx2z/uUMsA1n3Y/buWQbqCmJqK4LL7R
-K4X9p2jIugErsWx0Hbhzlefut8cl8ABMALJ+tguLHPPAUJ4lueAI3jZm/zel0btU
-ZCzJJ7VLkn5l/9Mt4blOvH+kQSGQQXemOR/qnuOf0GZvBeyqdn6/axag67XH/JJU
-LysRJyU3eExRarDzzFhdFPFqSBX/wge2sY0PjlxQRrM9vwGYT7JZVEc+NHt4bVaT
-LnPqZih4zR0Uv6CPLy64Lo7yFIrM6bV8+2ydDKXhlg==
------END CERTIFICATE-----
-
-# Issuer: O=Trustis Limited OU=Trustis FPS Root CA
-# Subject: O=Trustis Limited OU=Trustis FPS Root CA
-# Label: "Trustis FPS Root CA"
-# Serial: 36053640375399034304724988975563710553
-# MD5 Fingerprint: 30:c9:e7:1e:6b:e6:14:eb:65:b2:16:69:20:31:67:4d
-# SHA1 Fingerprint: 3b:c0:38:0b:33:c3:f6:a6:0c:86:15:22:93:d9:df:f5:4b:81:c0:04
-# SHA256 Fingerprint: c1:b4:82:99:ab:a5:20:8f:e9:63:0a:ce:55:ca:68:a0:3e:da:5a:51:9c:88:02:a0:d3:a6:73:be:8f:8e:55:7d
------BEGIN CERTIFICATE-----
-MIIDZzCCAk+gAwIBAgIQGx+ttiD5JNM2a/fH8YygWTANBgkqhkiG9w0BAQUFADBF
-MQswCQYDVQQGEwJHQjEYMBYGA1UEChMPVHJ1c3RpcyBMaW1pdGVkMRwwGgYDVQQL
-ExNUcnVzdGlzIEZQUyBSb290IENBMB4XDTAzMTIyMzEyMTQwNloXDTI0MDEyMTEx
-MzY1NFowRTELMAkGA1UEBhMCR0IxGDAWBgNVBAoTD1RydXN0aXMgTGltaXRlZDEc
-MBoGA1UECxMTVHJ1c3RpcyBGUFMgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAMVQe547NdDfxIzNjpvto8A2mfRC6qc+gIMPpqdZh8mQRUN+
-AOqGeSoDvT03mYlmt+WKVoaTnGhLaASMk5MCPjDSNzoiYYkchU59j9WvezX2fihH
-iTHcDnlkH5nSW7r+f2C/revnPDgpai/lkQtV/+xvWNUtyd5MZnGPDNcE2gfmHhjj
-vSkCqPoc4Vu5g6hBSLwacY3nYuUtsuvffM/bq1rKMfFMIvMFE/eC+XN5DL7XSxzA
-0RU8k0Fk0ea+IxciAIleH2ulrG6nS4zto3Lmr2NNL4XSFDWaLk6M6jKYKIahkQlB
-OrTh4/L68MkKokHdqeMDx4gVOxzUGpTXn2RZEm0CAwEAAaNTMFEwDwYDVR0TAQH/
-BAUwAwEB/zAfBgNVHSMEGDAWgBS6+nEleYtXQSUhhgtx67JkDoshZzAdBgNVHQ4E
-FgQUuvpxJXmLV0ElIYYLceuyZA6LIWcwDQYJKoZIhvcNAQEFBQADggEBAH5Y//01
-GX2cGE+esCu8jowU/yyg2kdbw++BLa8F6nRIW/M+TgfHbcWzk88iNVy2P3UnXwmW
-zaD+vkAMXBJV+JOCyinpXj9WV4s4NvdFGkwozZ5BuO1WTISkQMi4sKUraXAEasP4
-1BIy+Q7DsdwyhEQsb8tGD+pmQQ9P8Vilpg0ND2HepZ5dfWWhPBfnqFVO76DH7cZE
-f1T1o+CP8HxVIo8ptoGj4W1OLBuAZ+ytIJ8MYmHVl/9D7S3B2l0pKoU/rGXuhg8F
-jZBf3+6f9L/uHfuY5H+QK4R4EA5sSVPvFVtlRkpdr7r7OnIdzfYliB6XzCGcKQEN
-ZetX2fNXlrtIzYE=
------END CERTIFICATE-----
-
-# Issuer: CN=StartCom Certification Authority O=StartCom Ltd. OU=Secure Digital Certificate Signing
-# Subject: CN=StartCom Certification Authority O=StartCom Ltd. OU=Secure Digital Certificate Signing
-# Label: "StartCom Certification Authority"
-# Serial: 45
-# MD5 Fingerprint: c9:3b:0d:84:41:fc:a4:76:79:23:08:57:de:10:19:16
-# SHA1 Fingerprint: a3:f1:33:3f:e2:42:bf:cf:c5:d1:4e:8f:39:42:98:40:68:10:d1:a0
-# SHA256 Fingerprint: e1:78:90:ee:09:a3:fb:f4:f4:8b:9c:41:4a:17:d6:37:b7:a5:06:47:e9:bc:75:23:22:72:7f:cc:17:42:a9:11
------BEGIN CERTIFICATE-----
-MIIHhzCCBW+gAwIBAgIBLTANBgkqhkiG9w0BAQsFADB9MQswCQYDVQQGEwJJTDEW
-MBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwg
-Q2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0NjM3WhcNMzYwOTE3MTk0NjM2WjB9
-MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMi
-U2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3Rh
-cnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUA
-A4ICDwAwggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZk
-pMyONvg45iPwbm2xPN1yo4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rf
-OQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/C
-Ji/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/deMotHweXMAEtcnn6RtYT
-Kqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt2PZE4XNi
-HzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMM
-Av+Z6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w
-+2OqqGwaVLRcJXrJosmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+
-Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3
-Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVcUjyJthkqcwEKDwOzEmDyei+B
-26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT37uMdBNSSwID
-AQABo4ICEDCCAgwwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYD
-VR0OBBYEFE4L7xqkQFulF2mHMMo0aEPQQa7yMB8GA1UdIwQYMBaAFE4L7xqkQFul
-F2mHMMo0aEPQQa7yMIIBWgYDVR0gBIIBUTCCAU0wggFJBgsrBgEEAYG1NwEBATCC
-ATgwLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5w
-ZGYwNAYIKwYBBQUHAgEWKGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL2ludGVybWVk
-aWF0ZS5wZGYwgc8GCCsGAQUFBwICMIHCMCcWIFN0YXJ0IENvbW1lcmNpYWwgKFN0
-YXJ0Q29tKSBMdGQuMAMCAQEagZZMaW1pdGVkIExpYWJpbGl0eSwgcmVhZCB0aGUg
-c2VjdGlvbiAqTGVnYWwgTGltaXRhdGlvbnMqIG9mIHRoZSBTdGFydENvbSBDZXJ0
-aWZpY2F0aW9uIEF1dGhvcml0eSBQb2xpY3kgYXZhaWxhYmxlIGF0IGh0dHA6Ly93
-d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwEQYJYIZIAYb4QgEBBAQDAgAHMDgG
-CWCGSAGG+EIBDQQrFilTdGFydENvbSBGcmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1
-dGhvcml0eTANBgkqhkiG9w0BAQsFAAOCAgEAjo/n3JR5fPGFf59Jb2vKXfuM/gTF
-wWLRfUKKvFO3lANmMD+x5wqnUCBVJX92ehQN6wQOQOY+2IirByeDqXWmN3PH/UvS
-Ta0XQMhGvjt/UfzDtgUx3M2FIk5xt/JxXrAaxrqTi3iSSoX4eA+D/i+tLPfkpLst
-0OcNOrg+zvZ49q5HJMqjNTbOx8aHmNrs++myziebiMMEofYLWWivydsQD032ZGNc
-pRJvkrKTlMeIFw6Ttn5ii5B/q06f/ON1FE8qMt9bDeD1e5MNq6HPh+GlBEXoPBKl
-CcWw0bdT82AUuoVpaiF8H3VhFyAXe2w7QSlc4axa0c2Mm+tgHRns9+Ww2vl5GKVF
-P0lDV9LdJNUso/2RjSe15esUBppMeyG7Oq0wBhjA2MFrLH9ZXF2RsXAiV+uKa0hK
-1Q8p7MZAwC+ITGgBF3f0JBlPvfrhsiAhS90a2Cl9qrjeVOwhVYBsHvUwyKMQ5bLm
-KhQxw4UtjJixhlpPiVktucf3HMiKf8CdBUrmQk9io20ppB+Fq9vlgcitKj1MXVuE
-JnHEhV5xJMqlG2zYYdMa4FTbzrqpMrUi9nNBCV24F10OD5mQ1kfabwo6YigUZ4LZ
-8dCAWZvLMdibD4x3TrVoivJs9iQOLWxwxXPR3hTQcY+203sC9uO41Alua551hDnm
-fyWl8kgAwKQB2j8=
------END CERTIFICATE-----
-
-# Issuer: CN=StartCom Certification Authority G2 O=StartCom Ltd.
-# Subject: CN=StartCom Certification Authority G2 O=StartCom Ltd.
-# Label: "StartCom Certification Authority G2"
-# Serial: 59
-# MD5 Fingerprint: 78:4b:fb:9e:64:82:0a:d3:b8:4c:62:f3:64:f2:90:64
-# SHA1 Fingerprint: 31:f1:fd:68:22:63:20:ee:c6:3b:3f:9d:ea:4a:3e:53:7c:7c:39:17
-# SHA256 Fingerprint: c7:ba:65:67:de:93:a7:98:ae:1f:aa:79:1e:71:2d:37:8f:ae:1f:93:c4:39:7f:ea:44:1b:b7:cb:e6:fd:59:95
------BEGIN CERTIFICATE-----
-MIIFYzCCA0ugAwIBAgIBOzANBgkqhkiG9w0BAQsFADBTMQswCQYDVQQGEwJJTDEW
-MBQGA1UEChMNU3RhcnRDb20gTHRkLjEsMCoGA1UEAxMjU3RhcnRDb20gQ2VydGlm
-aWNhdGlvbiBBdXRob3JpdHkgRzIwHhcNMTAwMTAxMDEwMDAxWhcNMzkxMjMxMjM1
-OTAxWjBTMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjEsMCoG
-A1UEAxMjU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgRzIwggIiMA0G
-CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2iTZbB7cgNr2Cu+EWIAOVeq8Oo1XJ
-JZlKxdBWQYeQTSFgpBSHO839sj60ZwNq7eEPS8CRhXBF4EKe3ikj1AENoBB5uNsD
-vfOpL9HG4A/LnooUCri99lZi8cVytjIl2bLzvWXFDSxu1ZJvGIsAQRSCb0AgJnoo
-D/Uefyf3lLE3PbfHkffiAez9lInhzG7TNtYKGXmu1zSCZf98Qru23QumNK9LYP5/
-Q0kGi4xDuFby2X8hQxfqp0iVAXV16iulQ5XqFYSdCI0mblWbq9zSOdIxHWDirMxW
-RST1HFSr7obdljKF+ExP6JV2tgXdNiNnvP8V4so75qbsO+wmETRIjfaAKxojAuuK
-HDp2KntWFhxyKrOq42ClAJ8Em+JvHhRYW6Vsi1g8w7pOOlz34ZYrPu8HvKTlXcxN
-nw3h3Kq74W4a7I/htkxNeXJdFzULHdfBR9qWJODQcqhaX2YtENwvKhOuJv4KHBnM
-0D4LnMgJLvlblnpHnOl68wVQdJVznjAJ85eCXuaPOQgeWeU1FEIT/wCc976qUM/i
-UUjXuG+v+E5+M5iSFGI6dWPPe/regjupuznixL0sAA7IF6wT700ljtizkC+p2il9
-Ha90OrInwMEePnWjFqmveiJdnxMaz6eg6+OGCtP95paV1yPIN93EfKo2rJgaErHg
-TuixO/XWb/Ew1wIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE
-AwIBBjAdBgNVHQ4EFgQUS8W0QGutHLOlHGVuRjaJhwUMDrYwDQYJKoZIhvcNAQEL
-BQADggIBAHNXPyzVlTJ+N9uWkusZXn5T50HsEbZH77Xe7XRcxfGOSeD8bpkTzZ+K
-2s06Ctg6Wgk/XzTQLwPSZh0avZyQN8gMjgdalEVGKua+etqhqaRpEpKwfTbURIfX
-UfEpY9Z1zRbkJ4kd+MIySP3bmdCPX1R0zKxnNBFi2QwKN4fRoxdIjtIXHfbX/dtl
-6/2o1PXWT6RbdejF0mCy2wl+JYt7ulKSnj7oxXehPOBKc2thz4bcQ///If4jXSRK
-9dNtD2IEBVeC2m6kMyV5Sy5UGYvMLD0w6dEG/+gyRr61M3Z3qAFdlsHB1b6uJcDJ
-HgoJIIihDsnzb02CVAAgp9KP5DlUFy6NHrgbuxu9mk47EDTcnIhT76IxW1hPkWLI
-wpqazRVdOKnWvvgTtZ8SafJQYqz7Fzf07rh1Z2AQ+4NQ+US1dZxAF7L+/XldblhY
-XzD8AK6vM8EOTmy6p6ahfzLbOOCxchcKK5HsamMm7YnUeMx0HgX4a/6ManY5Ka5l
-IxKVCCIcl85bBu4M4ru8H0ST9tg4RQUh7eStqxK2A6RCLi3ECToDZ2mEmuFZkIoo
-hdVddLHRDiBYmxOlsGOm7XtH/UVVMKTumtTm4ofvmMkyghEpIrwACjFeLQ/Ajulr
-so8uBtjRkcfGEvRM/TAXw8HaOFvjqermobp573PYtlNXLfbQ4ddI
------END CERTIFICATE-----
-
-# Issuer: CN=Buypass Class 2 Root CA O=Buypass AS-983163327
-# Subject: CN=Buypass Class 2 Root CA O=Buypass AS-983163327
-# Label: "Buypass Class 2 Root CA"
-# Serial: 2
-# MD5 Fingerprint: 46:a7:d2:fe:45:fb:64:5a:a8:59:90:9b:78:44:9b:29
-# SHA1 Fingerprint: 49:0a:75:74:de:87:0a:47:fe:58:ee:f6:c7:6b:eb:c6:0b:12:40:99
-# SHA256 Fingerprint: 9a:11:40:25:19:7c:5b:b9:5d:94:e6:3d:55:cd:43:79:08:47:b6:46:b2:3c:df:11:ad:a4:a0:0e:ff:15:fb:48
------BEGIN CERTIFICATE-----
-MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEd
-MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3Mg
-Q2xhc3MgMiBSb290IENBMB4XDTEwMTAyNjA4MzgwM1oXDTQwMTAyNjA4MzgwM1ow
-TjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MSAw
-HgYDVQQDDBdCdXlwYXNzIENsYXNzIDIgUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEB
-BQADggIPADCCAgoCggIBANfHXvfBB9R3+0Mh9PT1aeTuMgHbo4Yf5FkNuud1g1Lr
-6hxhFUi7HQfKjK6w3Jad6sNgkoaCKHOcVgb/S2TwDCo3SbXlzwx87vFKu3MwZfPV
-L4O2fuPn9Z6rYPnT8Z2SdIrkHJasW4DptfQxh6NR/Md+oW+OU3fUl8FVM5I+GC91
-1K2GScuVr1QGbNgGE41b/+EmGVnAJLqBcXmQRFBoJJRfuLMR8SlBYaNByyM21cHx
-MlAQTn/0hpPshNOOvEu/XAFOBz3cFIqUCqTqc/sLUegTBxj6DvEr0VQVfTzh97QZ
-QmdiXnfgolXsttlpF9U6r0TtSsWe5HonfOV116rLJeffawrbD02TTqigzXsu8lkB
-arcNuAeBfos4GzjmCleZPe4h6KP1DBbdi+w0jpwqHAAVF41og9JwnxgIzRFo1clr
-Us3ERo/ctfPYV3Me6ZQ5BL/T3jjetFPsaRyifsSP5BtwrfKi+fv3FmRmaZ9JUaLi
-FRhnBkp/1Wy1TbMz4GHrXb7pmA8y1x1LPC5aAVKRCfLf6o3YBkBjqhHk/sM3nhRS
-P/TizPJhk9H9Z2vXUq6/aKtAQ6BXNVN48FP4YUIHZMbXb5tMOA1jrGKvNouicwoN
-9SG9dKpN6nIDSdvHXx1iY8f93ZHsM+71bbRuMGjeyNYmsHVee7QHIJihdjK4TWxP
-AgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFMmAd+BikoL1Rpzz
-uvdMw964o605MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAU18h
-9bqwOlI5LJKwbADJ784g7wbylp7ppHR/ehb8t/W2+xUbP6umwHJdELFx7rxP462s
-A20ucS6vxOOto70MEae0/0qyexAQH6dXQbLArvQsWdZHEIjzIVEpMMpghq9Gqx3t
-OluwlN5E40EIosHsHdb9T7bWR9AUC8rmyrV7d35BH16Dx7aMOZawP5aBQW9gkOLo
-+fsicdl9sz1Gv7SEr5AcD48Saq/v7h56rgJKihcrdv6sVIkkLE8/trKnToyokZf7
-KcZ7XC25y2a2t6hbElGFtQl+Ynhw/qlqYLYdDnkM/crqJIByw5c/8nerQyIKx+u2
-DISCLIBrQYoIwOula9+ZEsuK1V6ADJHgJgg2SMX6OBE1/yWDLfJ6v9r9jv6ly0Us
-H8SIU653DtmadsWOLB2jutXsMq7Aqqz30XpN69QH4kj3Io6wpJ9qzo6ysmD0oyLQ
-I+uUWnpp3Q+/QFesa1lQ2aOZ4W7+jQF5JyMV3pKdewlNWudLSDBaGOYKbeaP4NK7
-5t98biGCwWg5TbSYWGZizEqQXsP6JwSxeRV0mcy+rSDeJmAc61ZRpqPq5KM/p/9h
-3PFaTWwyI0PurKju7koSCTxdccK+efrCh2gdC/1cacwG0Jp9VJkqyTkaGa9LKkPz
-Y11aWOIv4x3kqdbQCtCev9eBCfHJxyYNrJgWVqA=
------END CERTIFICATE-----
-
-# Issuer: CN=Buypass Class 3 Root CA O=Buypass AS-983163327
-# Subject: CN=Buypass Class 3 Root CA O=Buypass AS-983163327
-# Label: "Buypass Class 3 Root CA"
-# Serial: 2
-# MD5 Fingerprint: 3d:3b:18:9e:2c:64:5a:e8:d5:88:ce:0e:f9:37:c2:ec
-# SHA1 Fingerprint: da:fa:f7:fa:66:84:ec:06:8f:14:50:bd:c7:c2:81:a5:bc:a9:64:57
-# SHA256 Fingerprint: ed:f7:eb:bc:a2:7a:2a:38:4d:38:7b:7d:40:10:c6:66:e2:ed:b4:84:3e:4c:29:b4:ae:1d:5b:93:32:e6:b2:4d
------BEGIN CERTIFICATE-----
-MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEd
-MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3Mg
-Q2xhc3MgMyBSb290IENBMB4XDTEwMTAyNjA4Mjg1OFoXDTQwMTAyNjA4Mjg1OFow
-TjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MSAw
-HgYDVQQDDBdCdXlwYXNzIENsYXNzIDMgUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEB
-BQADggIPADCCAgoCggIBAKXaCpUWUOOV8l6ddjEGMnqb8RB2uACatVI2zSRHsJ8Y
-ZLya9vrVediQYkwiL944PdbgqOkcLNt4EemOaFEVcsfzM4fkoF0LXOBXByow9c3E
-N3coTRiR5r/VUv1xLXA+58bEiuPwKAv0dpihi4dVsjoT/Lc+JzeOIuOoTyrvYLs9
-tznDDgFHmV0ST9tD+leh7fmdvhFHJlsTmKtdFoqwNxxXnUX/iJY2v7vKB3tvh2PX
-0DJq1l1sDPGzbjniazEuOQAnFN44wOwZZoYS6J1yFhNkUsepNxz9gjDthBgd9K5c
-/3ATAOux9TN6S9ZV+AWNS2mw9bMoNlwUxFFzTWsL8TQH2xc519woe2v1n/MuwU8X
-KhDzzMro6/1rqy6any2CbgTUUgGTLT2G/H783+9CHaZr77kgxve9oKeV/afmiSTY
-zIw0bOIjL9kSGiG5VZFvC5F5GQytQIgLcOJ60g7YaEi7ghM5EFjp2CoHxhLbWNvS
-O1UQRwUVZ2J+GGOmRj8JDlQyXr8NYnon74Do29lLBlo3WiXQCBJ31G8JUJc9yB3D
-34xFMFbG02SrZvPAXpacw8Tvw3xrizp5f7NJzz3iiZ+gMEuFuZyUJHmPfWupRWgP
-K9Dx2hzLabjKSWJtyNBjYt1gD1iqj6G8BaVmos8bdrKEZLFMOVLAMLrwjEsCsLa3
-AgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFEe4zf/lb+74suwv
-Tg75JbCOPGvDMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAACAj
-QTUEkMJAYmDv4jVM1z+s4jSQuKFvdvoWFqRINyzpkMLyPPgKn9iB5btb2iUspKdV
-cSQy9sgL8rxq+JOssgfCX5/bzMiKqr5qb+FJEMwx14C7u8jYog5kV+qi9cKpMRXS
-IGrs/CIBKM+GuIAeqcwRpTzyFrNHnfzSgCHEy9BHcEGhyoMZCCxt8l13nIoUE9Q2
-HJLw5QY33KbmkJs4j1xrG0aGQ0JfPgEHU1RdZX33inOhmlRaHylDFCfChQ+1iHsa
-O5S3HWCntZznKWlXWpuTekMwGwPXYshApqr8ZORK15FTAaggiG6cX0S5y2CBNOxv
-033aSF/rtJC8LakcC6wc1aJoIIAE1vyxjy+7SjENSoYc6+I2KSb12tjE8nVhz36u
-dmNKekBlk4f4HoCMhuWG1o8O/FMsYOgWYRqiPkN7zTlgVGr18okmAWiDSKIz6MkE
-kbIRNBE+6tBDGR8Dk5AM/1E9V/RBbuHLoL7ryWPNbczk+DaqaJ3tvV2XcEQNtg41
-3OEMXbugUZTLfhbrES+jkkXITHHZvMmZUldGL1DPvTVp9D0VzgalLA8+9oG6lLvD
-u79leNKGef9JOxqDDPDeeOzI8k1MGt6CKfjBWtrt7uYnXuhF0J0cUahoq0Tj0Itq
-4/g7u9xN12TyUb7mqqta6THuBrxzvxNiCp/HuZc=
------END CERTIFICATE-----
-
-# Issuer: CN=T-TeleSec GlobalRoot Class 3 O=T-Systems Enterprise Services GmbH OU=T-Systems Trust Center
-# Subject: CN=T-TeleSec GlobalRoot Class 3 O=T-Systems Enterprise Services GmbH OU=T-Systems Trust Center
-# Label: "T-TeleSec GlobalRoot Class 3"
-# Serial: 1
-# MD5 Fingerprint: ca:fb:40:a8:4e:39:92:8a:1d:fe:8e:2f:c4:27:ea:ef
-# SHA1 Fingerprint: 55:a6:72:3e:cb:f2:ec:cd:c3:23:74:70:19:9d:2a:be:11:e3:81:d1
-# SHA256 Fingerprint: fd:73:da:d3:1c:64:4f:f1:b4:3b:ef:0c:cd:da:96:71:0b:9c:d9:87:5e:ca:7e:31:70:7a:f3:e9:6d:52:2b:bd
------BEGIN CERTIFICATE-----
-MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUx
-KzApBgNVBAoMIlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAd
-BgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNl
-YyBHbG9iYWxSb290IENsYXNzIDMwHhcNMDgxMDAxMTAyOTU2WhcNMzMxMDAxMjM1
-OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lzdGVtcyBFbnRlcnBy
-aXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBDZW50
-ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDMwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9dZPwYiJvJK7genasfb3ZJNW4t/zN
-8ELg63iIVl6bmlQdTQyK9tPPcPRStdiTBONGhnFBSivwKixVA9ZIw+A5OO3yXDw/
-RLyTPWGrTs0NvvAgJ1gORH8EGoel15YUNpDQSXuhdfsaa3Ox+M6pCSzyU9XDFES4
-hqX2iys52qMzVNn6chr3IhUciJFrf2blw2qAsCTz34ZFiP0Zf3WHHx+xGwpzJFu5
-ZeAsVMhg02YXP+HMVDNzkQI6pn97djmiH5a2OK61yJN0HZ65tOVgnS9W0eDrXltM
-EnAMbEQgqxHY9Bn20pxSN+f6tsIxO0rUFJmtxxr1XV/6B7h8DR/Wgx6zAgMBAAGj
-QjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS1
-A/d2O2GCahKqGFPrAyGUv/7OyjANBgkqhkiG9w0BAQsFAAOCAQEAVj3vlNW92nOy
-WL6ukK2YJ5f+AbGwUgC4TeQbIXQbfsDuXmkqJa9c1h3a0nnJ85cp4IaH3gRZD/FZ
-1GSFS5mvJQQeyUapl96Cshtwn5z2r3Ex3XsFpSzTucpH9sry9uetuUg/vBa3wW30
-6gmv7PO15wWeph6KU1HWk4HMdJP2udqmJQV0eVp+QD6CSyYRMG7hP0HHRwA11fXT
-91Q+gT3aSWqas+8QPebrb9HIIkfLzM8BMZLZGOMivgkeGj5asuRrDFR6fUNOuIml
-e9eiPZaGzPImNC1qkp2aGtAw4l1OBLBfiyB+d8E9lYLRRpo7PHi4b6HQDWSieB4p
-TpPDpFQUWw==
------END CERTIFICATE-----
-
-# Issuer: CN=EE Certification Centre Root CA O=AS Sertifitseerimiskeskus
-# Subject: CN=EE Certification Centre Root CA O=AS Sertifitseerimiskeskus
-# Label: "EE Certification Centre Root CA"
-# Serial: 112324828676200291871926431888494945866
-# MD5 Fingerprint: 43:5e:88:d4:7d:1a:4a:7e:fd:84:2e:52:eb:01:d4:6f
-# SHA1 Fingerprint: c9:a8:b9:e7:55:80:5e:58:e3:53:77:a7:25:eb:af:c3:7b:27:cc:d7
-# SHA256 Fingerprint: 3e:84:ba:43:42:90:85:16:e7:75:73:c0:99:2f:09:79:ca:08:4e:46:85:68:1f:f1:95:cc:ba:8a:22:9b:8a:76
------BEGIN CERTIFICATE-----
-MIIEAzCCAuugAwIBAgIQVID5oHPtPwBMyonY43HmSjANBgkqhkiG9w0BAQUFADB1
-MQswCQYDVQQGEwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1
-czEoMCYGA1UEAwwfRUUgQ2VydGlmaWNhdGlvbiBDZW50cmUgUm9vdCBDQTEYMBYG
-CSqGSIb3DQEJARYJcGtpQHNrLmVlMCIYDzIwMTAxMDMwMTAxMDMwWhgPMjAzMDEy
-MTcyMzU5NTlaMHUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKDBlBUyBTZXJ0aWZpdHNl
-ZXJpbWlza2Vza3VzMSgwJgYDVQQDDB9FRSBDZXJ0aWZpY2F0aW9uIENlbnRyZSBS
-b290IENBMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDIIMDs4MVLqwd4lfNE7vsLDP90jmG7sWLqI9iroWUy
-euuOF0+W2Ap7kaJjbMeMTC55v6kF/GlclY1i+blw7cNRfdCT5mzrMEvhvH2/UpvO
-bntl8jixwKIy72KyaOBhU8E2lf/slLo2rpwcpzIP5Xy0xm90/XsY6KxX7QYgSzIw
-WFv9zajmofxwvI6Sc9uXp3whrj3B9UiHbCe9nyV0gVWw93X2PaRka9ZP585ArQ/d
-MtO8ihJTmMmJ+xAdTX7Nfh9WDSFwhfYggx/2uh8Ej+p3iDXE/+pOoYtNP2MbRMNE
-1CV2yreN1x5KZmTNXMWcg+HCCIia7E6j8T4cLNlsHaFLAgMBAAGjgYowgYcwDwYD
-VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBLyWj7qVhy/
-zQas8fElyalL1BSZMEUGA1UdJQQ+MDwGCCsGAQUFBwMCBggrBgEFBQcDAQYIKwYB
-BQUHAwMGCCsGAQUFBwMEBggrBgEFBQcDCAYIKwYBBQUHAwkwDQYJKoZIhvcNAQEF
-BQADggEBAHv25MANqhlHt01Xo/6tu7Fq1Q+e2+RjxY6hUFaTlrg4wCQiZrxTFGGV
-v9DHKpY5P30osxBAIWrEr7BSdxjhlthWXePdNl4dp1BUoMUq5KqMlIpPnTX/dqQG
-E5Gion0ARD9V04I8GtVbvFZMIi5GQ4okQC3zErg7cBqklrkar4dBGmoYDQZPxz5u
-uSlNDUmJEYcyW+ZLBMjkXOZ0c5RdFpgTlf7727FE5TpwrDdr5rMzcijJs1eg9gIW
-iAYLtqZLICjU3j2LrTcFU3T+bsy8QxdxXvnFzBqpYe73dgzzcvRyrc9yAjYHR8/v
-GVCJYMzpJJUPwssd8m92kMfMdcGWxZ0=
------END CERTIFICATE-----
-
-# Issuer: CN=TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı O=TÜRKTRUST Bilgi İletişim ve Bilişim Güvenliği Hizmetleri A.Ş. (c) Aralık 2007
-# Subject: CN=TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı O=TÜRKTRUST Bilgi İletişim ve Bilişim Güvenliği Hizmetleri A.Ş. (c) Aralık 2007
-# Label: "TURKTRUST Certificate Services Provider Root 2007"
-# Serial: 1
-# MD5 Fingerprint: 2b:70:20:56:86:82:a0:18:c8:07:53:12:28:70:21:72
-# SHA1 Fingerprint: f1:7f:6f:b6:31:dc:99:e3:a3:c8:7f:fe:1c:f1:81:10:88:d9:60:33
-# SHA256 Fingerprint: 97:8c:d9:66:f2:fa:a0:7b:a7:aa:95:00:d9:c0:2e:9d:77:f2:cd:ad:a6:ad:6b:a7:4a:f4:b9:1c:66:59:3c:50
------BEGIN CERTIFICATE-----
-MIIEPTCCAyWgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBvzE/MD0GA1UEAww2VMOc
-UktUUlVTVCBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sx
-c8SxMQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMV4wXAYDVQQKDFVUw5xS
-S1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnEn2kg
-SGl6bWV0bGVyaSBBLsWeLiAoYykgQXJhbMSxayAyMDA3MB4XDTA3MTIyNTE4Mzcx
-OVoXDTE3MTIyMjE4MzcxOVowgb8xPzA9BgNVBAMMNlTDnFJLVFJVU1QgRWxla3Ry
-b25payBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsTELMAkGA1UEBhMC
-VFIxDzANBgNVBAcMBkFua2FyYTFeMFwGA1UECgxVVMOcUktUUlVTVCBCaWxnaSDE
-sGxldGnFn2ltIHZlIEJpbGnFn2ltIEfDvHZlbmxpxJ9pIEhpem1ldGxlcmkgQS7F
-ni4gKGMpIEFyYWzEsWsgMjAwNzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAKu3PgqMyKVYFeaK7yc9SrToJdPNM8Ig3BnuiD9NYvDdE3ePYakqtdTyuTFY
-KTsvP2qcb3N2Je40IIDu6rfwxArNK4aUyeNgsURSsloptJGXg9i3phQvKUmi8wUG
-+7RP2qFsmmaf8EMJyupyj+sA1zU511YXRxcw9L6/P8JorzZAwan0qafoEGsIiveG
-HtyaKhUG9qPw9ODHFNRRf8+0222vR5YXm3dx2KdxnSQM9pQ/hTEST7ruToK4uT6P
-IzdezKKqdfcYbwnTrqdUKDT74eA7YH2gvnmJhsifLfkKS8RQouf9eRbHegsYz85M
-733WB2+Y8a+xwXrXgTW4qhe04MsCAwEAAaNCMEAwHQYDVR0OBBYEFCnFkKslrxHk
-Yb+j/4hhkeYO/pyBMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0G
-CSqGSIb3DQEBBQUAA4IBAQAQDdr4Ouwo0RSVgrESLFF6QSU2TJ/sPx+EnWVUXKgW
-AkD6bho3hO9ynYYKVZ1WKKxmLNA6VpM0ByWtCLCPyA8JWcqdmBzlVPi5RX9ql2+I
-aE1KBiY3iAIOtsbWcpnOa3faYjGkVh+uX4132l32iPwa2Z61gfAyuOOI0JzzaqC5
-mxRZNTZPz/OOXl0XrRWV2N2y1RVuAE6zS89mlOTgzbUF2mNXi+WzqtvALhyQRNsa
-XRik7r4EW5nVcV9VZWRi1aKbBFmGyGJ353yCRWo9F7/snXUMrqNvWtMvmDb08PUZ
-qxFdyKbjKlhqQgnDvZImZjINXQhVdP+MmNAKpoRq0Tl9
------END CERTIFICATE-----
-
-# Issuer: CN=D-TRUST Root Class 3 CA 2 2009 O=D-Trust GmbH
-# Subject: CN=D-TRUST Root Class 3 CA 2 2009 O=D-Trust GmbH
-# Label: "D-TRUST Root Class 3 CA 2 2009"
-# Serial: 623603
-# MD5 Fingerprint: cd:e0:25:69:8d:47:ac:9c:89:35:90:f7:fd:51:3d:2f
-# SHA1 Fingerprint: 58:e8:ab:b0:36:15:33:fb:80:f7:9b:1b:6d:29:d3:ff:8d:5f:00:f0
-# SHA256 Fingerprint: 49:e7:a4:42:ac:f0:ea:62:87:05:00:54:b5:25:64:b6:50:e4:f4:9e:42:e3:48:d6:aa:38:e0:39:e9:57:b1:c1
------BEGIN CERTIFICATE-----
-MIIEMzCCAxugAwIBAgIDCYPzMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNVBAYTAkRF
-MRUwEwYDVQQKDAxELVRydXN0IEdtYkgxJzAlBgNVBAMMHkQtVFJVU1QgUm9vdCBD
-bGFzcyAzIENBIDIgMjAwOTAeFw0wOTExMDUwODM1NThaFw0yOTExMDUwODM1NTha
-ME0xCzAJBgNVBAYTAkRFMRUwEwYDVQQKDAxELVRydXN0IEdtYkgxJzAlBgNVBAMM
-HkQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgMjAwOTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBANOySs96R+91myP6Oi/WUEWJNTrGa9v+2wBoqOADER03
-UAifTUpolDWzU9GUY6cgVq/eUXjsKj3zSEhQPgrfRlWLJ23DEE0NkVJD2IfgXU42
-tSHKXzlABF9bfsyjxiupQB7ZNoTWSPOSHjRGICTBpFGOShrvUD9pXRl/RcPHAY9R
-ySPocq60vFYJfxLLHLGvKZAKyVXMD9O0Gu1HNVpK7ZxzBCHQqr0ME7UAyiZsxGsM
-lFqVlNpQmvH/pStmMaTJOKDfHR+4CS7zp+hnUquVH+BGPtikw8paxTGA6Eian5Rp
-/hnd2HN8gcqW3o7tszIFZYQ05ub9VxC1X3a/L7AQDcUCAwEAAaOCARowggEWMA8G
-A1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFP3aFMSfMN4hvR5COfyrYyNJ4PGEMA4G
-A1UdDwEB/wQEAwIBBjCB0wYDVR0fBIHLMIHIMIGAoH6gfIZ6bGRhcDovL2RpcmVj
-dG9yeS5kLXRydXN0Lm5ldC9DTj1ELVRSVVNUJTIwUm9vdCUyMENsYXNzJTIwMyUy
-MENBJTIwMiUyMDIwMDksTz1ELVRydXN0JTIwR21iSCxDPURFP2NlcnRpZmljYXRl
-cmV2b2NhdGlvbmxpc3QwQ6BBoD+GPWh0dHA6Ly93d3cuZC10cnVzdC5uZXQvY3Js
-L2QtdHJ1c3Rfcm9vdF9jbGFzc18zX2NhXzJfMjAwOS5jcmwwDQYJKoZIhvcNAQEL
-BQADggEBAH+X2zDI36ScfSF6gHDOFBJpiBSVYEQBrLLpME+bUMJm2H6NMLVwMeni
-acfzcNsgFYbQDfC+rAF1hM5+n02/t2A7nPPKHeJeaNijnZflQGDSNiH+0LS4F9p0
-o3/U37CYAqxva2ssJSRyoWXuJVrl5jLn8t+rSfrzkGkj2wTZ51xY/GXUl77M/C4K
-zCUqNQT4YJEVdT1B/yMfGchs64JTBKbkTCJNjYy6zltz7GRUUG3RnFX7acM2w4y8
-PIWmawomDeCTmGCufsYkl4phX5GOZpIJhzbNi5stPvZR1FDUWSi9g/LMKHtThm3Y
-Johw1+qRzT65ysCQblrGXnRl11z+o+I=
------END CERTIFICATE-----
-
-# Issuer: CN=D-TRUST Root Class 3 CA 2 EV 2009 O=D-Trust GmbH
-# Subject: CN=D-TRUST Root Class 3 CA 2 EV 2009 O=D-Trust GmbH
-# Label: "D-TRUST Root Class 3 CA 2 EV 2009"
-# Serial: 623604
-# MD5 Fingerprint: aa:c6:43:2c:5e:2d:cd:c4:34:c0:50:4f:11:02:4f:b6
-# SHA1 Fingerprint: 96:c9:1b:0b:95:b4:10:98:42:fa:d0:d8:22:79:fe:60:fa:b9:16:83
-# SHA256 Fingerprint: ee:c5:49:6b:98:8c:e9:86:25:b9:34:09:2e:ec:29:08:be:d0:b0:f3:16:c2:d4:73:0c:84:ea:f1:f3:d3:48:81
------BEGIN CERTIFICATE-----
-MIIEQzCCAyugAwIBAgIDCYP0MA0GCSqGSIb3DQEBCwUAMFAxCzAJBgNVBAYTAkRF
-MRUwEwYDVQQKDAxELVRydXN0IEdtYkgxKjAoBgNVBAMMIUQtVFJVU1QgUm9vdCBD
-bGFzcyAzIENBIDIgRVYgMjAwOTAeFw0wOTExMDUwODUwNDZaFw0yOTExMDUwODUw
-NDZaMFAxCzAJBgNVBAYTAkRFMRUwEwYDVQQKDAxELVRydXN0IEdtYkgxKjAoBgNV
-BAMMIUQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgRVYgMjAwOTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAJnxhDRwui+3MKCOvXwEz75ivJn9gpfSegpn
-ljgJ9hBOlSJzmY3aFS3nBfwZcyK3jpgAvDw9rKFs+9Z5JUut8Mxk2og+KbgPCdM0
-3TP1YtHhzRnp7hhPTFiu4h7WDFsVWtg6uMQYZB7jM7K1iXdODL/ZlGsTl28So/6Z
-qQTMFexgaDbtCHu39b+T7WYxg4zGcTSHThfqr4uRjRxWQa4iN1438h3Z0S0NL2lR
-p75mpoo6Kr3HGrHhFPC+Oh25z1uxav60sUYgovseO3Dvk5h9jHOW8sXvhXCtKSb8
-HgQ+HKDYD8tSg2J87otTlZCpV6LqYQXY+U3EJ/pure3511H3a6UCAwEAAaOCASQw
-ggEgMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNOUikxiEyoZLsyvcop9Ntea
-HNxnMA4GA1UdDwEB/wQEAwIBBjCB3QYDVR0fBIHVMIHSMIGHoIGEoIGBhn9sZGFw
-Oi8vZGlyZWN0b3J5LmQtdHJ1c3QubmV0L0NOPUQtVFJVU1QlMjBSb290JTIwQ2xh
-c3MlMjAzJTIwQ0ElMjAyJTIwRVYlMjAyMDA5LE89RC1UcnVzdCUyMEdtYkgsQz1E
-RT9jZXJ0aWZpY2F0ZXJldm9jYXRpb25saXN0MEagRKBChkBodHRwOi8vd3d3LmQt
-dHJ1c3QubmV0L2NybC9kLXRydXN0X3Jvb3RfY2xhc3NfM19jYV8yX2V2XzIwMDku
-Y3JsMA0GCSqGSIb3DQEBCwUAA4IBAQA07XtaPKSUiO8aEXUHL7P+PPoeUSbrh/Yp
-3uDx1MYkCenBz1UbtDDZzhr+BlGmFaQt77JLvyAoJUnRpjZ3NOhk31KxEcdzes05
-nsKtjHEh8lprr988TlWvsoRlFIm5d8sqMb7Po23Pb0iUMkZv53GMoKaEGTcH8gNF
-CSuGdXzfX2lXANtu2KZyIktQ1HWYVt+3GP9DQ1CuekR78HlR10M9p9OB0/DJT7na
-xpeG0ILD5EJt/rDiZE4OJudANCa1CInXCGNjOCd1HjPqbqjdn5lPdE2BiYBL3ZqX
-KVwvvoFBuYz/6n1gBp7N1z3TLqMVvKjmJuVvw9y4AyHqnxbxLFS1
------END CERTIFICATE-----
-
-# Issuer: CN=Autoridad de Certificacion Raiz del Estado Venezolano O=Sistema Nacional de Certificacion Electronica OU=Superintendencia de Servicios de Certificacion Electronica
-# Subject: CN=PSCProcert O=Sistema Nacional de Certificacion Electronica OU=Proveedor de Certificados PROCERT
-# Label: "PSCProcert"
-# Serial: 11
-# MD5 Fingerprint: e6:24:e9:12:01:ae:0c:de:8e:85:c4:ce:a3:12:dd:ec
-# SHA1 Fingerprint: 70:c1:8d:74:b4:28:81:0a:e4:fd:a5:75:d7:01:9f:99:b0:3d:50:74
-# SHA256 Fingerprint: 3c:fc:3c:14:d1:f6:84:ff:17:e3:8c:43:ca:44:0c:00:b9:67:ec:93:3e:8b:fe:06:4c:a1:d7:2c:90:f2:ad:b0
------BEGIN CERTIFICATE-----
-MIIJhjCCB26gAwIBAgIBCzANBgkqhkiG9w0BAQsFADCCAR4xPjA8BgNVBAMTNUF1
-dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIFJhaXogZGVsIEVzdGFkbyBWZW5lem9s
-YW5vMQswCQYDVQQGEwJWRTEQMA4GA1UEBxMHQ2FyYWNhczEZMBcGA1UECBMQRGlz
-dHJpdG8gQ2FwaXRhbDE2MDQGA1UEChMtU2lzdGVtYSBOYWNpb25hbCBkZSBDZXJ0
-aWZpY2FjaW9uIEVsZWN0cm9uaWNhMUMwQQYDVQQLEzpTdXBlcmludGVuZGVuY2lh
-IGRlIFNlcnZpY2lvcyBkZSBDZXJ0aWZpY2FjaW9uIEVsZWN0cm9uaWNhMSUwIwYJ
-KoZIhvcNAQkBFhZhY3JhaXpAc3VzY2VydGUuZ29iLnZlMB4XDTEwMTIyODE2NTEw
-MFoXDTIwMTIyNTIzNTk1OVowgdExJjAkBgkqhkiG9w0BCQEWF2NvbnRhY3RvQHBy
-b2NlcnQubmV0LnZlMQ8wDQYDVQQHEwZDaGFjYW8xEDAOBgNVBAgTB01pcmFuZGEx
-KjAoBgNVBAsTIVByb3ZlZWRvciBkZSBDZXJ0aWZpY2Fkb3MgUFJPQ0VSVDE2MDQG
-A1UEChMtU2lzdGVtYSBOYWNpb25hbCBkZSBDZXJ0aWZpY2FjaW9uIEVsZWN0cm9u
-aWNhMQswCQYDVQQGEwJWRTETMBEGA1UEAxMKUFNDUHJvY2VydDCCAiIwDQYJKoZI
-hvcNAQEBBQADggIPADCCAgoCggIBANW39KOUM6FGqVVhSQ2oh3NekS1wwQYalNo9
-7BVCwfWMrmoX8Yqt/ICV6oNEolt6Vc5Pp6XVurgfoCfAUFM+jbnADrgV3NZs+J74
-BCXfgI8Qhd19L3uA3VcAZCP4bsm+lU/hdezgfl6VzbHvvnpC2Mks0+saGiKLt38G
-ieU89RLAu9MLmV+QfI4tL3czkkohRqipCKzx9hEC2ZUWno0vluYC3XXCFCpa1sl9
-JcLB/KpnheLsvtF8PPqv1W7/U0HU9TI4seJfxPmOEO8GqQKJ/+MMbpfg353bIdD0
-PghpbNjU5Db4g7ayNo+c7zo3Fn2/omnXO1ty0K+qP1xmk6wKImG20qCZyFSTXai2
-0b1dCl53lKItwIKOvMoDKjSuc/HUtQy9vmebVOvh+qBa7Dh+PsHMosdEMXXqP+UH
-0quhJZb25uSgXTcYOWEAM11G1ADEtMo88aKjPvM6/2kwLkDd9p+cJsmWN63nOaK/
-6mnbVSKVUyqUtd+tFjiBdWbjxywbk5yqjKPK2Ww8F22c3HxT4CAnQzb5EuE8XL1m
-v6JpIzi4mWCZDlZTOpx+FIywBm/xhnaQr/2v/pDGj59/i5IjnOcVdo/Vi5QTcmn7
-K2FjiO/mpF7moxdqWEfLcU8UC17IAggmosvpr2uKGcfLFFb14dq12fy/czja+eev
-bqQ34gcnAgMBAAGjggMXMIIDEzASBgNVHRMBAf8ECDAGAQH/AgEBMDcGA1UdEgQw
-MC6CD3N1c2NlcnRlLmdvYi52ZaAbBgVghl4CAqASDBBSSUYtRy0yMDAwNDAzNi0w
-MB0GA1UdDgQWBBRBDxk4qpl/Qguk1yeYVKIXTC1RVDCCAVAGA1UdIwSCAUcwggFD
-gBStuyIdxuDSAaj9dlBSk+2YwU2u06GCASakggEiMIIBHjE+MDwGA1UEAxM1QXV0
-b3JpZGFkIGRlIENlcnRpZmljYWNpb24gUmFpeiBkZWwgRXN0YWRvIFZlbmV6b2xh
-bm8xCzAJBgNVBAYTAlZFMRAwDgYDVQQHEwdDYXJhY2FzMRkwFwYDVQQIExBEaXN0
-cml0byBDYXBpdGFsMTYwNAYDVQQKEy1TaXN0ZW1hIE5hY2lvbmFsIGRlIENlcnRp
-ZmljYWNpb24gRWxlY3Ryb25pY2ExQzBBBgNVBAsTOlN1cGVyaW50ZW5kZW5jaWEg
-ZGUgU2VydmljaW9zIGRlIENlcnRpZmljYWNpb24gRWxlY3Ryb25pY2ExJTAjBgkq
-hkiG9w0BCQEWFmFjcmFpekBzdXNjZXJ0ZS5nb2IudmWCAQowDgYDVR0PAQH/BAQD
-AgEGME0GA1UdEQRGMESCDnByb2NlcnQubmV0LnZloBUGBWCGXgIBoAwMClBTQy0w
-MDAwMDKgGwYFYIZeAgKgEgwQUklGLUotMzE2MzUzNzMtNzB2BgNVHR8EbzBtMEag
-RKBChkBodHRwOi8vd3d3LnN1c2NlcnRlLmdvYi52ZS9sY3IvQ0VSVElGSUNBRE8t
-UkFJWi1TSEEzODRDUkxERVIuY3JsMCOgIaAfhh1sZGFwOi8vYWNyYWl6LnN1c2Nl
-cnRlLmdvYi52ZTA3BggrBgEFBQcBAQQrMCkwJwYIKwYBBQUHMAGGG2h0dHA6Ly9v
-Y3NwLnN1c2NlcnRlLmdvYi52ZTBBBgNVHSAEOjA4MDYGBmCGXgMBAjAsMCoGCCsG
-AQUFBwIBFh5odHRwOi8vd3d3LnN1c2NlcnRlLmdvYi52ZS9kcGMwDQYJKoZIhvcN
-AQELBQADggIBACtZ6yKZu4SqT96QxtGGcSOeSwORR3C7wJJg7ODU523G0+1ng3dS
-1fLld6c2suNUvtm7CpsR72H0xpkzmfWvADmNg7+mvTV+LFwxNG9s2/NkAZiqlCxB
-3RWGymspThbASfzXg0gTB1GEMVKIu4YXx2sviiCtxQuPcD4quxtxj7mkoP3Yldmv
-Wb8lK5jpY5MvYB7Eqvh39YtsL+1+LrVPQA3uvFd359m21D+VJzog1eWuq2w1n8Gh
-HVnchIHuTQfiSLaeS5UtQbHh6N5+LwUeaO6/u5BlOsju6rEYNxxik6SgMexxbJHm
-pHmJWhSnFFAFTKQAVzAswbVhltw+HoSvOULP5dAssSS830DD7X9jSr3hTxJkhpXz
-sOfIt+FTvZLm8wyWuevo5pLtp4EJFAv8lXrPj9Y0TzYS3F7RNHXGRoAvlQSMx4bE
-qCaJqD8Zm4G7UaRKhqsLEQ+xrmNTbSjq3TNWOByyrYDT13K9mmyZY+gAu0F2Bbdb
-mRiKw7gSXFbPVgx96OLP7bx0R/vu0xdOIk9W/1DzLuY5poLWccret9W6aAjtmcz9
-opLLabid+Qqkpj5PkygqYWwHJgD/ll9ohri4zspV4KuxPX+Y1zMOWj3YeMLEYC/H
-YvBhkdI4sPaeVdtAgAUSM84dkpvRabP/v/GSCmE1P93+hvS84Bpxs2Km
------END CERTIFICATE-----
-
-# Issuer: CN=China Internet Network Information Center EV Certificates Root O=China Internet Network Information Center
-# Subject: CN=China Internet Network Information Center EV Certificates Root O=China Internet Network Information Center
-# Label: "China Internet Network Information Center EV Certificates Root"
-# Serial: 1218379777
-# MD5 Fingerprint: 55:5d:63:00:97:bd:6a:97:f5:67:ab:4b:fb:6e:63:15
-# SHA1 Fingerprint: 4f:99:aa:93:fb:2b:d1:37:26:a1:99:4a:ce:7f:f0:05:f2:93:5d:1e
-# SHA256 Fingerprint: 1c:01:c6:f4:db:b2:fe:fc:22:55:8b:2b:ca:32:56:3f:49:84:4a:cf:c3:2b:7b:e4:b0:ff:59:9f:9e:8c:7a:f7
------BEGIN CERTIFICATE-----
-MIID9zCCAt+gAwIBAgIESJ8AATANBgkqhkiG9w0BAQUFADCBijELMAkGA1UEBhMC
-Q04xMjAwBgNVBAoMKUNoaW5hIEludGVybmV0IE5ldHdvcmsgSW5mb3JtYXRpb24g
-Q2VudGVyMUcwRQYDVQQDDD5DaGluYSBJbnRlcm5ldCBOZXR3b3JrIEluZm9ybWF0
-aW9uIENlbnRlciBFViBDZXJ0aWZpY2F0ZXMgUm9vdDAeFw0xMDA4MzEwNzExMjVa
-Fw0zMDA4MzEwNzExMjVaMIGKMQswCQYDVQQGEwJDTjEyMDAGA1UECgwpQ2hpbmEg
-SW50ZXJuZXQgTmV0d29yayBJbmZvcm1hdGlvbiBDZW50ZXIxRzBFBgNVBAMMPkNo
-aW5hIEludGVybmV0IE5ldHdvcmsgSW5mb3JtYXRpb24gQ2VudGVyIEVWIENlcnRp
-ZmljYXRlcyBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm35z
-7r07eKpkQ0H1UN+U8i6yjUqORlTSIRLIOTJCBumD1Z9S7eVnAztUwYyZmczpwA//
-DdmEEbK40ctb3B75aDFk4Zv6dOtouSCV98YPjUesWgbdYavi7NifFy2cyjw1l1Vx
-zUOFsUcW9SxTgHbP0wBkvUCZ3czY28Sf1hNfQYOL+Q2HklY0bBoQCxfVWhyXWIQ8
-hBouXJE0bhlffxdpxWXvayHG1VA6v2G5BY3vbzQ6sm8UY78WO5upKv23KzhmBsUs
-4qpnHkWnjQRmQvaPK++IIGmPMowUc9orhpFjIpryp9vOiYurXccUwVswah+xt54u
-gQEC7c+WXmPbqOY4twIDAQABo2MwYTAfBgNVHSMEGDAWgBR8cks5x8DbYqVPm6oY
-NJKiyoOCWTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4E
-FgQUfHJLOcfA22KlT5uqGDSSosqDglkwDQYJKoZIhvcNAQEFBQADggEBACrDx0M3
-j92tpLIM7twUbY8opJhJywyA6vPtI2Z1fcXTIWd50XPFtQO3WKwMVC/GVhMPMdoG
-52U7HW8228gd+f2ABsqjPWYWqJ1MFn3AlUa1UeTiH9fqBk1jjZaM7+czV0I664zB
-echNdn3e9rG3geCg+aF4RhcaVpjwTj2rHO3sOdwHSPdj/gauwqRcalsyiMXHM4Ws
-ZkJHwlgkmeHlPuV1LI5D1l08eB6olYIpUNHRFrrvwb562bTYzB5MRuF3sTGrvSrI
-zo9uoV1/A3U05K2JRVRevq4opbs/eHnrc7MKDf2+yfdWrPa37S+bISnHOLaVxATy
-wy39FCqQmbkHzJ8=
------END CERTIFICATE-----
-
-# Issuer: CN=Swisscom Root CA 2 O=Swisscom OU=Digital Certificate Services
-# Subject: CN=Swisscom Root CA 2 O=Swisscom OU=Digital Certificate Services
-# Label: "Swisscom Root CA 2"
-# Serial: 40698052477090394928831521023204026294
-# MD5 Fingerprint: 5b:04:69:ec:a5:83:94:63:18:a7:86:d0:e4:f2:6e:19
-# SHA1 Fingerprint: 77:47:4f:c6:30:e4:0f:4c:47:64:3f:84:ba:b8:c6:95:4a:8a:41:ec
-# SHA256 Fingerprint: f0:9b:12:2c:71:14:f4:a0:9b:d4:ea:4f:4a:99:d5:58:b4:6e:4c:25:cd:81:14:0d:29:c0:56:13:91:4c:38:41
------BEGIN CERTIFICATE-----
-MIIF2TCCA8GgAwIBAgIQHp4o6Ejy5e/DfEoeWhhntjANBgkqhkiG9w0BAQsFADBk
-MQswCQYDVQQGEwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsTHERpZ2l0
-YWwgQ2VydGlmaWNhdGUgU2VydmljZXMxGzAZBgNVBAMTElN3aXNzY29tIFJvb3Qg
-Q0EgMjAeFw0xMTA2MjQwODM4MTRaFw0zMTA2MjUwNzM4MTRaMGQxCzAJBgNVBAYT
-AmNoMREwDwYDVQQKEwhTd2lzc2NvbTElMCMGA1UECxMcRGlnaXRhbCBDZXJ0aWZp
-Y2F0ZSBTZXJ2aWNlczEbMBkGA1UEAxMSU3dpc3Njb20gUm9vdCBDQSAyMIICIjAN
-BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAlUJOhJ1R5tMJ6HJaI2nbeHCOFvEr
-jw0DzpPMLgAIe6szjPTpQOYXTKueuEcUMncy3SgM3hhLX3af+Dk7/E6J2HzFZ++r
-0rk0X2s682Q2zsKwzxNoysjL67XiPS4h3+os1OD5cJZM/2pYmLcX5BtS5X4HAB1f
-2uY+lQS3aYg5oUFgJWFLlTloYhyxCwWJwDaCFCE/rtuh/bxvHGCGtlOUSbkrRsVP
-ACu/obvLP+DHVxxX6NZp+MEkUp2IVd3Chy50I9AU/SpHWrumnf2U5NGKpV+GY3aF
-y6//SSj8gO1MedK75MDvAe5QQQg1I3ArqRa0jG6F6bYRzzHdUyYb3y1aSgJA/MTA
-tukxGggo5WDDH8SQjhBiYEQN7Aq+VRhxLKX0srwVYv8c474d2h5Xszx+zYIdkeNL
-6yxSNLCK/RJOlrDrcH+eOfdmQrGrrFLadkBXeyq96G4DsguAhYidDMfCd7Camlf0
-uPoTXGiTOmekl9AbmbeGMktg2M7v0Ax/lZ9vh0+Hio5fCHyqW/xavqGRn1V9TrAL
-acywlKinh/LTSlDcX3KwFnUey7QYYpqwpzmqm59m2I2mbJYV4+by+PGDYmy7Velh
-k6M99bFXi08jsJvllGov34zflVEpYKELKeRcVVi3qPyZ7iVNTA6z00yPhOgpD/0Q
-VAKFyPnlw4vP5w8CAwEAAaOBhjCBgzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0hBBYw
-FDASBgdghXQBUwIBBgdghXQBUwIBMBIGA1UdEwEB/wQIMAYBAf8CAQcwHQYDVR0O
-BBYEFE0mICKJS9PVpAqhb97iEoHF8TwuMB8GA1UdIwQYMBaAFE0mICKJS9PVpAqh
-b97iEoHF8TwuMA0GCSqGSIb3DQEBCwUAA4ICAQAyCrKkG8t9voJXiblqf/P0wS4R
-fbgZPnm3qKhyN2abGu2sEzsOv2LwnN+ee6FTSA5BesogpxcbtnjsQJHzQq0Qw1zv
-/2BZf82Fo4s9SBwlAjxnffUy6S8w5X2lejjQ82YqZh6NM4OKb3xuqFp1mrjX2lhI
-REeoTPpMSQpKwhI3qEAMw8jh0FcNlzKVxzqfl9NX+Ave5XLzo9v/tdhZsnPdTSpx
-srpJ9csc1fV5yJmz/MFMdOO0vSk3FQQoHt5FRnDsr7p4DooqzgB53MBfGWcsa0vv
-aGgLQ+OswWIJ76bdZWGgr4RVSJFSHMYlkSrQwSIjYVmvRRGFHQEkNI/Ps/8XciAT
-woCqISxxOQ7Qj1zB09GOInJGTB2Wrk9xseEFKZZZ9LuedT3PDTcNYtsmjGOpI99n
-Bjx8Oto0QuFmtEYE3saWmA9LSHokMnWRn6z3aOkquVVlzl1h0ydw2Df+n7mvoC5W
-t6NlUe07qxS/TFED6F+KBZvuim6c779o+sjaC+NCydAXFJy3SuCvkychVSa1ZC+N
-8f+mQAWFBVzKBxlcCxMoTFh/wqXvRdpg065lYZ1Tg3TCrvJcwhbtkj6EPnNgiLx2
-9CzP0H1907he0ZESEOnN3col49XtmS++dYFLJPlFRpTJKSFTnCZFqhMX5OfNeOI5
-wSsSnqaeG8XmDtkx2Q==
------END CERTIFICATE-----
-
-# Issuer: CN=Swisscom Root EV CA 2 O=Swisscom OU=Digital Certificate Services
-# Subject: CN=Swisscom Root EV CA 2 O=Swisscom OU=Digital Certificate Services
-# Label: "Swisscom Root EV CA 2"
-# Serial: 322973295377129385374608406479535262296
-# MD5 Fingerprint: 7b:30:34:9f:dd:0a:4b:6b:35:ca:31:51:28:5d:ae:ec
-# SHA1 Fingerprint: e7:a1:90:29:d3:d5:52:dc:0d:0f:c6:92:d3:ea:88:0d:15:2e:1a:6b
-# SHA256 Fingerprint: d9:5f:ea:3c:a4:ee:dc:e7:4c:d7:6e:75:fc:6d:1f:f6:2c:44:1f:0f:a8:bc:77:f0:34:b1:9e:5d:b2:58:01:5d
------BEGIN CERTIFICATE-----
-MIIF4DCCA8igAwIBAgIRAPL6ZOJ0Y9ON/RAdBB92ylgwDQYJKoZIhvcNAQELBQAw
-ZzELMAkGA1UEBhMCY2gxETAPBgNVBAoTCFN3aXNzY29tMSUwIwYDVQQLExxEaWdp
-dGFsIENlcnRpZmljYXRlIFNlcnZpY2VzMR4wHAYDVQQDExVTd2lzc2NvbSBSb290
-IEVWIENBIDIwHhcNMTEwNjI0MDk0NTA4WhcNMzEwNjI1MDg0NTA4WjBnMQswCQYD
-VQQGEwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsTHERpZ2l0YWwgQ2Vy
-dGlmaWNhdGUgU2VydmljZXMxHjAcBgNVBAMTFVN3aXNzY29tIFJvb3QgRVYgQ0Eg
-MjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMT3HS9X6lds93BdY7Bx
-UglgRCgzo3pOCvrY6myLURYaVa5UJsTMRQdBTxB5f3HSek4/OE6zAMaVylvNwSqD
-1ycfMQ4jFrclyxy0uYAyXhqdk/HoPGAsp15XGVhRXrwsVgu42O+LgrQ8uMIkqBPH
-oCE2G3pXKSinLr9xJZDzRINpUKTk4RtiGZQJo/PDvO/0vezbE53PnUgJUmfANykR
-HvvSEaeFGHR55E+FFOtSN+KxRdjMDUN/rhPSays/p8LiqG12W0OfvrSdsyaGOx9/
-5fLoZigWJdBLlzin5M8J0TbDC77aO0RYjb7xnglrPvMyxyuHxuxenPaHZa0zKcQv
-idm5y8kDnftslFGXEBuGCxobP/YCfnvUxVFkKJ3106yDgYjTdLRZncHrYTNaRdHL
-OdAGalNgHa/2+2m8atwBz735j9m9W8E6X47aD0upm50qKGsaCnw8qyIL5XctcfaC
-NYGu+HuB5ur+rPQam3Rc6I8k9l2dRsQs0h4rIWqDJ2dVSqTjyDKXZpBy2uPUZC5f
-46Fq9mDU5zXNysRojddxyNMkM3OxbPlq4SjbX8Y96L5V5jcb7STZDxmPX2MYWFCB
-UWVv8p9+agTnNCRxunZLWB4ZvRVgRaoMEkABnRDixzgHcgplwLa7JSnaFp6LNYth
-7eVxV4O1PHGf40+/fh6Bn0GXAgMBAAGjgYYwgYMwDgYDVR0PAQH/BAQDAgGGMB0G
-A1UdIQQWMBQwEgYHYIV0AVMCAgYHYIV0AVMCAjASBgNVHRMBAf8ECDAGAQH/AgED
-MB0GA1UdDgQWBBRF2aWBbj2ITY1x0kbBbkUe88SAnTAfBgNVHSMEGDAWgBRF2aWB
-bj2ITY1x0kbBbkUe88SAnTANBgkqhkiG9w0BAQsFAAOCAgEAlDpzBp9SSzBc1P6x
-XCX5145v9Ydkn+0UjrgEjihLj6p7jjm02Vj2e6E1CqGdivdj5eu9OYLU43otb98T
-PLr+flaYC/NUn81ETm484T4VvwYmneTwkLbUwp4wLh/vx3rEUMfqe9pQy3omywC0
-Wqu1kx+AiYQElY2NfwmTv9SoqORjbdlk5LgpWgi/UOGED1V7XwgiG/W9mR4U9s70
-WBCCswo9GcG/W6uqmdjyMb3lOGbcWAXH7WMaLgqXfIeTK7KK4/HsGOV1timH59yL
-Gn602MnTihdsfSlEvoqq9X46Lmgxk7lq2prg2+kupYTNHAq4Sgj5nPFhJpiTt3tm
-7JFe3VE/23MPrQRYCd0EApUKPtN236YQHoA96M2kZNEzx5LH4k5E4wnJTsJdhw4S
-nr8PyQUQ3nqjsTzyP6WqJ3mtMX0f/fwZacXduT98zca0wjAefm6S139hdlqP65VN
-vBFuIXxZN5nQBrz5Bm0yFqXZaajh3DyAHmBR3NdUIR7KYndP+tiPsys6DXhyyWhB
-WkdKwqPrGtcKqzwyVcgKEZzfdNbwQBUdyLmPtTbFr/giuMod89a2GQ+fYWVq6nTI
-fI/DT11lgh/ZDYnadXL77/FHZxOzyNEZiCcmmpl5fx7kLD977vHeTYuWl8PVP3wb
-I+2ksx0WckNLIOFZfsLorSa/ovc=
------END CERTIFICATE-----
-
-# Issuer: CN=CA Disig Root R1 O=Disig a.s.
-# Subject: CN=CA Disig Root R1 O=Disig a.s.
-# Label: "CA Disig Root R1"
-# Serial: 14052245610670616104
-# MD5 Fingerprint: be:ec:11:93:9a:f5:69:21:bc:d7:c1:c0:67:89:cc:2a
-# SHA1 Fingerprint: 8e:1c:74:f8:a6:20:b9:e5:8a:f4:61:fa:ec:2b:47:56:51:1a:52:c6
-# SHA256 Fingerprint: f9:6f:23:f4:c3:e7:9c:07:7a:46:98:8d:5a:f5:90:06:76:a0:f0:39:cb:64:5d:d1:75:49:b2:16:c8:24:40:ce
------BEGIN CERTIFICATE-----
-MIIFaTCCA1GgAwIBAgIJAMMDmu5QkG4oMA0GCSqGSIb3DQEBBQUAMFIxCzAJBgNV
-BAYTAlNLMRMwEQYDVQQHEwpCcmF0aXNsYXZhMRMwEQYDVQQKEwpEaXNpZyBhLnMu
-MRkwFwYDVQQDExBDQSBEaXNpZyBSb290IFIxMB4XDTEyMDcxOTA5MDY1NloXDTQy
-MDcxOTA5MDY1NlowUjELMAkGA1UEBhMCU0sxEzARBgNVBAcTCkJyYXRpc2xhdmEx
-EzARBgNVBAoTCkRpc2lnIGEucy4xGTAXBgNVBAMTEENBIERpc2lnIFJvb3QgUjEw
-ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCqw3j33Jijp1pedxiy3QRk
-D2P9m5YJgNXoqqXinCaUOuiZc4yd39ffg/N4T0Dhf9Kn0uXKE5Pn7cZ3Xza1lK/o
-OI7bm+V8u8yN63Vz4STN5qctGS7Y1oprFOsIYgrY3LMATcMjfF9DCCMyEtztDK3A
-fQ+lekLZWnDZv6fXARz2m6uOt0qGeKAeVjGu74IKgEH3G8muqzIm1Cxr7X1r5OJe
-IgpFy4QxTaz+29FHuvlglzmxZcfe+5nkCiKxLU3lSCZpq+Kq8/v8kiky6bM+TR8n
-oc2OuRf7JT7JbvN32g0S9l3HuzYQ1VTW8+DiR0jm3hTaYVKvJrT1cU/J19IG32PK
-/yHoWQbgCNWEFVP3Q+V8xaCJmGtzxmjOZd69fwX3se72V6FglcXM6pM6vpmumwKj
-rckWtc7dXpl4fho5frLABaTAgqWjR56M6ly2vGfb5ipN0gTco65F97yLnByn1tUD
-3AjLLhbKXEAz6GfDLuemROoRRRw1ZS0eRWEkG4IupZ0zXWX4Qfkuy5Q/H6MMMSRE
-7cderVC6xkGbrPAXZcD4XW9boAo0PO7X6oifmPmvTiT6l7Jkdtqr9O3jw2Dv1fkC
-yC2fg69naQanMVXVz0tv/wQFx1isXxYb5dKj6zHbHzMVTdDypVP1y+E9Tmgt2BLd
-qvLmTZtJ5cUoobqwWsagtQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1Ud
-DwEB/wQEAwIBBjAdBgNVHQ4EFgQUiQq0OJMa5qvum5EY+fU8PjXQ04IwDQYJKoZI
-hvcNAQEFBQADggIBADKL9p1Kyb4U5YysOMo6CdQbzoaz3evUuii+Eq5FLAR0rBNR
-xVgYZk2C2tXck8An4b58n1KeElb21Zyp9HWc+jcSjxyT7Ff+Bw+r1RL3D65hXlaA
-SfX8MPWbTx9BLxyE04nH4toCdu0Jz2zBuByDHBb6lM19oMgY0sidbvW9adRtPTXo
-HqJPYNcHKfyyo6SdbhWSVhlMCrDpfNIZTUJG7L399ldb3Zh+pE3McgODWF3vkzpB
-emOqfDqo9ayk0d2iLbYq/J8BjuIQscTK5GfbVSUZP/3oNn6z4eGBrxEWi1CXYBmC
-AMBrTXO40RMHPuq2MU/wQppt4hF05ZSsjYSVPCGvxdpHyN85YmLLW1AL14FABZyb
-7bq2ix4Eb5YgOe2kfSnbSM6C3NQCjR0EMVrHS/BsYVLXtFHCgWzN4funodKSds+x
-DzdYpPJScWc/DIh4gInByLUfkmO+p3qKViwaqKactV2zY9ATIKHrkWzQjX2v3wvk
-F7mGnjixlAxYjOBVqjtjbZqJYLhkKpLGN/R+Q0O3c+gB53+XD9fyexn9GtePyfqF
-a3qdnom2piiZk4hA9z7NUaPK6u95RyG1/jLix8NRb76AdPCkwzryT+lf3xkK8jsT
-Q6wxpLPn6/wY1gGp8yqPNg7rtLG8t0zJa7+h89n07eLw4+1knj0vllJPgFOL
------END CERTIFICATE-----
-
-# Issuer: CN=CA Disig Root R2 O=Disig a.s.
-# Subject: CN=CA Disig Root R2 O=Disig a.s.
-# Label: "CA Disig Root R2"
-# Serial: 10572350602393338211
-# MD5 Fingerprint: 26:01:fb:d8:27:a7:17:9a:45:54:38:1a:43:01:3b:03
-# SHA1 Fingerprint: b5:61:eb:ea:a4:de:e4:25:4b:69:1a:98:a5:57:47:c2:34:c7:d9:71
-# SHA256 Fingerprint: e2:3d:4a:03:6d:7b:70:e9:f5:95:b1:42:20:79:d2:b9:1e:df:bb:1f:b6:51:a0:63:3e:aa:8a:9d:c5:f8:07:03
------BEGIN CERTIFICATE-----
-MIIFaTCCA1GgAwIBAgIJAJK4iNuwisFjMA0GCSqGSIb3DQEBCwUAMFIxCzAJBgNV
-BAYTAlNLMRMwEQYDVQQHEwpCcmF0aXNsYXZhMRMwEQYDVQQKEwpEaXNpZyBhLnMu
-MRkwFwYDVQQDExBDQSBEaXNpZyBSb290IFIyMB4XDTEyMDcxOTA5MTUzMFoXDTQy
-MDcxOTA5MTUzMFowUjELMAkGA1UEBhMCU0sxEzARBgNVBAcTCkJyYXRpc2xhdmEx
-EzARBgNVBAoTCkRpc2lnIGEucy4xGTAXBgNVBAMTEENBIERpc2lnIFJvb3QgUjIw
-ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCio8QACdaFXS1tFPbCw3Oe
-NcJxVX6B+6tGUODBfEl45qt5WDza/3wcn9iXAng+a0EE6UG9vgMsRfYvZNSrXaNH
-PWSb6WiaxswbP7q+sos0Ai6YVRn8jG+qX9pMzk0DIaPY0jSTVpbLTAwAFjxfGs3I
-x2ymrdMxp7zo5eFm1tL7A7RBZckQrg4FY8aAamkw/dLukO8NJ9+flXP04SXabBbe
-QTg06ov80egEFGEtQX6sx3dOy1FU+16SGBsEWmjGycT6txOgmLcRK7fWV8x8nhfR
-yyX+hk4kLlYMeE2eARKmK6cBZW58Yh2EhN/qwGu1pSqVg8NTEQxzHQuyRpDRQjrO
-QG6Vrf/GlK1ul4SOfW+eioANSW1z4nuSHsPzwfPrLgVv2RvPN3YEyLRa5Beny912
-H9AZdugsBbPWnDTYltxhh5EF5EQIM8HauQhl1K6yNg3ruji6DOWbnuuNZt2Zz9aJ
-QfYEkoopKW1rOhzndX0CcQ7zwOe9yxndnWCywmZgtrEE7snmhrmaZkCo5xHtgUUD
-i/ZnWejBBhG93c+AAk9lQHhcR1DIm+YfgXvkRKhbhZri3lrVx/k6RGZL5DJUfORs
-nLMOPReisjQS1n6yqEm70XooQL6iFh/f5DcfEXP7kAplQ6INfPgGAVUzfbANuPT1
-rqVCV3w2EYx7XsQDnYx5nQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1Ud
-DwEB/wQEAwIBBjAdBgNVHQ4EFgQUtZn4r7CU9eMg1gqtzk5WpC5uQu0wDQYJKoZI
-hvcNAQELBQADggIBACYGXnDnZTPIgm7ZnBc6G3pmsgH2eDtpXi/q/075KMOYKmFM
-tCQSin1tERT3nLXK5ryeJ45MGcipvXrA1zYObYVybqjGom32+nNjf7xueQgcnYqf
-GopTpti72TVVsRHFqQOzVju5hJMiXn7B9hJSi+osZ7z+Nkz1uM/Rs0mSO9MpDpkb
-lvdhuDvEK7Z4bLQjb/D907JedR+Zlais9trhxTF7+9FGs9K8Z7RiVLoJ92Owk6Ka
-+elSLotgEqv89WBW7xBci8QaQtyDW2QOy7W81k/BfDxujRNt+3vrMNDcTa/F1bal
-TFtxyegxvug4BkihGuLq0t4SOVga/4AOgnXmt8kHbA7v/zjxmHHEt38OFdAlab0i
-nSvtBfZGR6ztwPDUO+Ls7pZbkBNOHlY667DvlruWIxG68kOGdGSVyCh13x01utI3
-gzhTODY7z2zp+WsO0PsE6E9312UBeIYMej4hYvF/Y3EMyZ9E26gnonW+boE+18Dr
-G5gPcFw0sorMwIUY6256s/daoQe/qUKS82Ail+QUoQebTnbAjn39pCXHR+3/H3Os
-zMOl6W8KjptlwlCFtaOgUxLMVYdh84GuEEZhvUQhuMI9dM9+JDX6HAcOmz0iyu8x
-L4ysEr3vQCj8KWefshNPZiTEUxnpHikV7+ZtsH8tZ/3zbBt1RqPlShfppNcL
------END CERTIFICATE-----
-
-# Issuer: CN=ACCVRAIZ1 O=ACCV OU=PKIACCV
-# Subject: CN=ACCVRAIZ1 O=ACCV OU=PKIACCV
-# Label: "ACCVRAIZ1"
-# Serial: 6828503384748696800
-# MD5 Fingerprint: d0:a0:5a:ee:05:b6:09:94:21:a1:7d:f1:b2:29:82:02
-# SHA1 Fingerprint: 93:05:7a:88:15:c6:4f:ce:88:2f:fa:91:16:52:28:78:bc:53:64:17
-# SHA256 Fingerprint: 9a:6e:c0:12:e1:a7:da:9d:be:34:19:4d:47:8a:d7:c0:db:18:22:fb:07:1d:f1:29:81:49:6e:d1:04:38:41:13
------BEGIN CERTIFICATE-----
-MIIH0zCCBbugAwIBAgIIXsO3pkN/pOAwDQYJKoZIhvcNAQEFBQAwQjESMBAGA1UE
-AwwJQUNDVlJBSVoxMRAwDgYDVQQLDAdQS0lBQ0NWMQ0wCwYDVQQKDARBQ0NWMQsw
-CQYDVQQGEwJFUzAeFw0xMTA1MDUwOTM3MzdaFw0zMDEyMzEwOTM3MzdaMEIxEjAQ
-BgNVBAMMCUFDQ1ZSQUlaMTEQMA4GA1UECwwHUEtJQUNDVjENMAsGA1UECgwEQUND
-VjELMAkGA1UEBhMCRVMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCb
-qau/YUqXry+XZpp0X9DZlv3P4uRm7x8fRzPCRKPfmt4ftVTdFXxpNRFvu8gMjmoY
-HtiP2Ra8EEg2XPBjs5BaXCQ316PWywlxufEBcoSwfdtNgM3802/J+Nq2DoLSRYWo
-G2ioPej0RGy9ocLLA76MPhMAhN9KSMDjIgro6TenGEyxCQ0jVn8ETdkXhBilyNpA
-lHPrzg5XPAOBOp0KoVdDaaxXbXmQeOW1tDvYvEyNKKGno6e6Ak4l0Squ7a4DIrhr
-IA8wKFSVf+DuzgpmndFALW4ir50awQUZ0m/A8p/4e7MCQvtQqR0tkw8jq8bBD5L/
-0KIV9VMJcRz/RROE5iZe+OCIHAr8Fraocwa48GOEAqDGWuzndN9wrqODJerWx5eH
-k6fGioozl2A3ED6XPm4pFdahD9GILBKfb6qkxkLrQaLjlUPTAYVtjrs78yM2x/47
-4KElB0iryYl0/wiPgL/AlmXz7uxLaL2diMMxs0Dx6M/2OLuc5NF/1OVYm3z61PMO
-m3WR5LpSLhl+0fXNWhn8ugb2+1KoS5kE3fj5tItQo05iifCHJPqDQsGH+tUtKSpa
-cXpkatcnYGMN285J9Y0fkIkyF/hzQ7jSWpOGYdbhdQrqeWZ2iE9x6wQl1gpaepPl
-uUsXQA+xtrn13k/c4LOsOxFwYIRKQ26ZIMApcQrAZQIDAQABo4ICyzCCAscwfQYI
-KwYBBQUHAQEEcTBvMEwGCCsGAQUFBzAChkBodHRwOi8vd3d3LmFjY3YuZXMvZmls
-ZWFkbWluL0FyY2hpdm9zL2NlcnRpZmljYWRvcy9yYWl6YWNjdjEuY3J0MB8GCCsG
-AQUFBzABhhNodHRwOi8vb2NzcC5hY2N2LmVzMB0GA1UdDgQWBBTSh7Tj3zcnk1X2
-VuqB5TbMjB4/vTAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFNKHtOPfNyeT
-VfZW6oHlNsyMHj+9MIIBcwYDVR0gBIIBajCCAWYwggFiBgRVHSAAMIIBWDCCASIG
-CCsGAQUFBwICMIIBFB6CARAAQQB1AHQAbwByAGkAZABhAGQAIABkAGUAIABDAGUA
-cgB0AGkAZgBpAGMAYQBjAGkA8wBuACAAUgBhAO0AegAgAGQAZQAgAGwAYQAgAEEA
-QwBDAFYAIAAoAEEAZwBlAG4AYwBpAGEAIABkAGUAIABUAGUAYwBuAG8AbABvAGcA
-7QBhACAAeQAgAEMAZQByAHQAaQBmAGkAYwBhAGMAaQDzAG4AIABFAGwAZQBjAHQA
-cgDzAG4AaQBjAGEALAAgAEMASQBGACAAUQA0ADYAMAAxADEANQA2AEUAKQAuACAA
-QwBQAFMAIABlAG4AIABoAHQAdABwADoALwAvAHcAdwB3AC4AYQBjAGMAdgAuAGUA
-czAwBggrBgEFBQcCARYkaHR0cDovL3d3dy5hY2N2LmVzL2xlZ2lzbGFjaW9uX2Mu
-aHRtMFUGA1UdHwROMEwwSqBIoEaGRGh0dHA6Ly93d3cuYWNjdi5lcy9maWxlYWRt
-aW4vQXJjaGl2b3MvY2VydGlmaWNhZG9zL3JhaXphY2N2MV9kZXIuY3JsMA4GA1Ud
-DwEB/wQEAwIBBjAXBgNVHREEEDAOgQxhY2N2QGFjY3YuZXMwDQYJKoZIhvcNAQEF
-BQADggIBAJcxAp/n/UNnSEQU5CmH7UwoZtCPNdpNYbdKl02125DgBS4OxnnQ8pdp
-D70ER9m+27Up2pvZrqmZ1dM8MJP1jaGo/AaNRPTKFpV8M9xii6g3+CfYCS0b78gU
-JyCpZET/LtZ1qmxNYEAZSUNUY9rizLpm5U9EelvZaoErQNV/+QEnWCzI7UiRfD+m
-AM/EKXMRNt6GGT6d7hmKG9Ww7Y49nCrADdg9ZuM8Db3VlFzi4qc1GwQA9j9ajepD
-vV+JHanBsMyZ4k0ACtrJJ1vnE5Bc5PUzolVt3OAJTS+xJlsndQAJxGJ3KQhfnlms
-tn6tn1QwIgPBHnFk/vk4CpYY3QIUrCPLBhwepH2NDd4nQeit2hW3sCPdK6jT2iWH
-7ehVRE2I9DZ+hJp4rPcOVkkO1jMl1oRQQmwgEh0q1b688nCBpHBgvgW1m54ERL5h
-I6zppSSMEYCUWqKiuUnSwdzRp+0xESyeGabu4VXhwOrPDYTkF7eifKXeVSUG7szA
-h1xA2syVP1XgNce4hL60Xc16gwFy7ofmXx2utYXGJt/mwZrpHgJHnyqobalbz+xF
-d3+YJ5oyXSrjhO7FmGYvliAd3djDJ9ew+f7Zfc3Qn48LFFhRny+Lwzgt3uiP1o2H
-pPVWQxaZLPSkVrQ0uGE3ycJYgBugl6H8WY3pEfbRD0tVNEYqi4Y7
------END CERTIFICATE-----
-
-# Issuer: CN=TWCA Global Root CA O=TAIWAN-CA OU=Root CA
-# Subject: CN=TWCA Global Root CA O=TAIWAN-CA OU=Root CA
-# Label: "TWCA Global Root CA"
-# Serial: 3262
-# MD5 Fingerprint: f9:03:7e:cf:e6:9e:3c:73:7a:2a:90:07:69:ff:2b:96
-# SHA1 Fingerprint: 9c:bb:48:53:f6:a4:f6:d3:52:a4:e8:32:52:55:60:13:f5:ad:af:65
-# SHA256 Fingerprint: 59:76:90:07:f7:68:5d:0f:cd:50:87:2f:9f:95:d5:75:5a:5b:2b:45:7d:81:f3:69:2b:61:0a:98:67:2f:0e:1b
------BEGIN CERTIFICATE-----
-MIIFQTCCAymgAwIBAgICDL4wDQYJKoZIhvcNAQELBQAwUTELMAkGA1UEBhMCVFcx
-EjAQBgNVBAoTCVRBSVdBTi1DQTEQMA4GA1UECxMHUm9vdCBDQTEcMBoGA1UEAxMT
-VFdDQSBHbG9iYWwgUm9vdCBDQTAeFw0xMjA2MjcwNjI4MzNaFw0zMDEyMzExNTU5
-NTlaMFExCzAJBgNVBAYTAlRXMRIwEAYDVQQKEwlUQUlXQU4tQ0ExEDAOBgNVBAsT
-B1Jvb3QgQ0ExHDAaBgNVBAMTE1RXQ0EgR2xvYmFsIFJvb3QgQ0EwggIiMA0GCSqG
-SIb3DQEBAQUAA4ICDwAwggIKAoICAQCwBdvI64zEbooh745NnHEKH1Jw7W2CnJfF
-10xORUnLQEK1EjRsGcJ0pDFfhQKX7EMzClPSnIyOt7h52yvVavKOZsTuKwEHktSz
-0ALfUPZVr2YOy+BHYC8rMjk1Ujoog/h7FsYYuGLWRyWRzvAZEk2tY/XTP3VfKfCh
-MBwqoJimFb3u/Rk28OKRQ4/6ytYQJ0lM793B8YVwm8rqqFpD/G2Gb3PpN0Wp8DbH
-zIh1HrtsBv+baz4X7GGqcXzGHaL3SekVtTzWoWH1EfcFbx39Eb7QMAfCKbAJTibc
-46KokWofwpFFiFzlmLhxpRUZyXx1EcxwdE8tmx2RRP1WKKD+u4ZqyPpcC1jcxkt2
-yKsi2XMPpfRaAok/T54igu6idFMqPVMnaR1sjjIsZAAmY2E2TqNGtz99sy2sbZCi
-laLOz9qC5wc0GZbpuCGqKX6mOL6OKUohZnkfs8O1CWfe1tQHRvMq2uYiN2DLgbYP
-oA/pyJV/v1WRBXrPPRXAb94JlAGD1zQbzECl8LibZ9WYkTunhHiVJqRaCPgrdLQA
-BDzfuBSO6N+pjWxnkjMdwLfS7JLIvgm/LCkFbwJrnu+8vyq8W8BQj0FwcYeyTbcE
-qYSjMq+u7msXi7Kx/mzhkIyIqJdIzshNy/MGz19qCkKxHh53L46g5pIOBvwFItIm
-4TFRfTLcDwIDAQABoyMwITAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB
-/zANBgkqhkiG9w0BAQsFAAOCAgEAXzSBdu+WHdXltdkCY4QWwa6gcFGn90xHNcgL
-1yg9iXHZqjNB6hQbbCEAwGxCGX6faVsgQt+i0trEfJdLjbDorMjupWkEmQqSpqsn
-LhpNgb+E1HAerUf+/UqdM+DyucRFCCEK2mlpc3INvjT+lIutwx4116KD7+U4x6WF
-H6vPNOw/KP4M8VeGTslV9xzU2KV9Bnpv1d8Q34FOIWWxtuEXeZVFBs5fzNxGiWNo
-RI2T9GRwoD2dKAXDOXC4Ynsg/eTb6QihuJ49CcdP+yz4k3ZB3lLg4VfSnQO8d57+
-nile98FRYB/e2guyLXW3Q0iT5/Z5xoRdgFlglPx4mI88k1HtQJAH32RjJMtOcQWh
-15QaiDLxInQirqWm2BJpTGCjAu4r7NRjkgtevi92a6O2JryPA9gK8kxkRr05YuWW
-6zRjESjMlfGt7+/cgFhI6Uu46mWs6fyAtbXIRfmswZ/ZuepiiI7E8UuDEq3mi4TW
-nsLrgxifarsbJGAzcMzs9zLzXNl5fe+epP7JI8Mk7hWSsT2RTyaGvWZzJBPqpK5j
-wa19hAM8EHiGG3njxPPyBJUgriOCxLM6AGK/5jYk4Ve6xx6QddVfP5VhK8E7zeWz
-aGHQRiapIVJpLesux+t3zqY6tQMzT3bR51xUAV3LePTJDL/PEo4XLSNolOer/qmy
-KwbQBM0=
------END CERTIFICATE-----
diff --git a/script/_Lib/requests/certs.py b/script/_Lib/requests/certs.py
deleted file mode 100644
index 07e6475..0000000
--- a/script/_Lib/requests/certs.py
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-"""
-certs.py
-~~~~~~~~
-
-This module returns the preferred default CA certificate bundle.
-
-If you are packaging Requests, e.g., for a Linux distribution or a managed
-environment, you can change the definition of where() to return a separately
-packaged CA bundle.
-"""
-import os.path
-
-try:
- from certifi import where
-except ImportError:
- def where():
- """Return the preferred certificate bundle."""
- # vendored bundle inside Requests
- return os.path.join(os.path.dirname(__file__), 'cacert.pem')
-
-if __name__ == '__main__':
- print(where())
diff --git a/script/_Lib/requests/compat.py b/script/_Lib/requests/compat.py
deleted file mode 100644
index be5a1ed..0000000
--- a/script/_Lib/requests/compat.py
+++ /dev/null
@@ -1,115 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-pythoncompat
-"""
-
-from .packages import chardet
-
-import sys
-
-# -------
-# Pythons
-# -------
-
-# Syntax sugar.
-_ver = sys.version_info
-
-#: Python 2.x?
-is_py2 = (_ver[0] == 2)
-
-#: Python 3.x?
-is_py3 = (_ver[0] == 3)
-
-#: Python 3.0.x
-is_py30 = (is_py3 and _ver[1] == 0)
-
-#: Python 3.1.x
-is_py31 = (is_py3 and _ver[1] == 1)
-
-#: Python 3.2.x
-is_py32 = (is_py3 and _ver[1] == 2)
-
-#: Python 3.3.x
-is_py33 = (is_py3 and _ver[1] == 3)
-
-#: Python 3.4.x
-is_py34 = (is_py3 and _ver[1] == 4)
-
-#: Python 2.7.x
-is_py27 = (is_py2 and _ver[1] == 7)
-
-#: Python 2.6.x
-is_py26 = (is_py2 and _ver[1] == 6)
-
-#: Python 2.5.x
-is_py25 = (is_py2 and _ver[1] == 5)
-
-#: Python 2.4.x
-is_py24 = (is_py2 and _ver[1] == 4) # I'm assuming this is not by choice.
-
-
-# ---------
-# Platforms
-# ---------
-
-
-# Syntax sugar.
-_ver = sys.version.lower()
-
-is_pypy = ('pypy' in _ver)
-is_jython = ('jython' in _ver)
-is_ironpython = ('iron' in _ver)
-
-# Assume CPython, if nothing else.
-is_cpython = not any((is_pypy, is_jython, is_ironpython))
-
-# Windows-based system.
-is_windows = 'win32' in str(sys.platform).lower()
-
-# Standard Linux 2+ system.
-is_linux = ('linux' in str(sys.platform).lower())
-is_osx = ('darwin' in str(sys.platform).lower())
-is_hpux = ('hpux' in str(sys.platform).lower()) # Complete guess.
-is_solaris = ('solar==' in str(sys.platform).lower()) # Complete guess.
-
-try:
- import simplejson as json
-except (ImportError, SyntaxError):
- # simplejson does not support Python 3.2, it thows a SyntaxError
- # because of u'...' Unicode literals.
- import json
-
-# ---------
-# Specifics
-# ---------
-
-if is_py2:
- from urllib import quote, unquote, quote_plus, unquote_plus, urlencode, getproxies, proxy_bypass
- from urlparse import urlparse, urlunparse, urljoin, urlsplit, urldefrag
- from urllib2 import parse_http_list
- import cookielib
- from Cookie import Morsel
- from StringIO import StringIO
- from .packages.urllib3.packages.ordered_dict import OrderedDict
-
- builtin_str = str
- bytes = str
- str = unicode
- basestring = basestring
- numeric_types = (int, long, float)
-
-
-elif is_py3:
- from urllib.parse import urlparse, urlunparse, urljoin, urlsplit, urlencode, quote, unquote, quote_plus, unquote_plus, urldefrag
- from urllib.request import parse_http_list, getproxies, proxy_bypass
- from http import cookiejar as cookielib
- from http.cookies import Morsel
- from io import StringIO
- from collections import OrderedDict
-
- builtin_str = str
- str = str
- bytes = bytes
- basestring = (str, bytes)
- numeric_types = (int, float)
diff --git a/script/_Lib/requests/cookies.py b/script/_Lib/requests/cookies.py
deleted file mode 100644
index 831c49c..0000000
--- a/script/_Lib/requests/cookies.py
+++ /dev/null
@@ -1,454 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-Compatibility code to be able to use `cookielib.CookieJar` with requests.
-
-requests.utils imports from here, so be careful with imports.
-"""
-
-import time
-import collections
-from .compat import cookielib, urlparse, urlunparse, Morsel
-
-try:
- import threading
- # grr, pyflakes: this fixes "redefinition of unused 'threading'"
- threading
-except ImportError:
- import dummy_threading as threading
-
-
-class MockRequest(object):
- """Wraps a `requests.Request` to mimic a `urllib2.Request`.
-
- The code in `cookielib.CookieJar` expects this interface in order to correctly
- manage cookie policies, i.e., determine whether a cookie can be set, given the
- domains of the request and the cookie.
-
- The original request object is read-only. The client is responsible for collecting
- the new headers via `get_new_headers()` and interpreting them appropriately. You
- probably want `get_cookie_header`, defined below.
- """
-
- def __init__(self, request):
- self._r = request
- self._new_headers = {}
- self.type = urlparse(self._r.url).scheme
-
- def get_type(self):
- return self.type
-
- def get_host(self):
- return urlparse(self._r.url).netloc
-
- def get_origin_req_host(self):
- return self.get_host()
-
- def get_full_url(self):
- # Only return the response's URL if the user hadn't set the Host
- # header
- if not self._r.headers.get('Host'):
- return self._r.url
- # If they did set it, retrieve it and reconstruct the expected domain
- host = self._r.headers['Host']
- parsed = urlparse(self._r.url)
- # Reconstruct the URL as we expect it
- return urlunparse([
- parsed.scheme, host, parsed.path, parsed.params, parsed.query,
- parsed.fragment
- ])
-
- def is_unverifiable(self):
- return True
-
- def has_header(self, name):
- return name in self._r.headers or name in self._new_headers
-
- def get_header(self, name, default=None):
- return self._r.headers.get(name, self._new_headers.get(name, default))
-
- def add_header(self, key, val):
- """cookielib has no legitimate use for this method; add it back if you find one."""
- raise NotImplementedError("Cookie headers should be added with add_unredirected_header()")
-
- def add_unredirected_header(self, name, value):
- self._new_headers[name] = value
-
- def get_new_headers(self):
- return self._new_headers
-
- @property
- def unverifiable(self):
- return self.is_unverifiable()
-
- @property
- def origin_req_host(self):
- return self.get_origin_req_host()
-
- @property
- def host(self):
- return self.get_host()
-
-
-class MockResponse(object):
- """Wraps a `httplib.HTTPMessage` to mimic a `urllib.addinfourl`.
-
- ...what? Basically, expose the parsed HTTP headers from the server response
- the way `cookielib` expects to see them.
- """
-
- def __init__(self, headers):
- """Make a MockResponse for `cookielib` to read.
-
- :param headers: a httplib.HTTPMessage or analogous carrying the headers
- """
- self._headers = headers
-
- def info(self):
- return self._headers
-
- def getheaders(self, name):
- self._headers.getheaders(name)
-
-
-def extract_cookies_to_jar(jar, request, response):
- """Extract the cookies from the response into a CookieJar.
-
- :param jar: cookielib.CookieJar (not necessarily a RequestsCookieJar)
- :param request: our own requests.Request object
- :param response: urllib3.HTTPResponse object
- """
- if not (hasattr(response, '_original_response') and
- response._original_response):
- return
- # the _original_response field is the wrapped httplib.HTTPResponse object,
- req = MockRequest(request)
- # pull out the HTTPMessage with the headers and put it in the mock:
- res = MockResponse(response._original_response.msg)
- jar.extract_cookies(res, req)
-
-
-def get_cookie_header(jar, request):
- """Produce an appropriate Cookie header string to be sent with `request`, or None."""
- r = MockRequest(request)
- jar.add_cookie_header(r)
- return r.get_new_headers().get('Cookie')
-
-
-def remove_cookie_by_name(cookiejar, name, domain=None, path=None):
- """Unsets a cookie by name, by default over all domains and paths.
-
- Wraps CookieJar.clear(), is O(n).
- """
- clearables = []
- for cookie in cookiejar:
- if cookie.name == name:
- if domain is None or domain == cookie.domain:
- if path is None or path == cookie.path:
- clearables.append((cookie.domain, cookie.path, cookie.name))
-
- for domain, path, name in clearables:
- cookiejar.clear(domain, path, name)
-
-
-class CookieConflictError(RuntimeError):
- """There are two cookies that meet the criteria specified in the cookie jar.
- Use .get and .set and include domain and path args in order to be more specific."""
-
-
-class RequestsCookieJar(cookielib.CookieJar, collections.MutableMapping):
- """Compatibility class; is a cookielib.CookieJar, but exposes a dict interface.
-
- This is the CookieJar we create by default for requests and sessions that
- don't specify one, since some clients may expect response.cookies and
- session.cookies to support dict operations.
-
- Don't use the dict interface internally; it's just for compatibility with
- with external client code. All `requests` code should work out of the box
- with externally provided instances of CookieJar, e.g., LWPCookieJar and
- FileCookieJar.
-
- Caution: dictionary operations that are normally O(1) may be O(n).
-
- Unlike a regular CookieJar, this class is pickleable.
- """
-
- def get(self, name, default=None, domain=None, path=None):
- """Dict-like get() that also supports optional domain and path args in
- order to resolve naming collisions from using one cookie jar over
- multiple domains. Caution: operation is O(n), not O(1)."""
- try:
- return self._find_no_duplicates(name, domain, path)
- except KeyError:
- return default
-
- def set(self, name, value, **kwargs):
- """Dict-like set() that also supports optional domain and path args in
- order to resolve naming collisions from using one cookie jar over
- multiple domains."""
- # support client code that unsets cookies by assignment of a None value:
- if value is None:
- remove_cookie_by_name(self, name, domain=kwargs.get('domain'), path=kwargs.get('path'))
- return
-
- if isinstance(value, Morsel):
- c = morsel_to_cookie(value)
- else:
- c = create_cookie(name, value, **kwargs)
- self.set_cookie(c)
- return c
-
- def iterkeys(self):
- """Dict-like iterkeys() that returns an iterator of names of cookies from the jar.
- See itervalues() and iteritems()."""
- for cookie in iter(self):
- yield cookie.name
-
- def keys(self):
- """Dict-like keys() that returns a list of names of cookies from the jar.
- See values() and items()."""
- return list(self.iterkeys())
-
- def itervalues(self):
- """Dict-like itervalues() that returns an iterator of values of cookies from the jar.
- See iterkeys() and iteritems()."""
- for cookie in iter(self):
- yield cookie.value
-
- def values(self):
- """Dict-like values() that returns a list of values of cookies from the jar.
- See keys() and items()."""
- return list(self.itervalues())
-
- def iteritems(self):
- """Dict-like iteritems() that returns an iterator of name-value tuples from the jar.
- See iterkeys() and itervalues()."""
- for cookie in iter(self):
- yield cookie.name, cookie.value
-
- def items(self):
- """Dict-like items() that returns a list of name-value tuples from the jar.
- See keys() and values(). Allows client-code to call "dict(RequestsCookieJar)
- and get a vanilla python dict of key value pairs."""
- return list(self.iteritems())
-
- def list_domains(self):
- """Utility method to list all the domains in the jar."""
- domains = []
- for cookie in iter(self):
- if cookie.domain not in domains:
- domains.append(cookie.domain)
- return domains
-
- def list_paths(self):
- """Utility method to list all the paths in the jar."""
- paths = []
- for cookie in iter(self):
- if cookie.path not in paths:
- paths.append(cookie.path)
- return paths
-
- def multiple_domains(self):
- """Returns True if there are multiple domains in the jar.
- Returns False otherwise."""
- domains = []
- for cookie in iter(self):
- if cookie.domain is not None and cookie.domain in domains:
- return True
- domains.append(cookie.domain)
- return False # there is only one domain in jar
-
- def get_dict(self, domain=None, path=None):
- """Takes as an argument an optional domain and path and returns a plain old
- Python dict of name-value pairs of cookies that meet the requirements."""
- dictionary = {}
- for cookie in iter(self):
- if (domain is None or cookie.domain == domain) and (path is None
- or cookie.path == path):
- dictionary[cookie.name] = cookie.value
- return dictionary
-
- def __getitem__(self, name):
- """Dict-like __getitem__() for compatibility with client code. Throws exception
- if there are more than one cookie with name. In that case, use the more
- explicit get() method instead. Caution: operation is O(n), not O(1)."""
-
- return self._find_no_duplicates(name)
-
- def __setitem__(self, name, value):
- """Dict-like __setitem__ for compatibility with client code. Throws exception
- if there is already a cookie of that name in the jar. In that case, use the more
- explicit set() method instead."""
-
- self.set(name, value)
-
- def __delitem__(self, name):
- """Deletes a cookie given a name. Wraps cookielib.CookieJar's remove_cookie_by_name()."""
- remove_cookie_by_name(self, name)
-
- def set_cookie(self, cookie, *args, **kwargs):
- if hasattr(cookie.value, 'startswith') and cookie.value.startswith('"') and cookie.value.endswith('"'):
- cookie.value = cookie.value.replace('\\"', '')
- return super(RequestsCookieJar, self).set_cookie(cookie, *args, **kwargs)
-
- def update(self, other):
- """Updates this jar with cookies from another CookieJar or dict-like"""
- if isinstance(other, cookielib.CookieJar):
- for cookie in other:
- self.set_cookie(cookie)
- else:
- super(RequestsCookieJar, self).update(other)
-
- def _find(self, name, domain=None, path=None):
- """Requests uses this method internally to get cookie values. Takes as args name
- and optional domain and path. Returns a cookie.value. If there are conflicting cookies,
- _find arbitrarily chooses one. See _find_no_duplicates if you want an exception thrown
- if there are conflicting cookies."""
- for cookie in iter(self):
- if cookie.name == name:
- if domain is None or cookie.domain == domain:
- if path is None or cookie.path == path:
- return cookie.value
-
- raise KeyError('name=%r, domain=%r, path=%r' % (name, domain, path))
-
- def _find_no_duplicates(self, name, domain=None, path=None):
- """__get_item__ and get call _find_no_duplicates -- never used in Requests internally.
- Takes as args name and optional domain and path. Returns a cookie.value.
- Throws KeyError if cookie is not found and CookieConflictError if there are
- multiple cookies that match name and optionally domain and path."""
- toReturn = None
- for cookie in iter(self):
- if cookie.name == name:
- if domain is None or cookie.domain == domain:
- if path is None or cookie.path == path:
- if toReturn is not None: # if there are multiple cookies that meet passed in criteria
- raise CookieConflictError('There are multiple cookies with name, %r' % (name))
- toReturn = cookie.value # we will eventually return this as long as no cookie conflict
-
- if toReturn:
- return toReturn
- raise KeyError('name=%r, domain=%r, path=%r' % (name, domain, path))
-
- def __getstate__(self):
- """Unlike a normal CookieJar, this class is pickleable."""
- state = self.__dict__.copy()
- # remove the unpickleable RLock object
- state.pop('_cookies_lock')
- return state
-
- def __setstate__(self, state):
- """Unlike a normal CookieJar, this class is pickleable."""
- self.__dict__.update(state)
- if '_cookies_lock' not in self.__dict__:
- self._cookies_lock = threading.RLock()
-
- def copy(self):
- """Return a copy of this RequestsCookieJar."""
- new_cj = RequestsCookieJar()
- new_cj.update(self)
- return new_cj
-
-
-def create_cookie(name, value, **kwargs):
- """Make a cookie from underspecified parameters.
-
- By default, the pair of `name` and `value` will be set for the domain ''
- and sent on every request (this is sometimes called a "supercookie").
- """
- result = dict(
- version=0,
- name=name,
- value=value,
- port=None,
- domain='',
- path='/',
- secure=False,
- expires=None,
- discard=True,
- comment=None,
- comment_url=None,
- rest={'HttpOnly': None},
- rfc2109=False,)
-
- badargs = set(kwargs) - set(result)
- if badargs:
- err = 'create_cookie() got unexpected keyword arguments: %s'
- raise TypeError(err % list(badargs))
-
- result.update(kwargs)
- result['port_specified'] = bool(result['port'])
- result['domain_specified'] = bool(result['domain'])
- result['domain_initial_dot'] = result['domain'].startswith('.')
- result['path_specified'] = bool(result['path'])
-
- return cookielib.Cookie(**result)
-
-
-def morsel_to_cookie(morsel):
- """Convert a Morsel object into a Cookie containing the one k/v pair."""
-
- expires = None
- if morsel['max-age']:
- expires = time.time() + morsel['max-age']
- elif morsel['expires']:
- time_template = '%a, %d-%b-%Y %H:%M:%S GMT'
- expires = time.mktime(
- time.strptime(morsel['expires'], time_template)) - time.timezone
- return create_cookie(
- comment=morsel['comment'],
- comment_url=bool(morsel['comment']),
- discard=False,
- domain=morsel['domain'],
- expires=expires,
- name=morsel.key,
- path=morsel['path'],
- port=None,
- rest={'HttpOnly': morsel['httponly']},
- rfc2109=False,
- secure=bool(morsel['secure']),
- value=morsel.value,
- version=morsel['version'] or 0,
- )
-
-
-def cookiejar_from_dict(cookie_dict, cookiejar=None, overwrite=True):
- """Returns a CookieJar from a key/value dictionary.
-
- :param cookie_dict: Dict of key/values to insert into CookieJar.
- :param cookiejar: (optional) A cookiejar to add the cookies to.
- :param overwrite: (optional) If False, will not replace cookies
- already in the jar with new ones.
- """
- if cookiejar is None:
- cookiejar = RequestsCookieJar()
-
- if cookie_dict is not None:
- names_from_jar = [cookie.name for cookie in cookiejar]
- for name in cookie_dict:
- if overwrite or (name not in names_from_jar):
- cookiejar.set_cookie(create_cookie(name, cookie_dict[name]))
-
- return cookiejar
-
-
-def merge_cookies(cookiejar, cookies):
- """Add cookies to cookiejar and returns a merged CookieJar.
-
- :param cookiejar: CookieJar object to add the cookies to.
- :param cookies: Dictionary or CookieJar object to be added.
- """
- if not isinstance(cookiejar, cookielib.CookieJar):
- raise ValueError('You can only merge into CookieJar')
-
- if isinstance(cookies, dict):
- cookiejar = cookiejar_from_dict(
- cookies, cookiejar=cookiejar, overwrite=False)
- elif isinstance(cookies, cookielib.CookieJar):
- try:
- cookiejar.update(cookies)
- except AttributeError:
- for cookie_in_jar in cookies:
- cookiejar.set_cookie(cookie_in_jar)
-
- return cookiejar
diff --git a/script/_Lib/requests/exceptions.py b/script/_Lib/requests/exceptions.py
deleted file mode 100644
index 34c7a0d..0000000
--- a/script/_Lib/requests/exceptions.py
+++ /dev/null
@@ -1,94 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-requests.exceptions
-~~~~~~~~~~~~~~~~~~~
-
-This module contains the set of Requests' exceptions.
-
-"""
-from .packages.urllib3.exceptions import HTTPError as BaseHTTPError
-
-
-class RequestException(IOError):
- """There was an ambiguous exception that occurred while handling your
- request."""
-
- def __init__(self, *args, **kwargs):
- """
- Initialize RequestException with `request` and `response` objects.
- """
- response = kwargs.pop('response', None)
- self.response = response
- self.request = kwargs.pop('request', None)
- if (response is not None and not self.request and
- hasattr(response, 'request')):
- self.request = self.response.request
- super(RequestException, self).__init__(*args, **kwargs)
-
-
-class HTTPError(RequestException):
- """An HTTP error occurred."""
-
-
-class ConnectionError(RequestException):
- """A Connection error occurred."""
-
-
-class ProxyError(ConnectionError):
- """A proxy error occurred."""
-
-
-class SSLError(ConnectionError):
- """An SSL error occurred."""
-
-
-class Timeout(RequestException):
- """The request timed out.
-
- Catching this error will catch both
- :exc:`~requests.exceptions.ConnectTimeout` and
- :exc:`~requests.exceptions.ReadTimeout` errors.
- """
-
-
-class ConnectTimeout(ConnectionError, Timeout):
- """The request timed out while trying to connect to the remote server.
-
- Requests that produced this error are safe to retry.
- """
-
-
-class ReadTimeout(Timeout):
- """The server did not send any data in the allotted amount of time."""
-
-
-class URLRequired(RequestException):
- """A valid URL is required to make a request."""
-
-
-class TooManyRedirects(RequestException):
- """Too many redirects."""
-
-
-class MissingSchema(RequestException, ValueError):
- """The URL schema (e.g. http or https) is missing."""
-
-
-class InvalidSchema(RequestException, ValueError):
- """See defaults.py for valid schemas."""
-
-
-class InvalidURL(RequestException, ValueError):
- """ The URL provided was somehow invalid. """
-
-
-class ChunkedEncodingError(RequestException):
- """The server declared chunked encoding but sent an invalid chunk."""
-
-
-class ContentDecodingError(RequestException, BaseHTTPError):
- """Failed to decode response content"""
-
-class StreamConsumedError(RequestException, TypeError):
- """The content for this response was already consumed"""
diff --git a/script/_Lib/requests/hooks.py b/script/_Lib/requests/hooks.py
deleted file mode 100644
index 5dfaf6b..0000000
--- a/script/_Lib/requests/hooks.py
+++ /dev/null
@@ -1,45 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-requests.hooks
-~~~~~~~~~~~~~~
-
-This module provides the capabilities for the Requests hooks system.
-
-Available hooks:
-
-``response``:
- The response generated from a Request.
-
-"""
-
-
-HOOKS = ['response']
-
-
-def default_hooks():
- hooks = {}
- for event in HOOKS:
- hooks[event] = []
- return hooks
-
-# TODO: response is the only one
-
-
-def dispatch_hook(key, hooks, hook_data, **kwargs):
- """Dispatches a hook dictionary on a given piece of data."""
-
- hooks = hooks or dict()
-
- if key in hooks:
- hooks = hooks.get(key)
-
- if hasattr(hooks, '__call__'):
- hooks = [hooks]
-
- for hook in hooks:
- _hook_data = hook(hook_data, **kwargs)
- if _hook_data is not None:
- hook_data = _hook_data
-
- return hook_data
diff --git a/script/_Lib/requests/models.py b/script/_Lib/requests/models.py
deleted file mode 100644
index 17e5598..0000000
--- a/script/_Lib/requests/models.py
+++ /dev/null
@@ -1,833 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-requests.models
-~~~~~~~~~~~~~~~
-
-This module contains the primary objects that power Requests.
-"""
-
-import collections
-import datetime
-
-from io import BytesIO, UnsupportedOperation
-from .hooks import default_hooks
-from .structures import CaseInsensitiveDict
-
-from .auth import HTTPBasicAuth
-from .cookies import cookiejar_from_dict, get_cookie_header
-from .packages.urllib3.fields import RequestField
-from .packages.urllib3.filepost import encode_multipart_formdata
-from .packages.urllib3.util import parse_url
-from .packages.urllib3.exceptions import (
- DecodeError, ReadTimeoutError, ProtocolError)
-from .exceptions import (
- HTTPError, RequestException, MissingSchema, InvalidURL,
- ChunkedEncodingError, ContentDecodingError, ConnectionError,
- StreamConsumedError)
-from .utils import (
- guess_filename, get_auth_from_url, requote_uri,
- stream_decode_response_unicode, to_key_val_list, parse_header_links,
- iter_slices, guess_json_utf, super_len, to_native_string)
-from .compat import (
- cookielib, urlunparse, urlsplit, urlencode, str, bytes, StringIO,
- is_py2, chardet, json, builtin_str, basestring)
-from .status_codes import codes
-
-#: The set of HTTP status codes that indicate an automatically
-#: processable redirect.
-REDIRECT_STATI = (
- codes.moved, # 301
- codes.found, # 302
- codes.other, # 303
- codes.temporary_redirect, # 307
- codes.permanent_redirect, # 308
-)
-DEFAULT_REDIRECT_LIMIT = 30
-CONTENT_CHUNK_SIZE = 10 * 1024
-ITER_CHUNK_SIZE = 512
-
-json_dumps = json.dumps
-
-
-class RequestEncodingMixin(object):
- @property
- def path_url(self):
- """Build the path URL to use."""
-
- url = []
-
- p = urlsplit(self.url)
-
- path = p.path
- if not path:
- path = '/'
-
- url.append(path)
-
- query = p.query
- if query:
- url.append('?')
- url.append(query)
-
- return ''.join(url)
-
- @staticmethod
- def _encode_params(data):
- """Encode parameters in a piece of data.
-
- Will successfully encode parameters when passed as a dict or a list of
- 2-tuples. Order is retained if data is a list of 2-tuples but arbitrary
- if parameters are supplied as a dict.
- """
-
- if isinstance(data, (str, bytes)):
- return data
- elif hasattr(data, 'read'):
- return data
- elif hasattr(data, '__iter__'):
- result = []
- for k, vs in to_key_val_list(data):
- if isinstance(vs, basestring) or not hasattr(vs, '__iter__'):
- vs = [vs]
- for v in vs:
- if v is not None:
- result.append(
- (k.encode('utf-8') if isinstance(k, str) else k,
- v.encode('utf-8') if isinstance(v, str) else v))
- return urlencode(result, doseq=True)
- else:
- return data
-
- @staticmethod
- def _encode_files(files, data):
- """Build the body for a multipart/form-data request.
-
- Will successfully encode files when passed as a dict or a list of
- 2-tuples. Order is retained if data is a list of 2-tuples but arbitrary
- if parameters are supplied as a dict.
-
- """
- if (not files):
- raise ValueError("Files must be provided.")
- elif isinstance(data, basestring):
- raise ValueError("Data must not be a string.")
-
- new_fields = []
- fields = to_key_val_list(data or {})
- files = to_key_val_list(files or {})
-
- for field, val in fields:
- if isinstance(val, basestring) or not hasattr(val, '__iter__'):
- val = [val]
- for v in val:
- if v is not None:
- # Don't call str() on bytestrings: in Py3 it all goes wrong.
- if not isinstance(v, bytes):
- v = str(v)
-
- new_fields.append(
- (field.decode('utf-8') if isinstance(field, bytes) else field,
- v.encode('utf-8') if isinstance(v, str) else v))
-
- for (k, v) in files:
- # support for explicit filename
- ft = None
- fh = None
- if isinstance(v, (tuple, list)):
- if len(v) == 2:
- fn, fp = v
- elif len(v) == 3:
- fn, fp, ft = v
- else:
- fn, fp, ft, fh = v
- else:
- fn = guess_filename(v) or k
- fp = v
- if isinstance(fp, str):
- fp = StringIO(fp)
- if isinstance(fp, bytes):
- fp = BytesIO(fp)
-
- rf = RequestField(name=k, data=fp.read(),
- filename=fn, headers=fh)
- rf.make_multipart(content_type=ft)
- new_fields.append(rf)
-
- body, content_type = encode_multipart_formdata(new_fields)
-
- return body, content_type
-
-
-class RequestHooksMixin(object):
- def register_hook(self, event, hook):
- """Properly register a hook."""
-
- if event not in self.hooks:
- raise ValueError('Unsupported event specified, with event name "%s"' % (event))
-
- if isinstance(hook, collections.Callable):
- self.hooks[event].append(hook)
- elif hasattr(hook, '__iter__'):
- self.hooks[event].extend(h for h in hook if isinstance(h, collections.Callable))
-
- def deregister_hook(self, event, hook):
- """Deregister a previously registered hook.
- Returns True if the hook existed, False if not.
- """
-
- try:
- self.hooks[event].remove(hook)
- return True
- except ValueError:
- return False
-
-
-class Request(RequestHooksMixin):
- """A user-created :class:`Request ` object.
-
- Used to prepare a :class:`PreparedRequest `, which is sent to the server.
-
- :param method: HTTP method to use.
- :param url: URL to send.
- :param headers: dictionary of headers to send.
- :param files: dictionary of {filename: fileobject} files to multipart upload.
- :param data: the body to attach to the request. If a dictionary is provided, form-encoding will take place.
- :param json: json for the body to attach to the request (if data is not specified).
- :param params: dictionary of URL parameters to append to the URL.
- :param auth: Auth handler or (user, pass) tuple.
- :param cookies: dictionary or CookieJar of cookies to attach to this request.
- :param hooks: dictionary of callback hooks, for internal usage.
-
- Usage::
-
- >>> import requests
- >>> req = requests.Request('GET', 'http://httpbin.org/get')
- >>> req.prepare()
-
-
- """
- def __init__(self,
- method=None,
- url=None,
- headers=None,
- files=None,
- data=None,
- params=None,
- auth=None,
- cookies=None,
- hooks=None,
- json=None):
-
- # Default empty dicts for dict params.
- data = [] if data is None else data
- files = [] if files is None else files
- headers = {} if headers is None else headers
- params = {} if params is None else params
- hooks = {} if hooks is None else hooks
-
- self.hooks = default_hooks()
- for (k, v) in list(hooks.items()):
- self.register_hook(event=k, hook=v)
-
- self.method = method
- self.url = url
- self.headers = headers
- self.files = files
- self.data = data
- self.json = json
- self.params = params
- self.auth = auth
- self.cookies = cookies
-
- def __repr__(self):
- return '' % (self.method)
-
- def prepare(self):
- """Constructs a :class:`PreparedRequest ` for transmission and returns it."""
- p = PreparedRequest()
- p.prepare(
- method=self.method,
- url=self.url,
- headers=self.headers,
- files=self.files,
- data=self.data,
- json=self.json,
- params=self.params,
- auth=self.auth,
- cookies=self.cookies,
- hooks=self.hooks,
- )
- return p
-
-
-class PreparedRequest(RequestEncodingMixin, RequestHooksMixin):
- """The fully mutable :class:`PreparedRequest ` object,
- containing the exact bytes that will be sent to the server.
-
- Generated from either a :class:`Request ` object or manually.
-
- Usage::
-
- >>> import requests
- >>> req = requests.Request('GET', 'http://httpbin.org/get')
- >>> r = req.prepare()
-
-
- >>> s = requests.Session()
- >>> s.send(r)
-
-
- """
-
- def __init__(self):
- #: HTTP verb to send to the server.
- self.method = None
- #: HTTP URL to send the request to.
- self.url = None
- #: dictionary of HTTP headers.
- self.headers = None
- # The `CookieJar` used to create the Cookie header will be stored here
- # after prepare_cookies is called
- self._cookies = None
- #: request body to send to the server.
- self.body = None
- #: dictionary of callback hooks, for internal usage.
- self.hooks = default_hooks()
-
- def prepare(self, method=None, url=None, headers=None, files=None,
- data=None, params=None, auth=None, cookies=None, hooks=None,
- json=None):
- """Prepares the entire request with the given parameters."""
-
- self.prepare_method(method)
- self.prepare_url(url, params)
- self.prepare_headers(headers)
- self.prepare_cookies(cookies)
- self.prepare_body(data, files, json)
- self.prepare_auth(auth, url)
- # Note that prepare_auth must be last to enable authentication schemes
- # such as OAuth to work on a fully prepared request.
-
- # This MUST go after prepare_auth. Authenticators could add a hook
- self.prepare_hooks(hooks)
-
- def __repr__(self):
- return '' % (self.method)
-
- def copy(self):
- p = PreparedRequest()
- p.method = self.method
- p.url = self.url
- p.headers = self.headers.copy() if self.headers is not None else None
- p._cookies = self._cookies.copy() if self._cookies is not None else None
- p.body = self.body
- p.hooks = self.hooks
- return p
-
- def prepare_method(self, method):
- """Prepares the given HTTP method."""
- self.method = method
- if self.method is not None:
- self.method = self.method.upper()
-
- def prepare_url(self, url, params):
- """Prepares the given HTTP URL."""
- #: Accept objects that have string representations.
- #: We're unable to blindy call unicode/str functions
- #: as this will include the bytestring indicator (b'')
- #: on python 3.x.
- #: https://github.com/kennethreitz/requests/pull/2238
- if isinstance(url, bytes):
- url = url.decode('utf8')
- else:
- url = unicode(url) if is_py2 else str(url)
-
- # Don't do any URL preparation for non-HTTP schemes like `mailto`,
- # `data` etc to work around exceptions from `url_parse`, which
- # handles RFC 3986 only.
- if ':' in url and not url.lower().startswith('http'):
- self.url = url
- return
-
- # Support for unicode domain names and paths.
- scheme, auth, host, port, path, query, fragment = parse_url(url)
-
- if not scheme:
- raise MissingSchema("Invalid URL {0!r}: No schema supplied. "
- "Perhaps you meant http://{0}?".format(url))
-
- if not host:
- raise InvalidURL("Invalid URL %r: No host supplied" % url)
-
- # Only want to apply IDNA to the hostname
- try:
- host = host.encode('idna').decode('utf-8')
- except UnicodeError:
- raise InvalidURL('URL has an invalid label.')
-
- # Carefully reconstruct the network location
- netloc = auth or ''
- if netloc:
- netloc += '@'
- netloc += host
- if port:
- netloc += ':' + str(port)
-
- # Bare domains aren't valid URLs.
- if not path:
- path = '/'
-
- if is_py2:
- if isinstance(scheme, str):
- scheme = scheme.encode('utf-8')
- if isinstance(netloc, str):
- netloc = netloc.encode('utf-8')
- if isinstance(path, str):
- path = path.encode('utf-8')
- if isinstance(query, str):
- query = query.encode('utf-8')
- if isinstance(fragment, str):
- fragment = fragment.encode('utf-8')
-
- enc_params = self._encode_params(params)
- if enc_params:
- if query:
- query = '%s&%s' % (query, enc_params)
- else:
- query = enc_params
-
- url = requote_uri(urlunparse([scheme, netloc, path, None, query, fragment]))
- self.url = url
-
- def prepare_headers(self, headers):
- """Prepares the given HTTP headers."""
-
- if headers:
- self.headers = CaseInsensitiveDict((to_native_string(name), value) for name, value in headers.items())
- else:
- self.headers = CaseInsensitiveDict()
-
- def prepare_body(self, data, files, json=None):
- """Prepares the given HTTP body data."""
-
- # Check if file, fo, generator, iterator.
- # If not, run through normal process.
-
- # Nottin' on you.
- body = None
- content_type = None
- length = None
-
- if json is not None:
- content_type = 'application/json'
- body = json_dumps(json)
-
- is_stream = all([
- hasattr(data, '__iter__'),
- not isinstance(data, (basestring, list, tuple, dict))
- ])
-
- try:
- length = super_len(data)
- except (TypeError, AttributeError, UnsupportedOperation):
- length = None
-
- if is_stream:
- body = data
-
- if files:
- raise NotImplementedError('Streamed bodies and files are mutually exclusive.')
-
- if length is not None:
- self.headers['Content-Length'] = builtin_str(length)
- else:
- self.headers['Transfer-Encoding'] = 'chunked'
- else:
- # Multi-part file uploads.
- if files:
- (body, content_type) = self._encode_files(files, data)
- else:
- if data and json is None:
- body = self._encode_params(data)
- if isinstance(data, basestring) or hasattr(data, 'read'):
- content_type = None
- else:
- content_type = 'application/x-www-form-urlencoded'
-
- self.prepare_content_length(body)
-
- # Add content-type if it wasn't explicitly provided.
- if content_type and ('content-type' not in self.headers):
- self.headers['Content-Type'] = content_type
-
- self.body = body
-
- def prepare_content_length(self, body):
- if hasattr(body, 'seek') and hasattr(body, 'tell'):
- body.seek(0, 2)
- self.headers['Content-Length'] = builtin_str(body.tell())
- body.seek(0, 0)
- elif body is not None:
- l = super_len(body)
- if l:
- self.headers['Content-Length'] = builtin_str(l)
- elif self.method not in ('GET', 'HEAD'):
- self.headers['Content-Length'] = '0'
-
- def prepare_auth(self, auth, url=''):
- """Prepares the given HTTP auth data."""
-
- # If no Auth is explicitly provided, extract it from the URL first.
- if auth is None:
- url_auth = get_auth_from_url(self.url)
- auth = url_auth if any(url_auth) else None
-
- if auth:
- if isinstance(auth, tuple) and len(auth) == 2:
- # special-case basic HTTP auth
- auth = HTTPBasicAuth(*auth)
-
- # Allow auth to make its changes.
- r = auth(self)
-
- # Update self to reflect the auth changes.
- self.__dict__.update(r.__dict__)
-
- # Recompute Content-Length
- self.prepare_content_length(self.body)
-
- def prepare_cookies(self, cookies):
- """Prepares the given HTTP cookie data."""
-
- if isinstance(cookies, cookielib.CookieJar):
- self._cookies = cookies
- else:
- self._cookies = cookiejar_from_dict(cookies)
-
- cookie_header = get_cookie_header(self._cookies, self)
- if cookie_header is not None:
- self.headers['Cookie'] = cookie_header
-
- def prepare_hooks(self, hooks):
- """Prepares the given hooks."""
- for event in hooks:
- self.register_hook(event, hooks[event])
-
-
-class Response(object):
- """The :class:`Response ` object, which contains a
- server's response to an HTTP request.
- """
-
- __attrs__ = [
- '_content',
- 'status_code',
- 'headers',
- 'url',
- 'history',
- 'encoding',
- 'reason',
- 'cookies',
- 'elapsed',
- 'request',
- ]
-
- def __init__(self):
- super(Response, self).__init__()
-
- self._content = False
- self._content_consumed = False
-
- #: Integer Code of responded HTTP Status, e.g. 404 or 200.
- self.status_code = None
-
- #: Case-insensitive Dictionary of Response Headers.
- #: For example, ``headers['content-encoding']`` will return the
- #: value of a ``'Content-Encoding'`` response header.
- self.headers = CaseInsensitiveDict()
-
- #: File-like object representation of response (for advanced usage).
- #: Use of ``raw`` requires that ``stream=True`` be set on the request.
- # This requirement does not apply for use internally to Requests.
- self.raw = None
-
- #: Final URL location of Response.
- self.url = None
-
- #: Encoding to decode with when accessing r.text.
- self.encoding = None
-
- #: A list of :class:`Response ` objects from
- #: the history of the Request. Any redirect responses will end
- #: up here. The list is sorted from the oldest to the most recent request.
- self.history = []
-
- #: Textual reason of responded HTTP Status, e.g. "Not Found" or "OK".
- self.reason = None
-
- #: A CookieJar of Cookies the server sent back.
- self.cookies = cookiejar_from_dict({})
-
- #: The amount of time elapsed between sending the request
- #: and the arrival of the response (as a timedelta)
- self.elapsed = datetime.timedelta(0)
-
- #: The :class:`PreparedRequest ` object to which this
- #: is a response.
- self.request = None
-
- def __getstate__(self):
- # Consume everything; accessing the content attribute makes
- # sure the content has been fully read.
- if not self._content_consumed:
- self.content
-
- return dict(
- (attr, getattr(self, attr, None))
- for attr in self.__attrs__
- )
-
- def __setstate__(self, state):
- for name, value in state.items():
- setattr(self, name, value)
-
- # pickled objects do not have .raw
- setattr(self, '_content_consumed', True)
- setattr(self, 'raw', None)
-
- def __repr__(self):
- return '' % (self.status_code)
-
- def __bool__(self):
- """Returns true if :attr:`status_code` is 'OK'."""
- return self.ok
-
- def __nonzero__(self):
- """Returns true if :attr:`status_code` is 'OK'."""
- return self.ok
-
- def __iter__(self):
- """Allows you to use a response as an iterator."""
- return self.iter_content(128)
-
- @property
- def ok(self):
- try:
- self.raise_for_status()
- except RequestException:
- return False
- return True
-
- @property
- def is_redirect(self):
- """True if this Response is a well-formed HTTP redirect that could have
- been processed automatically (by :meth:`Session.resolve_redirects`).
- """
- return ('location' in self.headers and self.status_code in REDIRECT_STATI)
-
- @property
- def is_permanent_redirect(self):
- """True if this Response one of the permanant versions of redirect"""
- return ('location' in self.headers and self.status_code in (codes.moved_permanently, codes.permanent_redirect))
-
- @property
- def apparent_encoding(self):
- """The apparent encoding, provided by the chardet library"""
- return chardet.detect(self.content)['encoding']
-
- def iter_content(self, chunk_size=1, decode_unicode=False):
- """Iterates over the response data. When stream=True is set on the
- request, this avoids reading the content at once into memory for
- large responses. The chunk size is the number of bytes it should
- read into memory. This is not necessarily the length of each item
- returned as decoding can take place.
-
- If decode_unicode is True, content will be decoded using the best
- available encoding based on the response.
- """
- def generate():
- try:
- # Special case for urllib3.
- try:
- for chunk in self.raw.stream(chunk_size, decode_content=True):
- yield chunk
- except ProtocolError as e:
- raise ChunkedEncodingError(e)
- except DecodeError as e:
- raise ContentDecodingError(e)
- except ReadTimeoutError as e:
- raise ConnectionError(e)
- except AttributeError:
- # Standard file-like object.
- while True:
- chunk = self.raw.read(chunk_size)
- if not chunk:
- break
- yield chunk
-
- self._content_consumed = True
-
- if self._content_consumed and isinstance(self._content, bool):
- raise StreamConsumedError()
- # simulate reading small chunks of the content
- reused_chunks = iter_slices(self._content, chunk_size)
-
- stream_chunks = generate()
-
- chunks = reused_chunks if self._content_consumed else stream_chunks
-
- if decode_unicode:
- chunks = stream_decode_response_unicode(chunks, self)
-
- return chunks
-
- def iter_lines(self, chunk_size=ITER_CHUNK_SIZE, decode_unicode=None):
- """Iterates over the response data, one line at a time. When
- stream=True is set on the request, this avoids reading the
- content at once into memory for large responses.
- """
-
- pending = None
-
- for chunk in self.iter_content(chunk_size=chunk_size, decode_unicode=decode_unicode):
-
- if pending is not None:
- chunk = pending + chunk
- lines = chunk.splitlines()
-
- if lines and lines[-1] and chunk and lines[-1][-1] == chunk[-1]:
- pending = lines.pop()
- else:
- pending = None
-
- for line in lines:
- yield line
-
- if pending is not None:
- yield pending
-
- @property
- def content(self):
- """Content of the response, in bytes."""
-
- if self._content is False:
- # Read the contents.
- try:
- if self._content_consumed:
- raise RuntimeError(
- 'The content for this response was already consumed')
-
- if self.status_code == 0:
- self._content = None
- else:
- self._content = bytes().join(self.iter_content(CONTENT_CHUNK_SIZE)) or bytes()
-
- except AttributeError:
- self._content = None
-
- self._content_consumed = True
- # don't need to release the connection; that's been handled by urllib3
- # since we exhausted the data.
- return self._content
-
- @property
- def text(self):
- """Content of the response, in unicode.
-
- If Response.encoding is None, encoding will be guessed using
- ``chardet``.
-
- The encoding of the response content is determined based solely on HTTP
- headers, following RFC 2616 to the letter. If you can take advantage of
- non-HTTP knowledge to make a better guess at the encoding, you should
- set ``r.encoding`` appropriately before accessing this property.
- """
-
- # Try charset from content-type
- content = None
- encoding = self.encoding
-
- if not self.content:
- return str('')
-
- # Fallback to auto-detected encoding.
- if self.encoding is None:
- encoding = self.apparent_encoding
-
- # Decode unicode from given encoding.
- try:
- content = str(self.content, encoding, errors='replace')
- except (LookupError, TypeError):
- # A LookupError is raised if the encoding was not found which could
- # indicate a misspelling or similar mistake.
- #
- # A TypeError can be raised if encoding is None
- #
- # So we try blindly encoding.
- content = str(self.content, errors='replace')
-
- return content
-
- def json(self, **kwargs):
- """Returns the json-encoded content of a response, if any.
-
- :param \*\*kwargs: Optional arguments that ``json.loads`` takes.
- """
-
- if not self.encoding and len(self.content) > 3:
- # No encoding set. JSON RFC 4627 section 3 states we should expect
- # UTF-8, -16 or -32. Detect which one to use; If the detection or
- # decoding fails, fall back to `self.text` (using chardet to make
- # a best guess).
- encoding = guess_json_utf(self.content)
- if encoding is not None:
- try:
- return json.loads(self.content.decode(encoding), **kwargs)
- except UnicodeDecodeError:
- # Wrong UTF codec detected; usually because it's not UTF-8
- # but some other 8-bit codec. This is an RFC violation,
- # and the server didn't bother to tell us what codec *was*
- # used.
- pass
- return json.loads(self.text, **kwargs)
-
- @property
- def links(self):
- """Returns the parsed header links of the response, if any."""
-
- header = self.headers.get('link')
-
- # l = MultiDict()
- l = {}
-
- if header:
- links = parse_header_links(header)
-
- for link in links:
- key = link.get('rel') or link.get('url')
- l[key] = link
-
- return l
-
- def raise_for_status(self):
- """Raises stored :class:`HTTPError`, if one occurred."""
-
- http_error_msg = ''
-
- if 400 <= self.status_code < 500:
- http_error_msg = '%s Client Error: %s' % (self.status_code, self.reason)
-
- elif 500 <= self.status_code < 600:
- http_error_msg = '%s Server Error: %s' % (self.status_code, self.reason)
-
- if http_error_msg:
- raise HTTPError(http_error_msg, response=self)
-
- def close(self):
- """Releases the connection back to the pool. Once this method has been
- called the underlying ``raw`` object must not be accessed again.
-
- *Note: Should not normally need to be called explicitly.*
- """
- return self.raw.release_conn()
diff --git a/script/_Lib/requests/packages/__init__.py b/script/_Lib/requests/packages/__init__.py
deleted file mode 100644
index d62c4b7..0000000
--- a/script/_Lib/requests/packages/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from __future__ import absolute_import
-
-from . import urllib3
diff --git a/script/_Lib/requests/packages/chardet/__init__.py b/script/_Lib/requests/packages/chardet/__init__.py
deleted file mode 100644
index e4f0799..0000000
--- a/script/_Lib/requests/packages/chardet/__init__.py
+++ /dev/null
@@ -1,32 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-######################### END LICENSE BLOCK #########################
-
-__version__ = "2.2.1"
-from sys import version_info
-
-
-def detect(aBuf):
- if ((version_info < (3, 0) and isinstance(aBuf, unicode)) or
- (version_info >= (3, 0) and not isinstance(aBuf, bytes))):
- raise ValueError('Expected a bytes object, not a unicode object')
-
- from . import universaldetector
- u = universaldetector.UniversalDetector()
- u.reset()
- u.feed(aBuf)
- u.close()
- return u.result
diff --git a/script/_Lib/requests/packages/chardet/big5freq.py b/script/_Lib/requests/packages/chardet/big5freq.py
deleted file mode 100644
index 65bffc0..0000000
--- a/script/_Lib/requests/packages/chardet/big5freq.py
+++ /dev/null
@@ -1,925 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Communicator client code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-######################### END LICENSE BLOCK #########################
-
-# Big5 frequency table
-# by Taiwan's Mandarin Promotion Council
-#
-#
-# 128 --> 0.42261
-# 256 --> 0.57851
-# 512 --> 0.74851
-# 1024 --> 0.89384
-# 2048 --> 0.97583
-#
-# Ideal Distribution Ratio = 0.74851/(1-0.74851) =2.98
-# Random Distribution Ration = 512/(5401-512)=0.105
-#
-# Typical Distribution Ratio about 25% of Ideal one, still much higher than RDR
-
-BIG5_TYPICAL_DISTRIBUTION_RATIO = 0.75
-
-#Char to FreqOrder table
-BIG5_TABLE_SIZE = 5376
-
-Big5CharToFreqOrder = (
- 1,1801,1506, 255,1431, 198, 9, 82, 6,5008, 177, 202,3681,1256,2821, 110, # 16
-3814, 33,3274, 261, 76, 44,2114, 16,2946,2187,1176, 659,3971, 26,3451,2653, # 32
-1198,3972,3350,4202, 410,2215, 302, 590, 361,1964, 8, 204, 58,4510,5009,1932, # 48
- 63,5010,5011, 317,1614, 75, 222, 159,4203,2417,1480,5012,3555,3091, 224,2822, # 64
-3682, 3, 10,3973,1471, 29,2787,1135,2866,1940, 873, 130,3275,1123, 312,5013, # 80
-4511,2052, 507, 252, 682,5014, 142,1915, 124, 206,2947, 34,3556,3204, 64, 604, # 96
-5015,2501,1977,1978, 155,1991, 645, 641,1606,5016,3452, 337, 72, 406,5017, 80, # 112
- 630, 238,3205,1509, 263, 939,1092,2654, 756,1440,1094,3453, 449, 69,2987, 591, # 128
- 179,2096, 471, 115,2035,1844, 60, 50,2988, 134, 806,1869, 734,2036,3454, 180, # 144
- 995,1607, 156, 537,2907, 688,5018, 319,1305, 779,2145, 514,2379, 298,4512, 359, # 160
-2502, 90,2716,1338, 663, 11, 906,1099,2553, 20,2441, 182, 532,1716,5019, 732, # 176
-1376,4204,1311,1420,3206, 25,2317,1056, 113, 399, 382,1950, 242,3455,2474, 529, # 192
-3276, 475,1447,3683,5020, 117, 21, 656, 810,1297,2300,2334,3557,5021, 126,4205, # 208
- 706, 456, 150, 613,4513, 71,1118,2037,4206, 145,3092, 85, 835, 486,2115,1246, # 224
-1426, 428, 727,1285,1015, 800, 106, 623, 303,1281,5022,2128,2359, 347,3815, 221, # 240
-3558,3135,5023,1956,1153,4207, 83, 296,1199,3093, 192, 624, 93,5024, 822,1898, # 256
-2823,3136, 795,2065, 991,1554,1542,1592, 27, 43,2867, 859, 139,1456, 860,4514, # 272
- 437, 712,3974, 164,2397,3137, 695, 211,3037,2097, 195,3975,1608,3559,3560,3684, # 288
-3976, 234, 811,2989,2098,3977,2233,1441,3561,1615,2380, 668,2077,1638, 305, 228, # 304
-1664,4515, 467, 415,5025, 262,2099,1593, 239, 108, 300, 200,1033, 512,1247,2078, # 320
-5026,5027,2176,3207,3685,2682, 593, 845,1062,3277, 88,1723,2038,3978,1951, 212, # 336
- 266, 152, 149, 468,1899,4208,4516, 77, 187,5028,3038, 37, 5,2990,5029,3979, # 352
-5030,5031, 39,2524,4517,2908,3208,2079, 55, 148, 74,4518, 545, 483,1474,1029, # 368
-1665, 217,1870,1531,3138,1104,2655,4209, 24, 172,3562, 900,3980,3563,3564,4519, # 384
- 32,1408,2824,1312, 329, 487,2360,2251,2717, 784,2683, 4,3039,3351,1427,1789, # 400
- 188, 109, 499,5032,3686,1717,1790, 888,1217,3040,4520,5033,3565,5034,3352,1520, # 416
-3687,3981, 196,1034, 775,5035,5036, 929,1816, 249, 439, 38,5037,1063,5038, 794, # 432
-3982,1435,2301, 46, 178,3278,2066,5039,2381,5040, 214,1709,4521, 804, 35, 707, # 448
- 324,3688,1601,2554, 140, 459,4210,5041,5042,1365, 839, 272, 978,2262,2580,3456, # 464
-2129,1363,3689,1423, 697, 100,3094, 48, 70,1231, 495,3139,2196,5043,1294,5044, # 480
-2080, 462, 586,1042,3279, 853, 256, 988, 185,2382,3457,1698, 434,1084,5045,3458, # 496
- 314,2625,2788,4522,2335,2336, 569,2285, 637,1817,2525, 757,1162,1879,1616,3459, # 512
- 287,1577,2116, 768,4523,1671,2868,3566,2526,1321,3816, 909,2418,5046,4211, 933, # 528
-3817,4212,2053,2361,1222,4524, 765,2419,1322, 786,4525,5047,1920,1462,1677,2909, # 544
-1699,5048,4526,1424,2442,3140,3690,2600,3353,1775,1941,3460,3983,4213, 309,1369, # 560
-1130,2825, 364,2234,1653,1299,3984,3567,3985,3986,2656, 525,1085,3041, 902,2001, # 576
-1475, 964,4527, 421,1845,1415,1057,2286, 940,1364,3141, 376,4528,4529,1381, 7, # 592
-2527, 983,2383, 336,1710,2684,1846, 321,3461, 559,1131,3042,2752,1809,1132,1313, # 608
- 265,1481,1858,5049, 352,1203,2826,3280, 167,1089, 420,2827, 776, 792,1724,3568, # 624
-4214,2443,3281,5050,4215,5051, 446, 229, 333,2753, 901,3818,1200,1557,4530,2657, # 640
-1921, 395,2754,2685,3819,4216,1836, 125, 916,3209,2626,4531,5052,5053,3820,5054, # 656
-5055,5056,4532,3142,3691,1133,2555,1757,3462,1510,2318,1409,3569,5057,2146, 438, # 672
-2601,2910,2384,3354,1068, 958,3043, 461, 311,2869,2686,4217,1916,3210,4218,1979, # 688
- 383, 750,2755,2627,4219, 274, 539, 385,1278,1442,5058,1154,1965, 384, 561, 210, # 704
- 98,1295,2556,3570,5059,1711,2420,1482,3463,3987,2911,1257, 129,5060,3821, 642, # 720
- 523,2789,2790,2658,5061, 141,2235,1333, 68, 176, 441, 876, 907,4220, 603,2602, # 736
- 710, 171,3464, 404, 549, 18,3143,2398,1410,3692,1666,5062,3571,4533,2912,4534, # 752
-5063,2991, 368,5064, 146, 366, 99, 871,3693,1543, 748, 807,1586,1185, 22,2263, # 768
- 379,3822,3211,5065,3212, 505,1942,2628,1992,1382,2319,5066, 380,2362, 218, 702, # 784
-1818,1248,3465,3044,3572,3355,3282,5067,2992,3694, 930,3283,3823,5068, 59,5069, # 800
- 585, 601,4221, 497,3466,1112,1314,4535,1802,5070,1223,1472,2177,5071, 749,1837, # 816
- 690,1900,3824,1773,3988,1476, 429,1043,1791,2236,2117, 917,4222, 447,1086,1629, # 832
-5072, 556,5073,5074,2021,1654, 844,1090, 105, 550, 966,1758,2828,1008,1783, 686, # 848
-1095,5075,2287, 793,1602,5076,3573,2603,4536,4223,2948,2302,4537,3825, 980,2503, # 864
- 544, 353, 527,4538, 908,2687,2913,5077, 381,2629,1943,1348,5078,1341,1252, 560, # 880
-3095,5079,3467,2870,5080,2054, 973, 886,2081, 143,4539,5081,5082, 157,3989, 496, # 896
-4224, 57, 840, 540,2039,4540,4541,3468,2118,1445, 970,2264,1748,1966,2082,4225, # 912
-3144,1234,1776,3284,2829,3695, 773,1206,2130,1066,2040,1326,3990,1738,1725,4226, # 928
- 279,3145, 51,1544,2604, 423,1578,2131,2067, 173,4542,1880,5083,5084,1583, 264, # 944
- 610,3696,4543,2444, 280, 154,5085,5086,5087,1739, 338,1282,3096, 693,2871,1411, # 960
-1074,3826,2445,5088,4544,5089,5090,1240, 952,2399,5091,2914,1538,2688, 685,1483, # 976
-4227,2475,1436, 953,4228,2055,4545, 671,2400, 79,4229,2446,3285, 608, 567,2689, # 992
-3469,4230,4231,1691, 393,1261,1792,2401,5092,4546,5093,5094,5095,5096,1383,1672, # 1008
-3827,3213,1464, 522,1119, 661,1150, 216, 675,4547,3991,1432,3574, 609,4548,2690, # 1024
-2402,5097,5098,5099,4232,3045, 0,5100,2476, 315, 231,2447, 301,3356,4549,2385, # 1040
-5101, 233,4233,3697,1819,4550,4551,5102, 96,1777,1315,2083,5103, 257,5104,1810, # 1056
-3698,2718,1139,1820,4234,2022,1124,2164,2791,1778,2659,5105,3097, 363,1655,3214, # 1072
-5106,2993,5107,5108,5109,3992,1567,3993, 718, 103,3215, 849,1443, 341,3357,2949, # 1088
-1484,5110,1712, 127, 67, 339,4235,2403, 679,1412, 821,5111,5112, 834, 738, 351, # 1104
-2994,2147, 846, 235,1497,1881, 418,1993,3828,2719, 186,1100,2148,2756,3575,1545, # 1120
-1355,2950,2872,1377, 583,3994,4236,2581,2995,5113,1298,3699,1078,2557,3700,2363, # 1136
- 78,3829,3830, 267,1289,2100,2002,1594,4237, 348, 369,1274,2197,2178,1838,4552, # 1152
-1821,2830,3701,2757,2288,2003,4553,2951,2758, 144,3358, 882,4554,3995,2759,3470, # 1168
-4555,2915,5114,4238,1726, 320,5115,3996,3046, 788,2996,5116,2831,1774,1327,2873, # 1184
-3997,2832,5117,1306,4556,2004,1700,3831,3576,2364,2660, 787,2023, 506, 824,3702, # 1200
- 534, 323,4557,1044,3359,2024,1901, 946,3471,5118,1779,1500,1678,5119,1882,4558, # 1216
- 165, 243,4559,3703,2528, 123, 683,4239, 764,4560, 36,3998,1793, 589,2916, 816, # 1232
- 626,1667,3047,2237,1639,1555,1622,3832,3999,5120,4000,2874,1370,1228,1933, 891, # 1248
-2084,2917, 304,4240,5121, 292,2997,2720,3577, 691,2101,4241,1115,4561, 118, 662, # 1264
-5122, 611,1156, 854,2386,1316,2875, 2, 386, 515,2918,5123,5124,3286, 868,2238, # 1280
-1486, 855,2661, 785,2216,3048,5125,1040,3216,3578,5126,3146, 448,5127,1525,5128, # 1296
-2165,4562,5129,3833,5130,4242,2833,3579,3147, 503, 818,4001,3148,1568, 814, 676, # 1312
-1444, 306,1749,5131,3834,1416,1030, 197,1428, 805,2834,1501,4563,5132,5133,5134, # 1328
-1994,5135,4564,5136,5137,2198, 13,2792,3704,2998,3149,1229,1917,5138,3835,2132, # 1344
-5139,4243,4565,2404,3580,5140,2217,1511,1727,1120,5141,5142, 646,3836,2448, 307, # 1360
-5143,5144,1595,3217,5145,5146,5147,3705,1113,1356,4002,1465,2529,2530,5148, 519, # 1376
-5149, 128,2133, 92,2289,1980,5150,4003,1512, 342,3150,2199,5151,2793,2218,1981, # 1392
-3360,4244, 290,1656,1317, 789, 827,2365,5152,3837,4566, 562, 581,4004,5153, 401, # 1408
-4567,2252, 94,4568,5154,1399,2794,5155,1463,2025,4569,3218,1944,5156, 828,1105, # 1424
-4245,1262,1394,5157,4246, 605,4570,5158,1784,2876,5159,2835, 819,2102, 578,2200, # 1440
-2952,5160,1502, 436,3287,4247,3288,2836,4005,2919,3472,3473,5161,2721,2320,5162, # 1456
-5163,2337,2068, 23,4571, 193, 826,3838,2103, 699,1630,4248,3098, 390,1794,1064, # 1472
-3581,5164,1579,3099,3100,1400,5165,4249,1839,1640,2877,5166,4572,4573, 137,4250, # 1488
- 598,3101,1967, 780, 104, 974,2953,5167, 278, 899, 253, 402, 572, 504, 493,1339, # 1504
-5168,4006,1275,4574,2582,2558,5169,3706,3049,3102,2253, 565,1334,2722, 863, 41, # 1520
-5170,5171,4575,5172,1657,2338, 19, 463,2760,4251, 606,5173,2999,3289,1087,2085, # 1536
-1323,2662,3000,5174,1631,1623,1750,4252,2691,5175,2878, 791,2723,2663,2339, 232, # 1552
-2421,5176,3001,1498,5177,2664,2630, 755,1366,3707,3290,3151,2026,1609, 119,1918, # 1568
-3474, 862,1026,4253,5178,4007,3839,4576,4008,4577,2265,1952,2477,5179,1125, 817, # 1584
-4254,4255,4009,1513,1766,2041,1487,4256,3050,3291,2837,3840,3152,5180,5181,1507, # 1600
-5182,2692, 733, 40,1632,1106,2879, 345,4257, 841,2531, 230,4578,3002,1847,3292, # 1616
-3475,5183,1263, 986,3476,5184, 735, 879, 254,1137, 857, 622,1300,1180,1388,1562, # 1632
-4010,4011,2954, 967,2761,2665,1349, 592,2134,1692,3361,3003,1995,4258,1679,4012, # 1648
-1902,2188,5185, 739,3708,2724,1296,1290,5186,4259,2201,2202,1922,1563,2605,2559, # 1664
-1871,2762,3004,5187, 435,5188, 343,1108, 596, 17,1751,4579,2239,3477,3709,5189, # 1680
-4580, 294,3582,2955,1693, 477, 979, 281,2042,3583, 643,2043,3710,2631,2795,2266, # 1696
-1031,2340,2135,2303,3584,4581, 367,1249,2560,5190,3585,5191,4582,1283,3362,2005, # 1712
- 240,1762,3363,4583,4584, 836,1069,3153, 474,5192,2149,2532, 268,3586,5193,3219, # 1728
-1521,1284,5194,1658,1546,4260,5195,3587,3588,5196,4261,3364,2693,1685,4262, 961, # 1744
-1673,2632, 190,2006,2203,3841,4585,4586,5197, 570,2504,3711,1490,5198,4587,2633, # 1760
-3293,1957,4588, 584,1514, 396,1045,1945,5199,4589,1968,2449,5200,5201,4590,4013, # 1776
- 619,5202,3154,3294, 215,2007,2796,2561,3220,4591,3221,4592, 763,4263,3842,4593, # 1792
-5203,5204,1958,1767,2956,3365,3712,1174, 452,1477,4594,3366,3155,5205,2838,1253, # 1808
-2387,2189,1091,2290,4264, 492,5206, 638,1169,1825,2136,1752,4014, 648, 926,1021, # 1824
-1324,4595, 520,4596, 997, 847,1007, 892,4597,3843,2267,1872,3713,2405,1785,4598, # 1840
-1953,2957,3103,3222,1728,4265,2044,3714,4599,2008,1701,3156,1551, 30,2268,4266, # 1856
-5207,2027,4600,3589,5208, 501,5209,4267, 594,3478,2166,1822,3590,3479,3591,3223, # 1872
- 829,2839,4268,5210,1680,3157,1225,4269,5211,3295,4601,4270,3158,2341,5212,4602, # 1888
-4271,5213,4015,4016,5214,1848,2388,2606,3367,5215,4603, 374,4017, 652,4272,4273, # 1904
- 375,1140, 798,5216,5217,5218,2366,4604,2269, 546,1659, 138,3051,2450,4605,5219, # 1920
-2254, 612,1849, 910, 796,3844,1740,1371, 825,3845,3846,5220,2920,2562,5221, 692, # 1936
- 444,3052,2634, 801,4606,4274,5222,1491, 244,1053,3053,4275,4276, 340,5223,4018, # 1952
-1041,3005, 293,1168, 87,1357,5224,1539, 959,5225,2240, 721, 694,4277,3847, 219, # 1968
-1478, 644,1417,3368,2666,1413,1401,1335,1389,4019,5226,5227,3006,2367,3159,1826, # 1984
- 730,1515, 184,2840, 66,4607,5228,1660,2958, 246,3369, 378,1457, 226,3480, 975, # 2000
-4020,2959,1264,3592, 674, 696,5229, 163,5230,1141,2422,2167, 713,3593,3370,4608, # 2016
-4021,5231,5232,1186, 15,5233,1079,1070,5234,1522,3224,3594, 276,1050,2725, 758, # 2032
-1126, 653,2960,3296,5235,2342, 889,3595,4022,3104,3007, 903,1250,4609,4023,3481, # 2048
-3596,1342,1681,1718, 766,3297, 286, 89,2961,3715,5236,1713,5237,2607,3371,3008, # 2064
-5238,2962,2219,3225,2880,5239,4610,2505,2533, 181, 387,1075,4024, 731,2190,3372, # 2080
-5240,3298, 310, 313,3482,2304, 770,4278, 54,3054, 189,4611,3105,3848,4025,5241, # 2096
-1230,1617,1850, 355,3597,4279,4612,3373, 111,4280,3716,1350,3160,3483,3055,4281, # 2112
-2150,3299,3598,5242,2797,4026,4027,3009, 722,2009,5243,1071, 247,1207,2343,2478, # 2128
-1378,4613,2010, 864,1437,1214,4614, 373,3849,1142,2220, 667,4615, 442,2763,2563, # 2144
-3850,4028,1969,4282,3300,1840, 837, 170,1107, 934,1336,1883,5244,5245,2119,4283, # 2160
-2841, 743,1569,5246,4616,4284, 582,2389,1418,3484,5247,1803,5248, 357,1395,1729, # 2176
-3717,3301,2423,1564,2241,5249,3106,3851,1633,4617,1114,2086,4285,1532,5250, 482, # 2192
-2451,4618,5251,5252,1492, 833,1466,5253,2726,3599,1641,2842,5254,1526,1272,3718, # 2208
-4286,1686,1795, 416,2564,1903,1954,1804,5255,3852,2798,3853,1159,2321,5256,2881, # 2224
-4619,1610,1584,3056,2424,2764, 443,3302,1163,3161,5257,5258,4029,5259,4287,2506, # 2240
-3057,4620,4030,3162,2104,1647,3600,2011,1873,4288,5260,4289, 431,3485,5261, 250, # 2256
- 97, 81,4290,5262,1648,1851,1558, 160, 848,5263, 866, 740,1694,5264,2204,2843, # 2272
-3226,4291,4621,3719,1687, 950,2479, 426, 469,3227,3720,3721,4031,5265,5266,1188, # 2288
- 424,1996, 861,3601,4292,3854,2205,2694, 168,1235,3602,4293,5267,2087,1674,4622, # 2304
-3374,3303, 220,2565,1009,5268,3855, 670,3010, 332,1208, 717,5269,5270,3603,2452, # 2320
-4032,3375,5271, 513,5272,1209,2882,3376,3163,4623,1080,5273,5274,5275,5276,2534, # 2336
-3722,3604, 815,1587,4033,4034,5277,3605,3486,3856,1254,4624,1328,3058,1390,4035, # 2352
-1741,4036,3857,4037,5278, 236,3858,2453,3304,5279,5280,3723,3859,1273,3860,4625, # 2368
-5281, 308,5282,4626, 245,4627,1852,2480,1307,2583, 430, 715,2137,2454,5283, 270, # 2384
- 199,2883,4038,5284,3606,2727,1753, 761,1754, 725,1661,1841,4628,3487,3724,5285, # 2400
-5286, 587, 14,3305, 227,2608, 326, 480,2270, 943,2765,3607, 291, 650,1884,5287, # 2416
-1702,1226, 102,1547, 62,3488, 904,4629,3489,1164,4294,5288,5289,1224,1548,2766, # 2432
- 391, 498,1493,5290,1386,1419,5291,2056,1177,4630, 813, 880,1081,2368, 566,1145, # 2448
-4631,2291,1001,1035,2566,2609,2242, 394,1286,5292,5293,2069,5294, 86,1494,1730, # 2464
-4039, 491,1588, 745, 897,2963, 843,3377,4040,2767,2884,3306,1768, 998,2221,2070, # 2480
- 397,1827,1195,1970,3725,3011,3378, 284,5295,3861,2507,2138,2120,1904,5296,4041, # 2496
-2151,4042,4295,1036,3490,1905, 114,2567,4296, 209,1527,5297,5298,2964,2844,2635, # 2512
-2390,2728,3164, 812,2568,5299,3307,5300,1559, 737,1885,3726,1210, 885, 28,2695, # 2528
-3608,3862,5301,4297,1004,1780,4632,5302, 346,1982,2222,2696,4633,3863,1742, 797, # 2544
-1642,4043,1934,1072,1384,2152, 896,4044,3308,3727,3228,2885,3609,5303,2569,1959, # 2560
-4634,2455,1786,5304,5305,5306,4045,4298,1005,1308,3728,4299,2729,4635,4636,1528, # 2576
-2610, 161,1178,4300,1983, 987,4637,1101,4301, 631,4046,1157,3229,2425,1343,1241, # 2592
-1016,2243,2570, 372, 877,2344,2508,1160, 555,1935, 911,4047,5307, 466,1170, 169, # 2608
-1051,2921,2697,3729,2481,3012,1182,2012,2571,1251,2636,5308, 992,2345,3491,1540, # 2624
-2730,1201,2071,2406,1997,2482,5309,4638, 528,1923,2191,1503,1874,1570,2369,3379, # 2640
-3309,5310, 557,1073,5311,1828,3492,2088,2271,3165,3059,3107, 767,3108,2799,4639, # 2656
-1006,4302,4640,2346,1267,2179,3730,3230, 778,4048,3231,2731,1597,2667,5312,4641, # 2672
-5313,3493,5314,5315,5316,3310,2698,1433,3311, 131, 95,1504,4049, 723,4303,3166, # 2688
-1842,3610,2768,2192,4050,2028,2105,3731,5317,3013,4051,1218,5318,3380,3232,4052, # 2704
-4304,2584, 248,1634,3864, 912,5319,2845,3732,3060,3865, 654, 53,5320,3014,5321, # 2720
-1688,4642, 777,3494,1032,4053,1425,5322, 191, 820,2121,2846, 971,4643, 931,3233, # 2736
- 135, 664, 783,3866,1998, 772,2922,1936,4054,3867,4644,2923,3234, 282,2732, 640, # 2752
-1372,3495,1127, 922, 325,3381,5323,5324, 711,2045,5325,5326,4055,2223,2800,1937, # 2768
-4056,3382,2224,2255,3868,2305,5327,4645,3869,1258,3312,4057,3235,2139,2965,4058, # 2784
-4059,5328,2225, 258,3236,4646, 101,1227,5329,3313,1755,5330,1391,3314,5331,2924, # 2800
-2057, 893,5332,5333,5334,1402,4305,2347,5335,5336,3237,3611,5337,5338, 878,1325, # 2816
-1781,2801,4647, 259,1385,2585, 744,1183,2272,4648,5339,4060,2509,5340, 684,1024, # 2832
-4306,5341, 472,3612,3496,1165,3315,4061,4062, 322,2153, 881, 455,1695,1152,1340, # 2848
- 660, 554,2154,4649,1058,4650,4307, 830,1065,3383,4063,4651,1924,5342,1703,1919, # 2864
-5343, 932,2273, 122,5344,4652, 947, 677,5345,3870,2637, 297,1906,1925,2274,4653, # 2880
-2322,3316,5346,5347,4308,5348,4309, 84,4310, 112, 989,5349, 547,1059,4064, 701, # 2896
-3613,1019,5350,4311,5351,3497, 942, 639, 457,2306,2456, 993,2966, 407, 851, 494, # 2912
-4654,3384, 927,5352,1237,5353,2426,3385, 573,4312, 680, 921,2925,1279,1875, 285, # 2928
- 790,1448,1984, 719,2168,5354,5355,4655,4065,4066,1649,5356,1541, 563,5357,1077, # 2944
-5358,3386,3061,3498, 511,3015,4067,4068,3733,4069,1268,2572,3387,3238,4656,4657, # 2960
-5359, 535,1048,1276,1189,2926,2029,3167,1438,1373,2847,2967,1134,2013,5360,4313, # 2976
-1238,2586,3109,1259,5361, 700,5362,2968,3168,3734,4314,5363,4315,1146,1876,1907, # 2992
-4658,2611,4070, 781,2427, 132,1589, 203, 147, 273,2802,2407, 898,1787,2155,4071, # 3008
-4072,5364,3871,2803,5365,5366,4659,4660,5367,3239,5368,1635,3872, 965,5369,1805, # 3024
-2699,1516,3614,1121,1082,1329,3317,4073,1449,3873, 65,1128,2848,2927,2769,1590, # 3040
-3874,5370,5371, 12,2668, 45, 976,2587,3169,4661, 517,2535,1013,1037,3240,5372, # 3056
-3875,2849,5373,3876,5374,3499,5375,2612, 614,1999,2323,3877,3110,2733,2638,5376, # 3072
-2588,4316, 599,1269,5377,1811,3735,5378,2700,3111, 759,1060, 489,1806,3388,3318, # 3088
-1358,5379,5380,2391,1387,1215,2639,2256, 490,5381,5382,4317,1759,2392,2348,5383, # 3104
-4662,3878,1908,4074,2640,1807,3241,4663,3500,3319,2770,2349, 874,5384,5385,3501, # 3120
-3736,1859, 91,2928,3737,3062,3879,4664,5386,3170,4075,2669,5387,3502,1202,1403, # 3136
-3880,2969,2536,1517,2510,4665,3503,2511,5388,4666,5389,2701,1886,1495,1731,4076, # 3152
-2370,4667,5390,2030,5391,5392,4077,2702,1216, 237,2589,4318,2324,4078,3881,4668, # 3168
-4669,2703,3615,3504, 445,4670,5393,5394,5395,5396,2771, 61,4079,3738,1823,4080, # 3184
-5397, 687,2046, 935, 925, 405,2670, 703,1096,1860,2734,4671,4081,1877,1367,2704, # 3200
-3389, 918,2106,1782,2483, 334,3320,1611,1093,4672, 564,3171,3505,3739,3390, 945, # 3216
-2641,2058,4673,5398,1926, 872,4319,5399,3506,2705,3112, 349,4320,3740,4082,4674, # 3232
-3882,4321,3741,2156,4083,4675,4676,4322,4677,2408,2047, 782,4084, 400, 251,4323, # 3248
-1624,5400,5401, 277,3742, 299,1265, 476,1191,3883,2122,4324,4325,1109, 205,5402, # 3264
-2590,1000,2157,3616,1861,5403,5404,5405,4678,5406,4679,2573, 107,2484,2158,4085, # 3280
-3507,3172,5407,1533, 541,1301, 158, 753,4326,2886,3617,5408,1696, 370,1088,4327, # 3296
-4680,3618, 579, 327, 440, 162,2244, 269,1938,1374,3508, 968,3063, 56,1396,3113, # 3312
-2107,3321,3391,5409,1927,2159,4681,3016,5410,3619,5411,5412,3743,4682,2485,5413, # 3328
-2804,5414,1650,4683,5415,2613,5416,5417,4086,2671,3392,1149,3393,4087,3884,4088, # 3344
-5418,1076, 49,5419, 951,3242,3322,3323, 450,2850, 920,5420,1812,2805,2371,4328, # 3360
-1909,1138,2372,3885,3509,5421,3243,4684,1910,1147,1518,2428,4685,3886,5422,4686, # 3376
-2393,2614, 260,1796,3244,5423,5424,3887,3324, 708,5425,3620,1704,5426,3621,1351, # 3392
-1618,3394,3017,1887, 944,4329,3395,4330,3064,3396,4331,5427,3744, 422, 413,1714, # 3408
-3325, 500,2059,2350,4332,2486,5428,1344,1911, 954,5429,1668,5430,5431,4089,2409, # 3424
-4333,3622,3888,4334,5432,2307,1318,2512,3114, 133,3115,2887,4687, 629, 31,2851, # 3440
-2706,3889,4688, 850, 949,4689,4090,2970,1732,2089,4335,1496,1853,5433,4091, 620, # 3456
-3245, 981,1242,3745,3397,1619,3746,1643,3326,2140,2457,1971,1719,3510,2169,5434, # 3472
-3246,5435,5436,3398,1829,5437,1277,4690,1565,2048,5438,1636,3623,3116,5439, 869, # 3488
-2852, 655,3890,3891,3117,4092,3018,3892,1310,3624,4691,5440,5441,5442,1733, 558, # 3504
-4692,3747, 335,1549,3065,1756,4336,3748,1946,3511,1830,1291,1192, 470,2735,2108, # 3520
-2806, 913,1054,4093,5443,1027,5444,3066,4094,4693, 982,2672,3399,3173,3512,3247, # 3536
-3248,1947,2807,5445, 571,4694,5446,1831,5447,3625,2591,1523,2429,5448,2090, 984, # 3552
-4695,3749,1960,5449,3750, 852, 923,2808,3513,3751, 969,1519, 999,2049,2325,1705, # 3568
-5450,3118, 615,1662, 151, 597,4095,2410,2326,1049, 275,4696,3752,4337, 568,3753, # 3584
-3626,2487,4338,3754,5451,2430,2275, 409,3249,5452,1566,2888,3514,1002, 769,2853, # 3600
- 194,2091,3174,3755,2226,3327,4339, 628,1505,5453,5454,1763,2180,3019,4096, 521, # 3616
-1161,2592,1788,2206,2411,4697,4097,1625,4340,4341, 412, 42,3119, 464,5455,2642, # 3632
-4698,3400,1760,1571,2889,3515,2537,1219,2207,3893,2643,2141,2373,4699,4700,3328, # 3648
-1651,3401,3627,5456,5457,3628,2488,3516,5458,3756,5459,5460,2276,2092, 460,5461, # 3664
-4701,5462,3020, 962, 588,3629, 289,3250,2644,1116, 52,5463,3067,1797,5464,5465, # 3680
-5466,1467,5467,1598,1143,3757,4342,1985,1734,1067,4702,1280,3402, 465,4703,1572, # 3696
- 510,5468,1928,2245,1813,1644,3630,5469,4704,3758,5470,5471,2673,1573,1534,5472, # 3712
-5473, 536,1808,1761,3517,3894,3175,2645,5474,5475,5476,4705,3518,2929,1912,2809, # 3728
-5477,3329,1122, 377,3251,5478, 360,5479,5480,4343,1529, 551,5481,2060,3759,1769, # 3744
-2431,5482,2930,4344,3330,3120,2327,2109,2031,4706,1404, 136,1468,1479, 672,1171, # 3760
-3252,2308, 271,3176,5483,2772,5484,2050, 678,2736, 865,1948,4707,5485,2014,4098, # 3776
-2971,5486,2737,2227,1397,3068,3760,4708,4709,1735,2931,3403,3631,5487,3895, 509, # 3792
-2854,2458,2890,3896,5488,5489,3177,3178,4710,4345,2538,4711,2309,1166,1010, 552, # 3808
- 681,1888,5490,5491,2972,2973,4099,1287,1596,1862,3179, 358, 453, 736, 175, 478, # 3824
-1117, 905,1167,1097,5492,1854,1530,5493,1706,5494,2181,3519,2292,3761,3520,3632, # 3840
-4346,2093,4347,5495,3404,1193,2489,4348,1458,2193,2208,1863,1889,1421,3331,2932, # 3856
-3069,2182,3521, 595,2123,5496,4100,5497,5498,4349,1707,2646, 223,3762,1359, 751, # 3872
-3121, 183,3522,5499,2810,3021, 419,2374, 633, 704,3897,2394, 241,5500,5501,5502, # 3888
- 838,3022,3763,2277,2773,2459,3898,1939,2051,4101,1309,3122,2246,1181,5503,1136, # 3904
-2209,3899,2375,1446,4350,2310,4712,5504,5505,4351,1055,2615, 484,3764,5506,4102, # 3920
- 625,4352,2278,3405,1499,4353,4103,5507,4104,4354,3253,2279,2280,3523,5508,5509, # 3936
-2774, 808,2616,3765,3406,4105,4355,3123,2539, 526,3407,3900,4356, 955,5510,1620, # 3952
-4357,2647,2432,5511,1429,3766,1669,1832, 994, 928,5512,3633,1260,5513,5514,5515, # 3968
-1949,2293, 741,2933,1626,4358,2738,2460, 867,1184, 362,3408,1392,5516,5517,4106, # 3984
-4359,1770,1736,3254,2934,4713,4714,1929,2707,1459,1158,5518,3070,3409,2891,1292, # 4000
-1930,2513,2855,3767,1986,1187,2072,2015,2617,4360,5519,2574,2514,2170,3768,2490, # 4016
-3332,5520,3769,4715,5521,5522, 666,1003,3023,1022,3634,4361,5523,4716,1814,2257, # 4032
- 574,3901,1603, 295,1535, 705,3902,4362, 283, 858, 417,5524,5525,3255,4717,4718, # 4048
-3071,1220,1890,1046,2281,2461,4107,1393,1599, 689,2575, 388,4363,5526,2491, 802, # 4064
-5527,2811,3903,2061,1405,2258,5528,4719,3904,2110,1052,1345,3256,1585,5529, 809, # 4080
-5530,5531,5532, 575,2739,3524, 956,1552,1469,1144,2328,5533,2329,1560,2462,3635, # 4096
-3257,4108, 616,2210,4364,3180,2183,2294,5534,1833,5535,3525,4720,5536,1319,3770, # 4112
-3771,1211,3636,1023,3258,1293,2812,5537,5538,5539,3905, 607,2311,3906, 762,2892, # 4128
-1439,4365,1360,4721,1485,3072,5540,4722,1038,4366,1450,2062,2648,4367,1379,4723, # 4144
-2593,5541,5542,4368,1352,1414,2330,2935,1172,5543,5544,3907,3908,4724,1798,1451, # 4160
-5545,5546,5547,5548,2936,4109,4110,2492,2351, 411,4111,4112,3637,3333,3124,4725, # 4176
-1561,2674,1452,4113,1375,5549,5550, 47,2974, 316,5551,1406,1591,2937,3181,5552, # 4192
-1025,2142,3125,3182, 354,2740, 884,2228,4369,2412, 508,3772, 726,3638, 996,2433, # 4208
-3639, 729,5553, 392,2194,1453,4114,4726,3773,5554,5555,2463,3640,2618,1675,2813, # 4224
- 919,2352,2975,2353,1270,4727,4115, 73,5556,5557, 647,5558,3259,2856,2259,1550, # 4240
-1346,3024,5559,1332, 883,3526,5560,5561,5562,5563,3334,2775,5564,1212, 831,1347, # 4256
-4370,4728,2331,3909,1864,3073, 720,3910,4729,4730,3911,5565,4371,5566,5567,4731, # 4272
-5568,5569,1799,4732,3774,2619,4733,3641,1645,2376,4734,5570,2938, 669,2211,2675, # 4288
-2434,5571,2893,5572,5573,1028,3260,5574,4372,2413,5575,2260,1353,5576,5577,4735, # 4304
-3183, 518,5578,4116,5579,4373,1961,5580,2143,4374,5581,5582,3025,2354,2355,3912, # 4320
- 516,1834,1454,4117,2708,4375,4736,2229,2620,1972,1129,3642,5583,2776,5584,2976, # 4336
-1422, 577,1470,3026,1524,3410,5585,5586, 432,4376,3074,3527,5587,2594,1455,2515, # 4352
-2230,1973,1175,5588,1020,2741,4118,3528,4737,5589,2742,5590,1743,1361,3075,3529, # 4368
-2649,4119,4377,4738,2295, 895, 924,4378,2171, 331,2247,3076, 166,1627,3077,1098, # 4384
-5591,1232,2894,2231,3411,4739, 657, 403,1196,2377, 542,3775,3412,1600,4379,3530, # 4400
-5592,4740,2777,3261, 576, 530,1362,4741,4742,2540,2676,3776,4120,5593, 842,3913, # 4416
-5594,2814,2032,1014,4121, 213,2709,3413, 665, 621,4380,5595,3777,2939,2435,5596, # 4432
-2436,3335,3643,3414,4743,4381,2541,4382,4744,3644,1682,4383,3531,1380,5597, 724, # 4448
-2282, 600,1670,5598,1337,1233,4745,3126,2248,5599,1621,4746,5600, 651,4384,5601, # 4464
-1612,4385,2621,5602,2857,5603,2743,2312,3078,5604, 716,2464,3079, 174,1255,2710, # 4480
-4122,3645, 548,1320,1398, 728,4123,1574,5605,1891,1197,3080,4124,5606,3081,3082, # 4496
-3778,3646,3779, 747,5607, 635,4386,4747,5608,5609,5610,4387,5611,5612,4748,5613, # 4512
-3415,4749,2437, 451,5614,3780,2542,2073,4388,2744,4389,4125,5615,1764,4750,5616, # 4528
-4390, 350,4751,2283,2395,2493,5617,4391,4126,2249,1434,4127, 488,4752, 458,4392, # 4544
-4128,3781, 771,1330,2396,3914,2576,3184,2160,2414,1553,2677,3185,4393,5618,2494, # 4560
-2895,2622,1720,2711,4394,3416,4753,5619,2543,4395,5620,3262,4396,2778,5621,2016, # 4576
-2745,5622,1155,1017,3782,3915,5623,3336,2313, 201,1865,4397,1430,5624,4129,5625, # 4592
-5626,5627,5628,5629,4398,1604,5630, 414,1866, 371,2595,4754,4755,3532,2017,3127, # 4608
-4756,1708, 960,4399, 887, 389,2172,1536,1663,1721,5631,2232,4130,2356,2940,1580, # 4624
-5632,5633,1744,4757,2544,4758,4759,5634,4760,5635,2074,5636,4761,3647,3417,2896, # 4640
-4400,5637,4401,2650,3418,2815, 673,2712,2465, 709,3533,4131,3648,4402,5638,1148, # 4656
- 502, 634,5639,5640,1204,4762,3649,1575,4763,2623,3783,5641,3784,3128, 948,3263, # 4672
- 121,1745,3916,1110,5642,4403,3083,2516,3027,4132,3785,1151,1771,3917,1488,4133, # 4688
-1987,5643,2438,3534,5644,5645,2094,5646,4404,3918,1213,1407,2816, 531,2746,2545, # 4704
-3264,1011,1537,4764,2779,4405,3129,1061,5647,3786,3787,1867,2897,5648,2018, 120, # 4720
-4406,4407,2063,3650,3265,2314,3919,2678,3419,1955,4765,4134,5649,3535,1047,2713, # 4736
-1266,5650,1368,4766,2858, 649,3420,3920,2546,2747,1102,2859,2679,5651,5652,2000, # 4752
-5653,1111,3651,2977,5654,2495,3921,3652,2817,1855,3421,3788,5655,5656,3422,2415, # 4768
-2898,3337,3266,3653,5657,2577,5658,3654,2818,4135,1460, 856,5659,3655,5660,2899, # 4784
-2978,5661,2900,3922,5662,4408, 632,2517, 875,3923,1697,3924,2296,5663,5664,4767, # 4800
-3028,1239, 580,4768,4409,5665, 914, 936,2075,1190,4136,1039,2124,5666,5667,5668, # 4816
-5669,3423,1473,5670,1354,4410,3925,4769,2173,3084,4137, 915,3338,4411,4412,3339, # 4832
-1605,1835,5671,2748, 398,3656,4413,3926,4138, 328,1913,2860,4139,3927,1331,4414, # 4848
-3029, 937,4415,5672,3657,4140,4141,3424,2161,4770,3425, 524, 742, 538,3085,1012, # 4864
-5673,5674,3928,2466,5675, 658,1103, 225,3929,5676,5677,4771,5678,4772,5679,3267, # 4880
-1243,5680,4142, 963,2250,4773,5681,2714,3658,3186,5682,5683,2596,2332,5684,4774, # 4896
-5685,5686,5687,3536, 957,3426,2547,2033,1931,2941,2467, 870,2019,3659,1746,2780, # 4912
-2781,2439,2468,5688,3930,5689,3789,3130,3790,3537,3427,3791,5690,1179,3086,5691, # 4928
-3187,2378,4416,3792,2548,3188,3131,2749,4143,5692,3428,1556,2549,2297, 977,2901, # 4944
-2034,4144,1205,3429,5693,1765,3430,3189,2125,1271, 714,1689,4775,3538,5694,2333, # 4960
-3931, 533,4417,3660,2184, 617,5695,2469,3340,3539,2315,5696,5697,3190,5698,5699, # 4976
-3932,1988, 618, 427,2651,3540,3431,5700,5701,1244,1690,5702,2819,4418,4776,5703, # 4992
-3541,4777,5704,2284,1576, 473,3661,4419,3432, 972,5705,3662,5706,3087,5707,5708, # 5008
-4778,4779,5709,3793,4145,4146,5710, 153,4780, 356,5711,1892,2902,4420,2144, 408, # 5024
- 803,2357,5712,3933,5713,4421,1646,2578,2518,4781,4782,3934,5714,3935,4422,5715, # 5040
-2416,3433, 752,5716,5717,1962,3341,2979,5718, 746,3030,2470,4783,4423,3794, 698, # 5056
-4784,1893,4424,3663,2550,4785,3664,3936,5719,3191,3434,5720,1824,1302,4147,2715, # 5072
-3937,1974,4425,5721,4426,3192, 823,1303,1288,1236,2861,3542,4148,3435, 774,3938, # 5088
-5722,1581,4786,1304,2862,3939,4787,5723,2440,2162,1083,3268,4427,4149,4428, 344, # 5104
-1173, 288,2316, 454,1683,5724,5725,1461,4788,4150,2597,5726,5727,4789, 985, 894, # 5120
-5728,3436,3193,5729,1914,2942,3795,1989,5730,2111,1975,5731,4151,5732,2579,1194, # 5136
- 425,5733,4790,3194,1245,3796,4429,5734,5735,2863,5736, 636,4791,1856,3940, 760, # 5152
-1800,5737,4430,2212,1508,4792,4152,1894,1684,2298,5738,5739,4793,4431,4432,2213, # 5168
- 479,5740,5741, 832,5742,4153,2496,5743,2980,2497,3797, 990,3132, 627,1815,2652, # 5184
-4433,1582,4434,2126,2112,3543,4794,5744, 799,4435,3195,5745,4795,2113,1737,3031, # 5200
-1018, 543, 754,4436,3342,1676,4796,4797,4154,4798,1489,5746,3544,5747,2624,2903, # 5216
-4155,5748,5749,2981,5750,5751,5752,5753,3196,4799,4800,2185,1722,5754,3269,3270, # 5232
-1843,3665,1715, 481, 365,1976,1857,5755,5756,1963,2498,4801,5757,2127,3666,3271, # 5248
- 433,1895,2064,2076,5758, 602,2750,5759,5760,5761,5762,5763,3032,1628,3437,5764, # 5264
-3197,4802,4156,2904,4803,2519,5765,2551,2782,5766,5767,5768,3343,4804,2905,5769, # 5280
-4805,5770,2864,4806,4807,1221,2982,4157,2520,5771,5772,5773,1868,1990,5774,5775, # 5296
-5776,1896,5777,5778,4808,1897,4158, 318,5779,2095,4159,4437,5780,5781, 485,5782, # 5312
- 938,3941, 553,2680, 116,5783,3942,3667,5784,3545,2681,2783,3438,3344,2820,5785, # 5328
-3668,2943,4160,1747,2944,2983,5786,5787, 207,5788,4809,5789,4810,2521,5790,3033, # 5344
- 890,3669,3943,5791,1878,3798,3439,5792,2186,2358,3440,1652,5793,5794,5795, 941, # 5360
-2299, 208,3546,4161,2020, 330,4438,3944,2906,2499,3799,4439,4811,5796,5797,5798, # 5376 #last 512
-#Everything below is of no interest for detection purpose
-2522,1613,4812,5799,3345,3945,2523,5800,4162,5801,1637,4163,2471,4813,3946,5802, # 5392
-2500,3034,3800,5803,5804,2195,4814,5805,2163,5806,5807,5808,5809,5810,5811,5812, # 5408
-5813,5814,5815,5816,5817,5818,5819,5820,5821,5822,5823,5824,5825,5826,5827,5828, # 5424
-5829,5830,5831,5832,5833,5834,5835,5836,5837,5838,5839,5840,5841,5842,5843,5844, # 5440
-5845,5846,5847,5848,5849,5850,5851,5852,5853,5854,5855,5856,5857,5858,5859,5860, # 5456
-5861,5862,5863,5864,5865,5866,5867,5868,5869,5870,5871,5872,5873,5874,5875,5876, # 5472
-5877,5878,5879,5880,5881,5882,5883,5884,5885,5886,5887,5888,5889,5890,5891,5892, # 5488
-5893,5894,5895,5896,5897,5898,5899,5900,5901,5902,5903,5904,5905,5906,5907,5908, # 5504
-5909,5910,5911,5912,5913,5914,5915,5916,5917,5918,5919,5920,5921,5922,5923,5924, # 5520
-5925,5926,5927,5928,5929,5930,5931,5932,5933,5934,5935,5936,5937,5938,5939,5940, # 5536
-5941,5942,5943,5944,5945,5946,5947,5948,5949,5950,5951,5952,5953,5954,5955,5956, # 5552
-5957,5958,5959,5960,5961,5962,5963,5964,5965,5966,5967,5968,5969,5970,5971,5972, # 5568
-5973,5974,5975,5976,5977,5978,5979,5980,5981,5982,5983,5984,5985,5986,5987,5988, # 5584
-5989,5990,5991,5992,5993,5994,5995,5996,5997,5998,5999,6000,6001,6002,6003,6004, # 5600
-6005,6006,6007,6008,6009,6010,6011,6012,6013,6014,6015,6016,6017,6018,6019,6020, # 5616
-6021,6022,6023,6024,6025,6026,6027,6028,6029,6030,6031,6032,6033,6034,6035,6036, # 5632
-6037,6038,6039,6040,6041,6042,6043,6044,6045,6046,6047,6048,6049,6050,6051,6052, # 5648
-6053,6054,6055,6056,6057,6058,6059,6060,6061,6062,6063,6064,6065,6066,6067,6068, # 5664
-6069,6070,6071,6072,6073,6074,6075,6076,6077,6078,6079,6080,6081,6082,6083,6084, # 5680
-6085,6086,6087,6088,6089,6090,6091,6092,6093,6094,6095,6096,6097,6098,6099,6100, # 5696
-6101,6102,6103,6104,6105,6106,6107,6108,6109,6110,6111,6112,6113,6114,6115,6116, # 5712
-6117,6118,6119,6120,6121,6122,6123,6124,6125,6126,6127,6128,6129,6130,6131,6132, # 5728
-6133,6134,6135,6136,6137,6138,6139,6140,6141,6142,6143,6144,6145,6146,6147,6148, # 5744
-6149,6150,6151,6152,6153,6154,6155,6156,6157,6158,6159,6160,6161,6162,6163,6164, # 5760
-6165,6166,6167,6168,6169,6170,6171,6172,6173,6174,6175,6176,6177,6178,6179,6180, # 5776
-6181,6182,6183,6184,6185,6186,6187,6188,6189,6190,6191,6192,6193,6194,6195,6196, # 5792
-6197,6198,6199,6200,6201,6202,6203,6204,6205,6206,6207,6208,6209,6210,6211,6212, # 5808
-6213,6214,6215,6216,6217,6218,6219,6220,6221,6222,6223,3670,6224,6225,6226,6227, # 5824
-6228,6229,6230,6231,6232,6233,6234,6235,6236,6237,6238,6239,6240,6241,6242,6243, # 5840
-6244,6245,6246,6247,6248,6249,6250,6251,6252,6253,6254,6255,6256,6257,6258,6259, # 5856
-6260,6261,6262,6263,6264,6265,6266,6267,6268,6269,6270,6271,6272,6273,6274,6275, # 5872
-6276,6277,6278,6279,6280,6281,6282,6283,6284,6285,4815,6286,6287,6288,6289,6290, # 5888
-6291,6292,4816,6293,6294,6295,6296,6297,6298,6299,6300,6301,6302,6303,6304,6305, # 5904
-6306,6307,6308,6309,6310,6311,4817,4818,6312,6313,6314,6315,6316,6317,6318,4819, # 5920
-6319,6320,6321,6322,6323,6324,6325,6326,6327,6328,6329,6330,6331,6332,6333,6334, # 5936
-6335,6336,6337,4820,6338,6339,6340,6341,6342,6343,6344,6345,6346,6347,6348,6349, # 5952
-6350,6351,6352,6353,6354,6355,6356,6357,6358,6359,6360,6361,6362,6363,6364,6365, # 5968
-6366,6367,6368,6369,6370,6371,6372,6373,6374,6375,6376,6377,6378,6379,6380,6381, # 5984
-6382,6383,6384,6385,6386,6387,6388,6389,6390,6391,6392,6393,6394,6395,6396,6397, # 6000
-6398,6399,6400,6401,6402,6403,6404,6405,6406,6407,6408,6409,6410,3441,6411,6412, # 6016
-6413,6414,6415,6416,6417,6418,6419,6420,6421,6422,6423,6424,6425,4440,6426,6427, # 6032
-6428,6429,6430,6431,6432,6433,6434,6435,6436,6437,6438,6439,6440,6441,6442,6443, # 6048
-6444,6445,6446,6447,6448,6449,6450,6451,6452,6453,6454,4821,6455,6456,6457,6458, # 6064
-6459,6460,6461,6462,6463,6464,6465,6466,6467,6468,6469,6470,6471,6472,6473,6474, # 6080
-6475,6476,6477,3947,3948,6478,6479,6480,6481,3272,4441,6482,6483,6484,6485,4442, # 6096
-6486,6487,6488,6489,6490,6491,6492,6493,6494,6495,6496,4822,6497,6498,6499,6500, # 6112
-6501,6502,6503,6504,6505,6506,6507,6508,6509,6510,6511,6512,6513,6514,6515,6516, # 6128
-6517,6518,6519,6520,6521,6522,6523,6524,6525,6526,6527,6528,6529,6530,6531,6532, # 6144
-6533,6534,6535,6536,6537,6538,6539,6540,6541,6542,6543,6544,6545,6546,6547,6548, # 6160
-6549,6550,6551,6552,6553,6554,6555,6556,2784,6557,4823,6558,6559,6560,6561,6562, # 6176
-6563,6564,6565,6566,6567,6568,6569,3949,6570,6571,6572,4824,6573,6574,6575,6576, # 6192
-6577,6578,6579,6580,6581,6582,6583,4825,6584,6585,6586,3950,2785,6587,6588,6589, # 6208
-6590,6591,6592,6593,6594,6595,6596,6597,6598,6599,6600,6601,6602,6603,6604,6605, # 6224
-6606,6607,6608,6609,6610,6611,6612,4826,6613,6614,6615,4827,6616,6617,6618,6619, # 6240
-6620,6621,6622,6623,6624,6625,4164,6626,6627,6628,6629,6630,6631,6632,6633,6634, # 6256
-3547,6635,4828,6636,6637,6638,6639,6640,6641,6642,3951,2984,6643,6644,6645,6646, # 6272
-6647,6648,6649,4165,6650,4829,6651,6652,4830,6653,6654,6655,6656,6657,6658,6659, # 6288
-6660,6661,6662,4831,6663,6664,6665,6666,6667,6668,6669,6670,6671,4166,6672,4832, # 6304
-3952,6673,6674,6675,6676,4833,6677,6678,6679,4167,6680,6681,6682,3198,6683,6684, # 6320
-6685,6686,6687,6688,6689,6690,6691,6692,6693,6694,6695,6696,6697,4834,6698,6699, # 6336
-6700,6701,6702,6703,6704,6705,6706,6707,6708,6709,6710,6711,6712,6713,6714,6715, # 6352
-6716,6717,6718,6719,6720,6721,6722,6723,6724,6725,6726,6727,6728,6729,6730,6731, # 6368
-6732,6733,6734,4443,6735,6736,6737,6738,6739,6740,6741,6742,6743,6744,6745,4444, # 6384
-6746,6747,6748,6749,6750,6751,6752,6753,6754,6755,6756,6757,6758,6759,6760,6761, # 6400
-6762,6763,6764,6765,6766,6767,6768,6769,6770,6771,6772,6773,6774,6775,6776,6777, # 6416
-6778,6779,6780,6781,4168,6782,6783,3442,6784,6785,6786,6787,6788,6789,6790,6791, # 6432
-4169,6792,6793,6794,6795,6796,6797,6798,6799,6800,6801,6802,6803,6804,6805,6806, # 6448
-6807,6808,6809,6810,6811,4835,6812,6813,6814,4445,6815,6816,4446,6817,6818,6819, # 6464
-6820,6821,6822,6823,6824,6825,6826,6827,6828,6829,6830,6831,6832,6833,6834,6835, # 6480
-3548,6836,6837,6838,6839,6840,6841,6842,6843,6844,6845,6846,4836,6847,6848,6849, # 6496
-6850,6851,6852,6853,6854,3953,6855,6856,6857,6858,6859,6860,6861,6862,6863,6864, # 6512
-6865,6866,6867,6868,6869,6870,6871,6872,6873,6874,6875,6876,6877,3199,6878,6879, # 6528
-6880,6881,6882,4447,6883,6884,6885,6886,6887,6888,6889,6890,6891,6892,6893,6894, # 6544
-6895,6896,6897,6898,6899,6900,6901,6902,6903,6904,4170,6905,6906,6907,6908,6909, # 6560
-6910,6911,6912,6913,6914,6915,6916,6917,6918,6919,6920,6921,6922,6923,6924,6925, # 6576
-6926,6927,4837,6928,6929,6930,6931,6932,6933,6934,6935,6936,3346,6937,6938,4838, # 6592
-6939,6940,6941,4448,6942,6943,6944,6945,6946,4449,6947,6948,6949,6950,6951,6952, # 6608
-6953,6954,6955,6956,6957,6958,6959,6960,6961,6962,6963,6964,6965,6966,6967,6968, # 6624
-6969,6970,6971,6972,6973,6974,6975,6976,6977,6978,6979,6980,6981,6982,6983,6984, # 6640
-6985,6986,6987,6988,6989,6990,6991,6992,6993,6994,3671,6995,6996,6997,6998,4839, # 6656
-6999,7000,7001,7002,3549,7003,7004,7005,7006,7007,7008,7009,7010,7011,7012,7013, # 6672
-7014,7015,7016,7017,7018,7019,7020,7021,7022,7023,7024,7025,7026,7027,7028,7029, # 6688
-7030,4840,7031,7032,7033,7034,7035,7036,7037,7038,4841,7039,7040,7041,7042,7043, # 6704
-7044,7045,7046,7047,7048,7049,7050,7051,7052,7053,7054,7055,7056,7057,7058,7059, # 6720
-7060,7061,7062,7063,7064,7065,7066,7067,7068,7069,7070,2985,7071,7072,7073,7074, # 6736
-7075,7076,7077,7078,7079,7080,4842,7081,7082,7083,7084,7085,7086,7087,7088,7089, # 6752
-7090,7091,7092,7093,7094,7095,7096,7097,7098,7099,7100,7101,7102,7103,7104,7105, # 6768
-7106,7107,7108,7109,7110,7111,7112,7113,7114,7115,7116,7117,7118,4450,7119,7120, # 6784
-7121,7122,7123,7124,7125,7126,7127,7128,7129,7130,7131,7132,7133,7134,7135,7136, # 6800
-7137,7138,7139,7140,7141,7142,7143,4843,7144,7145,7146,7147,7148,7149,7150,7151, # 6816
-7152,7153,7154,7155,7156,7157,7158,7159,7160,7161,7162,7163,7164,7165,7166,7167, # 6832
-7168,7169,7170,7171,7172,7173,7174,7175,7176,7177,7178,7179,7180,7181,7182,7183, # 6848
-7184,7185,7186,7187,7188,4171,4172,7189,7190,7191,7192,7193,7194,7195,7196,7197, # 6864
-7198,7199,7200,7201,7202,7203,7204,7205,7206,7207,7208,7209,7210,7211,7212,7213, # 6880
-7214,7215,7216,7217,7218,7219,7220,7221,7222,7223,7224,7225,7226,7227,7228,7229, # 6896
-7230,7231,7232,7233,7234,7235,7236,7237,7238,7239,7240,7241,7242,7243,7244,7245, # 6912
-7246,7247,7248,7249,7250,7251,7252,7253,7254,7255,7256,7257,7258,7259,7260,7261, # 6928
-7262,7263,7264,7265,7266,7267,7268,7269,7270,7271,7272,7273,7274,7275,7276,7277, # 6944
-7278,7279,7280,7281,7282,7283,7284,7285,7286,7287,7288,7289,7290,7291,7292,7293, # 6960
-7294,7295,7296,4844,7297,7298,7299,7300,7301,7302,7303,7304,7305,7306,7307,7308, # 6976
-7309,7310,7311,7312,7313,7314,7315,7316,4451,7317,7318,7319,7320,7321,7322,7323, # 6992
-7324,7325,7326,7327,7328,7329,7330,7331,7332,7333,7334,7335,7336,7337,7338,7339, # 7008
-7340,7341,7342,7343,7344,7345,7346,7347,7348,7349,7350,7351,7352,7353,4173,7354, # 7024
-7355,4845,7356,7357,7358,7359,7360,7361,7362,7363,7364,7365,7366,7367,7368,7369, # 7040
-7370,7371,7372,7373,7374,7375,7376,7377,7378,7379,7380,7381,7382,7383,7384,7385, # 7056
-7386,7387,7388,4846,7389,7390,7391,7392,7393,7394,7395,7396,7397,7398,7399,7400, # 7072
-7401,7402,7403,7404,7405,3672,7406,7407,7408,7409,7410,7411,7412,7413,7414,7415, # 7088
-7416,7417,7418,7419,7420,7421,7422,7423,7424,7425,7426,7427,7428,7429,7430,7431, # 7104
-7432,7433,7434,7435,7436,7437,7438,7439,7440,7441,7442,7443,7444,7445,7446,7447, # 7120
-7448,7449,7450,7451,7452,7453,4452,7454,3200,7455,7456,7457,7458,7459,7460,7461, # 7136
-7462,7463,7464,7465,7466,7467,7468,7469,7470,7471,7472,7473,7474,4847,7475,7476, # 7152
-7477,3133,7478,7479,7480,7481,7482,7483,7484,7485,7486,7487,7488,7489,7490,7491, # 7168
-7492,7493,7494,7495,7496,7497,7498,7499,7500,7501,7502,3347,7503,7504,7505,7506, # 7184
-7507,7508,7509,7510,7511,7512,7513,7514,7515,7516,7517,7518,7519,7520,7521,4848, # 7200
-7522,7523,7524,7525,7526,7527,7528,7529,7530,7531,7532,7533,7534,7535,7536,7537, # 7216
-7538,7539,7540,7541,7542,7543,7544,7545,7546,7547,7548,7549,3801,4849,7550,7551, # 7232
-7552,7553,7554,7555,7556,7557,7558,7559,7560,7561,7562,7563,7564,7565,7566,7567, # 7248
-7568,7569,3035,7570,7571,7572,7573,7574,7575,7576,7577,7578,7579,7580,7581,7582, # 7264
-7583,7584,7585,7586,7587,7588,7589,7590,7591,7592,7593,7594,7595,7596,7597,7598, # 7280
-7599,7600,7601,7602,7603,7604,7605,7606,7607,7608,7609,7610,7611,7612,7613,7614, # 7296
-7615,7616,4850,7617,7618,3802,7619,7620,7621,7622,7623,7624,7625,7626,7627,7628, # 7312
-7629,7630,7631,7632,4851,7633,7634,7635,7636,7637,7638,7639,7640,7641,7642,7643, # 7328
-7644,7645,7646,7647,7648,7649,7650,7651,7652,7653,7654,7655,7656,7657,7658,7659, # 7344
-7660,7661,7662,7663,7664,7665,7666,7667,7668,7669,7670,4453,7671,7672,7673,7674, # 7360
-7675,7676,7677,7678,7679,7680,7681,7682,7683,7684,7685,7686,7687,7688,7689,7690, # 7376
-7691,7692,7693,7694,7695,7696,7697,3443,7698,7699,7700,7701,7702,4454,7703,7704, # 7392
-7705,7706,7707,7708,7709,7710,7711,7712,7713,2472,7714,7715,7716,7717,7718,7719, # 7408
-7720,7721,7722,7723,7724,7725,7726,7727,7728,7729,7730,7731,3954,7732,7733,7734, # 7424
-7735,7736,7737,7738,7739,7740,7741,7742,7743,7744,7745,7746,7747,7748,7749,7750, # 7440
-3134,7751,7752,4852,7753,7754,7755,4853,7756,7757,7758,7759,7760,4174,7761,7762, # 7456
-7763,7764,7765,7766,7767,7768,7769,7770,7771,7772,7773,7774,7775,7776,7777,7778, # 7472
-7779,7780,7781,7782,7783,7784,7785,7786,7787,7788,7789,7790,7791,7792,7793,7794, # 7488
-7795,7796,7797,7798,7799,7800,7801,7802,7803,7804,7805,4854,7806,7807,7808,7809, # 7504
-7810,7811,7812,7813,7814,7815,7816,7817,7818,7819,7820,7821,7822,7823,7824,7825, # 7520
-4855,7826,7827,7828,7829,7830,7831,7832,7833,7834,7835,7836,7837,7838,7839,7840, # 7536
-7841,7842,7843,7844,7845,7846,7847,3955,7848,7849,7850,7851,7852,7853,7854,7855, # 7552
-7856,7857,7858,7859,7860,3444,7861,7862,7863,7864,7865,7866,7867,7868,7869,7870, # 7568
-7871,7872,7873,7874,7875,7876,7877,7878,7879,7880,7881,7882,7883,7884,7885,7886, # 7584
-7887,7888,7889,7890,7891,4175,7892,7893,7894,7895,7896,4856,4857,7897,7898,7899, # 7600
-7900,2598,7901,7902,7903,7904,7905,7906,7907,7908,4455,7909,7910,7911,7912,7913, # 7616
-7914,3201,7915,7916,7917,7918,7919,7920,7921,4858,7922,7923,7924,7925,7926,7927, # 7632
-7928,7929,7930,7931,7932,7933,7934,7935,7936,7937,7938,7939,7940,7941,7942,7943, # 7648
-7944,7945,7946,7947,7948,7949,7950,7951,7952,7953,7954,7955,7956,7957,7958,7959, # 7664
-7960,7961,7962,7963,7964,7965,7966,7967,7968,7969,7970,7971,7972,7973,7974,7975, # 7680
-7976,7977,7978,7979,7980,7981,4859,7982,7983,7984,7985,7986,7987,7988,7989,7990, # 7696
-7991,7992,7993,7994,7995,7996,4860,7997,7998,7999,8000,8001,8002,8003,8004,8005, # 7712
-8006,8007,8008,8009,8010,8011,8012,8013,8014,8015,8016,4176,8017,8018,8019,8020, # 7728
-8021,8022,8023,4861,8024,8025,8026,8027,8028,8029,8030,8031,8032,8033,8034,8035, # 7744
-8036,4862,4456,8037,8038,8039,8040,4863,8041,8042,8043,8044,8045,8046,8047,8048, # 7760
-8049,8050,8051,8052,8053,8054,8055,8056,8057,8058,8059,8060,8061,8062,8063,8064, # 7776
-8065,8066,8067,8068,8069,8070,8071,8072,8073,8074,8075,8076,8077,8078,8079,8080, # 7792
-8081,8082,8083,8084,8085,8086,8087,8088,8089,8090,8091,8092,8093,8094,8095,8096, # 7808
-8097,8098,8099,4864,4177,8100,8101,8102,8103,8104,8105,8106,8107,8108,8109,8110, # 7824
-8111,8112,8113,8114,8115,8116,8117,8118,8119,8120,4178,8121,8122,8123,8124,8125, # 7840
-8126,8127,8128,8129,8130,8131,8132,8133,8134,8135,8136,8137,8138,8139,8140,8141, # 7856
-8142,8143,8144,8145,4865,4866,8146,8147,8148,8149,8150,8151,8152,8153,8154,8155, # 7872
-8156,8157,8158,8159,8160,8161,8162,8163,8164,8165,4179,8166,8167,8168,8169,8170, # 7888
-8171,8172,8173,8174,8175,8176,8177,8178,8179,8180,8181,4457,8182,8183,8184,8185, # 7904
-8186,8187,8188,8189,8190,8191,8192,8193,8194,8195,8196,8197,8198,8199,8200,8201, # 7920
-8202,8203,8204,8205,8206,8207,8208,8209,8210,8211,8212,8213,8214,8215,8216,8217, # 7936
-8218,8219,8220,8221,8222,8223,8224,8225,8226,8227,8228,8229,8230,8231,8232,8233, # 7952
-8234,8235,8236,8237,8238,8239,8240,8241,8242,8243,8244,8245,8246,8247,8248,8249, # 7968
-8250,8251,8252,8253,8254,8255,8256,3445,8257,8258,8259,8260,8261,8262,4458,8263, # 7984
-8264,8265,8266,8267,8268,8269,8270,8271,8272,4459,8273,8274,8275,8276,3550,8277, # 8000
-8278,8279,8280,8281,8282,8283,8284,8285,8286,8287,8288,8289,4460,8290,8291,8292, # 8016
-8293,8294,8295,8296,8297,8298,8299,8300,8301,8302,8303,8304,8305,8306,8307,4867, # 8032
-8308,8309,8310,8311,8312,3551,8313,8314,8315,8316,8317,8318,8319,8320,8321,8322, # 8048
-8323,8324,8325,8326,4868,8327,8328,8329,8330,8331,8332,8333,8334,8335,8336,8337, # 8064
-8338,8339,8340,8341,8342,8343,8344,8345,8346,8347,8348,8349,8350,8351,8352,8353, # 8080
-8354,8355,8356,8357,8358,8359,8360,8361,8362,8363,4869,4461,8364,8365,8366,8367, # 8096
-8368,8369,8370,4870,8371,8372,8373,8374,8375,8376,8377,8378,8379,8380,8381,8382, # 8112
-8383,8384,8385,8386,8387,8388,8389,8390,8391,8392,8393,8394,8395,8396,8397,8398, # 8128
-8399,8400,8401,8402,8403,8404,8405,8406,8407,8408,8409,8410,4871,8411,8412,8413, # 8144
-8414,8415,8416,8417,8418,8419,8420,8421,8422,4462,8423,8424,8425,8426,8427,8428, # 8160
-8429,8430,8431,8432,8433,2986,8434,8435,8436,8437,8438,8439,8440,8441,8442,8443, # 8176
-8444,8445,8446,8447,8448,8449,8450,8451,8452,8453,8454,8455,8456,8457,8458,8459, # 8192
-8460,8461,8462,8463,8464,8465,8466,8467,8468,8469,8470,8471,8472,8473,8474,8475, # 8208
-8476,8477,8478,4180,8479,8480,8481,8482,8483,8484,8485,8486,8487,8488,8489,8490, # 8224
-8491,8492,8493,8494,8495,8496,8497,8498,8499,8500,8501,8502,8503,8504,8505,8506, # 8240
-8507,8508,8509,8510,8511,8512,8513,8514,8515,8516,8517,8518,8519,8520,8521,8522, # 8256
-8523,8524,8525,8526,8527,8528,8529,8530,8531,8532,8533,8534,8535,8536,8537,8538, # 8272
-8539,8540,8541,8542,8543,8544,8545,8546,8547,8548,8549,8550,8551,8552,8553,8554, # 8288
-8555,8556,8557,8558,8559,8560,8561,8562,8563,8564,4872,8565,8566,8567,8568,8569, # 8304
-8570,8571,8572,8573,4873,8574,8575,8576,8577,8578,8579,8580,8581,8582,8583,8584, # 8320
-8585,8586,8587,8588,8589,8590,8591,8592,8593,8594,8595,8596,8597,8598,8599,8600, # 8336
-8601,8602,8603,8604,8605,3803,8606,8607,8608,8609,8610,8611,8612,8613,4874,3804, # 8352
-8614,8615,8616,8617,8618,8619,8620,8621,3956,8622,8623,8624,8625,8626,8627,8628, # 8368
-8629,8630,8631,8632,8633,8634,8635,8636,8637,8638,2865,8639,8640,8641,8642,8643, # 8384
-8644,8645,8646,8647,8648,8649,8650,8651,8652,8653,8654,8655,8656,4463,8657,8658, # 8400
-8659,4875,4876,8660,8661,8662,8663,8664,8665,8666,8667,8668,8669,8670,8671,8672, # 8416
-8673,8674,8675,8676,8677,8678,8679,8680,8681,4464,8682,8683,8684,8685,8686,8687, # 8432
-8688,8689,8690,8691,8692,8693,8694,8695,8696,8697,8698,8699,8700,8701,8702,8703, # 8448
-8704,8705,8706,8707,8708,8709,2261,8710,8711,8712,8713,8714,8715,8716,8717,8718, # 8464
-8719,8720,8721,8722,8723,8724,8725,8726,8727,8728,8729,8730,8731,8732,8733,4181, # 8480
-8734,8735,8736,8737,8738,8739,8740,8741,8742,8743,8744,8745,8746,8747,8748,8749, # 8496
-8750,8751,8752,8753,8754,8755,8756,8757,8758,8759,8760,8761,8762,8763,4877,8764, # 8512
-8765,8766,8767,8768,8769,8770,8771,8772,8773,8774,8775,8776,8777,8778,8779,8780, # 8528
-8781,8782,8783,8784,8785,8786,8787,8788,4878,8789,4879,8790,8791,8792,4880,8793, # 8544
-8794,8795,8796,8797,8798,8799,8800,8801,4881,8802,8803,8804,8805,8806,8807,8808, # 8560
-8809,8810,8811,8812,8813,8814,8815,3957,8816,8817,8818,8819,8820,8821,8822,8823, # 8576
-8824,8825,8826,8827,8828,8829,8830,8831,8832,8833,8834,8835,8836,8837,8838,8839, # 8592
-8840,8841,8842,8843,8844,8845,8846,8847,4882,8848,8849,8850,8851,8852,8853,8854, # 8608
-8855,8856,8857,8858,8859,8860,8861,8862,8863,8864,8865,8866,8867,8868,8869,8870, # 8624
-8871,8872,8873,8874,8875,8876,8877,8878,8879,8880,8881,8882,8883,8884,3202,8885, # 8640
-8886,8887,8888,8889,8890,8891,8892,8893,8894,8895,8896,8897,8898,8899,8900,8901, # 8656
-8902,8903,8904,8905,8906,8907,8908,8909,8910,8911,8912,8913,8914,8915,8916,8917, # 8672
-8918,8919,8920,8921,8922,8923,8924,4465,8925,8926,8927,8928,8929,8930,8931,8932, # 8688
-4883,8933,8934,8935,8936,8937,8938,8939,8940,8941,8942,8943,2214,8944,8945,8946, # 8704
-8947,8948,8949,8950,8951,8952,8953,8954,8955,8956,8957,8958,8959,8960,8961,8962, # 8720
-8963,8964,8965,4884,8966,8967,8968,8969,8970,8971,8972,8973,8974,8975,8976,8977, # 8736
-8978,8979,8980,8981,8982,8983,8984,8985,8986,8987,8988,8989,8990,8991,8992,4885, # 8752
-8993,8994,8995,8996,8997,8998,8999,9000,9001,9002,9003,9004,9005,9006,9007,9008, # 8768
-9009,9010,9011,9012,9013,9014,9015,9016,9017,9018,9019,9020,9021,4182,9022,9023, # 8784
-9024,9025,9026,9027,9028,9029,9030,9031,9032,9033,9034,9035,9036,9037,9038,9039, # 8800
-9040,9041,9042,9043,9044,9045,9046,9047,9048,9049,9050,9051,9052,9053,9054,9055, # 8816
-9056,9057,9058,9059,9060,9061,9062,9063,4886,9064,9065,9066,9067,9068,9069,4887, # 8832
-9070,9071,9072,9073,9074,9075,9076,9077,9078,9079,9080,9081,9082,9083,9084,9085, # 8848
-9086,9087,9088,9089,9090,9091,9092,9093,9094,9095,9096,9097,9098,9099,9100,9101, # 8864
-9102,9103,9104,9105,9106,9107,9108,9109,9110,9111,9112,9113,9114,9115,9116,9117, # 8880
-9118,9119,9120,9121,9122,9123,9124,9125,9126,9127,9128,9129,9130,9131,9132,9133, # 8896
-9134,9135,9136,9137,9138,9139,9140,9141,3958,9142,9143,9144,9145,9146,9147,9148, # 8912
-9149,9150,9151,4888,9152,9153,9154,9155,9156,9157,9158,9159,9160,9161,9162,9163, # 8928
-9164,9165,9166,9167,9168,9169,9170,9171,9172,9173,9174,9175,4889,9176,9177,9178, # 8944
-9179,9180,9181,9182,9183,9184,9185,9186,9187,9188,9189,9190,9191,9192,9193,9194, # 8960
-9195,9196,9197,9198,9199,9200,9201,9202,9203,4890,9204,9205,9206,9207,9208,9209, # 8976
-9210,9211,9212,9213,9214,9215,9216,9217,9218,9219,9220,9221,9222,4466,9223,9224, # 8992
-9225,9226,9227,9228,9229,9230,9231,9232,9233,9234,9235,9236,9237,9238,9239,9240, # 9008
-9241,9242,9243,9244,9245,4891,9246,9247,9248,9249,9250,9251,9252,9253,9254,9255, # 9024
-9256,9257,4892,9258,9259,9260,9261,4893,4894,9262,9263,9264,9265,9266,9267,9268, # 9040
-9269,9270,9271,9272,9273,4467,9274,9275,9276,9277,9278,9279,9280,9281,9282,9283, # 9056
-9284,9285,3673,9286,9287,9288,9289,9290,9291,9292,9293,9294,9295,9296,9297,9298, # 9072
-9299,9300,9301,9302,9303,9304,9305,9306,9307,9308,9309,9310,9311,9312,9313,9314, # 9088
-9315,9316,9317,9318,9319,9320,9321,9322,4895,9323,9324,9325,9326,9327,9328,9329, # 9104
-9330,9331,9332,9333,9334,9335,9336,9337,9338,9339,9340,9341,9342,9343,9344,9345, # 9120
-9346,9347,4468,9348,9349,9350,9351,9352,9353,9354,9355,9356,9357,9358,9359,9360, # 9136
-9361,9362,9363,9364,9365,9366,9367,9368,9369,9370,9371,9372,9373,4896,9374,4469, # 9152
-9375,9376,9377,9378,9379,4897,9380,9381,9382,9383,9384,9385,9386,9387,9388,9389, # 9168
-9390,9391,9392,9393,9394,9395,9396,9397,9398,9399,9400,9401,9402,9403,9404,9405, # 9184
-9406,4470,9407,2751,9408,9409,3674,3552,9410,9411,9412,9413,9414,9415,9416,9417, # 9200
-9418,9419,9420,9421,4898,9422,9423,9424,9425,9426,9427,9428,9429,3959,9430,9431, # 9216
-9432,9433,9434,9435,9436,4471,9437,9438,9439,9440,9441,9442,9443,9444,9445,9446, # 9232
-9447,9448,9449,9450,3348,9451,9452,9453,9454,9455,9456,9457,9458,9459,9460,9461, # 9248
-9462,9463,9464,9465,9466,9467,9468,9469,9470,9471,9472,4899,9473,9474,9475,9476, # 9264
-9477,4900,9478,9479,9480,9481,9482,9483,9484,9485,9486,9487,9488,3349,9489,9490, # 9280
-9491,9492,9493,9494,9495,9496,9497,9498,9499,9500,9501,9502,9503,9504,9505,9506, # 9296
-9507,9508,9509,9510,9511,9512,9513,9514,9515,9516,9517,9518,9519,9520,4901,9521, # 9312
-9522,9523,9524,9525,9526,4902,9527,9528,9529,9530,9531,9532,9533,9534,9535,9536, # 9328
-9537,9538,9539,9540,9541,9542,9543,9544,9545,9546,9547,9548,9549,9550,9551,9552, # 9344
-9553,9554,9555,9556,9557,9558,9559,9560,9561,9562,9563,9564,9565,9566,9567,9568, # 9360
-9569,9570,9571,9572,9573,9574,9575,9576,9577,9578,9579,9580,9581,9582,9583,9584, # 9376
-3805,9585,9586,9587,9588,9589,9590,9591,9592,9593,9594,9595,9596,9597,9598,9599, # 9392
-9600,9601,9602,4903,9603,9604,9605,9606,9607,4904,9608,9609,9610,9611,9612,9613, # 9408
-9614,4905,9615,9616,9617,9618,9619,9620,9621,9622,9623,9624,9625,9626,9627,9628, # 9424
-9629,9630,9631,9632,4906,9633,9634,9635,9636,9637,9638,9639,9640,9641,9642,9643, # 9440
-4907,9644,9645,9646,9647,9648,9649,9650,9651,9652,9653,9654,9655,9656,9657,9658, # 9456
-9659,9660,9661,9662,9663,9664,9665,9666,9667,9668,9669,9670,9671,9672,4183,9673, # 9472
-9674,9675,9676,9677,4908,9678,9679,9680,9681,4909,9682,9683,9684,9685,9686,9687, # 9488
-9688,9689,9690,4910,9691,9692,9693,3675,9694,9695,9696,2945,9697,9698,9699,9700, # 9504
-9701,9702,9703,9704,9705,4911,9706,9707,9708,9709,9710,9711,9712,9713,9714,9715, # 9520
-9716,9717,9718,9719,9720,9721,9722,9723,9724,9725,9726,9727,9728,9729,9730,9731, # 9536
-9732,9733,9734,9735,4912,9736,9737,9738,9739,9740,4913,9741,9742,9743,9744,9745, # 9552
-9746,9747,9748,9749,9750,9751,9752,9753,9754,9755,9756,9757,9758,4914,9759,9760, # 9568
-9761,9762,9763,9764,9765,9766,9767,9768,9769,9770,9771,9772,9773,9774,9775,9776, # 9584
-9777,9778,9779,9780,9781,9782,4915,9783,9784,9785,9786,9787,9788,9789,9790,9791, # 9600
-9792,9793,4916,9794,9795,9796,9797,9798,9799,9800,9801,9802,9803,9804,9805,9806, # 9616
-9807,9808,9809,9810,9811,9812,9813,9814,9815,9816,9817,9818,9819,9820,9821,9822, # 9632
-9823,9824,9825,9826,9827,9828,9829,9830,9831,9832,9833,9834,9835,9836,9837,9838, # 9648
-9839,9840,9841,9842,9843,9844,9845,9846,9847,9848,9849,9850,9851,9852,9853,9854, # 9664
-9855,9856,9857,9858,9859,9860,9861,9862,9863,9864,9865,9866,9867,9868,4917,9869, # 9680
-9870,9871,9872,9873,9874,9875,9876,9877,9878,9879,9880,9881,9882,9883,9884,9885, # 9696
-9886,9887,9888,9889,9890,9891,9892,4472,9893,9894,9895,9896,9897,3806,9898,9899, # 9712
-9900,9901,9902,9903,9904,9905,9906,9907,9908,9909,9910,9911,9912,9913,9914,4918, # 9728
-9915,9916,9917,4919,9918,9919,9920,9921,4184,9922,9923,9924,9925,9926,9927,9928, # 9744
-9929,9930,9931,9932,9933,9934,9935,9936,9937,9938,9939,9940,9941,9942,9943,9944, # 9760
-9945,9946,4920,9947,9948,9949,9950,9951,9952,9953,9954,9955,4185,9956,9957,9958, # 9776
-9959,9960,9961,9962,9963,9964,9965,4921,9966,9967,9968,4473,9969,9970,9971,9972, # 9792
-9973,9974,9975,9976,9977,4474,9978,9979,9980,9981,9982,9983,9984,9985,9986,9987, # 9808
-9988,9989,9990,9991,9992,9993,9994,9995,9996,9997,9998,9999,10000,10001,10002,10003, # 9824
-10004,10005,10006,10007,10008,10009,10010,10011,10012,10013,10014,10015,10016,10017,10018,10019, # 9840
-10020,10021,4922,10022,4923,10023,10024,10025,10026,10027,10028,10029,10030,10031,10032,10033, # 9856
-10034,10035,10036,10037,10038,10039,10040,10041,10042,10043,10044,10045,10046,10047,10048,4924, # 9872
-10049,10050,10051,10052,10053,10054,10055,10056,10057,10058,10059,10060,10061,10062,10063,10064, # 9888
-10065,10066,10067,10068,10069,10070,10071,10072,10073,10074,10075,10076,10077,10078,10079,10080, # 9904
-10081,10082,10083,10084,10085,10086,10087,4475,10088,10089,10090,10091,10092,10093,10094,10095, # 9920
-10096,10097,4476,10098,10099,10100,10101,10102,10103,10104,10105,10106,10107,10108,10109,10110, # 9936
-10111,2174,10112,10113,10114,10115,10116,10117,10118,10119,10120,10121,10122,10123,10124,10125, # 9952
-10126,10127,10128,10129,10130,10131,10132,10133,10134,10135,10136,10137,10138,10139,10140,3807, # 9968
-4186,4925,10141,10142,10143,10144,10145,10146,10147,4477,4187,10148,10149,10150,10151,10152, # 9984
-10153,4188,10154,10155,10156,10157,10158,10159,10160,10161,4926,10162,10163,10164,10165,10166, #10000
-10167,10168,10169,10170,10171,10172,10173,10174,10175,10176,10177,10178,10179,10180,10181,10182, #10016
-10183,10184,10185,10186,10187,10188,10189,10190,10191,10192,3203,10193,10194,10195,10196,10197, #10032
-10198,10199,10200,4478,10201,10202,10203,10204,4479,10205,10206,10207,10208,10209,10210,10211, #10048
-10212,10213,10214,10215,10216,10217,10218,10219,10220,10221,10222,10223,10224,10225,10226,10227, #10064
-10228,10229,10230,10231,10232,10233,10234,4927,10235,10236,10237,10238,10239,10240,10241,10242, #10080
-10243,10244,10245,10246,10247,10248,10249,10250,10251,10252,10253,10254,10255,10256,10257,10258, #10096
-10259,10260,10261,10262,10263,10264,10265,10266,10267,10268,10269,10270,10271,10272,10273,4480, #10112
-4928,4929,10274,10275,10276,10277,10278,10279,10280,10281,10282,10283,10284,10285,10286,10287, #10128
-10288,10289,10290,10291,10292,10293,10294,10295,10296,10297,10298,10299,10300,10301,10302,10303, #10144
-10304,10305,10306,10307,10308,10309,10310,10311,10312,10313,10314,10315,10316,10317,10318,10319, #10160
-10320,10321,10322,10323,10324,10325,10326,10327,10328,10329,10330,10331,10332,10333,10334,4930, #10176
-10335,10336,10337,10338,10339,10340,10341,10342,4931,10343,10344,10345,10346,10347,10348,10349, #10192
-10350,10351,10352,10353,10354,10355,3088,10356,2786,10357,10358,10359,10360,4189,10361,10362, #10208
-10363,10364,10365,10366,10367,10368,10369,10370,10371,10372,10373,10374,10375,4932,10376,10377, #10224
-10378,10379,10380,10381,10382,10383,10384,10385,10386,10387,10388,10389,10390,10391,10392,4933, #10240
-10393,10394,10395,4934,10396,10397,10398,10399,10400,10401,10402,10403,10404,10405,10406,10407, #10256
-10408,10409,10410,10411,10412,3446,10413,10414,10415,10416,10417,10418,10419,10420,10421,10422, #10272
-10423,4935,10424,10425,10426,10427,10428,10429,10430,4936,10431,10432,10433,10434,10435,10436, #10288
-10437,10438,10439,10440,10441,10442,10443,4937,10444,10445,10446,10447,4481,10448,10449,10450, #10304
-10451,10452,10453,10454,10455,10456,10457,10458,10459,10460,10461,10462,10463,10464,10465,10466, #10320
-10467,10468,10469,10470,10471,10472,10473,10474,10475,10476,10477,10478,10479,10480,10481,10482, #10336
-10483,10484,10485,10486,10487,10488,10489,10490,10491,10492,10493,10494,10495,10496,10497,10498, #10352
-10499,10500,10501,10502,10503,10504,10505,4938,10506,10507,10508,10509,10510,2552,10511,10512, #10368
-10513,10514,10515,10516,3447,10517,10518,10519,10520,10521,10522,10523,10524,10525,10526,10527, #10384
-10528,10529,10530,10531,10532,10533,10534,10535,10536,10537,10538,10539,10540,10541,10542,10543, #10400
-4482,10544,4939,10545,10546,10547,10548,10549,10550,10551,10552,10553,10554,10555,10556,10557, #10416
-10558,10559,10560,10561,10562,10563,10564,10565,10566,10567,3676,4483,10568,10569,10570,10571, #10432
-10572,3448,10573,10574,10575,10576,10577,10578,10579,10580,10581,10582,10583,10584,10585,10586, #10448
-10587,10588,10589,10590,10591,10592,10593,10594,10595,10596,10597,10598,10599,10600,10601,10602, #10464
-10603,10604,10605,10606,10607,10608,10609,10610,10611,10612,10613,10614,10615,10616,10617,10618, #10480
-10619,10620,10621,10622,10623,10624,10625,10626,10627,4484,10628,10629,10630,10631,10632,4940, #10496
-10633,10634,10635,10636,10637,10638,10639,10640,10641,10642,10643,10644,10645,10646,10647,10648, #10512
-10649,10650,10651,10652,10653,10654,10655,10656,4941,10657,10658,10659,2599,10660,10661,10662, #10528
-10663,10664,10665,10666,3089,10667,10668,10669,10670,10671,10672,10673,10674,10675,10676,10677, #10544
-10678,10679,10680,4942,10681,10682,10683,10684,10685,10686,10687,10688,10689,10690,10691,10692, #10560
-10693,10694,10695,10696,10697,4485,10698,10699,10700,10701,10702,10703,10704,4943,10705,3677, #10576
-10706,10707,10708,10709,10710,10711,10712,4944,10713,10714,10715,10716,10717,10718,10719,10720, #10592
-10721,10722,10723,10724,10725,10726,10727,10728,4945,10729,10730,10731,10732,10733,10734,10735, #10608
-10736,10737,10738,10739,10740,10741,10742,10743,10744,10745,10746,10747,10748,10749,10750,10751, #10624
-10752,10753,10754,10755,10756,10757,10758,10759,10760,10761,4946,10762,10763,10764,10765,10766, #10640
-10767,4947,4948,10768,10769,10770,10771,10772,10773,10774,10775,10776,10777,10778,10779,10780, #10656
-10781,10782,10783,10784,10785,10786,10787,10788,10789,10790,10791,10792,10793,10794,10795,10796, #10672
-10797,10798,10799,10800,10801,10802,10803,10804,10805,10806,10807,10808,10809,10810,10811,10812, #10688
-10813,10814,10815,10816,10817,10818,10819,10820,10821,10822,10823,10824,10825,10826,10827,10828, #10704
-10829,10830,10831,10832,10833,10834,10835,10836,10837,10838,10839,10840,10841,10842,10843,10844, #10720
-10845,10846,10847,10848,10849,10850,10851,10852,10853,10854,10855,10856,10857,10858,10859,10860, #10736
-10861,10862,10863,10864,10865,10866,10867,10868,10869,10870,10871,10872,10873,10874,10875,10876, #10752
-10877,10878,4486,10879,10880,10881,10882,10883,10884,10885,4949,10886,10887,10888,10889,10890, #10768
-10891,10892,10893,10894,10895,10896,10897,10898,10899,10900,10901,10902,10903,10904,10905,10906, #10784
-10907,10908,10909,10910,10911,10912,10913,10914,10915,10916,10917,10918,10919,4487,10920,10921, #10800
-10922,10923,10924,10925,10926,10927,10928,10929,10930,10931,10932,4950,10933,10934,10935,10936, #10816
-10937,10938,10939,10940,10941,10942,10943,10944,10945,10946,10947,10948,10949,4488,10950,10951, #10832
-10952,10953,10954,10955,10956,10957,10958,10959,4190,10960,10961,10962,10963,10964,10965,10966, #10848
-10967,10968,10969,10970,10971,10972,10973,10974,10975,10976,10977,10978,10979,10980,10981,10982, #10864
-10983,10984,10985,10986,10987,10988,10989,10990,10991,10992,10993,10994,10995,10996,10997,10998, #10880
-10999,11000,11001,11002,11003,11004,11005,11006,3960,11007,11008,11009,11010,11011,11012,11013, #10896
-11014,11015,11016,11017,11018,11019,11020,11021,11022,11023,11024,11025,11026,11027,11028,11029, #10912
-11030,11031,11032,4951,11033,11034,11035,11036,11037,11038,11039,11040,11041,11042,11043,11044, #10928
-11045,11046,11047,4489,11048,11049,11050,11051,4952,11052,11053,11054,11055,11056,11057,11058, #10944
-4953,11059,11060,11061,11062,11063,11064,11065,11066,11067,11068,11069,11070,11071,4954,11072, #10960
-11073,11074,11075,11076,11077,11078,11079,11080,11081,11082,11083,11084,11085,11086,11087,11088, #10976
-11089,11090,11091,11092,11093,11094,11095,11096,11097,11098,11099,11100,11101,11102,11103,11104, #10992
-11105,11106,11107,11108,11109,11110,11111,11112,11113,11114,11115,3808,11116,11117,11118,11119, #11008
-11120,11121,11122,11123,11124,11125,11126,11127,11128,11129,11130,11131,11132,11133,11134,4955, #11024
-11135,11136,11137,11138,11139,11140,11141,11142,11143,11144,11145,11146,11147,11148,11149,11150, #11040
-11151,11152,11153,11154,11155,11156,11157,11158,11159,11160,11161,4956,11162,11163,11164,11165, #11056
-11166,11167,11168,11169,11170,11171,11172,11173,11174,11175,11176,11177,11178,11179,11180,4957, #11072
-11181,11182,11183,11184,11185,11186,4958,11187,11188,11189,11190,11191,11192,11193,11194,11195, #11088
-11196,11197,11198,11199,11200,3678,11201,11202,11203,11204,11205,11206,4191,11207,11208,11209, #11104
-11210,11211,11212,11213,11214,11215,11216,11217,11218,11219,11220,11221,11222,11223,11224,11225, #11120
-11226,11227,11228,11229,11230,11231,11232,11233,11234,11235,11236,11237,11238,11239,11240,11241, #11136
-11242,11243,11244,11245,11246,11247,11248,11249,11250,11251,4959,11252,11253,11254,11255,11256, #11152
-11257,11258,11259,11260,11261,11262,11263,11264,11265,11266,11267,11268,11269,11270,11271,11272, #11168
-11273,11274,11275,11276,11277,11278,11279,11280,11281,11282,11283,11284,11285,11286,11287,11288, #11184
-11289,11290,11291,11292,11293,11294,11295,11296,11297,11298,11299,11300,11301,11302,11303,11304, #11200
-11305,11306,11307,11308,11309,11310,11311,11312,11313,11314,3679,11315,11316,11317,11318,4490, #11216
-11319,11320,11321,11322,11323,11324,11325,11326,11327,11328,11329,11330,11331,11332,11333,11334, #11232
-11335,11336,11337,11338,11339,11340,11341,11342,11343,11344,11345,11346,11347,4960,11348,11349, #11248
-11350,11351,11352,11353,11354,11355,11356,11357,11358,11359,11360,11361,11362,11363,11364,11365, #11264
-11366,11367,11368,11369,11370,11371,11372,11373,11374,11375,11376,11377,3961,4961,11378,11379, #11280
-11380,11381,11382,11383,11384,11385,11386,11387,11388,11389,11390,11391,11392,11393,11394,11395, #11296
-11396,11397,4192,11398,11399,11400,11401,11402,11403,11404,11405,11406,11407,11408,11409,11410, #11312
-11411,4962,11412,11413,11414,11415,11416,11417,11418,11419,11420,11421,11422,11423,11424,11425, #11328
-11426,11427,11428,11429,11430,11431,11432,11433,11434,11435,11436,11437,11438,11439,11440,11441, #11344
-11442,11443,11444,11445,11446,11447,11448,11449,11450,11451,11452,11453,11454,11455,11456,11457, #11360
-11458,11459,11460,11461,11462,11463,11464,11465,11466,11467,11468,11469,4963,11470,11471,4491, #11376
-11472,11473,11474,11475,4964,11476,11477,11478,11479,11480,11481,11482,11483,11484,11485,11486, #11392
-11487,11488,11489,11490,11491,11492,4965,11493,11494,11495,11496,11497,11498,11499,11500,11501, #11408
-11502,11503,11504,11505,11506,11507,11508,11509,11510,11511,11512,11513,11514,11515,11516,11517, #11424
-11518,11519,11520,11521,11522,11523,11524,11525,11526,11527,11528,11529,3962,11530,11531,11532, #11440
-11533,11534,11535,11536,11537,11538,11539,11540,11541,11542,11543,11544,11545,11546,11547,11548, #11456
-11549,11550,11551,11552,11553,11554,11555,11556,11557,11558,11559,11560,11561,11562,11563,11564, #11472
-4193,4194,11565,11566,11567,11568,11569,11570,11571,11572,11573,11574,11575,11576,11577,11578, #11488
-11579,11580,11581,11582,11583,11584,11585,11586,11587,11588,11589,11590,11591,4966,4195,11592, #11504
-11593,11594,11595,11596,11597,11598,11599,11600,11601,11602,11603,11604,3090,11605,11606,11607, #11520
-11608,11609,11610,4967,11611,11612,11613,11614,11615,11616,11617,11618,11619,11620,11621,11622, #11536
-11623,11624,11625,11626,11627,11628,11629,11630,11631,11632,11633,11634,11635,11636,11637,11638, #11552
-11639,11640,11641,11642,11643,11644,11645,11646,11647,11648,11649,11650,11651,11652,11653,11654, #11568
-11655,11656,11657,11658,11659,11660,11661,11662,11663,11664,11665,11666,11667,11668,11669,11670, #11584
-11671,11672,11673,11674,4968,11675,11676,11677,11678,11679,11680,11681,11682,11683,11684,11685, #11600
-11686,11687,11688,11689,11690,11691,11692,11693,3809,11694,11695,11696,11697,11698,11699,11700, #11616
-11701,11702,11703,11704,11705,11706,11707,11708,11709,11710,11711,11712,11713,11714,11715,11716, #11632
-11717,11718,3553,11719,11720,11721,11722,11723,11724,11725,11726,11727,11728,11729,11730,4969, #11648
-11731,11732,11733,11734,11735,11736,11737,11738,11739,11740,4492,11741,11742,11743,11744,11745, #11664
-11746,11747,11748,11749,11750,11751,11752,4970,11753,11754,11755,11756,11757,11758,11759,11760, #11680
-11761,11762,11763,11764,11765,11766,11767,11768,11769,11770,11771,11772,11773,11774,11775,11776, #11696
-11777,11778,11779,11780,11781,11782,11783,11784,11785,11786,11787,11788,11789,11790,4971,11791, #11712
-11792,11793,11794,11795,11796,11797,4972,11798,11799,11800,11801,11802,11803,11804,11805,11806, #11728
-11807,11808,11809,11810,4973,11811,11812,11813,11814,11815,11816,11817,11818,11819,11820,11821, #11744
-11822,11823,11824,11825,11826,11827,11828,11829,11830,11831,11832,11833,11834,3680,3810,11835, #11760
-11836,4974,11837,11838,11839,11840,11841,11842,11843,11844,11845,11846,11847,11848,11849,11850, #11776
-11851,11852,11853,11854,11855,11856,11857,11858,11859,11860,11861,11862,11863,11864,11865,11866, #11792
-11867,11868,11869,11870,11871,11872,11873,11874,11875,11876,11877,11878,11879,11880,11881,11882, #11808
-11883,11884,4493,11885,11886,11887,11888,11889,11890,11891,11892,11893,11894,11895,11896,11897, #11824
-11898,11899,11900,11901,11902,11903,11904,11905,11906,11907,11908,11909,11910,11911,11912,11913, #11840
-11914,11915,4975,11916,11917,11918,11919,11920,11921,11922,11923,11924,11925,11926,11927,11928, #11856
-11929,11930,11931,11932,11933,11934,11935,11936,11937,11938,11939,11940,11941,11942,11943,11944, #11872
-11945,11946,11947,11948,11949,4976,11950,11951,11952,11953,11954,11955,11956,11957,11958,11959, #11888
-11960,11961,11962,11963,11964,11965,11966,11967,11968,11969,11970,11971,11972,11973,11974,11975, #11904
-11976,11977,11978,11979,11980,11981,11982,11983,11984,11985,11986,11987,4196,11988,11989,11990, #11920
-11991,11992,4977,11993,11994,11995,11996,11997,11998,11999,12000,12001,12002,12003,12004,12005, #11936
-12006,12007,12008,12009,12010,12011,12012,12013,12014,12015,12016,12017,12018,12019,12020,12021, #11952
-12022,12023,12024,12025,12026,12027,12028,12029,12030,12031,12032,12033,12034,12035,12036,12037, #11968
-12038,12039,12040,12041,12042,12043,12044,12045,12046,12047,12048,12049,12050,12051,12052,12053, #11984
-12054,12055,12056,12057,12058,12059,12060,12061,4978,12062,12063,12064,12065,12066,12067,12068, #12000
-12069,12070,12071,12072,12073,12074,12075,12076,12077,12078,12079,12080,12081,12082,12083,12084, #12016
-12085,12086,12087,12088,12089,12090,12091,12092,12093,12094,12095,12096,12097,12098,12099,12100, #12032
-12101,12102,12103,12104,12105,12106,12107,12108,12109,12110,12111,12112,12113,12114,12115,12116, #12048
-12117,12118,12119,12120,12121,12122,12123,4979,12124,12125,12126,12127,12128,4197,12129,12130, #12064
-12131,12132,12133,12134,12135,12136,12137,12138,12139,12140,12141,12142,12143,12144,12145,12146, #12080
-12147,12148,12149,12150,12151,12152,12153,12154,4980,12155,12156,12157,12158,12159,12160,4494, #12096
-12161,12162,12163,12164,3811,12165,12166,12167,12168,12169,4495,12170,12171,4496,12172,12173, #12112
-12174,12175,12176,3812,12177,12178,12179,12180,12181,12182,12183,12184,12185,12186,12187,12188, #12128
-12189,12190,12191,12192,12193,12194,12195,12196,12197,12198,12199,12200,12201,12202,12203,12204, #12144
-12205,12206,12207,12208,12209,12210,12211,12212,12213,12214,12215,12216,12217,12218,12219,12220, #12160
-12221,4981,12222,12223,12224,12225,12226,12227,12228,12229,12230,12231,12232,12233,12234,12235, #12176
-4982,12236,12237,12238,12239,12240,12241,12242,12243,12244,12245,4983,12246,12247,12248,12249, #12192
-4984,12250,12251,12252,12253,12254,12255,12256,12257,12258,12259,12260,12261,12262,12263,12264, #12208
-4985,12265,4497,12266,12267,12268,12269,12270,12271,12272,12273,12274,12275,12276,12277,12278, #12224
-12279,12280,12281,12282,12283,12284,12285,12286,12287,4986,12288,12289,12290,12291,12292,12293, #12240
-12294,12295,12296,2473,12297,12298,12299,12300,12301,12302,12303,12304,12305,12306,12307,12308, #12256
-12309,12310,12311,12312,12313,12314,12315,12316,12317,12318,12319,3963,12320,12321,12322,12323, #12272
-12324,12325,12326,12327,12328,12329,12330,12331,12332,4987,12333,12334,12335,12336,12337,12338, #12288
-12339,12340,12341,12342,12343,12344,12345,12346,12347,12348,12349,12350,12351,12352,12353,12354, #12304
-12355,12356,12357,12358,12359,3964,12360,12361,12362,12363,12364,12365,12366,12367,12368,12369, #12320
-12370,3965,12371,12372,12373,12374,12375,12376,12377,12378,12379,12380,12381,12382,12383,12384, #12336
-12385,12386,12387,12388,12389,12390,12391,12392,12393,12394,12395,12396,12397,12398,12399,12400, #12352
-12401,12402,12403,12404,12405,12406,12407,12408,4988,12409,12410,12411,12412,12413,12414,12415, #12368
-12416,12417,12418,12419,12420,12421,12422,12423,12424,12425,12426,12427,12428,12429,12430,12431, #12384
-12432,12433,12434,12435,12436,12437,12438,3554,12439,12440,12441,12442,12443,12444,12445,12446, #12400
-12447,12448,12449,12450,12451,12452,12453,12454,12455,12456,12457,12458,12459,12460,12461,12462, #12416
-12463,12464,4989,12465,12466,12467,12468,12469,12470,12471,12472,12473,12474,12475,12476,12477, #12432
-12478,12479,12480,4990,12481,12482,12483,12484,12485,12486,12487,12488,12489,4498,12490,12491, #12448
-12492,12493,12494,12495,12496,12497,12498,12499,12500,12501,12502,12503,12504,12505,12506,12507, #12464
-12508,12509,12510,12511,12512,12513,12514,12515,12516,12517,12518,12519,12520,12521,12522,12523, #12480
-12524,12525,12526,12527,12528,12529,12530,12531,12532,12533,12534,12535,12536,12537,12538,12539, #12496
-12540,12541,12542,12543,12544,12545,12546,12547,12548,12549,12550,12551,4991,12552,12553,12554, #12512
-12555,12556,12557,12558,12559,12560,12561,12562,12563,12564,12565,12566,12567,12568,12569,12570, #12528
-12571,12572,12573,12574,12575,12576,12577,12578,3036,12579,12580,12581,12582,12583,3966,12584, #12544
-12585,12586,12587,12588,12589,12590,12591,12592,12593,12594,12595,12596,12597,12598,12599,12600, #12560
-12601,12602,12603,12604,12605,12606,12607,12608,12609,12610,12611,12612,12613,12614,12615,12616, #12576
-12617,12618,12619,12620,12621,12622,12623,12624,12625,12626,12627,12628,12629,12630,12631,12632, #12592
-12633,12634,12635,12636,12637,12638,12639,12640,12641,12642,12643,12644,12645,12646,4499,12647, #12608
-12648,12649,12650,12651,12652,12653,12654,12655,12656,12657,12658,12659,12660,12661,12662,12663, #12624
-12664,12665,12666,12667,12668,12669,12670,12671,12672,12673,12674,12675,12676,12677,12678,12679, #12640
-12680,12681,12682,12683,12684,12685,12686,12687,12688,12689,12690,12691,12692,12693,12694,12695, #12656
-12696,12697,12698,4992,12699,12700,12701,12702,12703,12704,12705,12706,12707,12708,12709,12710, #12672
-12711,12712,12713,12714,12715,12716,12717,12718,12719,12720,12721,12722,12723,12724,12725,12726, #12688
-12727,12728,12729,12730,12731,12732,12733,12734,12735,12736,12737,12738,12739,12740,12741,12742, #12704
-12743,12744,12745,12746,12747,12748,12749,12750,12751,12752,12753,12754,12755,12756,12757,12758, #12720
-12759,12760,12761,12762,12763,12764,12765,12766,12767,12768,12769,12770,12771,12772,12773,12774, #12736
-12775,12776,12777,12778,4993,2175,12779,12780,12781,12782,12783,12784,12785,12786,4500,12787, #12752
-12788,12789,12790,12791,12792,12793,12794,12795,12796,12797,12798,12799,12800,12801,12802,12803, #12768
-12804,12805,12806,12807,12808,12809,12810,12811,12812,12813,12814,12815,12816,12817,12818,12819, #12784
-12820,12821,12822,12823,12824,12825,12826,4198,3967,12827,12828,12829,12830,12831,12832,12833, #12800
-12834,12835,12836,12837,12838,12839,12840,12841,12842,12843,12844,12845,12846,12847,12848,12849, #12816
-12850,12851,12852,12853,12854,12855,12856,12857,12858,12859,12860,12861,4199,12862,12863,12864, #12832
-12865,12866,12867,12868,12869,12870,12871,12872,12873,12874,12875,12876,12877,12878,12879,12880, #12848
-12881,12882,12883,12884,12885,12886,12887,4501,12888,12889,12890,12891,12892,12893,12894,12895, #12864
-12896,12897,12898,12899,12900,12901,12902,12903,12904,12905,12906,12907,12908,12909,12910,12911, #12880
-12912,4994,12913,12914,12915,12916,12917,12918,12919,12920,12921,12922,12923,12924,12925,12926, #12896
-12927,12928,12929,12930,12931,12932,12933,12934,12935,12936,12937,12938,12939,12940,12941,12942, #12912
-12943,12944,12945,12946,12947,12948,12949,12950,12951,12952,12953,12954,12955,12956,1772,12957, #12928
-12958,12959,12960,12961,12962,12963,12964,12965,12966,12967,12968,12969,12970,12971,12972,12973, #12944
-12974,12975,12976,12977,12978,12979,12980,12981,12982,12983,12984,12985,12986,12987,12988,12989, #12960
-12990,12991,12992,12993,12994,12995,12996,12997,4502,12998,4503,12999,13000,13001,13002,13003, #12976
-4504,13004,13005,13006,13007,13008,13009,13010,13011,13012,13013,13014,13015,13016,13017,13018, #12992
-13019,13020,13021,13022,13023,13024,13025,13026,13027,13028,13029,3449,13030,13031,13032,13033, #13008
-13034,13035,13036,13037,13038,13039,13040,13041,13042,13043,13044,13045,13046,13047,13048,13049, #13024
-13050,13051,13052,13053,13054,13055,13056,13057,13058,13059,13060,13061,13062,13063,13064,13065, #13040
-13066,13067,13068,13069,13070,13071,13072,13073,13074,13075,13076,13077,13078,13079,13080,13081, #13056
-13082,13083,13084,13085,13086,13087,13088,13089,13090,13091,13092,13093,13094,13095,13096,13097, #13072
-13098,13099,13100,13101,13102,13103,13104,13105,13106,13107,13108,13109,13110,13111,13112,13113, #13088
-13114,13115,13116,13117,13118,3968,13119,4995,13120,13121,13122,13123,13124,13125,13126,13127, #13104
-4505,13128,13129,13130,13131,13132,13133,13134,4996,4506,13135,13136,13137,13138,13139,4997, #13120
-13140,13141,13142,13143,13144,13145,13146,13147,13148,13149,13150,13151,13152,13153,13154,13155, #13136
-13156,13157,13158,13159,4998,13160,13161,13162,13163,13164,13165,13166,13167,13168,13169,13170, #13152
-13171,13172,13173,13174,13175,13176,4999,13177,13178,13179,13180,13181,13182,13183,13184,13185, #13168
-13186,13187,13188,13189,13190,13191,13192,13193,13194,13195,13196,13197,13198,13199,13200,13201, #13184
-13202,13203,13204,13205,13206,5000,13207,13208,13209,13210,13211,13212,13213,13214,13215,13216, #13200
-13217,13218,13219,13220,13221,13222,13223,13224,13225,13226,13227,4200,5001,13228,13229,13230, #13216
-13231,13232,13233,13234,13235,13236,13237,13238,13239,13240,3969,13241,13242,13243,13244,3970, #13232
-13245,13246,13247,13248,13249,13250,13251,13252,13253,13254,13255,13256,13257,13258,13259,13260, #13248
-13261,13262,13263,13264,13265,13266,13267,13268,3450,13269,13270,13271,13272,13273,13274,13275, #13264
-13276,5002,13277,13278,13279,13280,13281,13282,13283,13284,13285,13286,13287,13288,13289,13290, #13280
-13291,13292,13293,13294,13295,13296,13297,13298,13299,13300,13301,13302,3813,13303,13304,13305, #13296
-13306,13307,13308,13309,13310,13311,13312,13313,13314,13315,13316,13317,13318,13319,13320,13321, #13312
-13322,13323,13324,13325,13326,13327,13328,4507,13329,13330,13331,13332,13333,13334,13335,13336, #13328
-13337,13338,13339,13340,13341,5003,13342,13343,13344,13345,13346,13347,13348,13349,13350,13351, #13344
-13352,13353,13354,13355,13356,13357,13358,13359,13360,13361,13362,13363,13364,13365,13366,13367, #13360
-5004,13368,13369,13370,13371,13372,13373,13374,13375,13376,13377,13378,13379,13380,13381,13382, #13376
-13383,13384,13385,13386,13387,13388,13389,13390,13391,13392,13393,13394,13395,13396,13397,13398, #13392
-13399,13400,13401,13402,13403,13404,13405,13406,13407,13408,13409,13410,13411,13412,13413,13414, #13408
-13415,13416,13417,13418,13419,13420,13421,13422,13423,13424,13425,13426,13427,13428,13429,13430, #13424
-13431,13432,4508,13433,13434,13435,4201,13436,13437,13438,13439,13440,13441,13442,13443,13444, #13440
-13445,13446,13447,13448,13449,13450,13451,13452,13453,13454,13455,13456,13457,5005,13458,13459, #13456
-13460,13461,13462,13463,13464,13465,13466,13467,13468,13469,13470,4509,13471,13472,13473,13474, #13472
-13475,13476,13477,13478,13479,13480,13481,13482,13483,13484,13485,13486,13487,13488,13489,13490, #13488
-13491,13492,13493,13494,13495,13496,13497,13498,13499,13500,13501,13502,13503,13504,13505,13506, #13504
-13507,13508,13509,13510,13511,13512,13513,13514,13515,13516,13517,13518,13519,13520,13521,13522, #13520
-13523,13524,13525,13526,13527,13528,13529,13530,13531,13532,13533,13534,13535,13536,13537,13538, #13536
-13539,13540,13541,13542,13543,13544,13545,13546,13547,13548,13549,13550,13551,13552,13553,13554, #13552
-13555,13556,13557,13558,13559,13560,13561,13562,13563,13564,13565,13566,13567,13568,13569,13570, #13568
-13571,13572,13573,13574,13575,13576,13577,13578,13579,13580,13581,13582,13583,13584,13585,13586, #13584
-13587,13588,13589,13590,13591,13592,13593,13594,13595,13596,13597,13598,13599,13600,13601,13602, #13600
-13603,13604,13605,13606,13607,13608,13609,13610,13611,13612,13613,13614,13615,13616,13617,13618, #13616
-13619,13620,13621,13622,13623,13624,13625,13626,13627,13628,13629,13630,13631,13632,13633,13634, #13632
-13635,13636,13637,13638,13639,13640,13641,13642,5006,13643,13644,13645,13646,13647,13648,13649, #13648
-13650,13651,5007,13652,13653,13654,13655,13656,13657,13658,13659,13660,13661,13662,13663,13664, #13664
-13665,13666,13667,13668,13669,13670,13671,13672,13673,13674,13675,13676,13677,13678,13679,13680, #13680
-13681,13682,13683,13684,13685,13686,13687,13688,13689,13690,13691,13692,13693,13694,13695,13696, #13696
-13697,13698,13699,13700,13701,13702,13703,13704,13705,13706,13707,13708,13709,13710,13711,13712, #13712
-13713,13714,13715,13716,13717,13718,13719,13720,13721,13722,13723,13724,13725,13726,13727,13728, #13728
-13729,13730,13731,13732,13733,13734,13735,13736,13737,13738,13739,13740,13741,13742,13743,13744, #13744
-13745,13746,13747,13748,13749,13750,13751,13752,13753,13754,13755,13756,13757,13758,13759,13760, #13760
-13761,13762,13763,13764,13765,13766,13767,13768,13769,13770,13771,13772,13773,13774,3273,13775, #13776
-13776,13777,13778,13779,13780,13781,13782,13783,13784,13785,13786,13787,13788,13789,13790,13791, #13792
-13792,13793,13794,13795,13796,13797,13798,13799,13800,13801,13802,13803,13804,13805,13806,13807, #13808
-13808,13809,13810,13811,13812,13813,13814,13815,13816,13817,13818,13819,13820,13821,13822,13823, #13824
-13824,13825,13826,13827,13828,13829,13830,13831,13832,13833,13834,13835,13836,13837,13838,13839, #13840
-13840,13841,13842,13843,13844,13845,13846,13847,13848,13849,13850,13851,13852,13853,13854,13855, #13856
-13856,13857,13858,13859,13860,13861,13862,13863,13864,13865,13866,13867,13868,13869,13870,13871, #13872
-13872,13873,13874,13875,13876,13877,13878,13879,13880,13881,13882,13883,13884,13885,13886,13887, #13888
-13888,13889,13890,13891,13892,13893,13894,13895,13896,13897,13898,13899,13900,13901,13902,13903, #13904
-13904,13905,13906,13907,13908,13909,13910,13911,13912,13913,13914,13915,13916,13917,13918,13919, #13920
-13920,13921,13922,13923,13924,13925,13926,13927,13928,13929,13930,13931,13932,13933,13934,13935, #13936
-13936,13937,13938,13939,13940,13941,13942,13943,13944,13945,13946,13947,13948,13949,13950,13951, #13952
-13952,13953,13954,13955,13956,13957,13958,13959,13960,13961,13962,13963,13964,13965,13966,13967, #13968
-13968,13969,13970,13971,13972) #13973
-
-# flake8: noqa
diff --git a/script/_Lib/requests/packages/chardet/big5prober.py b/script/_Lib/requests/packages/chardet/big5prober.py
deleted file mode 100644
index becce81..0000000
--- a/script/_Lib/requests/packages/chardet/big5prober.py
+++ /dev/null
@@ -1,42 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Communicator client code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-######################### END LICENSE BLOCK #########################
-
-from .mbcharsetprober import MultiByteCharSetProber
-from .codingstatemachine import CodingStateMachine
-from .chardistribution import Big5DistributionAnalysis
-from .mbcssm import Big5SMModel
-
-
-class Big5Prober(MultiByteCharSetProber):
- def __init__(self):
- MultiByteCharSetProber.__init__(self)
- self._mCodingSM = CodingStateMachine(Big5SMModel)
- self._mDistributionAnalyzer = Big5DistributionAnalysis()
- self.reset()
-
- def get_charset_name(self):
- return "Big5"
diff --git a/script/_Lib/requests/packages/chardet/chardetect.py b/script/_Lib/requests/packages/chardet/chardetect.py
deleted file mode 100644
index ecd0163..0000000
--- a/script/_Lib/requests/packages/chardet/chardetect.py
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/bin/env python
-"""
-Script which takes one or more file paths and reports on their detected
-encodings
-
-Example::
-
- % chardetect somefile someotherfile
- somefile: windows-1252 with confidence 0.5
- someotherfile: ascii with confidence 1.0
-
-If no paths are provided, it takes its input from stdin.
-
-"""
-from io import open
-from sys import argv, stdin
-
-from chardet.universaldetector import UniversalDetector
-
-
-def description_of(file, name='stdin'):
- """Return a string describing the probable encoding of a file."""
- u = UniversalDetector()
- for line in file:
- u.feed(line)
- u.close()
- result = u.result
- if result['encoding']:
- return '%s: %s with confidence %s' % (name,
- result['encoding'],
- result['confidence'])
- else:
- return '%s: no result' % name
-
-
-def main():
- if len(argv) <= 1:
- print(description_of(stdin))
- else:
- for path in argv[1:]:
- with open(path, 'rb') as f:
- print(description_of(f, path))
-
-
-if __name__ == '__main__':
- main()
diff --git a/script/_Lib/requests/packages/chardet/chardistribution.py b/script/_Lib/requests/packages/chardet/chardistribution.py
deleted file mode 100644
index 4e64a00..0000000
--- a/script/_Lib/requests/packages/chardet/chardistribution.py
+++ /dev/null
@@ -1,231 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Communicator client code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-######################### END LICENSE BLOCK #########################
-
-from .euctwfreq import (EUCTWCharToFreqOrder, EUCTW_TABLE_SIZE,
- EUCTW_TYPICAL_DISTRIBUTION_RATIO)
-from .euckrfreq import (EUCKRCharToFreqOrder, EUCKR_TABLE_SIZE,
- EUCKR_TYPICAL_DISTRIBUTION_RATIO)
-from .gb2312freq import (GB2312CharToFreqOrder, GB2312_TABLE_SIZE,
- GB2312_TYPICAL_DISTRIBUTION_RATIO)
-from .big5freq import (Big5CharToFreqOrder, BIG5_TABLE_SIZE,
- BIG5_TYPICAL_DISTRIBUTION_RATIO)
-from .jisfreq import (JISCharToFreqOrder, JIS_TABLE_SIZE,
- JIS_TYPICAL_DISTRIBUTION_RATIO)
-from .compat import wrap_ord
-
-ENOUGH_DATA_THRESHOLD = 1024
-SURE_YES = 0.99
-SURE_NO = 0.01
-MINIMUM_DATA_THRESHOLD = 3
-
-
-class CharDistributionAnalysis:
- def __init__(self):
- # Mapping table to get frequency order from char order (get from
- # GetOrder())
- self._mCharToFreqOrder = None
- self._mTableSize = None # Size of above table
- # This is a constant value which varies from language to language,
- # used in calculating confidence. See
- # http://www.mozilla.org/projects/intl/UniversalCharsetDetection.html
- # for further detail.
- self._mTypicalDistributionRatio = None
- self.reset()
-
- def reset(self):
- """reset analyser, clear any state"""
- # If this flag is set to True, detection is done and conclusion has
- # been made
- self._mDone = False
- self._mTotalChars = 0 # Total characters encountered
- # The number of characters whose frequency order is less than 512
- self._mFreqChars = 0
-
- def feed(self, aBuf, aCharLen):
- """feed a character with known length"""
- if aCharLen == 2:
- # we only care about 2-bytes character in our distribution analysis
- order = self.get_order(aBuf)
- else:
- order = -1
- if order >= 0:
- self._mTotalChars += 1
- # order is valid
- if order < self._mTableSize:
- if 512 > self._mCharToFreqOrder[order]:
- self._mFreqChars += 1
-
- def get_confidence(self):
- """return confidence based on existing data"""
- # if we didn't receive any character in our consideration range,
- # return negative answer
- if self._mTotalChars <= 0 or self._mFreqChars <= MINIMUM_DATA_THRESHOLD:
- return SURE_NO
-
- if self._mTotalChars != self._mFreqChars:
- r = (self._mFreqChars / ((self._mTotalChars - self._mFreqChars)
- * self._mTypicalDistributionRatio))
- if r < SURE_YES:
- return r
-
- # normalize confidence (we don't want to be 100% sure)
- return SURE_YES
-
- def got_enough_data(self):
- # It is not necessary to receive all data to draw conclusion.
- # For charset detection, certain amount of data is enough
- return self._mTotalChars > ENOUGH_DATA_THRESHOLD
-
- def get_order(self, aBuf):
- # We do not handle characters based on the original encoding string,
- # but convert this encoding string to a number, here called order.
- # This allows multiple encodings of a language to share one frequency
- # table.
- return -1
-
-
-class EUCTWDistributionAnalysis(CharDistributionAnalysis):
- def __init__(self):
- CharDistributionAnalysis.__init__(self)
- self._mCharToFreqOrder = EUCTWCharToFreqOrder
- self._mTableSize = EUCTW_TABLE_SIZE
- self._mTypicalDistributionRatio = EUCTW_TYPICAL_DISTRIBUTION_RATIO
-
- def get_order(self, aBuf):
- # for euc-TW encoding, we are interested
- # first byte range: 0xc4 -- 0xfe
- # second byte range: 0xa1 -- 0xfe
- # no validation needed here. State machine has done that
- first_char = wrap_ord(aBuf[0])
- if first_char >= 0xC4:
- return 94 * (first_char - 0xC4) + wrap_ord(aBuf[1]) - 0xA1
- else:
- return -1
-
-
-class EUCKRDistributionAnalysis(CharDistributionAnalysis):
- def __init__(self):
- CharDistributionAnalysis.__init__(self)
- self._mCharToFreqOrder = EUCKRCharToFreqOrder
- self._mTableSize = EUCKR_TABLE_SIZE
- self._mTypicalDistributionRatio = EUCKR_TYPICAL_DISTRIBUTION_RATIO
-
- def get_order(self, aBuf):
- # for euc-KR encoding, we are interested
- # first byte range: 0xb0 -- 0xfe
- # second byte range: 0xa1 -- 0xfe
- # no validation needed here. State machine has done that
- first_char = wrap_ord(aBuf[0])
- if first_char >= 0xB0:
- return 94 * (first_char - 0xB0) + wrap_ord(aBuf[1]) - 0xA1
- else:
- return -1
-
-
-class GB2312DistributionAnalysis(CharDistributionAnalysis):
- def __init__(self):
- CharDistributionAnalysis.__init__(self)
- self._mCharToFreqOrder = GB2312CharToFreqOrder
- self._mTableSize = GB2312_TABLE_SIZE
- self._mTypicalDistributionRatio = GB2312_TYPICAL_DISTRIBUTION_RATIO
-
- def get_order(self, aBuf):
- # for GB2312 encoding, we are interested
- # first byte range: 0xb0 -- 0xfe
- # second byte range: 0xa1 -- 0xfe
- # no validation needed here. State machine has done that
- first_char, second_char = wrap_ord(aBuf[0]), wrap_ord(aBuf[1])
- if (first_char >= 0xB0) and (second_char >= 0xA1):
- return 94 * (first_char - 0xB0) + second_char - 0xA1
- else:
- return -1
-
-
-class Big5DistributionAnalysis(CharDistributionAnalysis):
- def __init__(self):
- CharDistributionAnalysis.__init__(self)
- self._mCharToFreqOrder = Big5CharToFreqOrder
- self._mTableSize = BIG5_TABLE_SIZE
- self._mTypicalDistributionRatio = BIG5_TYPICAL_DISTRIBUTION_RATIO
-
- def get_order(self, aBuf):
- # for big5 encoding, we are interested
- # first byte range: 0xa4 -- 0xfe
- # second byte range: 0x40 -- 0x7e , 0xa1 -- 0xfe
- # no validation needed here. State machine has done that
- first_char, second_char = wrap_ord(aBuf[0]), wrap_ord(aBuf[1])
- if first_char >= 0xA4:
- if second_char >= 0xA1:
- return 157 * (first_char - 0xA4) + second_char - 0xA1 + 63
- else:
- return 157 * (first_char - 0xA4) + second_char - 0x40
- else:
- return -1
-
-
-class SJISDistributionAnalysis(CharDistributionAnalysis):
- def __init__(self):
- CharDistributionAnalysis.__init__(self)
- self._mCharToFreqOrder = JISCharToFreqOrder
- self._mTableSize = JIS_TABLE_SIZE
- self._mTypicalDistributionRatio = JIS_TYPICAL_DISTRIBUTION_RATIO
-
- def get_order(self, aBuf):
- # for sjis encoding, we are interested
- # first byte range: 0x81 -- 0x9f , 0xe0 -- 0xfe
- # second byte range: 0x40 -- 0x7e, 0x81 -- oxfe
- # no validation needed here. State machine has done that
- first_char, second_char = wrap_ord(aBuf[0]), wrap_ord(aBuf[1])
- if (first_char >= 0x81) and (first_char <= 0x9F):
- order = 188 * (first_char - 0x81)
- elif (first_char >= 0xE0) and (first_char <= 0xEF):
- order = 188 * (first_char - 0xE0 + 31)
- else:
- return -1
- order = order + second_char - 0x40
- if second_char > 0x7F:
- order = -1
- return order
-
-
-class EUCJPDistributionAnalysis(CharDistributionAnalysis):
- def __init__(self):
- CharDistributionAnalysis.__init__(self)
- self._mCharToFreqOrder = JISCharToFreqOrder
- self._mTableSize = JIS_TABLE_SIZE
- self._mTypicalDistributionRatio = JIS_TYPICAL_DISTRIBUTION_RATIO
-
- def get_order(self, aBuf):
- # for euc-JP encoding, we are interested
- # first byte range: 0xa0 -- 0xfe
- # second byte range: 0xa1 -- 0xfe
- # no validation needed here. State machine has done that
- char = wrap_ord(aBuf[0])
- if char >= 0xA0:
- return 94 * (char - 0xA1) + wrap_ord(aBuf[1]) - 0xa1
- else:
- return -1
diff --git a/script/_Lib/requests/packages/chardet/charsetgroupprober.py b/script/_Lib/requests/packages/chardet/charsetgroupprober.py
deleted file mode 100644
index 85e7a1c..0000000
--- a/script/_Lib/requests/packages/chardet/charsetgroupprober.py
+++ /dev/null
@@ -1,106 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Communicator client code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-######################### END LICENSE BLOCK #########################
-
-from . import constants
-import sys
-from .charsetprober import CharSetProber
-
-
-class CharSetGroupProber(CharSetProber):
- def __init__(self):
- CharSetProber.__init__(self)
- self._mActiveNum = 0
- self._mProbers = []
- self._mBestGuessProber = None
-
- def reset(self):
- CharSetProber.reset(self)
- self._mActiveNum = 0
- for prober in self._mProbers:
- if prober:
- prober.reset()
- prober.active = True
- self._mActiveNum += 1
- self._mBestGuessProber = None
-
- def get_charset_name(self):
- if not self._mBestGuessProber:
- self.get_confidence()
- if not self._mBestGuessProber:
- return None
-# self._mBestGuessProber = self._mProbers[0]
- return self._mBestGuessProber.get_charset_name()
-
- def feed(self, aBuf):
- for prober in self._mProbers:
- if not prober:
- continue
- if not prober.active:
- continue
- st = prober.feed(aBuf)
- if not st:
- continue
- if st == constants.eFoundIt:
- self._mBestGuessProber = prober
- return self.get_state()
- elif st == constants.eNotMe:
- prober.active = False
- self._mActiveNum -= 1
- if self._mActiveNum <= 0:
- self._mState = constants.eNotMe
- return self.get_state()
- return self.get_state()
-
- def get_confidence(self):
- st = self.get_state()
- if st == constants.eFoundIt:
- return 0.99
- elif st == constants.eNotMe:
- return 0.01
- bestConf = 0.0
- self._mBestGuessProber = None
- for prober in self._mProbers:
- if not prober:
- continue
- if not prober.active:
- if constants._debug:
- sys.stderr.write(prober.get_charset_name()
- + ' not active\n')
- continue
- cf = prober.get_confidence()
- if constants._debug:
- sys.stderr.write('%s confidence = %s\n' %
- (prober.get_charset_name(), cf))
- if bestConf < cf:
- bestConf = cf
- self._mBestGuessProber = prober
- if not self._mBestGuessProber:
- return 0.0
- return bestConf
-# else:
-# self._mBestGuessProber = self._mProbers[0]
-# return self._mBestGuessProber.get_confidence()
diff --git a/script/_Lib/requests/packages/chardet/charsetprober.py b/script/_Lib/requests/packages/chardet/charsetprober.py
deleted file mode 100644
index 9758171..0000000
--- a/script/_Lib/requests/packages/chardet/charsetprober.py
+++ /dev/null
@@ -1,62 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Universal charset detector code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Mark Pilgrim - port to Python
-# Shy Shalom - original C code
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-######################### END LICENSE BLOCK #########################
-
-from . import constants
-import re
-
-
-class CharSetProber:
- def __init__(self):
- pass
-
- def reset(self):
- self._mState = constants.eDetecting
-
- def get_charset_name(self):
- return None
-
- def feed(self, aBuf):
- pass
-
- def get_state(self):
- return self._mState
-
- def get_confidence(self):
- return 0.0
-
- def filter_high_bit_only(self, aBuf):
- aBuf = re.sub(b'([\x00-\x7F])+', b' ', aBuf)
- return aBuf
-
- def filter_without_english_letters(self, aBuf):
- aBuf = re.sub(b'([A-Za-z])+', b' ', aBuf)
- return aBuf
-
- def filter_with_english_letters(self, aBuf):
- # TODO
- return aBuf
diff --git a/script/_Lib/requests/packages/chardet/codingstatemachine.py b/script/_Lib/requests/packages/chardet/codingstatemachine.py
deleted file mode 100644
index 8dd8c91..0000000
--- a/script/_Lib/requests/packages/chardet/codingstatemachine.py
+++ /dev/null
@@ -1,61 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-######################### END LICENSE BLOCK #########################
-
-from .constants import eStart
-from .compat import wrap_ord
-
-
-class CodingStateMachine:
- def __init__(self, sm):
- self._mModel = sm
- self._mCurrentBytePos = 0
- self._mCurrentCharLen = 0
- self.reset()
-
- def reset(self):
- self._mCurrentState = eStart
-
- def next_state(self, c):
- # for each byte we get its class
- # if it is first byte, we also get byte length
- # PY3K: aBuf is a byte stream, so c is an int, not a byte
- byteCls = self._mModel['classTable'][wrap_ord(c)]
- if self._mCurrentState == eStart:
- self._mCurrentBytePos = 0
- self._mCurrentCharLen = self._mModel['charLenTable'][byteCls]
- # from byte's class and stateTable, we get its next state
- curr_state = (self._mCurrentState * self._mModel['classFactor']
- + byteCls)
- self._mCurrentState = self._mModel['stateTable'][curr_state]
- self._mCurrentBytePos += 1
- return self._mCurrentState
-
- def get_current_charlen(self):
- return self._mCurrentCharLen
-
- def get_coding_state_machine(self):
- return self._mModel['name']
diff --git a/script/_Lib/requests/packages/chardet/compat.py b/script/_Lib/requests/packages/chardet/compat.py
deleted file mode 100644
index d9e30ad..0000000
--- a/script/_Lib/requests/packages/chardet/compat.py
+++ /dev/null
@@ -1,34 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# Contributor(s):
-# Ian Cordasco - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-######################### END LICENSE BLOCK #########################
-
-import sys
-
-
-if sys.version_info < (3, 0):
- base_str = (str, unicode)
-else:
- base_str = (bytes, str)
-
-
-def wrap_ord(a):
- if sys.version_info < (3, 0) and isinstance(a, base_str):
- return ord(a)
- else:
- return a
diff --git a/script/_Lib/requests/packages/chardet/constants.py b/script/_Lib/requests/packages/chardet/constants.py
deleted file mode 100644
index e4d148b..0000000
--- a/script/_Lib/requests/packages/chardet/constants.py
+++ /dev/null
@@ -1,39 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Universal charset detector code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Mark Pilgrim - port to Python
-# Shy Shalom - original C code
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-######################### END LICENSE BLOCK #########################
-
-_debug = 0
-
-eDetecting = 0
-eFoundIt = 1
-eNotMe = 2
-
-eStart = 0
-eError = 1
-eItsMe = 2
-
-SHORTCUT_THRESHOLD = 0.95
diff --git a/script/_Lib/requests/packages/chardet/cp949prober.py b/script/_Lib/requests/packages/chardet/cp949prober.py
deleted file mode 100644
index ff4272f..0000000
--- a/script/_Lib/requests/packages/chardet/cp949prober.py
+++ /dev/null
@@ -1,44 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-######################### END LICENSE BLOCK #########################
-
-from .mbcharsetprober import MultiByteCharSetProber
-from .codingstatemachine import CodingStateMachine
-from .chardistribution import EUCKRDistributionAnalysis
-from .mbcssm import CP949SMModel
-
-
-class CP949Prober(MultiByteCharSetProber):
- def __init__(self):
- MultiByteCharSetProber.__init__(self)
- self._mCodingSM = CodingStateMachine(CP949SMModel)
- # NOTE: CP949 is a superset of EUC-KR, so the distribution should be
- # not different.
- self._mDistributionAnalyzer = EUCKRDistributionAnalysis()
- self.reset()
-
- def get_charset_name(self):
- return "CP949"
diff --git a/script/_Lib/requests/packages/chardet/escprober.py b/script/_Lib/requests/packages/chardet/escprober.py
deleted file mode 100644
index 80a844f..0000000
--- a/script/_Lib/requests/packages/chardet/escprober.py
+++ /dev/null
@@ -1,86 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-######################### END LICENSE BLOCK #########################
-
-from . import constants
-from .escsm import (HZSMModel, ISO2022CNSMModel, ISO2022JPSMModel,
- ISO2022KRSMModel)
-from .charsetprober import CharSetProber
-from .codingstatemachine import CodingStateMachine
-from .compat import wrap_ord
-
-
-class EscCharSetProber(CharSetProber):
- def __init__(self):
- CharSetProber.__init__(self)
- self._mCodingSM = [
- CodingStateMachine(HZSMModel),
- CodingStateMachine(ISO2022CNSMModel),
- CodingStateMachine(ISO2022JPSMModel),
- CodingStateMachine(ISO2022KRSMModel)
- ]
- self.reset()
-
- def reset(self):
- CharSetProber.reset(self)
- for codingSM in self._mCodingSM:
- if not codingSM:
- continue
- codingSM.active = True
- codingSM.reset()
- self._mActiveSM = len(self._mCodingSM)
- self._mDetectedCharset = None
-
- def get_charset_name(self):
- return self._mDetectedCharset
-
- def get_confidence(self):
- if self._mDetectedCharset:
- return 0.99
- else:
- return 0.00
-
- def feed(self, aBuf):
- for c in aBuf:
- # PY3K: aBuf is a byte array, so c is an int, not a byte
- for codingSM in self._mCodingSM:
- if not codingSM:
- continue
- if not codingSM.active:
- continue
- codingState = codingSM.next_state(wrap_ord(c))
- if codingState == constants.eError:
- codingSM.active = False
- self._mActiveSM -= 1
- if self._mActiveSM <= 0:
- self._mState = constants.eNotMe
- return self.get_state()
- elif codingState == constants.eItsMe:
- self._mState = constants.eFoundIt
- self._mDetectedCharset = codingSM.get_coding_state_machine() # nopep8
- return self.get_state()
-
- return self.get_state()
diff --git a/script/_Lib/requests/packages/chardet/escsm.py b/script/_Lib/requests/packages/chardet/escsm.py
deleted file mode 100644
index bd302b4..0000000
--- a/script/_Lib/requests/packages/chardet/escsm.py
+++ /dev/null
@@ -1,242 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-######################### END LICENSE BLOCK #########################
-
-from .constants import eStart, eError, eItsMe
-
-HZ_cls = (
-1,0,0,0,0,0,0,0, # 00 - 07
-0,0,0,0,0,0,0,0, # 08 - 0f
-0,0,0,0,0,0,0,0, # 10 - 17
-0,0,0,1,0,0,0,0, # 18 - 1f
-0,0,0,0,0,0,0,0, # 20 - 27
-0,0,0,0,0,0,0,0, # 28 - 2f
-0,0,0,0,0,0,0,0, # 30 - 37
-0,0,0,0,0,0,0,0, # 38 - 3f
-0,0,0,0,0,0,0,0, # 40 - 47
-0,0,0,0,0,0,0,0, # 48 - 4f
-0,0,0,0,0,0,0,0, # 50 - 57
-0,0,0,0,0,0,0,0, # 58 - 5f
-0,0,0,0,0,0,0,0, # 60 - 67
-0,0,0,0,0,0,0,0, # 68 - 6f
-0,0,0,0,0,0,0,0, # 70 - 77
-0,0,0,4,0,5,2,0, # 78 - 7f
-1,1,1,1,1,1,1,1, # 80 - 87
-1,1,1,1,1,1,1,1, # 88 - 8f
-1,1,1,1,1,1,1,1, # 90 - 97
-1,1,1,1,1,1,1,1, # 98 - 9f
-1,1,1,1,1,1,1,1, # a0 - a7
-1,1,1,1,1,1,1,1, # a8 - af
-1,1,1,1,1,1,1,1, # b0 - b7
-1,1,1,1,1,1,1,1, # b8 - bf
-1,1,1,1,1,1,1,1, # c0 - c7
-1,1,1,1,1,1,1,1, # c8 - cf
-1,1,1,1,1,1,1,1, # d0 - d7
-1,1,1,1,1,1,1,1, # d8 - df
-1,1,1,1,1,1,1,1, # e0 - e7
-1,1,1,1,1,1,1,1, # e8 - ef
-1,1,1,1,1,1,1,1, # f0 - f7
-1,1,1,1,1,1,1,1, # f8 - ff
-)
-
-HZ_st = (
-eStart,eError, 3,eStart,eStart,eStart,eError,eError,# 00-07
-eError,eError,eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,# 08-0f
-eItsMe,eItsMe,eError,eError,eStart,eStart, 4,eError,# 10-17
- 5,eError, 6,eError, 5, 5, 4,eError,# 18-1f
- 4,eError, 4, 4, 4,eError, 4,eError,# 20-27
- 4,eItsMe,eStart,eStart,eStart,eStart,eStart,eStart,# 28-2f
-)
-
-HZCharLenTable = (0, 0, 0, 0, 0, 0)
-
-HZSMModel = {'classTable': HZ_cls,
- 'classFactor': 6,
- 'stateTable': HZ_st,
- 'charLenTable': HZCharLenTable,
- 'name': "HZ-GB-2312"}
-
-ISO2022CN_cls = (
-2,0,0,0,0,0,0,0, # 00 - 07
-0,0,0,0,0,0,0,0, # 08 - 0f
-0,0,0,0,0,0,0,0, # 10 - 17
-0,0,0,1,0,0,0,0, # 18 - 1f
-0,0,0,0,0,0,0,0, # 20 - 27
-0,3,0,0,0,0,0,0, # 28 - 2f
-0,0,0,0,0,0,0,0, # 30 - 37
-0,0,0,0,0,0,0,0, # 38 - 3f
-0,0,0,4,0,0,0,0, # 40 - 47
-0,0,0,0,0,0,0,0, # 48 - 4f
-0,0,0,0,0,0,0,0, # 50 - 57
-0,0,0,0,0,0,0,0, # 58 - 5f
-0,0,0,0,0,0,0,0, # 60 - 67
-0,0,0,0,0,0,0,0, # 68 - 6f
-0,0,0,0,0,0,0,0, # 70 - 77
-0,0,0,0,0,0,0,0, # 78 - 7f
-2,2,2,2,2,2,2,2, # 80 - 87
-2,2,2,2,2,2,2,2, # 88 - 8f
-2,2,2,2,2,2,2,2, # 90 - 97
-2,2,2,2,2,2,2,2, # 98 - 9f
-2,2,2,2,2,2,2,2, # a0 - a7
-2,2,2,2,2,2,2,2, # a8 - af
-2,2,2,2,2,2,2,2, # b0 - b7
-2,2,2,2,2,2,2,2, # b8 - bf
-2,2,2,2,2,2,2,2, # c0 - c7
-2,2,2,2,2,2,2,2, # c8 - cf
-2,2,2,2,2,2,2,2, # d0 - d7
-2,2,2,2,2,2,2,2, # d8 - df
-2,2,2,2,2,2,2,2, # e0 - e7
-2,2,2,2,2,2,2,2, # e8 - ef
-2,2,2,2,2,2,2,2, # f0 - f7
-2,2,2,2,2,2,2,2, # f8 - ff
-)
-
-ISO2022CN_st = (
-eStart, 3,eError,eStart,eStart,eStart,eStart,eStart,# 00-07
-eStart,eError,eError,eError,eError,eError,eError,eError,# 08-0f
-eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,# 10-17
-eItsMe,eItsMe,eItsMe,eError,eError,eError, 4,eError,# 18-1f
-eError,eError,eError,eItsMe,eError,eError,eError,eError,# 20-27
- 5, 6,eError,eError,eError,eError,eError,eError,# 28-2f
-eError,eError,eError,eItsMe,eError,eError,eError,eError,# 30-37
-eError,eError,eError,eError,eError,eItsMe,eError,eStart,# 38-3f
-)
-
-ISO2022CNCharLenTable = (0, 0, 0, 0, 0, 0, 0, 0, 0)
-
-ISO2022CNSMModel = {'classTable': ISO2022CN_cls,
- 'classFactor': 9,
- 'stateTable': ISO2022CN_st,
- 'charLenTable': ISO2022CNCharLenTable,
- 'name': "ISO-2022-CN"}
-
-ISO2022JP_cls = (
-2,0,0,0,0,0,0,0, # 00 - 07
-0,0,0,0,0,0,2,2, # 08 - 0f
-0,0,0,0,0,0,0,0, # 10 - 17
-0,0,0,1,0,0,0,0, # 18 - 1f
-0,0,0,0,7,0,0,0, # 20 - 27
-3,0,0,0,0,0,0,0, # 28 - 2f
-0,0,0,0,0,0,0,0, # 30 - 37
-0,0,0,0,0,0,0,0, # 38 - 3f
-6,0,4,0,8,0,0,0, # 40 - 47
-0,9,5,0,0,0,0,0, # 48 - 4f
-0,0,0,0,0,0,0,0, # 50 - 57
-0,0,0,0,0,0,0,0, # 58 - 5f
-0,0,0,0,0,0,0,0, # 60 - 67
-0,0,0,0,0,0,0,0, # 68 - 6f
-0,0,0,0,0,0,0,0, # 70 - 77
-0,0,0,0,0,0,0,0, # 78 - 7f
-2,2,2,2,2,2,2,2, # 80 - 87
-2,2,2,2,2,2,2,2, # 88 - 8f
-2,2,2,2,2,2,2,2, # 90 - 97
-2,2,2,2,2,2,2,2, # 98 - 9f
-2,2,2,2,2,2,2,2, # a0 - a7
-2,2,2,2,2,2,2,2, # a8 - af
-2,2,2,2,2,2,2,2, # b0 - b7
-2,2,2,2,2,2,2,2, # b8 - bf
-2,2,2,2,2,2,2,2, # c0 - c7
-2,2,2,2,2,2,2,2, # c8 - cf
-2,2,2,2,2,2,2,2, # d0 - d7
-2,2,2,2,2,2,2,2, # d8 - df
-2,2,2,2,2,2,2,2, # e0 - e7
-2,2,2,2,2,2,2,2, # e8 - ef
-2,2,2,2,2,2,2,2, # f0 - f7
-2,2,2,2,2,2,2,2, # f8 - ff
-)
-
-ISO2022JP_st = (
-eStart, 3,eError,eStart,eStart,eStart,eStart,eStart,# 00-07
-eStart,eStart,eError,eError,eError,eError,eError,eError,# 08-0f
-eError,eError,eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,# 10-17
-eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eError,eError,# 18-1f
-eError, 5,eError,eError,eError, 4,eError,eError,# 20-27
-eError,eError,eError, 6,eItsMe,eError,eItsMe,eError,# 28-2f
-eError,eError,eError,eError,eError,eError,eItsMe,eItsMe,# 30-37
-eError,eError,eError,eItsMe,eError,eError,eError,eError,# 38-3f
-eError,eError,eError,eError,eItsMe,eError,eStart,eStart,# 40-47
-)
-
-ISO2022JPCharLenTable = (0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
-
-ISO2022JPSMModel = {'classTable': ISO2022JP_cls,
- 'classFactor': 10,
- 'stateTable': ISO2022JP_st,
- 'charLenTable': ISO2022JPCharLenTable,
- 'name': "ISO-2022-JP"}
-
-ISO2022KR_cls = (
-2,0,0,0,0,0,0,0, # 00 - 07
-0,0,0,0,0,0,0,0, # 08 - 0f
-0,0,0,0,0,0,0,0, # 10 - 17
-0,0,0,1,0,0,0,0, # 18 - 1f
-0,0,0,0,3,0,0,0, # 20 - 27
-0,4,0,0,0,0,0,0, # 28 - 2f
-0,0,0,0,0,0,0,0, # 30 - 37
-0,0,0,0,0,0,0,0, # 38 - 3f
-0,0,0,5,0,0,0,0, # 40 - 47
-0,0,0,0,0,0,0,0, # 48 - 4f
-0,0,0,0,0,0,0,0, # 50 - 57
-0,0,0,0,0,0,0,0, # 58 - 5f
-0,0,0,0,0,0,0,0, # 60 - 67
-0,0,0,0,0,0,0,0, # 68 - 6f
-0,0,0,0,0,0,0,0, # 70 - 77
-0,0,0,0,0,0,0,0, # 78 - 7f
-2,2,2,2,2,2,2,2, # 80 - 87
-2,2,2,2,2,2,2,2, # 88 - 8f
-2,2,2,2,2,2,2,2, # 90 - 97
-2,2,2,2,2,2,2,2, # 98 - 9f
-2,2,2,2,2,2,2,2, # a0 - a7
-2,2,2,2,2,2,2,2, # a8 - af
-2,2,2,2,2,2,2,2, # b0 - b7
-2,2,2,2,2,2,2,2, # b8 - bf
-2,2,2,2,2,2,2,2, # c0 - c7
-2,2,2,2,2,2,2,2, # c8 - cf
-2,2,2,2,2,2,2,2, # d0 - d7
-2,2,2,2,2,2,2,2, # d8 - df
-2,2,2,2,2,2,2,2, # e0 - e7
-2,2,2,2,2,2,2,2, # e8 - ef
-2,2,2,2,2,2,2,2, # f0 - f7
-2,2,2,2,2,2,2,2, # f8 - ff
-)
-
-ISO2022KR_st = (
-eStart, 3,eError,eStart,eStart,eStart,eError,eError,# 00-07
-eError,eError,eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,# 08-0f
-eItsMe,eItsMe,eError,eError,eError, 4,eError,eError,# 10-17
-eError,eError,eError,eError, 5,eError,eError,eError,# 18-1f
-eError,eError,eError,eItsMe,eStart,eStart,eStart,eStart,# 20-27
-)
-
-ISO2022KRCharLenTable = (0, 0, 0, 0, 0, 0)
-
-ISO2022KRSMModel = {'classTable': ISO2022KR_cls,
- 'classFactor': 6,
- 'stateTable': ISO2022KR_st,
- 'charLenTable': ISO2022KRCharLenTable,
- 'name': "ISO-2022-KR"}
-
-# flake8: noqa
diff --git a/script/_Lib/requests/packages/chardet/eucjpprober.py b/script/_Lib/requests/packages/chardet/eucjpprober.py
deleted file mode 100644
index 8e64fdc..0000000
--- a/script/_Lib/requests/packages/chardet/eucjpprober.py
+++ /dev/null
@@ -1,90 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-######################### END LICENSE BLOCK #########################
-
-import sys
-from . import constants
-from .mbcharsetprober import MultiByteCharSetProber
-from .codingstatemachine import CodingStateMachine
-from .chardistribution import EUCJPDistributionAnalysis
-from .jpcntx import EUCJPContextAnalysis
-from .mbcssm import EUCJPSMModel
-
-
-class EUCJPProber(MultiByteCharSetProber):
- def __init__(self):
- MultiByteCharSetProber.__init__(self)
- self._mCodingSM = CodingStateMachine(EUCJPSMModel)
- self._mDistributionAnalyzer = EUCJPDistributionAnalysis()
- self._mContextAnalyzer = EUCJPContextAnalysis()
- self.reset()
-
- def reset(self):
- MultiByteCharSetProber.reset(self)
- self._mContextAnalyzer.reset()
-
- def get_charset_name(self):
- return "EUC-JP"
-
- def feed(self, aBuf):
- aLen = len(aBuf)
- for i in range(0, aLen):
- # PY3K: aBuf is a byte array, so aBuf[i] is an int, not a byte
- codingState = self._mCodingSM.next_state(aBuf[i])
- if codingState == constants.eError:
- if constants._debug:
- sys.stderr.write(self.get_charset_name()
- + ' prober hit error at byte ' + str(i)
- + '\n')
- self._mState = constants.eNotMe
- break
- elif codingState == constants.eItsMe:
- self._mState = constants.eFoundIt
- break
- elif codingState == constants.eStart:
- charLen = self._mCodingSM.get_current_charlen()
- if i == 0:
- self._mLastChar[1] = aBuf[0]
- self._mContextAnalyzer.feed(self._mLastChar, charLen)
- self._mDistributionAnalyzer.feed(self._mLastChar, charLen)
- else:
- self._mContextAnalyzer.feed(aBuf[i - 1:i + 1], charLen)
- self._mDistributionAnalyzer.feed(aBuf[i - 1:i + 1],
- charLen)
-
- self._mLastChar[0] = aBuf[aLen - 1]
-
- if self.get_state() == constants.eDetecting:
- if (self._mContextAnalyzer.got_enough_data() and
- (self.get_confidence() > constants.SHORTCUT_THRESHOLD)):
- self._mState = constants.eFoundIt
-
- return self.get_state()
-
- def get_confidence(self):
- contxtCf = self._mContextAnalyzer.get_confidence()
- distribCf = self._mDistributionAnalyzer.get_confidence()
- return max(contxtCf, distribCf)
diff --git a/script/_Lib/requests/packages/chardet/euckrfreq.py b/script/_Lib/requests/packages/chardet/euckrfreq.py
deleted file mode 100644
index a179e4c..0000000
--- a/script/_Lib/requests/packages/chardet/euckrfreq.py
+++ /dev/null
@@ -1,596 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Communicator client code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-######################### END LICENSE BLOCK #########################
-
-# Sampling from about 20M text materials include literature and computer technology
-
-# 128 --> 0.79
-# 256 --> 0.92
-# 512 --> 0.986
-# 1024 --> 0.99944
-# 2048 --> 0.99999
-#
-# Idea Distribution Ratio = 0.98653 / (1-0.98653) = 73.24
-# Random Distribution Ration = 512 / (2350-512) = 0.279.
-#
-# Typical Distribution Ratio
-
-EUCKR_TYPICAL_DISTRIBUTION_RATIO = 6.0
-
-EUCKR_TABLE_SIZE = 2352
-
-# Char to FreqOrder table ,
-EUCKRCharToFreqOrder = ( \
- 13, 130, 120,1396, 481,1719,1720, 328, 609, 212,1721, 707, 400, 299,1722, 87,
-1397,1723, 104, 536,1117,1203,1724,1267, 685,1268, 508,1725,1726,1727,1728,1398,
-1399,1729,1730,1731, 141, 621, 326,1057, 368,1732, 267, 488, 20,1733,1269,1734,
- 945,1400,1735, 47, 904,1270,1736,1737, 773, 248,1738, 409, 313, 786, 429,1739,
- 116, 987, 813,1401, 683, 75,1204, 145,1740,1741,1742,1743, 16, 847, 667, 622,
- 708,1744,1745,1746, 966, 787, 304, 129,1747, 60, 820, 123, 676,1748,1749,1750,
-1751, 617,1752, 626,1753,1754,1755,1756, 653,1757,1758,1759,1760,1761,1762, 856,
- 344,1763,1764,1765,1766, 89, 401, 418, 806, 905, 848,1767,1768,1769, 946,1205,
- 709,1770,1118,1771, 241,1772,1773,1774,1271,1775, 569,1776, 999,1777,1778,1779,
-1780, 337, 751,1058, 28, 628, 254,1781, 177, 906, 270, 349, 891,1079,1782, 19,
-1783, 379,1784, 315,1785, 629, 754,1402, 559,1786, 636, 203,1206,1787, 710, 567,
-1788, 935, 814,1789,1790,1207, 766, 528,1791,1792,1208,1793,1794,1795,1796,1797,
-1403,1798,1799, 533,1059,1404,1405,1156,1406, 936, 884,1080,1800, 351,1801,1802,
-1803,1804,1805, 801,1806,1807,1808,1119,1809,1157, 714, 474,1407,1810, 298, 899,
- 885,1811,1120, 802,1158,1812, 892,1813,1814,1408, 659,1815,1816,1121,1817,1818,
-1819,1820,1821,1822, 319,1823, 594, 545,1824, 815, 937,1209,1825,1826, 573,1409,
-1022,1827,1210,1828,1829,1830,1831,1832,1833, 556, 722, 807,1122,1060,1834, 697,
-1835, 900, 557, 715,1836,1410, 540,1411, 752,1159, 294, 597,1211, 976, 803, 770,
-1412,1837,1838, 39, 794,1413, 358,1839, 371, 925,1840, 453, 661, 788, 531, 723,
- 544,1023,1081, 869, 91,1841, 392, 430, 790, 602,1414, 677,1082, 457,1415,1416,
-1842,1843, 475, 327,1024,1417, 795, 121,1844, 733, 403,1418,1845,1846,1847, 300,
- 119, 711,1212, 627,1848,1272, 207,1849,1850, 796,1213, 382,1851, 519,1852,1083,
- 893,1853,1854,1855, 367, 809, 487, 671,1856, 663,1857,1858, 956, 471, 306, 857,
-1859,1860,1160,1084,1861,1862,1863,1864,1865,1061,1866,1867,1868,1869,1870,1871,
- 282, 96, 574,1872, 502,1085,1873,1214,1874, 907,1875,1876, 827, 977,1419,1420,
-1421, 268,1877,1422,1878,1879,1880, 308,1881, 2, 537,1882,1883,1215,1884,1885,
- 127, 791,1886,1273,1423,1887, 34, 336, 404, 643,1888, 571, 654, 894, 840,1889,
- 0, 886,1274, 122, 575, 260, 908, 938,1890,1275, 410, 316,1891,1892, 100,1893,
-1894,1123, 48,1161,1124,1025,1895, 633, 901,1276,1896,1897, 115, 816,1898, 317,
-1899, 694,1900, 909, 734,1424, 572, 866,1425, 691, 85, 524,1010, 543, 394, 841,
-1901,1902,1903,1026,1904,1905,1906,1907,1908,1909, 30, 451, 651, 988, 310,1910,
-1911,1426, 810,1216, 93,1912,1913,1277,1217,1914, 858, 759, 45, 58, 181, 610,
- 269,1915,1916, 131,1062, 551, 443,1000, 821,1427, 957, 895,1086,1917,1918, 375,
-1919, 359,1920, 687,1921, 822,1922, 293,1923,1924, 40, 662, 118, 692, 29, 939,
- 887, 640, 482, 174,1925, 69,1162, 728,1428, 910,1926,1278,1218,1279, 386, 870,
- 217, 854,1163, 823,1927,1928,1929,1930, 834,1931, 78,1932, 859,1933,1063,1934,
-1935,1936,1937, 438,1164, 208, 595,1938,1939,1940,1941,1219,1125,1942, 280, 888,
-1429,1430,1220,1431,1943,1944,1945,1946,1947,1280, 150, 510,1432,1948,1949,1950,
-1951,1952,1953,1954,1011,1087,1955,1433,1043,1956, 881,1957, 614, 958,1064,1065,
-1221,1958, 638,1001, 860, 967, 896,1434, 989, 492, 553,1281,1165,1959,1282,1002,
-1283,1222,1960,1961,1962,1963, 36, 383, 228, 753, 247, 454,1964, 876, 678,1965,
-1966,1284, 126, 464, 490, 835, 136, 672, 529, 940,1088,1435, 473,1967,1968, 467,
- 50, 390, 227, 587, 279, 378, 598, 792, 968, 240, 151, 160, 849, 882,1126,1285,
- 639,1044, 133, 140, 288, 360, 811, 563,1027, 561, 142, 523,1969,1970,1971, 7,
- 103, 296, 439, 407, 506, 634, 990,1972,1973,1974,1975, 645,1976,1977,1978,1979,
-1980,1981, 236,1982,1436,1983,1984,1089, 192, 828, 618, 518,1166, 333,1127,1985,
- 818,1223,1986,1987,1988,1989,1990,1991,1992,1993, 342,1128,1286, 746, 842,1994,
-1995, 560, 223,1287, 98, 8, 189, 650, 978,1288,1996,1437,1997, 17, 345, 250,
- 423, 277, 234, 512, 226, 97, 289, 42, 167,1998, 201,1999,2000, 843, 836, 824,
- 532, 338, 783,1090, 182, 576, 436,1438,1439, 527, 500,2001, 947, 889,2002,2003,
-2004,2005, 262, 600, 314, 447,2006, 547,2007, 693, 738,1129,2008, 71,1440, 745,
- 619, 688,2009, 829,2010,2011, 147,2012, 33, 948,2013,2014, 74, 224,2015, 61,
- 191, 918, 399, 637,2016,1028,1130, 257, 902,2017,2018,2019,2020,2021,2022,2023,
-2024,2025,2026, 837,2027,2028,2029,2030, 179, 874, 591, 52, 724, 246,2031,2032,
-2033,2034,1167, 969,2035,1289, 630, 605, 911,1091,1168,2036,2037,2038,1441, 912,
-2039, 623,2040,2041, 253,1169,1290,2042,1442, 146, 620, 611, 577, 433,2043,1224,
- 719,1170, 959, 440, 437, 534, 84, 388, 480,1131, 159, 220, 198, 679,2044,1012,
- 819,1066,1443, 113,1225, 194, 318,1003,1029,2045,2046,2047,2048,1067,2049,2050,
-2051,2052,2053, 59, 913, 112,2054, 632,2055, 455, 144, 739,1291,2056, 273, 681,
- 499,2057, 448,2058,2059, 760,2060,2061, 970, 384, 169, 245,1132,2062,2063, 414,
-1444,2064,2065, 41, 235,2066, 157, 252, 877, 568, 919, 789, 580,2067, 725,2068,
-2069,1292,2070,2071,1445,2072,1446,2073,2074, 55, 588, 66,1447, 271,1092,2075,
-1226,2076, 960,1013, 372,2077,2078,2079,2080,2081,1293,2082,2083,2084,2085, 850,
-2086,2087,2088,2089,2090, 186,2091,1068, 180,2092,2093,2094, 109,1227, 522, 606,
-2095, 867,1448,1093, 991,1171, 926, 353,1133,2096, 581,2097,2098,2099,1294,1449,
-1450,2100, 596,1172,1014,1228,2101,1451,1295,1173,1229,2102,2103,1296,1134,1452,
- 949,1135,2104,2105,1094,1453,1454,1455,2106,1095,2107,2108,2109,2110,2111,2112,
-2113,2114,2115,2116,2117, 804,2118,2119,1230,1231, 805,1456, 405,1136,2120,2121,
-2122,2123,2124, 720, 701,1297, 992,1457, 927,1004,2125,2126,2127,2128,2129,2130,
- 22, 417,2131, 303,2132, 385,2133, 971, 520, 513,2134,1174, 73,1096, 231, 274,
- 962,1458, 673,2135,1459,2136, 152,1137,2137,2138,2139,2140,1005,1138,1460,1139,
-2141,2142,2143,2144, 11, 374, 844,2145, 154,1232, 46,1461,2146, 838, 830, 721,
-1233, 106,2147, 90, 428, 462, 578, 566,1175, 352,2148,2149, 538,1234, 124,1298,
-2150,1462, 761, 565,2151, 686,2152, 649,2153, 72, 173,2154, 460, 415,2155,1463,
-2156,1235, 305,2157,2158,2159,2160,2161,2162, 579,2163,2164,2165,2166,2167, 747,
-2168,2169,2170,2171,1464, 669,2172,2173,2174,2175,2176,1465,2177, 23, 530, 285,
-2178, 335, 729,2179, 397,2180,2181,2182,1030,2183,2184, 698,2185,2186, 325,2187,
-2188, 369,2189, 799,1097,1015, 348,2190,1069, 680,2191, 851,1466,2192,2193, 10,
-2194, 613, 424,2195, 979, 108, 449, 589, 27, 172, 81,1031, 80, 774, 281, 350,
-1032, 525, 301, 582,1176,2196, 674,1045,2197,2198,1467, 730, 762,2199,2200,2201,
-2202,1468,2203, 993,2204,2205, 266,1070, 963,1140,2206,2207,2208, 664,1098, 972,
-2209,2210,2211,1177,1469,1470, 871,2212,2213,2214,2215,2216,1471,2217,2218,2219,
-2220,2221,2222,2223,2224,2225,2226,2227,1472,1236,2228,2229,2230,2231,2232,2233,
-2234,2235,1299,2236,2237, 200,2238, 477, 373,2239,2240, 731, 825, 777,2241,2242,
-2243, 521, 486, 548,2244,2245,2246,1473,1300, 53, 549, 137, 875, 76, 158,2247,
-1301,1474, 469, 396,1016, 278, 712,2248, 321, 442, 503, 767, 744, 941,1237,1178,
-1475,2249, 82, 178,1141,1179, 973,2250,1302,2251, 297,2252,2253, 570,2254,2255,
-2256, 18, 450, 206,2257, 290, 292,1142,2258, 511, 162, 99, 346, 164, 735,2259,
-1476,1477, 4, 554, 343, 798,1099,2260,1100,2261, 43, 171,1303, 139, 215,2262,
-2263, 717, 775,2264,1033, 322, 216,2265, 831,2266, 149,2267,1304,2268,2269, 702,
-1238, 135, 845, 347, 309,2270, 484,2271, 878, 655, 238,1006,1478,2272, 67,2273,
- 295,2274,2275, 461,2276, 478, 942, 412,2277,1034,2278,2279,2280, 265,2281, 541,
-2282,2283,2284,2285,2286, 70, 852,1071,2287,2288,2289,2290, 21, 56, 509, 117,
- 432,2291,2292, 331, 980, 552,1101, 148, 284, 105, 393,1180,1239, 755,2293, 187,
-2294,1046,1479,2295, 340,2296, 63,1047, 230,2297,2298,1305, 763,1306, 101, 800,
- 808, 494,2299,2300,2301, 903,2302, 37,1072, 14, 5,2303, 79, 675,2304, 312,
-2305,2306,2307,2308,2309,1480, 6,1307,2310,2311,2312, 1, 470, 35, 24, 229,
-2313, 695, 210, 86, 778, 15, 784, 592, 779, 32, 77, 855, 964,2314, 259,2315,
- 501, 380,2316,2317, 83, 981, 153, 689,1308,1481,1482,1483,2318,2319, 716,1484,
-2320,2321,2322,2323,2324,2325,1485,2326,2327, 128, 57, 68, 261,1048, 211, 170,
-1240, 31,2328, 51, 435, 742,2329,2330,2331, 635,2332, 264, 456,2333,2334,2335,
- 425,2336,1486, 143, 507, 263, 943,2337, 363, 920,1487, 256,1488,1102, 243, 601,
-1489,2338,2339,2340,2341,2342,2343,2344, 861,2345,2346,2347,2348,2349,2350, 395,
-2351,1490,1491, 62, 535, 166, 225,2352,2353, 668, 419,1241, 138, 604, 928,2354,
-1181,2355,1492,1493,2356,2357,2358,1143,2359, 696,2360, 387, 307,1309, 682, 476,
-2361,2362, 332, 12, 222, 156,2363, 232,2364, 641, 276, 656, 517,1494,1495,1035,
- 416, 736,1496,2365,1017, 586,2366,2367,2368,1497,2369, 242,2370,2371,2372,1498,
-2373, 965, 713,2374,2375,2376,2377, 740, 982,1499, 944,1500,1007,2378,2379,1310,
-1501,2380,2381,2382, 785, 329,2383,2384,1502,2385,2386,2387, 932,2388,1503,2389,
-2390,2391,2392,1242,2393,2394,2395,2396,2397, 994, 950,2398,2399,2400,2401,1504,
-1311,2402,2403,2404,2405,1049, 749,2406,2407, 853, 718,1144,1312,2408,1182,1505,
-2409,2410, 255, 516, 479, 564, 550, 214,1506,1507,1313, 413, 239, 444, 339,1145,
-1036,1508,1509,1314,1037,1510,1315,2411,1511,2412,2413,2414, 176, 703, 497, 624,
- 593, 921, 302,2415, 341, 165,1103,1512,2416,1513,2417,2418,2419, 376,2420, 700,
-2421,2422,2423, 258, 768,1316,2424,1183,2425, 995, 608,2426,2427,2428,2429, 221,
-2430,2431,2432,2433,2434,2435,2436,2437, 195, 323, 726, 188, 897, 983,1317, 377,
- 644,1050, 879,2438, 452,2439,2440,2441,2442,2443,2444, 914,2445,2446,2447,2448,
- 915, 489,2449,1514,1184,2450,2451, 515, 64, 427, 495,2452, 583,2453, 483, 485,
-1038, 562, 213,1515, 748, 666,2454,2455,2456,2457, 334,2458, 780, 996,1008, 705,
-1243,2459,2460,2461,2462,2463, 114,2464, 493,1146, 366, 163,1516, 961,1104,2465,
- 291,2466,1318,1105,2467,1517, 365,2468, 355, 951,1244,2469,1319,2470, 631,2471,
-2472, 218,1320, 364, 320, 756,1518,1519,1321,1520,1322,2473,2474,2475,2476, 997,
-2477,2478,2479,2480, 665,1185,2481, 916,1521,2482,2483,2484, 584, 684,2485,2486,
- 797,2487,1051,1186,2488,2489,2490,1522,2491,2492, 370,2493,1039,1187, 65,2494,
- 434, 205, 463,1188,2495, 125, 812, 391, 402, 826, 699, 286, 398, 155, 781, 771,
- 585,2496, 590, 505,1073,2497, 599, 244, 219, 917,1018, 952, 646,1523,2498,1323,
-2499,2500, 49, 984, 354, 741,2501, 625,2502,1324,2503,1019, 190, 357, 757, 491,
- 95, 782, 868,2504,2505,2506,2507,2508,2509, 134,1524,1074, 422,1525, 898,2510,
- 161,2511,2512,2513,2514, 769,2515,1526,2516,2517, 411,1325,2518, 472,1527,2519,
-2520,2521,2522,2523,2524, 985,2525,2526,2527,2528,2529,2530, 764,2531,1245,2532,
-2533, 25, 204, 311,2534, 496,2535,1052,2536,2537,2538,2539,2540,2541,2542, 199,
- 704, 504, 468, 758, 657,1528, 196, 44, 839,1246, 272, 750,2543, 765, 862,2544,
-2545,1326,2546, 132, 615, 933,2547, 732,2548,2549,2550,1189,1529,2551, 283,1247,
-1053, 607, 929,2552,2553,2554, 930, 183, 872, 616,1040,1147,2555,1148,1020, 441,
- 249,1075,2556,2557,2558, 466, 743,2559,2560,2561, 92, 514, 426, 420, 526,2562,
-2563,2564,2565,2566,2567,2568, 185,2569,2570,2571,2572, 776,1530, 658,2573, 362,
-2574, 361, 922,1076, 793,2575,2576,2577,2578,2579,2580,1531, 251,2581,2582,2583,
-2584,1532, 54, 612, 237,1327,2585,2586, 275, 408, 647, 111,2587,1533,1106, 465,
- 3, 458, 9, 38,2588, 107, 110, 890, 209, 26, 737, 498,2589,1534,2590, 431,
- 202, 88,1535, 356, 287,1107, 660,1149,2591, 381,1536, 986,1150, 445,1248,1151,
- 974,2592,2593, 846,2594, 446, 953, 184,1249,1250, 727,2595, 923, 193, 883,2596,
-2597,2598, 102, 324, 539, 817,2599, 421,1041,2600, 832,2601, 94, 175, 197, 406,
-2602, 459,2603,2604,2605,2606,2607, 330, 555,2608,2609,2610, 706,1108, 389,2611,
-2612,2613,2614, 233,2615, 833, 558, 931, 954,1251,2616,2617,1537, 546,2618,2619,
-1009,2620,2621,2622,1538, 690,1328,2623, 955,2624,1539,2625,2626, 772,2627,2628,
-2629,2630,2631, 924, 648, 863, 603,2632,2633, 934,1540, 864, 865,2634, 642,1042,
- 670,1190,2635,2636,2637,2638, 168,2639, 652, 873, 542,1054,1541,2640,2641,2642, # 512, 256
-#Everything below is of no interest for detection purpose
-2643,2644,2645,2646,2647,2648,2649,2650,2651,2652,2653,2654,2655,2656,2657,2658,
-2659,2660,2661,2662,2663,2664,2665,2666,2667,2668,2669,2670,2671,2672,2673,2674,
-2675,2676,2677,2678,2679,2680,2681,2682,2683,2684,2685,2686,2687,2688,2689,2690,
-2691,2692,2693,2694,2695,2696,2697,2698,2699,1542, 880,2700,2701,2702,2703,2704,
-2705,2706,2707,2708,2709,2710,2711,2712,2713,2714,2715,2716,2717,2718,2719,2720,
-2721,2722,2723,2724,2725,1543,2726,2727,2728,2729,2730,2731,2732,1544,2733,2734,
-2735,2736,2737,2738,2739,2740,2741,2742,2743,2744,2745,2746,2747,2748,2749,2750,
-2751,2752,2753,2754,1545,2755,2756,2757,2758,2759,2760,2761,2762,2763,2764,2765,
-2766,1546,2767,1547,2768,2769,2770,2771,2772,2773,2774,2775,2776,2777,2778,2779,
-2780,2781,2782,2783,2784,2785,2786,1548,2787,2788,2789,1109,2790,2791,2792,2793,
-2794,2795,2796,2797,2798,2799,2800,2801,2802,2803,2804,2805,2806,2807,2808,2809,
-2810,2811,2812,1329,2813,2814,2815,2816,2817,2818,2819,2820,2821,2822,2823,2824,
-2825,2826,2827,2828,2829,2830,2831,2832,2833,2834,2835,2836,2837,2838,2839,2840,
-2841,2842,2843,2844,2845,2846,2847,2848,2849,2850,2851,2852,2853,2854,2855,2856,
-1549,2857,2858,2859,2860,1550,2861,2862,1551,2863,2864,2865,2866,2867,2868,2869,
-2870,2871,2872,2873,2874,1110,1330,2875,2876,2877,2878,2879,2880,2881,2882,2883,
-2884,2885,2886,2887,2888,2889,2890,2891,2892,2893,2894,2895,2896,2897,2898,2899,
-2900,2901,2902,2903,2904,2905,2906,2907,2908,2909,2910,2911,2912,2913,2914,2915,
-2916,2917,2918,2919,2920,2921,2922,2923,2924,2925,2926,2927,2928,2929,2930,1331,
-2931,2932,2933,2934,2935,2936,2937,2938,2939,2940,2941,2942,2943,1552,2944,2945,
-2946,2947,2948,2949,2950,2951,2952,2953,2954,2955,2956,2957,2958,2959,2960,2961,
-2962,2963,2964,1252,2965,2966,2967,2968,2969,2970,2971,2972,2973,2974,2975,2976,
-2977,2978,2979,2980,2981,2982,2983,2984,2985,2986,2987,2988,2989,2990,2991,2992,
-2993,2994,2995,2996,2997,2998,2999,3000,3001,3002,3003,3004,3005,3006,3007,3008,
-3009,3010,3011,3012,1553,3013,3014,3015,3016,3017,1554,3018,1332,3019,3020,3021,
-3022,3023,3024,3025,3026,3027,3028,3029,3030,3031,3032,3033,3034,3035,3036,3037,
-3038,3039,3040,3041,3042,3043,3044,3045,3046,3047,3048,3049,3050,1555,3051,3052,
-3053,1556,1557,3054,3055,3056,3057,3058,3059,3060,3061,3062,3063,3064,3065,3066,
-3067,1558,3068,3069,3070,3071,3072,3073,3074,3075,3076,1559,3077,3078,3079,3080,
-3081,3082,3083,1253,3084,3085,3086,3087,3088,3089,3090,3091,3092,3093,3094,3095,
-3096,3097,3098,3099,3100,3101,3102,3103,3104,3105,3106,3107,3108,1152,3109,3110,
-3111,3112,3113,1560,3114,3115,3116,3117,1111,3118,3119,3120,3121,3122,3123,3124,
-3125,3126,3127,3128,3129,3130,3131,3132,3133,3134,3135,3136,3137,3138,3139,3140,
-3141,3142,3143,3144,3145,3146,3147,3148,3149,3150,3151,3152,3153,3154,3155,3156,
-3157,3158,3159,3160,3161,3162,3163,3164,3165,3166,3167,3168,3169,3170,3171,3172,
-3173,3174,3175,3176,1333,3177,3178,3179,3180,3181,3182,3183,3184,3185,3186,3187,
-3188,3189,1561,3190,3191,1334,3192,3193,3194,3195,3196,3197,3198,3199,3200,3201,
-3202,3203,3204,3205,3206,3207,3208,3209,3210,3211,3212,3213,3214,3215,3216,3217,
-3218,3219,3220,3221,3222,3223,3224,3225,3226,3227,3228,3229,3230,3231,3232,3233,
-3234,1562,3235,3236,3237,3238,3239,3240,3241,3242,3243,3244,3245,3246,3247,3248,
-3249,3250,3251,3252,3253,3254,3255,3256,3257,3258,3259,3260,3261,3262,3263,3264,
-3265,3266,3267,3268,3269,3270,3271,3272,3273,3274,3275,3276,3277,1563,3278,3279,
-3280,3281,3282,3283,3284,3285,3286,3287,3288,3289,3290,3291,3292,3293,3294,3295,
-3296,3297,3298,3299,3300,3301,3302,3303,3304,3305,3306,3307,3308,3309,3310,3311,
-3312,3313,3314,3315,3316,3317,3318,3319,3320,3321,3322,3323,3324,3325,3326,3327,
-3328,3329,3330,3331,3332,3333,3334,3335,3336,3337,3338,3339,3340,3341,3342,3343,
-3344,3345,3346,3347,3348,3349,3350,3351,3352,3353,3354,3355,3356,3357,3358,3359,
-3360,3361,3362,3363,3364,1335,3365,3366,3367,3368,3369,3370,3371,3372,3373,3374,
-3375,3376,3377,3378,3379,3380,3381,3382,3383,3384,3385,3386,3387,1336,3388,3389,
-3390,3391,3392,3393,3394,3395,3396,3397,3398,3399,3400,3401,3402,3403,3404,3405,
-3406,3407,3408,3409,3410,3411,3412,3413,3414,1337,3415,3416,3417,3418,3419,1338,
-3420,3421,3422,1564,1565,3423,3424,3425,3426,3427,3428,3429,3430,3431,1254,3432,
-3433,3434,1339,3435,3436,3437,3438,3439,1566,3440,3441,3442,3443,3444,3445,3446,
-3447,3448,3449,3450,3451,3452,3453,3454,1255,3455,3456,3457,3458,3459,1567,1191,
-3460,1568,1569,3461,3462,3463,1570,3464,3465,3466,3467,3468,1571,3469,3470,3471,
-3472,3473,1572,3474,3475,3476,3477,3478,3479,3480,3481,3482,3483,3484,3485,3486,
-1340,3487,3488,3489,3490,3491,3492,1021,3493,3494,3495,3496,3497,3498,1573,3499,
-1341,3500,3501,3502,3503,3504,3505,3506,3507,3508,3509,3510,3511,1342,3512,3513,
-3514,3515,3516,1574,1343,3517,3518,3519,1575,3520,1576,3521,3522,3523,3524,3525,
-3526,3527,3528,3529,3530,3531,3532,3533,3534,3535,3536,3537,3538,3539,3540,3541,
-3542,3543,3544,3545,3546,3547,3548,3549,3550,3551,3552,3553,3554,3555,3556,3557,
-3558,3559,3560,3561,3562,3563,3564,3565,3566,3567,3568,3569,3570,3571,3572,3573,
-3574,3575,3576,3577,3578,3579,3580,1577,3581,3582,1578,3583,3584,3585,3586,3587,
-3588,3589,3590,3591,3592,3593,3594,3595,3596,3597,3598,3599,3600,3601,3602,3603,
-3604,1579,3605,3606,3607,3608,3609,3610,3611,3612,3613,3614,3615,3616,3617,3618,
-3619,3620,3621,3622,3623,3624,3625,3626,3627,3628,3629,1580,3630,3631,1581,3632,
-3633,3634,3635,3636,3637,3638,3639,3640,3641,3642,3643,3644,3645,3646,3647,3648,
-3649,3650,3651,3652,3653,3654,3655,3656,1582,3657,3658,3659,3660,3661,3662,3663,
-3664,3665,3666,3667,3668,3669,3670,3671,3672,3673,3674,3675,3676,3677,3678,3679,
-3680,3681,3682,3683,3684,3685,3686,3687,3688,3689,3690,3691,3692,3693,3694,3695,
-3696,3697,3698,3699,3700,1192,3701,3702,3703,3704,1256,3705,3706,3707,3708,1583,
-1257,3709,3710,3711,3712,3713,3714,3715,3716,1584,3717,3718,3719,3720,3721,3722,
-3723,3724,3725,3726,3727,3728,3729,3730,3731,3732,3733,3734,3735,3736,3737,3738,
-3739,3740,3741,3742,3743,3744,3745,1344,3746,3747,3748,3749,3750,3751,3752,3753,
-3754,3755,3756,1585,3757,3758,3759,3760,3761,3762,3763,3764,3765,3766,1586,3767,
-3768,3769,3770,3771,3772,3773,3774,3775,3776,3777,3778,1345,3779,3780,3781,3782,
-3783,3784,3785,3786,3787,3788,3789,3790,3791,3792,3793,3794,3795,1346,1587,3796,
-3797,1588,3798,3799,3800,3801,3802,3803,3804,3805,3806,1347,3807,3808,3809,3810,
-3811,1589,3812,3813,3814,3815,3816,3817,3818,3819,3820,3821,1590,3822,3823,1591,
-1348,3824,3825,3826,3827,3828,3829,3830,1592,3831,3832,1593,3833,3834,3835,3836,
-3837,3838,3839,3840,3841,3842,3843,3844,1349,3845,3846,3847,3848,3849,3850,3851,
-3852,3853,3854,3855,3856,3857,3858,1594,3859,3860,3861,3862,3863,3864,3865,3866,
-3867,3868,3869,1595,3870,3871,3872,3873,1596,3874,3875,3876,3877,3878,3879,3880,
-3881,3882,3883,3884,3885,3886,1597,3887,3888,3889,3890,3891,3892,3893,3894,3895,
-1598,3896,3897,3898,1599,1600,3899,1350,3900,1351,3901,3902,1352,3903,3904,3905,
-3906,3907,3908,3909,3910,3911,3912,3913,3914,3915,3916,3917,3918,3919,3920,3921,
-3922,3923,3924,1258,3925,3926,3927,3928,3929,3930,3931,1193,3932,1601,3933,3934,
-3935,3936,3937,3938,3939,3940,3941,3942,3943,1602,3944,3945,3946,3947,3948,1603,
-3949,3950,3951,3952,3953,3954,3955,3956,3957,3958,3959,3960,3961,3962,3963,3964,
-3965,1604,3966,3967,3968,3969,3970,3971,3972,3973,3974,3975,3976,3977,1353,3978,
-3979,3980,3981,3982,3983,3984,3985,3986,3987,3988,3989,3990,3991,1354,3992,3993,
-3994,3995,3996,3997,3998,3999,4000,4001,4002,4003,4004,4005,4006,4007,4008,4009,
-4010,4011,4012,4013,4014,4015,4016,4017,4018,4019,4020,4021,4022,4023,1355,4024,
-4025,4026,4027,4028,4029,4030,4031,4032,4033,4034,4035,4036,4037,4038,4039,4040,
-1605,4041,4042,4043,4044,4045,4046,4047,4048,4049,4050,4051,4052,4053,4054,4055,
-4056,4057,4058,4059,4060,1606,4061,4062,4063,4064,1607,4065,4066,4067,4068,4069,
-4070,4071,4072,4073,4074,4075,4076,1194,4077,4078,1608,4079,4080,4081,4082,4083,
-4084,4085,4086,4087,1609,4088,4089,4090,4091,4092,4093,4094,4095,4096,4097,4098,
-4099,4100,4101,4102,4103,4104,4105,4106,4107,4108,1259,4109,4110,4111,4112,4113,
-4114,4115,4116,4117,4118,4119,4120,4121,4122,4123,4124,1195,4125,4126,4127,1610,
-4128,4129,4130,4131,4132,4133,4134,4135,4136,4137,1356,4138,4139,4140,4141,4142,
-4143,4144,1611,4145,4146,4147,4148,4149,4150,4151,4152,4153,4154,4155,4156,4157,
-4158,4159,4160,4161,4162,4163,4164,4165,4166,4167,4168,4169,4170,4171,4172,4173,
-4174,4175,4176,4177,4178,4179,4180,4181,4182,4183,4184,4185,4186,4187,4188,4189,
-4190,4191,4192,4193,4194,4195,4196,4197,4198,4199,4200,4201,4202,4203,4204,4205,
-4206,4207,4208,4209,4210,4211,4212,4213,4214,4215,4216,4217,4218,4219,1612,4220,
-4221,4222,4223,4224,4225,4226,4227,1357,4228,1613,4229,4230,4231,4232,4233,4234,
-4235,4236,4237,4238,4239,4240,4241,4242,4243,1614,4244,4245,4246,4247,4248,4249,
-4250,4251,4252,4253,4254,4255,4256,4257,4258,4259,4260,4261,4262,4263,4264,4265,
-4266,4267,4268,4269,4270,1196,1358,4271,4272,4273,4274,4275,4276,4277,4278,4279,
-4280,4281,4282,4283,4284,4285,4286,4287,1615,4288,4289,4290,4291,4292,4293,4294,
-4295,4296,4297,4298,4299,4300,4301,4302,4303,4304,4305,4306,4307,4308,4309,4310,
-4311,4312,4313,4314,4315,4316,4317,4318,4319,4320,4321,4322,4323,4324,4325,4326,
-4327,4328,4329,4330,4331,4332,4333,4334,1616,4335,4336,4337,4338,4339,4340,4341,
-4342,4343,4344,4345,4346,4347,4348,4349,4350,4351,4352,4353,4354,4355,4356,4357,
-4358,4359,4360,1617,4361,4362,4363,4364,4365,1618,4366,4367,4368,4369,4370,4371,
-4372,4373,4374,4375,4376,4377,4378,4379,4380,4381,4382,4383,4384,4385,4386,4387,
-4388,4389,4390,4391,4392,4393,4394,4395,4396,4397,4398,4399,4400,4401,4402,4403,
-4404,4405,4406,4407,4408,4409,4410,4411,4412,4413,4414,4415,4416,1619,4417,4418,
-4419,4420,4421,4422,4423,4424,4425,1112,4426,4427,4428,4429,4430,1620,4431,4432,
-4433,4434,4435,4436,4437,4438,4439,4440,4441,4442,1260,1261,4443,4444,4445,4446,
-4447,4448,4449,4450,4451,4452,4453,4454,4455,1359,4456,4457,4458,4459,4460,4461,
-4462,4463,4464,4465,1621,4466,4467,4468,4469,4470,4471,4472,4473,4474,4475,4476,
-4477,4478,4479,4480,4481,4482,4483,4484,4485,4486,4487,4488,4489,1055,4490,4491,
-4492,4493,4494,4495,4496,4497,4498,4499,4500,4501,4502,4503,4504,4505,4506,4507,
-4508,4509,4510,4511,4512,4513,4514,4515,4516,4517,4518,1622,4519,4520,4521,1623,
-4522,4523,4524,4525,4526,4527,4528,4529,4530,4531,4532,4533,4534,4535,1360,4536,
-4537,4538,4539,4540,4541,4542,4543, 975,4544,4545,4546,4547,4548,4549,4550,4551,
-4552,4553,4554,4555,4556,4557,4558,4559,4560,4561,4562,4563,4564,4565,4566,4567,
-4568,4569,4570,4571,1624,4572,4573,4574,4575,4576,1625,4577,4578,4579,4580,4581,
-4582,4583,4584,1626,4585,4586,4587,4588,4589,4590,4591,4592,4593,4594,4595,1627,
-4596,4597,4598,4599,4600,4601,4602,4603,4604,4605,4606,4607,4608,4609,4610,4611,
-4612,4613,4614,4615,1628,4616,4617,4618,4619,4620,4621,4622,4623,4624,4625,4626,
-4627,4628,4629,4630,4631,4632,4633,4634,4635,4636,4637,4638,4639,4640,4641,4642,
-4643,4644,4645,4646,4647,4648,4649,1361,4650,4651,4652,4653,4654,4655,4656,4657,
-4658,4659,4660,4661,1362,4662,4663,4664,4665,4666,4667,4668,4669,4670,4671,4672,
-4673,4674,4675,4676,4677,4678,4679,4680,4681,4682,1629,4683,4684,4685,4686,4687,
-1630,4688,4689,4690,4691,1153,4692,4693,4694,1113,4695,4696,4697,4698,4699,4700,
-4701,4702,4703,4704,4705,4706,4707,4708,4709,4710,4711,1197,4712,4713,4714,4715,
-4716,4717,4718,4719,4720,4721,4722,4723,4724,4725,4726,4727,4728,4729,4730,4731,
-4732,4733,4734,4735,1631,4736,1632,4737,4738,4739,4740,4741,4742,4743,4744,1633,
-4745,4746,4747,4748,4749,1262,4750,4751,4752,4753,4754,1363,4755,4756,4757,4758,
-4759,4760,4761,4762,4763,4764,4765,4766,4767,4768,1634,4769,4770,4771,4772,4773,
-4774,4775,4776,4777,4778,1635,4779,4780,4781,4782,4783,4784,4785,4786,4787,4788,
-4789,1636,4790,4791,4792,4793,4794,4795,4796,4797,4798,4799,4800,4801,4802,4803,
-4804,4805,4806,1637,4807,4808,4809,1638,4810,4811,4812,4813,4814,4815,4816,4817,
-4818,1639,4819,4820,4821,4822,4823,4824,4825,4826,4827,4828,4829,4830,4831,4832,
-4833,1077,4834,4835,4836,4837,4838,4839,4840,4841,4842,4843,4844,4845,4846,4847,
-4848,4849,4850,4851,4852,4853,4854,4855,4856,4857,4858,4859,4860,4861,4862,4863,
-4864,4865,4866,4867,4868,4869,4870,4871,4872,4873,4874,4875,4876,4877,4878,4879,
-4880,4881,4882,4883,1640,4884,4885,1641,4886,4887,4888,4889,4890,4891,4892,4893,
-4894,4895,4896,4897,4898,4899,4900,4901,4902,4903,4904,4905,4906,4907,4908,4909,
-4910,4911,1642,4912,4913,4914,1364,4915,4916,4917,4918,4919,4920,4921,4922,4923,
-4924,4925,4926,4927,4928,4929,4930,4931,1643,4932,4933,4934,4935,4936,4937,4938,
-4939,4940,4941,4942,4943,4944,4945,4946,4947,4948,4949,4950,4951,4952,4953,4954,
-4955,4956,4957,4958,4959,4960,4961,4962,4963,4964,4965,4966,4967,4968,4969,4970,
-4971,4972,4973,4974,4975,4976,4977,4978,4979,4980,1644,4981,4982,4983,4984,1645,
-4985,4986,1646,4987,4988,4989,4990,4991,4992,4993,4994,4995,4996,4997,4998,4999,
-5000,5001,5002,5003,5004,5005,1647,5006,1648,5007,5008,5009,5010,5011,5012,1078,
-5013,5014,5015,5016,5017,5018,5019,5020,5021,5022,5023,5024,5025,5026,5027,5028,
-1365,5029,5030,5031,5032,5033,5034,5035,5036,5037,5038,5039,1649,5040,5041,5042,
-5043,5044,5045,1366,5046,5047,5048,5049,5050,5051,5052,5053,5054,5055,1650,5056,
-5057,5058,5059,5060,5061,5062,5063,5064,5065,5066,5067,5068,5069,5070,5071,5072,
-5073,5074,5075,5076,5077,1651,5078,5079,5080,5081,5082,5083,5084,5085,5086,5087,
-5088,5089,5090,5091,5092,5093,5094,5095,5096,5097,5098,5099,5100,5101,5102,5103,
-5104,5105,5106,5107,5108,5109,5110,1652,5111,5112,5113,5114,5115,5116,5117,5118,
-1367,5119,5120,5121,5122,5123,5124,5125,5126,5127,5128,5129,1653,5130,5131,5132,
-5133,5134,5135,5136,5137,5138,5139,5140,5141,5142,5143,5144,5145,5146,5147,5148,
-5149,1368,5150,1654,5151,1369,5152,5153,5154,5155,5156,5157,5158,5159,5160,5161,
-5162,5163,5164,5165,5166,5167,5168,5169,5170,5171,5172,5173,5174,5175,5176,5177,
-5178,1370,5179,5180,5181,5182,5183,5184,5185,5186,5187,5188,5189,5190,5191,5192,
-5193,5194,5195,5196,5197,5198,1655,5199,5200,5201,5202,1656,5203,5204,5205,5206,
-1371,5207,1372,5208,5209,5210,5211,1373,5212,5213,1374,5214,5215,5216,5217,5218,
-5219,5220,5221,5222,5223,5224,5225,5226,5227,5228,5229,5230,5231,5232,5233,5234,
-5235,5236,5237,5238,5239,5240,5241,5242,5243,5244,5245,5246,5247,1657,5248,5249,
-5250,5251,1658,1263,5252,5253,5254,5255,5256,1375,5257,5258,5259,5260,5261,5262,
-5263,5264,5265,5266,5267,5268,5269,5270,5271,5272,5273,5274,5275,5276,5277,5278,
-5279,5280,5281,5282,5283,1659,5284,5285,5286,5287,5288,5289,5290,5291,5292,5293,
-5294,5295,5296,5297,5298,5299,5300,1660,5301,5302,5303,5304,5305,5306,5307,5308,
-5309,5310,5311,5312,5313,5314,5315,5316,5317,5318,5319,5320,5321,1376,5322,5323,
-5324,5325,5326,5327,5328,5329,5330,5331,5332,5333,1198,5334,5335,5336,5337,5338,
-5339,5340,5341,5342,5343,1661,5344,5345,5346,5347,5348,5349,5350,5351,5352,5353,
-5354,5355,5356,5357,5358,5359,5360,5361,5362,5363,5364,5365,5366,5367,5368,5369,
-5370,5371,5372,5373,5374,5375,5376,5377,5378,5379,5380,5381,5382,5383,5384,5385,
-5386,5387,5388,5389,5390,5391,5392,5393,5394,5395,5396,5397,5398,1264,5399,5400,
-5401,5402,5403,5404,5405,5406,5407,5408,5409,5410,5411,5412,1662,5413,5414,5415,
-5416,1663,5417,5418,5419,5420,5421,5422,5423,5424,5425,5426,5427,5428,5429,5430,
-5431,5432,5433,5434,5435,5436,5437,5438,1664,5439,5440,5441,5442,5443,5444,5445,
-5446,5447,5448,5449,5450,5451,5452,5453,5454,5455,5456,5457,5458,5459,5460,5461,
-5462,5463,5464,5465,5466,5467,5468,5469,5470,5471,5472,5473,5474,5475,5476,5477,
-5478,1154,5479,5480,5481,5482,5483,5484,5485,1665,5486,5487,5488,5489,5490,5491,
-5492,5493,5494,5495,5496,5497,5498,5499,5500,5501,5502,5503,5504,5505,5506,5507,
-5508,5509,5510,5511,5512,5513,5514,5515,5516,5517,5518,5519,5520,5521,5522,5523,
-5524,5525,5526,5527,5528,5529,5530,5531,5532,5533,5534,5535,5536,5537,5538,5539,
-5540,5541,5542,5543,5544,5545,5546,5547,5548,1377,5549,5550,5551,5552,5553,5554,
-5555,5556,5557,5558,5559,5560,5561,5562,5563,5564,5565,5566,5567,5568,5569,5570,
-1114,5571,5572,5573,5574,5575,5576,5577,5578,5579,5580,5581,5582,5583,5584,5585,
-5586,5587,5588,5589,5590,5591,5592,1378,5593,5594,5595,5596,5597,5598,5599,5600,
-5601,5602,5603,5604,5605,5606,5607,5608,5609,5610,5611,5612,5613,5614,1379,5615,
-5616,5617,5618,5619,5620,5621,5622,5623,5624,5625,5626,5627,5628,5629,5630,5631,
-5632,5633,5634,1380,5635,5636,5637,5638,5639,5640,5641,5642,5643,5644,5645,5646,
-5647,5648,5649,1381,1056,5650,5651,5652,5653,5654,5655,5656,5657,5658,5659,5660,
-1666,5661,5662,5663,5664,5665,5666,5667,5668,1667,5669,1668,5670,5671,5672,5673,
-5674,5675,5676,5677,5678,1155,5679,5680,5681,5682,5683,5684,5685,5686,5687,5688,
-5689,5690,5691,5692,5693,5694,5695,5696,5697,5698,1669,5699,5700,5701,5702,5703,
-5704,5705,1670,5706,5707,5708,5709,5710,1671,5711,5712,5713,5714,1382,5715,5716,
-5717,5718,5719,5720,5721,5722,5723,5724,5725,1672,5726,5727,1673,1674,5728,5729,
-5730,5731,5732,5733,5734,5735,5736,1675,5737,5738,5739,5740,5741,5742,5743,5744,
-1676,5745,5746,5747,5748,5749,5750,5751,1383,5752,5753,5754,5755,5756,5757,5758,
-5759,5760,5761,5762,5763,5764,5765,5766,5767,5768,1677,5769,5770,5771,5772,5773,
-1678,5774,5775,5776, 998,5777,5778,5779,5780,5781,5782,5783,5784,5785,1384,5786,
-5787,5788,5789,5790,5791,5792,5793,5794,5795,5796,5797,5798,5799,5800,1679,5801,
-5802,5803,1115,1116,5804,5805,5806,5807,5808,5809,5810,5811,5812,5813,5814,5815,
-5816,5817,5818,5819,5820,5821,5822,5823,5824,5825,5826,5827,5828,5829,5830,5831,
-5832,5833,5834,5835,5836,5837,5838,5839,5840,5841,5842,5843,5844,5845,5846,5847,
-5848,5849,5850,5851,5852,5853,5854,5855,1680,5856,5857,5858,5859,5860,5861,5862,
-5863,5864,1681,5865,5866,5867,1682,5868,5869,5870,5871,5872,5873,5874,5875,5876,
-5877,5878,5879,1683,5880,1684,5881,5882,5883,5884,1685,5885,5886,5887,5888,5889,
-5890,5891,5892,5893,5894,5895,5896,5897,5898,5899,5900,5901,5902,5903,5904,5905,
-5906,5907,1686,5908,5909,5910,5911,5912,5913,5914,5915,5916,5917,5918,5919,5920,
-5921,5922,5923,5924,5925,5926,5927,5928,5929,5930,5931,5932,5933,5934,5935,1687,
-5936,5937,5938,5939,5940,5941,5942,5943,5944,5945,5946,5947,5948,5949,5950,5951,
-5952,1688,1689,5953,1199,5954,5955,5956,5957,5958,5959,5960,5961,1690,5962,5963,
-5964,5965,5966,5967,5968,5969,5970,5971,5972,5973,5974,5975,5976,5977,5978,5979,
-5980,5981,1385,5982,1386,5983,5984,5985,5986,5987,5988,5989,5990,5991,5992,5993,
-5994,5995,5996,5997,5998,5999,6000,6001,6002,6003,6004,6005,6006,6007,6008,6009,
-6010,6011,6012,6013,6014,6015,6016,6017,6018,6019,6020,6021,6022,6023,6024,6025,
-6026,6027,1265,6028,6029,1691,6030,6031,6032,6033,6034,6035,6036,6037,6038,6039,
-6040,6041,6042,6043,6044,6045,6046,6047,6048,6049,6050,6051,6052,6053,6054,6055,
-6056,6057,6058,6059,6060,6061,6062,6063,6064,6065,6066,6067,6068,6069,6070,6071,
-6072,6073,6074,6075,6076,6077,6078,6079,6080,6081,6082,6083,6084,1692,6085,6086,
-6087,6088,6089,6090,6091,6092,6093,6094,6095,6096,6097,6098,6099,6100,6101,6102,
-6103,6104,6105,6106,6107,6108,6109,6110,6111,6112,6113,6114,6115,6116,6117,6118,
-6119,6120,6121,6122,6123,6124,6125,6126,6127,6128,6129,6130,6131,1693,6132,6133,
-6134,6135,6136,1694,6137,6138,6139,6140,6141,1695,6142,6143,6144,6145,6146,6147,
-6148,6149,6150,6151,6152,6153,6154,6155,6156,6157,6158,6159,6160,6161,6162,6163,
-6164,6165,6166,6167,6168,6169,6170,6171,6172,6173,6174,6175,6176,6177,6178,6179,
-6180,6181,6182,6183,6184,6185,1696,6186,6187,6188,6189,6190,6191,6192,6193,6194,
-6195,6196,6197,6198,6199,6200,6201,6202,6203,6204,6205,6206,6207,6208,6209,6210,
-6211,6212,6213,6214,6215,6216,6217,6218,6219,1697,6220,6221,6222,6223,6224,6225,
-6226,6227,6228,6229,6230,6231,6232,6233,6234,6235,6236,6237,6238,6239,6240,6241,
-6242,6243,6244,6245,6246,6247,6248,6249,6250,6251,6252,6253,1698,6254,6255,6256,
-6257,6258,6259,6260,6261,6262,6263,1200,6264,6265,6266,6267,6268,6269,6270,6271, #1024
-6272,6273,6274,6275,6276,6277,6278,6279,6280,6281,6282,6283,6284,6285,6286,6287,
-6288,6289,6290,6291,6292,6293,6294,6295,6296,6297,6298,6299,6300,6301,6302,1699,
-6303,6304,1700,6305,6306,6307,6308,6309,6310,6311,6312,6313,6314,6315,6316,6317,
-6318,6319,6320,6321,6322,6323,6324,6325,6326,6327,6328,6329,6330,6331,6332,6333,
-6334,6335,6336,6337,6338,6339,1701,6340,6341,6342,6343,6344,1387,6345,6346,6347,
-6348,6349,6350,6351,6352,6353,6354,6355,6356,6357,6358,6359,6360,6361,6362,6363,
-6364,6365,6366,6367,6368,6369,6370,6371,6372,6373,6374,6375,6376,6377,6378,6379,
-6380,6381,6382,6383,6384,6385,6386,6387,6388,6389,6390,6391,6392,6393,6394,6395,
-6396,6397,6398,6399,6400,6401,6402,6403,6404,6405,6406,6407,6408,6409,6410,6411,
-6412,6413,1702,6414,6415,6416,6417,6418,6419,6420,6421,6422,1703,6423,6424,6425,
-6426,6427,6428,6429,6430,6431,6432,6433,6434,6435,6436,6437,6438,1704,6439,6440,
-6441,6442,6443,6444,6445,6446,6447,6448,6449,6450,6451,6452,6453,6454,6455,6456,
-6457,6458,6459,6460,6461,6462,6463,6464,6465,6466,6467,6468,6469,6470,6471,6472,
-6473,6474,6475,6476,6477,6478,6479,6480,6481,6482,6483,6484,6485,6486,6487,6488,
-6489,6490,6491,6492,6493,6494,6495,6496,6497,6498,6499,6500,6501,6502,6503,1266,
-6504,6505,6506,6507,6508,6509,6510,6511,6512,6513,6514,6515,6516,6517,6518,6519,
-6520,6521,6522,6523,6524,6525,6526,6527,6528,6529,6530,6531,6532,6533,6534,6535,
-6536,6537,6538,6539,6540,6541,6542,6543,6544,6545,6546,6547,6548,6549,6550,6551,
-1705,1706,6552,6553,6554,6555,6556,6557,6558,6559,6560,6561,6562,6563,6564,6565,
-6566,6567,6568,6569,6570,6571,6572,6573,6574,6575,6576,6577,6578,6579,6580,6581,
-6582,6583,6584,6585,6586,6587,6588,6589,6590,6591,6592,6593,6594,6595,6596,6597,
-6598,6599,6600,6601,6602,6603,6604,6605,6606,6607,6608,6609,6610,6611,6612,6613,
-6614,6615,6616,6617,6618,6619,6620,6621,6622,6623,6624,6625,6626,6627,6628,6629,
-6630,6631,6632,6633,6634,6635,6636,6637,1388,6638,6639,6640,6641,6642,6643,6644,
-1707,6645,6646,6647,6648,6649,6650,6651,6652,6653,6654,6655,6656,6657,6658,6659,
-6660,6661,6662,6663,1708,6664,6665,6666,6667,6668,6669,6670,6671,6672,6673,6674,
-1201,6675,6676,6677,6678,6679,6680,6681,6682,6683,6684,6685,6686,6687,6688,6689,
-6690,6691,6692,6693,6694,6695,6696,6697,6698,6699,6700,6701,6702,6703,6704,6705,
-6706,6707,6708,6709,6710,6711,6712,6713,6714,6715,6716,6717,6718,6719,6720,6721,
-6722,6723,6724,6725,1389,6726,6727,6728,6729,6730,6731,6732,6733,6734,6735,6736,
-1390,1709,6737,6738,6739,6740,6741,6742,1710,6743,6744,6745,6746,1391,6747,6748,
-6749,6750,6751,6752,6753,6754,6755,6756,6757,1392,6758,6759,6760,6761,6762,6763,
-6764,6765,6766,6767,6768,6769,6770,6771,6772,6773,6774,6775,6776,6777,6778,6779,
-6780,1202,6781,6782,6783,6784,6785,6786,6787,6788,6789,6790,6791,6792,6793,6794,
-6795,6796,6797,6798,6799,6800,6801,6802,6803,6804,6805,6806,6807,6808,6809,1711,
-6810,6811,6812,6813,6814,6815,6816,6817,6818,6819,6820,6821,6822,6823,6824,6825,
-6826,6827,6828,6829,6830,6831,6832,6833,6834,6835,6836,1393,6837,6838,6839,6840,
-6841,6842,6843,6844,6845,6846,6847,6848,6849,6850,6851,6852,6853,6854,6855,6856,
-6857,6858,6859,6860,6861,6862,6863,6864,6865,6866,6867,6868,6869,6870,6871,6872,
-6873,6874,6875,6876,6877,6878,6879,6880,6881,6882,6883,6884,6885,6886,6887,6888,
-6889,6890,6891,6892,6893,6894,6895,6896,6897,6898,6899,6900,6901,6902,1712,6903,
-6904,6905,6906,6907,6908,6909,6910,1713,6911,6912,6913,6914,6915,6916,6917,6918,
-6919,6920,6921,6922,6923,6924,6925,6926,6927,6928,6929,6930,6931,6932,6933,6934,
-6935,6936,6937,6938,6939,6940,6941,6942,6943,6944,6945,6946,6947,6948,6949,6950,
-6951,6952,6953,6954,6955,6956,6957,6958,6959,6960,6961,6962,6963,6964,6965,6966,
-6967,6968,6969,6970,6971,6972,6973,6974,1714,6975,6976,6977,6978,6979,6980,6981,
-6982,6983,6984,6985,6986,6987,6988,1394,6989,6990,6991,6992,6993,6994,6995,6996,
-6997,6998,6999,7000,1715,7001,7002,7003,7004,7005,7006,7007,7008,7009,7010,7011,
-7012,7013,7014,7015,7016,7017,7018,7019,7020,7021,7022,7023,7024,7025,7026,7027,
-7028,1716,7029,7030,7031,7032,7033,7034,7035,7036,7037,7038,7039,7040,7041,7042,
-7043,7044,7045,7046,7047,7048,7049,7050,7051,7052,7053,7054,7055,7056,7057,7058,
-7059,7060,7061,7062,7063,7064,7065,7066,7067,7068,7069,7070,7071,7072,7073,7074,
-7075,7076,7077,7078,7079,7080,7081,7082,7083,7084,7085,7086,7087,7088,7089,7090,
-7091,7092,7093,7094,7095,7096,7097,7098,7099,7100,7101,7102,7103,7104,7105,7106,
-7107,7108,7109,7110,7111,7112,7113,7114,7115,7116,7117,7118,7119,7120,7121,7122,
-7123,7124,7125,7126,7127,7128,7129,7130,7131,7132,7133,7134,7135,7136,7137,7138,
-7139,7140,7141,7142,7143,7144,7145,7146,7147,7148,7149,7150,7151,7152,7153,7154,
-7155,7156,7157,7158,7159,7160,7161,7162,7163,7164,7165,7166,7167,7168,7169,7170,
-7171,7172,7173,7174,7175,7176,7177,7178,7179,7180,7181,7182,7183,7184,7185,7186,
-7187,7188,7189,7190,7191,7192,7193,7194,7195,7196,7197,7198,7199,7200,7201,7202,
-7203,7204,7205,7206,7207,1395,7208,7209,7210,7211,7212,7213,1717,7214,7215,7216,
-7217,7218,7219,7220,7221,7222,7223,7224,7225,7226,7227,7228,7229,7230,7231,7232,
-7233,7234,7235,7236,7237,7238,7239,7240,7241,7242,7243,7244,7245,7246,7247,7248,
-7249,7250,7251,7252,7253,7254,7255,7256,7257,7258,7259,7260,7261,7262,7263,7264,
-7265,7266,7267,7268,7269,7270,7271,7272,7273,7274,7275,7276,7277,7278,7279,7280,
-7281,7282,7283,7284,7285,7286,7287,7288,7289,7290,7291,7292,7293,7294,7295,7296,
-7297,7298,7299,7300,7301,7302,7303,7304,7305,7306,7307,7308,7309,7310,7311,7312,
-7313,1718,7314,7315,7316,7317,7318,7319,7320,7321,7322,7323,7324,7325,7326,7327,
-7328,7329,7330,7331,7332,7333,7334,7335,7336,7337,7338,7339,7340,7341,7342,7343,
-7344,7345,7346,7347,7348,7349,7350,7351,7352,7353,7354,7355,7356,7357,7358,7359,
-7360,7361,7362,7363,7364,7365,7366,7367,7368,7369,7370,7371,7372,7373,7374,7375,
-7376,7377,7378,7379,7380,7381,7382,7383,7384,7385,7386,7387,7388,7389,7390,7391,
-7392,7393,7394,7395,7396,7397,7398,7399,7400,7401,7402,7403,7404,7405,7406,7407,
-7408,7409,7410,7411,7412,7413,7414,7415,7416,7417,7418,7419,7420,7421,7422,7423,
-7424,7425,7426,7427,7428,7429,7430,7431,7432,7433,7434,7435,7436,7437,7438,7439,
-7440,7441,7442,7443,7444,7445,7446,7447,7448,7449,7450,7451,7452,7453,7454,7455,
-7456,7457,7458,7459,7460,7461,7462,7463,7464,7465,7466,7467,7468,7469,7470,7471,
-7472,7473,7474,7475,7476,7477,7478,7479,7480,7481,7482,7483,7484,7485,7486,7487,
-7488,7489,7490,7491,7492,7493,7494,7495,7496,7497,7498,7499,7500,7501,7502,7503,
-7504,7505,7506,7507,7508,7509,7510,7511,7512,7513,7514,7515,7516,7517,7518,7519,
-7520,7521,7522,7523,7524,7525,7526,7527,7528,7529,7530,7531,7532,7533,7534,7535,
-7536,7537,7538,7539,7540,7541,7542,7543,7544,7545,7546,7547,7548,7549,7550,7551,
-7552,7553,7554,7555,7556,7557,7558,7559,7560,7561,7562,7563,7564,7565,7566,7567,
-7568,7569,7570,7571,7572,7573,7574,7575,7576,7577,7578,7579,7580,7581,7582,7583,
-7584,7585,7586,7587,7588,7589,7590,7591,7592,7593,7594,7595,7596,7597,7598,7599,
-7600,7601,7602,7603,7604,7605,7606,7607,7608,7609,7610,7611,7612,7613,7614,7615,
-7616,7617,7618,7619,7620,7621,7622,7623,7624,7625,7626,7627,7628,7629,7630,7631,
-7632,7633,7634,7635,7636,7637,7638,7639,7640,7641,7642,7643,7644,7645,7646,7647,
-7648,7649,7650,7651,7652,7653,7654,7655,7656,7657,7658,7659,7660,7661,7662,7663,
-7664,7665,7666,7667,7668,7669,7670,7671,7672,7673,7674,7675,7676,7677,7678,7679,
-7680,7681,7682,7683,7684,7685,7686,7687,7688,7689,7690,7691,7692,7693,7694,7695,
-7696,7697,7698,7699,7700,7701,7702,7703,7704,7705,7706,7707,7708,7709,7710,7711,
-7712,7713,7714,7715,7716,7717,7718,7719,7720,7721,7722,7723,7724,7725,7726,7727,
-7728,7729,7730,7731,7732,7733,7734,7735,7736,7737,7738,7739,7740,7741,7742,7743,
-7744,7745,7746,7747,7748,7749,7750,7751,7752,7753,7754,7755,7756,7757,7758,7759,
-7760,7761,7762,7763,7764,7765,7766,7767,7768,7769,7770,7771,7772,7773,7774,7775,
-7776,7777,7778,7779,7780,7781,7782,7783,7784,7785,7786,7787,7788,7789,7790,7791,
-7792,7793,7794,7795,7796,7797,7798,7799,7800,7801,7802,7803,7804,7805,7806,7807,
-7808,7809,7810,7811,7812,7813,7814,7815,7816,7817,7818,7819,7820,7821,7822,7823,
-7824,7825,7826,7827,7828,7829,7830,7831,7832,7833,7834,7835,7836,7837,7838,7839,
-7840,7841,7842,7843,7844,7845,7846,7847,7848,7849,7850,7851,7852,7853,7854,7855,
-7856,7857,7858,7859,7860,7861,7862,7863,7864,7865,7866,7867,7868,7869,7870,7871,
-7872,7873,7874,7875,7876,7877,7878,7879,7880,7881,7882,7883,7884,7885,7886,7887,
-7888,7889,7890,7891,7892,7893,7894,7895,7896,7897,7898,7899,7900,7901,7902,7903,
-7904,7905,7906,7907,7908,7909,7910,7911,7912,7913,7914,7915,7916,7917,7918,7919,
-7920,7921,7922,7923,7924,7925,7926,7927,7928,7929,7930,7931,7932,7933,7934,7935,
-7936,7937,7938,7939,7940,7941,7942,7943,7944,7945,7946,7947,7948,7949,7950,7951,
-7952,7953,7954,7955,7956,7957,7958,7959,7960,7961,7962,7963,7964,7965,7966,7967,
-7968,7969,7970,7971,7972,7973,7974,7975,7976,7977,7978,7979,7980,7981,7982,7983,
-7984,7985,7986,7987,7988,7989,7990,7991,7992,7993,7994,7995,7996,7997,7998,7999,
-8000,8001,8002,8003,8004,8005,8006,8007,8008,8009,8010,8011,8012,8013,8014,8015,
-8016,8017,8018,8019,8020,8021,8022,8023,8024,8025,8026,8027,8028,8029,8030,8031,
-8032,8033,8034,8035,8036,8037,8038,8039,8040,8041,8042,8043,8044,8045,8046,8047,
-8048,8049,8050,8051,8052,8053,8054,8055,8056,8057,8058,8059,8060,8061,8062,8063,
-8064,8065,8066,8067,8068,8069,8070,8071,8072,8073,8074,8075,8076,8077,8078,8079,
-8080,8081,8082,8083,8084,8085,8086,8087,8088,8089,8090,8091,8092,8093,8094,8095,
-8096,8097,8098,8099,8100,8101,8102,8103,8104,8105,8106,8107,8108,8109,8110,8111,
-8112,8113,8114,8115,8116,8117,8118,8119,8120,8121,8122,8123,8124,8125,8126,8127,
-8128,8129,8130,8131,8132,8133,8134,8135,8136,8137,8138,8139,8140,8141,8142,8143,
-8144,8145,8146,8147,8148,8149,8150,8151,8152,8153,8154,8155,8156,8157,8158,8159,
-8160,8161,8162,8163,8164,8165,8166,8167,8168,8169,8170,8171,8172,8173,8174,8175,
-8176,8177,8178,8179,8180,8181,8182,8183,8184,8185,8186,8187,8188,8189,8190,8191,
-8192,8193,8194,8195,8196,8197,8198,8199,8200,8201,8202,8203,8204,8205,8206,8207,
-8208,8209,8210,8211,8212,8213,8214,8215,8216,8217,8218,8219,8220,8221,8222,8223,
-8224,8225,8226,8227,8228,8229,8230,8231,8232,8233,8234,8235,8236,8237,8238,8239,
-8240,8241,8242,8243,8244,8245,8246,8247,8248,8249,8250,8251,8252,8253,8254,8255,
-8256,8257,8258,8259,8260,8261,8262,8263,8264,8265,8266,8267,8268,8269,8270,8271,
-8272,8273,8274,8275,8276,8277,8278,8279,8280,8281,8282,8283,8284,8285,8286,8287,
-8288,8289,8290,8291,8292,8293,8294,8295,8296,8297,8298,8299,8300,8301,8302,8303,
-8304,8305,8306,8307,8308,8309,8310,8311,8312,8313,8314,8315,8316,8317,8318,8319,
-8320,8321,8322,8323,8324,8325,8326,8327,8328,8329,8330,8331,8332,8333,8334,8335,
-8336,8337,8338,8339,8340,8341,8342,8343,8344,8345,8346,8347,8348,8349,8350,8351,
-8352,8353,8354,8355,8356,8357,8358,8359,8360,8361,8362,8363,8364,8365,8366,8367,
-8368,8369,8370,8371,8372,8373,8374,8375,8376,8377,8378,8379,8380,8381,8382,8383,
-8384,8385,8386,8387,8388,8389,8390,8391,8392,8393,8394,8395,8396,8397,8398,8399,
-8400,8401,8402,8403,8404,8405,8406,8407,8408,8409,8410,8411,8412,8413,8414,8415,
-8416,8417,8418,8419,8420,8421,8422,8423,8424,8425,8426,8427,8428,8429,8430,8431,
-8432,8433,8434,8435,8436,8437,8438,8439,8440,8441,8442,8443,8444,8445,8446,8447,
-8448,8449,8450,8451,8452,8453,8454,8455,8456,8457,8458,8459,8460,8461,8462,8463,
-8464,8465,8466,8467,8468,8469,8470,8471,8472,8473,8474,8475,8476,8477,8478,8479,
-8480,8481,8482,8483,8484,8485,8486,8487,8488,8489,8490,8491,8492,8493,8494,8495,
-8496,8497,8498,8499,8500,8501,8502,8503,8504,8505,8506,8507,8508,8509,8510,8511,
-8512,8513,8514,8515,8516,8517,8518,8519,8520,8521,8522,8523,8524,8525,8526,8527,
-8528,8529,8530,8531,8532,8533,8534,8535,8536,8537,8538,8539,8540,8541,8542,8543,
-8544,8545,8546,8547,8548,8549,8550,8551,8552,8553,8554,8555,8556,8557,8558,8559,
-8560,8561,8562,8563,8564,8565,8566,8567,8568,8569,8570,8571,8572,8573,8574,8575,
-8576,8577,8578,8579,8580,8581,8582,8583,8584,8585,8586,8587,8588,8589,8590,8591,
-8592,8593,8594,8595,8596,8597,8598,8599,8600,8601,8602,8603,8604,8605,8606,8607,
-8608,8609,8610,8611,8612,8613,8614,8615,8616,8617,8618,8619,8620,8621,8622,8623,
-8624,8625,8626,8627,8628,8629,8630,8631,8632,8633,8634,8635,8636,8637,8638,8639,
-8640,8641,8642,8643,8644,8645,8646,8647,8648,8649,8650,8651,8652,8653,8654,8655,
-8656,8657,8658,8659,8660,8661,8662,8663,8664,8665,8666,8667,8668,8669,8670,8671,
-8672,8673,8674,8675,8676,8677,8678,8679,8680,8681,8682,8683,8684,8685,8686,8687,
-8688,8689,8690,8691,8692,8693,8694,8695,8696,8697,8698,8699,8700,8701,8702,8703,
-8704,8705,8706,8707,8708,8709,8710,8711,8712,8713,8714,8715,8716,8717,8718,8719,
-8720,8721,8722,8723,8724,8725,8726,8727,8728,8729,8730,8731,8732,8733,8734,8735,
-8736,8737,8738,8739,8740,8741)
-
-# flake8: noqa
diff --git a/script/_Lib/requests/packages/chardet/euckrprober.py b/script/_Lib/requests/packages/chardet/euckrprober.py
deleted file mode 100644
index 5982a46..0000000
--- a/script/_Lib/requests/packages/chardet/euckrprober.py
+++ /dev/null
@@ -1,42 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-######################### END LICENSE BLOCK #########################
-
-from .mbcharsetprober import MultiByteCharSetProber
-from .codingstatemachine import CodingStateMachine
-from .chardistribution import EUCKRDistributionAnalysis
-from .mbcssm import EUCKRSMModel
-
-
-class EUCKRProber(MultiByteCharSetProber):
- def __init__(self):
- MultiByteCharSetProber.__init__(self)
- self._mCodingSM = CodingStateMachine(EUCKRSMModel)
- self._mDistributionAnalyzer = EUCKRDistributionAnalysis()
- self.reset()
-
- def get_charset_name(self):
- return "EUC-KR"
diff --git a/script/_Lib/requests/packages/chardet/euctwfreq.py b/script/_Lib/requests/packages/chardet/euctwfreq.py
deleted file mode 100644
index 576e750..0000000
--- a/script/_Lib/requests/packages/chardet/euctwfreq.py
+++ /dev/null
@@ -1,428 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Communicator client code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-######################### END LICENSE BLOCK #########################
-
-# EUCTW frequency table
-# Converted from big5 work
-# by Taiwan's Mandarin Promotion Council
-#
-
-# 128 --> 0.42261
-# 256 --> 0.57851
-# 512 --> 0.74851
-# 1024 --> 0.89384
-# 2048 --> 0.97583
-#
-# Idea Distribution Ratio = 0.74851/(1-0.74851) =2.98
-# Random Distribution Ration = 512/(5401-512)=0.105
-#
-# Typical Distribution Ratio about 25% of Ideal one, still much higher than RDR
-
-EUCTW_TYPICAL_DISTRIBUTION_RATIO = 0.75
-
-# Char to FreqOrder table ,
-EUCTW_TABLE_SIZE = 8102
-
-EUCTWCharToFreqOrder = (
- 1,1800,1506, 255,1431, 198, 9, 82, 6,7310, 177, 202,3615,1256,2808, 110, # 2742
-3735, 33,3241, 261, 76, 44,2113, 16,2931,2184,1176, 659,3868, 26,3404,2643, # 2758
-1198,3869,3313,4060, 410,2211, 302, 590, 361,1963, 8, 204, 58,4296,7311,1931, # 2774
- 63,7312,7313, 317,1614, 75, 222, 159,4061,2412,1480,7314,3500,3068, 224,2809, # 2790
-3616, 3, 10,3870,1471, 29,2774,1135,2852,1939, 873, 130,3242,1123, 312,7315, # 2806
-4297,2051, 507, 252, 682,7316, 142,1914, 124, 206,2932, 34,3501,3173, 64, 604, # 2822
-7317,2494,1976,1977, 155,1990, 645, 641,1606,7318,3405, 337, 72, 406,7319, 80, # 2838
- 630, 238,3174,1509, 263, 939,1092,2644, 756,1440,1094,3406, 449, 69,2969, 591, # 2854
- 179,2095, 471, 115,2034,1843, 60, 50,2970, 134, 806,1868, 734,2035,3407, 180, # 2870
- 995,1607, 156, 537,2893, 688,7320, 319,1305, 779,2144, 514,2374, 298,4298, 359, # 2886
-2495, 90,2707,1338, 663, 11, 906,1099,2545, 20,2436, 182, 532,1716,7321, 732, # 2902
-1376,4062,1311,1420,3175, 25,2312,1056, 113, 399, 382,1949, 242,3408,2467, 529, # 2918
-3243, 475,1447,3617,7322, 117, 21, 656, 810,1297,2295,2329,3502,7323, 126,4063, # 2934
- 706, 456, 150, 613,4299, 71,1118,2036,4064, 145,3069, 85, 835, 486,2114,1246, # 2950
-1426, 428, 727,1285,1015, 800, 106, 623, 303,1281,7324,2127,2354, 347,3736, 221, # 2966
-3503,3110,7325,1955,1153,4065, 83, 296,1199,3070, 192, 624, 93,7326, 822,1897, # 2982
-2810,3111, 795,2064, 991,1554,1542,1592, 27, 43,2853, 859, 139,1456, 860,4300, # 2998
- 437, 712,3871, 164,2392,3112, 695, 211,3017,2096, 195,3872,1608,3504,3505,3618, # 3014
-3873, 234, 811,2971,2097,3874,2229,1441,3506,1615,2375, 668,2076,1638, 305, 228, # 3030
-1664,4301, 467, 415,7327, 262,2098,1593, 239, 108, 300, 200,1033, 512,1247,2077, # 3046
-7328,7329,2173,3176,3619,2673, 593, 845,1062,3244, 88,1723,2037,3875,1950, 212, # 3062
- 266, 152, 149, 468,1898,4066,4302, 77, 187,7330,3018, 37, 5,2972,7331,3876, # 3078
-7332,7333, 39,2517,4303,2894,3177,2078, 55, 148, 74,4304, 545, 483,1474,1029, # 3094
-1665, 217,1869,1531,3113,1104,2645,4067, 24, 172,3507, 900,3877,3508,3509,4305, # 3110
- 32,1408,2811,1312, 329, 487,2355,2247,2708, 784,2674, 4,3019,3314,1427,1788, # 3126
- 188, 109, 499,7334,3620,1717,1789, 888,1217,3020,4306,7335,3510,7336,3315,1520, # 3142
-3621,3878, 196,1034, 775,7337,7338, 929,1815, 249, 439, 38,7339,1063,7340, 794, # 3158
-3879,1435,2296, 46, 178,3245,2065,7341,2376,7342, 214,1709,4307, 804, 35, 707, # 3174
- 324,3622,1601,2546, 140, 459,4068,7343,7344,1365, 839, 272, 978,2257,2572,3409, # 3190
-2128,1363,3623,1423, 697, 100,3071, 48, 70,1231, 495,3114,2193,7345,1294,7346, # 3206
-2079, 462, 586,1042,3246, 853, 256, 988, 185,2377,3410,1698, 434,1084,7347,3411, # 3222
- 314,2615,2775,4308,2330,2331, 569,2280, 637,1816,2518, 757,1162,1878,1616,3412, # 3238
- 287,1577,2115, 768,4309,1671,2854,3511,2519,1321,3737, 909,2413,7348,4069, 933, # 3254
-3738,7349,2052,2356,1222,4310, 765,2414,1322, 786,4311,7350,1919,1462,1677,2895, # 3270
-1699,7351,4312,1424,2437,3115,3624,2590,3316,1774,1940,3413,3880,4070, 309,1369, # 3286
-1130,2812, 364,2230,1653,1299,3881,3512,3882,3883,2646, 525,1085,3021, 902,2000, # 3302
-1475, 964,4313, 421,1844,1415,1057,2281, 940,1364,3116, 376,4314,4315,1381, 7, # 3318
-2520, 983,2378, 336,1710,2675,1845, 321,3414, 559,1131,3022,2742,1808,1132,1313, # 3334
- 265,1481,1857,7352, 352,1203,2813,3247, 167,1089, 420,2814, 776, 792,1724,3513, # 3350
-4071,2438,3248,7353,4072,7354, 446, 229, 333,2743, 901,3739,1200,1557,4316,2647, # 3366
-1920, 395,2744,2676,3740,4073,1835, 125, 916,3178,2616,4317,7355,7356,3741,7357, # 3382
-7358,7359,4318,3117,3625,1133,2547,1757,3415,1510,2313,1409,3514,7360,2145, 438, # 3398
-2591,2896,2379,3317,1068, 958,3023, 461, 311,2855,2677,4074,1915,3179,4075,1978, # 3414
- 383, 750,2745,2617,4076, 274, 539, 385,1278,1442,7361,1154,1964, 384, 561, 210, # 3430
- 98,1295,2548,3515,7362,1711,2415,1482,3416,3884,2897,1257, 129,7363,3742, 642, # 3446
- 523,2776,2777,2648,7364, 141,2231,1333, 68, 176, 441, 876, 907,4077, 603,2592, # 3462
- 710, 171,3417, 404, 549, 18,3118,2393,1410,3626,1666,7365,3516,4319,2898,4320, # 3478
-7366,2973, 368,7367, 146, 366, 99, 871,3627,1543, 748, 807,1586,1185, 22,2258, # 3494
- 379,3743,3180,7368,3181, 505,1941,2618,1991,1382,2314,7369, 380,2357, 218, 702, # 3510
-1817,1248,3418,3024,3517,3318,3249,7370,2974,3628, 930,3250,3744,7371, 59,7372, # 3526
- 585, 601,4078, 497,3419,1112,1314,4321,1801,7373,1223,1472,2174,7374, 749,1836, # 3542
- 690,1899,3745,1772,3885,1476, 429,1043,1790,2232,2116, 917,4079, 447,1086,1629, # 3558
-7375, 556,7376,7377,2020,1654, 844,1090, 105, 550, 966,1758,2815,1008,1782, 686, # 3574
-1095,7378,2282, 793,1602,7379,3518,2593,4322,4080,2933,2297,4323,3746, 980,2496, # 3590
- 544, 353, 527,4324, 908,2678,2899,7380, 381,2619,1942,1348,7381,1341,1252, 560, # 3606
-3072,7382,3420,2856,7383,2053, 973, 886,2080, 143,4325,7384,7385, 157,3886, 496, # 3622
-4081, 57, 840, 540,2038,4326,4327,3421,2117,1445, 970,2259,1748,1965,2081,4082, # 3638
-3119,1234,1775,3251,2816,3629, 773,1206,2129,1066,2039,1326,3887,1738,1725,4083, # 3654
- 279,3120, 51,1544,2594, 423,1578,2130,2066, 173,4328,1879,7386,7387,1583, 264, # 3670
- 610,3630,4329,2439, 280, 154,7388,7389,7390,1739, 338,1282,3073, 693,2857,1411, # 3686
-1074,3747,2440,7391,4330,7392,7393,1240, 952,2394,7394,2900,1538,2679, 685,1483, # 3702
-4084,2468,1436, 953,4085,2054,4331, 671,2395, 79,4086,2441,3252, 608, 567,2680, # 3718
-3422,4087,4088,1691, 393,1261,1791,2396,7395,4332,7396,7397,7398,7399,1383,1672, # 3734
-3748,3182,1464, 522,1119, 661,1150, 216, 675,4333,3888,1432,3519, 609,4334,2681, # 3750
-2397,7400,7401,7402,4089,3025, 0,7403,2469, 315, 231,2442, 301,3319,4335,2380, # 3766
-7404, 233,4090,3631,1818,4336,4337,7405, 96,1776,1315,2082,7406, 257,7407,1809, # 3782
-3632,2709,1139,1819,4091,2021,1124,2163,2778,1777,2649,7408,3074, 363,1655,3183, # 3798
-7409,2975,7410,7411,7412,3889,1567,3890, 718, 103,3184, 849,1443, 341,3320,2934, # 3814
-1484,7413,1712, 127, 67, 339,4092,2398, 679,1412, 821,7414,7415, 834, 738, 351, # 3830
-2976,2146, 846, 235,1497,1880, 418,1992,3749,2710, 186,1100,2147,2746,3520,1545, # 3846
-1355,2935,2858,1377, 583,3891,4093,2573,2977,7416,1298,3633,1078,2549,3634,2358, # 3862
- 78,3750,3751, 267,1289,2099,2001,1594,4094, 348, 369,1274,2194,2175,1837,4338, # 3878
-1820,2817,3635,2747,2283,2002,4339,2936,2748, 144,3321, 882,4340,3892,2749,3423, # 3894
-4341,2901,7417,4095,1726, 320,7418,3893,3026, 788,2978,7419,2818,1773,1327,2859, # 3910
-3894,2819,7420,1306,4342,2003,1700,3752,3521,2359,2650, 787,2022, 506, 824,3636, # 3926
- 534, 323,4343,1044,3322,2023,1900, 946,3424,7421,1778,1500,1678,7422,1881,4344, # 3942
- 165, 243,4345,3637,2521, 123, 683,4096, 764,4346, 36,3895,1792, 589,2902, 816, # 3958
- 626,1667,3027,2233,1639,1555,1622,3753,3896,7423,3897,2860,1370,1228,1932, 891, # 3974
-2083,2903, 304,4097,7424, 292,2979,2711,3522, 691,2100,4098,1115,4347, 118, 662, # 3990
-7425, 611,1156, 854,2381,1316,2861, 2, 386, 515,2904,7426,7427,3253, 868,2234, # 4006
-1486, 855,2651, 785,2212,3028,7428,1040,3185,3523,7429,3121, 448,7430,1525,7431, # 4022
-2164,4348,7432,3754,7433,4099,2820,3524,3122, 503, 818,3898,3123,1568, 814, 676, # 4038
-1444, 306,1749,7434,3755,1416,1030, 197,1428, 805,2821,1501,4349,7435,7436,7437, # 4054
-1993,7438,4350,7439,7440,2195, 13,2779,3638,2980,3124,1229,1916,7441,3756,2131, # 4070
-7442,4100,4351,2399,3525,7443,2213,1511,1727,1120,7444,7445, 646,3757,2443, 307, # 4086
-7446,7447,1595,3186,7448,7449,7450,3639,1113,1356,3899,1465,2522,2523,7451, 519, # 4102
-7452, 128,2132, 92,2284,1979,7453,3900,1512, 342,3125,2196,7454,2780,2214,1980, # 4118
-3323,7455, 290,1656,1317, 789, 827,2360,7456,3758,4352, 562, 581,3901,7457, 401, # 4134
-4353,2248, 94,4354,1399,2781,7458,1463,2024,4355,3187,1943,7459, 828,1105,4101, # 4150
-1262,1394,7460,4102, 605,4356,7461,1783,2862,7462,2822, 819,2101, 578,2197,2937, # 4166
-7463,1502, 436,3254,4103,3255,2823,3902,2905,3425,3426,7464,2712,2315,7465,7466, # 4182
-2332,2067, 23,4357, 193, 826,3759,2102, 699,1630,4104,3075, 390,1793,1064,3526, # 4198
-7467,1579,3076,3077,1400,7468,4105,1838,1640,2863,7469,4358,4359, 137,4106, 598, # 4214
-3078,1966, 780, 104, 974,2938,7470, 278, 899, 253, 402, 572, 504, 493,1339,7471, # 4230
-3903,1275,4360,2574,2550,7472,3640,3029,3079,2249, 565,1334,2713, 863, 41,7473, # 4246
-7474,4361,7475,1657,2333, 19, 463,2750,4107, 606,7476,2981,3256,1087,2084,1323, # 4262
-2652,2982,7477,1631,1623,1750,4108,2682,7478,2864, 791,2714,2653,2334, 232,2416, # 4278
-7479,2983,1498,7480,2654,2620, 755,1366,3641,3257,3126,2025,1609, 119,1917,3427, # 4294
- 862,1026,4109,7481,3904,3760,4362,3905,4363,2260,1951,2470,7482,1125, 817,4110, # 4310
-4111,3906,1513,1766,2040,1487,4112,3030,3258,2824,3761,3127,7483,7484,1507,7485, # 4326
-2683, 733, 40,1632,1106,2865, 345,4113, 841,2524, 230,4364,2984,1846,3259,3428, # 4342
-7486,1263, 986,3429,7487, 735, 879, 254,1137, 857, 622,1300,1180,1388,1562,3907, # 4358
-3908,2939, 967,2751,2655,1349, 592,2133,1692,3324,2985,1994,4114,1679,3909,1901, # 4374
-2185,7488, 739,3642,2715,1296,1290,7489,4115,2198,2199,1921,1563,2595,2551,1870, # 4390
-2752,2986,7490, 435,7491, 343,1108, 596, 17,1751,4365,2235,3430,3643,7492,4366, # 4406
- 294,3527,2940,1693, 477, 979, 281,2041,3528, 643,2042,3644,2621,2782,2261,1031, # 4422
-2335,2134,2298,3529,4367, 367,1249,2552,7493,3530,7494,4368,1283,3325,2004, 240, # 4438
-1762,3326,4369,4370, 836,1069,3128, 474,7495,2148,2525, 268,3531,7496,3188,1521, # 4454
-1284,7497,1658,1546,4116,7498,3532,3533,7499,4117,3327,2684,1685,4118, 961,1673, # 4470
-2622, 190,2005,2200,3762,4371,4372,7500, 570,2497,3645,1490,7501,4373,2623,3260, # 4486
-1956,4374, 584,1514, 396,1045,1944,7502,4375,1967,2444,7503,7504,4376,3910, 619, # 4502
-7505,3129,3261, 215,2006,2783,2553,3189,4377,3190,4378, 763,4119,3763,4379,7506, # 4518
-7507,1957,1767,2941,3328,3646,1174, 452,1477,4380,3329,3130,7508,2825,1253,2382, # 4534
-2186,1091,2285,4120, 492,7509, 638,1169,1824,2135,1752,3911, 648, 926,1021,1324, # 4550
-4381, 520,4382, 997, 847,1007, 892,4383,3764,2262,1871,3647,7510,2400,1784,4384, # 4566
-1952,2942,3080,3191,1728,4121,2043,3648,4385,2007,1701,3131,1551, 30,2263,4122, # 4582
-7511,2026,4386,3534,7512, 501,7513,4123, 594,3431,2165,1821,3535,3432,3536,3192, # 4598
- 829,2826,4124,7514,1680,3132,1225,4125,7515,3262,4387,4126,3133,2336,7516,4388, # 4614
-4127,7517,3912,3913,7518,1847,2383,2596,3330,7519,4389, 374,3914, 652,4128,4129, # 4630
- 375,1140, 798,7520,7521,7522,2361,4390,2264, 546,1659, 138,3031,2445,4391,7523, # 4646
-2250, 612,1848, 910, 796,3765,1740,1371, 825,3766,3767,7524,2906,2554,7525, 692, # 4662
- 444,3032,2624, 801,4392,4130,7526,1491, 244,1053,3033,4131,4132, 340,7527,3915, # 4678
-1041,2987, 293,1168, 87,1357,7528,1539, 959,7529,2236, 721, 694,4133,3768, 219, # 4694
-1478, 644,1417,3331,2656,1413,1401,1335,1389,3916,7530,7531,2988,2362,3134,1825, # 4710
- 730,1515, 184,2827, 66,4393,7532,1660,2943, 246,3332, 378,1457, 226,3433, 975, # 4726
-3917,2944,1264,3537, 674, 696,7533, 163,7534,1141,2417,2166, 713,3538,3333,4394, # 4742
-3918,7535,7536,1186, 15,7537,1079,1070,7538,1522,3193,3539, 276,1050,2716, 758, # 4758
-1126, 653,2945,3263,7539,2337, 889,3540,3919,3081,2989, 903,1250,4395,3920,3434, # 4774
-3541,1342,1681,1718, 766,3264, 286, 89,2946,3649,7540,1713,7541,2597,3334,2990, # 4790
-7542,2947,2215,3194,2866,7543,4396,2498,2526, 181, 387,1075,3921, 731,2187,3335, # 4806
-7544,3265, 310, 313,3435,2299, 770,4134, 54,3034, 189,4397,3082,3769,3922,7545, # 4822
-1230,1617,1849, 355,3542,4135,4398,3336, 111,4136,3650,1350,3135,3436,3035,4137, # 4838
-2149,3266,3543,7546,2784,3923,3924,2991, 722,2008,7547,1071, 247,1207,2338,2471, # 4854
-1378,4399,2009, 864,1437,1214,4400, 373,3770,1142,2216, 667,4401, 442,2753,2555, # 4870
-3771,3925,1968,4138,3267,1839, 837, 170,1107, 934,1336,1882,7548,7549,2118,4139, # 4886
-2828, 743,1569,7550,4402,4140, 582,2384,1418,3437,7551,1802,7552, 357,1395,1729, # 4902
-3651,3268,2418,1564,2237,7553,3083,3772,1633,4403,1114,2085,4141,1532,7554, 482, # 4918
-2446,4404,7555,7556,1492, 833,1466,7557,2717,3544,1641,2829,7558,1526,1272,3652, # 4934
-4142,1686,1794, 416,2556,1902,1953,1803,7559,3773,2785,3774,1159,2316,7560,2867, # 4950
-4405,1610,1584,3036,2419,2754, 443,3269,1163,3136,7561,7562,3926,7563,4143,2499, # 4966
-3037,4406,3927,3137,2103,1647,3545,2010,1872,4144,7564,4145, 431,3438,7565, 250, # 4982
- 97, 81,4146,7566,1648,1850,1558, 160, 848,7567, 866, 740,1694,7568,2201,2830, # 4998
-3195,4147,4407,3653,1687, 950,2472, 426, 469,3196,3654,3655,3928,7569,7570,1188, # 5014
- 424,1995, 861,3546,4148,3775,2202,2685, 168,1235,3547,4149,7571,2086,1674,4408, # 5030
-3337,3270, 220,2557,1009,7572,3776, 670,2992, 332,1208, 717,7573,7574,3548,2447, # 5046
-3929,3338,7575, 513,7576,1209,2868,3339,3138,4409,1080,7577,7578,7579,7580,2527, # 5062
-3656,3549, 815,1587,3930,3931,7581,3550,3439,3777,1254,4410,1328,3038,1390,3932, # 5078
-1741,3933,3778,3934,7582, 236,3779,2448,3271,7583,7584,3657,3780,1273,3781,4411, # 5094
-7585, 308,7586,4412, 245,4413,1851,2473,1307,2575, 430, 715,2136,2449,7587, 270, # 5110
- 199,2869,3935,7588,3551,2718,1753, 761,1754, 725,1661,1840,4414,3440,3658,7589, # 5126
-7590, 587, 14,3272, 227,2598, 326, 480,2265, 943,2755,3552, 291, 650,1883,7591, # 5142
-1702,1226, 102,1547, 62,3441, 904,4415,3442,1164,4150,7592,7593,1224,1548,2756, # 5158
- 391, 498,1493,7594,1386,1419,7595,2055,1177,4416, 813, 880,1081,2363, 566,1145, # 5174
-4417,2286,1001,1035,2558,2599,2238, 394,1286,7596,7597,2068,7598, 86,1494,1730, # 5190
-3936, 491,1588, 745, 897,2948, 843,3340,3937,2757,2870,3273,1768, 998,2217,2069, # 5206
- 397,1826,1195,1969,3659,2993,3341, 284,7599,3782,2500,2137,2119,1903,7600,3938, # 5222
-2150,3939,4151,1036,3443,1904, 114,2559,4152, 209,1527,7601,7602,2949,2831,2625, # 5238
-2385,2719,3139, 812,2560,7603,3274,7604,1559, 737,1884,3660,1210, 885, 28,2686, # 5254
-3553,3783,7605,4153,1004,1779,4418,7606, 346,1981,2218,2687,4419,3784,1742, 797, # 5270
-1642,3940,1933,1072,1384,2151, 896,3941,3275,3661,3197,2871,3554,7607,2561,1958, # 5286
-4420,2450,1785,7608,7609,7610,3942,4154,1005,1308,3662,4155,2720,4421,4422,1528, # 5302
-2600, 161,1178,4156,1982, 987,4423,1101,4157, 631,3943,1157,3198,2420,1343,1241, # 5318
-1016,2239,2562, 372, 877,2339,2501,1160, 555,1934, 911,3944,7611, 466,1170, 169, # 5334
-1051,2907,2688,3663,2474,2994,1182,2011,2563,1251,2626,7612, 992,2340,3444,1540, # 5350
-2721,1201,2070,2401,1996,2475,7613,4424, 528,1922,2188,1503,1873,1570,2364,3342, # 5366
-3276,7614, 557,1073,7615,1827,3445,2087,2266,3140,3039,3084, 767,3085,2786,4425, # 5382
-1006,4158,4426,2341,1267,2176,3664,3199, 778,3945,3200,2722,1597,2657,7616,4427, # 5398
-7617,3446,7618,7619,7620,3277,2689,1433,3278, 131, 95,1504,3946, 723,4159,3141, # 5414
-1841,3555,2758,2189,3947,2027,2104,3665,7621,2995,3948,1218,7622,3343,3201,3949, # 5430
-4160,2576, 248,1634,3785, 912,7623,2832,3666,3040,3786, 654, 53,7624,2996,7625, # 5446
-1688,4428, 777,3447,1032,3950,1425,7626, 191, 820,2120,2833, 971,4429, 931,3202, # 5462
- 135, 664, 783,3787,1997, 772,2908,1935,3951,3788,4430,2909,3203, 282,2723, 640, # 5478
-1372,3448,1127, 922, 325,3344,7627,7628, 711,2044,7629,7630,3952,2219,2787,1936, # 5494
-3953,3345,2220,2251,3789,2300,7631,4431,3790,1258,3279,3954,3204,2138,2950,3955, # 5510
-3956,7632,2221, 258,3205,4432, 101,1227,7633,3280,1755,7634,1391,3281,7635,2910, # 5526
-2056, 893,7636,7637,7638,1402,4161,2342,7639,7640,3206,3556,7641,7642, 878,1325, # 5542
-1780,2788,4433, 259,1385,2577, 744,1183,2267,4434,7643,3957,2502,7644, 684,1024, # 5558
-4162,7645, 472,3557,3449,1165,3282,3958,3959, 322,2152, 881, 455,1695,1152,1340, # 5574
- 660, 554,2153,4435,1058,4436,4163, 830,1065,3346,3960,4437,1923,7646,1703,1918, # 5590
-7647, 932,2268, 122,7648,4438, 947, 677,7649,3791,2627, 297,1905,1924,2269,4439, # 5606
-2317,3283,7650,7651,4164,7652,4165, 84,4166, 112, 989,7653, 547,1059,3961, 701, # 5622
-3558,1019,7654,4167,7655,3450, 942, 639, 457,2301,2451, 993,2951, 407, 851, 494, # 5638
-4440,3347, 927,7656,1237,7657,2421,3348, 573,4168, 680, 921,2911,1279,1874, 285, # 5654
- 790,1448,1983, 719,2167,7658,7659,4441,3962,3963,1649,7660,1541, 563,7661,1077, # 5670
-7662,3349,3041,3451, 511,2997,3964,3965,3667,3966,1268,2564,3350,3207,4442,4443, # 5686
-7663, 535,1048,1276,1189,2912,2028,3142,1438,1373,2834,2952,1134,2012,7664,4169, # 5702
-1238,2578,3086,1259,7665, 700,7666,2953,3143,3668,4170,7667,4171,1146,1875,1906, # 5718
-4444,2601,3967, 781,2422, 132,1589, 203, 147, 273,2789,2402, 898,1786,2154,3968, # 5734
-3969,7668,3792,2790,7669,7670,4445,4446,7671,3208,7672,1635,3793, 965,7673,1804, # 5750
-2690,1516,3559,1121,1082,1329,3284,3970,1449,3794, 65,1128,2835,2913,2759,1590, # 5766
-3795,7674,7675, 12,2658, 45, 976,2579,3144,4447, 517,2528,1013,1037,3209,7676, # 5782
-3796,2836,7677,3797,7678,3452,7679,2602, 614,1998,2318,3798,3087,2724,2628,7680, # 5798
-2580,4172, 599,1269,7681,1810,3669,7682,2691,3088, 759,1060, 489,1805,3351,3285, # 5814
-1358,7683,7684,2386,1387,1215,2629,2252, 490,7685,7686,4173,1759,2387,2343,7687, # 5830
-4448,3799,1907,3971,2630,1806,3210,4449,3453,3286,2760,2344, 874,7688,7689,3454, # 5846
-3670,1858, 91,2914,3671,3042,3800,4450,7690,3145,3972,2659,7691,3455,1202,1403, # 5862
-3801,2954,2529,1517,2503,4451,3456,2504,7692,4452,7693,2692,1885,1495,1731,3973, # 5878
-2365,4453,7694,2029,7695,7696,3974,2693,1216, 237,2581,4174,2319,3975,3802,4454, # 5894
-4455,2694,3560,3457, 445,4456,7697,7698,7699,7700,2761, 61,3976,3672,1822,3977, # 5910
-7701, 687,2045, 935, 925, 405,2660, 703,1096,1859,2725,4457,3978,1876,1367,2695, # 5926
-3352, 918,2105,1781,2476, 334,3287,1611,1093,4458, 564,3146,3458,3673,3353, 945, # 5942
-2631,2057,4459,7702,1925, 872,4175,7703,3459,2696,3089, 349,4176,3674,3979,4460, # 5958
-3803,4177,3675,2155,3980,4461,4462,4178,4463,2403,2046, 782,3981, 400, 251,4179, # 5974
-1624,7704,7705, 277,3676, 299,1265, 476,1191,3804,2121,4180,4181,1109, 205,7706, # 5990
-2582,1000,2156,3561,1860,7707,7708,7709,4464,7710,4465,2565, 107,2477,2157,3982, # 6006
-3460,3147,7711,1533, 541,1301, 158, 753,4182,2872,3562,7712,1696, 370,1088,4183, # 6022
-4466,3563, 579, 327, 440, 162,2240, 269,1937,1374,3461, 968,3043, 56,1396,3090, # 6038
-2106,3288,3354,7713,1926,2158,4467,2998,7714,3564,7715,7716,3677,4468,2478,7717, # 6054
-2791,7718,1650,4469,7719,2603,7720,7721,3983,2661,3355,1149,3356,3984,3805,3985, # 6070
-7722,1076, 49,7723, 951,3211,3289,3290, 450,2837, 920,7724,1811,2792,2366,4184, # 6086
-1908,1138,2367,3806,3462,7725,3212,4470,1909,1147,1518,2423,4471,3807,7726,4472, # 6102
-2388,2604, 260,1795,3213,7727,7728,3808,3291, 708,7729,3565,1704,7730,3566,1351, # 6118
-1618,3357,2999,1886, 944,4185,3358,4186,3044,3359,4187,7731,3678, 422, 413,1714, # 6134
-3292, 500,2058,2345,4188,2479,7732,1344,1910, 954,7733,1668,7734,7735,3986,2404, # 6150
-4189,3567,3809,4190,7736,2302,1318,2505,3091, 133,3092,2873,4473, 629, 31,2838, # 6166
-2697,3810,4474, 850, 949,4475,3987,2955,1732,2088,4191,1496,1852,7737,3988, 620, # 6182
-3214, 981,1242,3679,3360,1619,3680,1643,3293,2139,2452,1970,1719,3463,2168,7738, # 6198
-3215,7739,7740,3361,1828,7741,1277,4476,1565,2047,7742,1636,3568,3093,7743, 869, # 6214
-2839, 655,3811,3812,3094,3989,3000,3813,1310,3569,4477,7744,7745,7746,1733, 558, # 6230
-4478,3681, 335,1549,3045,1756,4192,3682,1945,3464,1829,1291,1192, 470,2726,2107, # 6246
-2793, 913,1054,3990,7747,1027,7748,3046,3991,4479, 982,2662,3362,3148,3465,3216, # 6262
-3217,1946,2794,7749, 571,4480,7750,1830,7751,3570,2583,1523,2424,7752,2089, 984, # 6278
-4481,3683,1959,7753,3684, 852, 923,2795,3466,3685, 969,1519, 999,2048,2320,1705, # 6294
-7754,3095, 615,1662, 151, 597,3992,2405,2321,1049, 275,4482,3686,4193, 568,3687, # 6310
-3571,2480,4194,3688,7755,2425,2270, 409,3218,7756,1566,2874,3467,1002, 769,2840, # 6326
- 194,2090,3149,3689,2222,3294,4195, 628,1505,7757,7758,1763,2177,3001,3993, 521, # 6342
-1161,2584,1787,2203,2406,4483,3994,1625,4196,4197, 412, 42,3096, 464,7759,2632, # 6358
-4484,3363,1760,1571,2875,3468,2530,1219,2204,3814,2633,2140,2368,4485,4486,3295, # 6374
-1651,3364,3572,7760,7761,3573,2481,3469,7762,3690,7763,7764,2271,2091, 460,7765, # 6390
-4487,7766,3002, 962, 588,3574, 289,3219,2634,1116, 52,7767,3047,1796,7768,7769, # 6406
-7770,1467,7771,1598,1143,3691,4198,1984,1734,1067,4488,1280,3365, 465,4489,1572, # 6422
- 510,7772,1927,2241,1812,1644,3575,7773,4490,3692,7774,7775,2663,1573,1534,7776, # 6438
-7777,4199, 536,1807,1761,3470,3815,3150,2635,7778,7779,7780,4491,3471,2915,1911, # 6454
-2796,7781,3296,1122, 377,3220,7782, 360,7783,7784,4200,1529, 551,7785,2059,3693, # 6470
-1769,2426,7786,2916,4201,3297,3097,2322,2108,2030,4492,1404, 136,1468,1479, 672, # 6486
-1171,3221,2303, 271,3151,7787,2762,7788,2049, 678,2727, 865,1947,4493,7789,2013, # 6502
-3995,2956,7790,2728,2223,1397,3048,3694,4494,4495,1735,2917,3366,3576,7791,3816, # 6518
- 509,2841,2453,2876,3817,7792,7793,3152,3153,4496,4202,2531,4497,2304,1166,1010, # 6534
- 552, 681,1887,7794,7795,2957,2958,3996,1287,1596,1861,3154, 358, 453, 736, 175, # 6550
- 478,1117, 905,1167,1097,7796,1853,1530,7797,1706,7798,2178,3472,2287,3695,3473, # 6566
-3577,4203,2092,4204,7799,3367,1193,2482,4205,1458,2190,2205,1862,1888,1421,3298, # 6582
-2918,3049,2179,3474, 595,2122,7800,3997,7801,7802,4206,1707,2636, 223,3696,1359, # 6598
- 751,3098, 183,3475,7803,2797,3003, 419,2369, 633, 704,3818,2389, 241,7804,7805, # 6614
-7806, 838,3004,3697,2272,2763,2454,3819,1938,2050,3998,1309,3099,2242,1181,7807, # 6630
-1136,2206,3820,2370,1446,4207,2305,4498,7808,7809,4208,1055,2605, 484,3698,7810, # 6646
-3999, 625,4209,2273,3368,1499,4210,4000,7811,4001,4211,3222,2274,2275,3476,7812, # 6662
-7813,2764, 808,2606,3699,3369,4002,4212,3100,2532, 526,3370,3821,4213, 955,7814, # 6678
-1620,4214,2637,2427,7815,1429,3700,1669,1831, 994, 928,7816,3578,1260,7817,7818, # 6694
-7819,1948,2288, 741,2919,1626,4215,2729,2455, 867,1184, 362,3371,1392,7820,7821, # 6710
-4003,4216,1770,1736,3223,2920,4499,4500,1928,2698,1459,1158,7822,3050,3372,2877, # 6726
-1292,1929,2506,2842,3701,1985,1187,2071,2014,2607,4217,7823,2566,2507,2169,3702, # 6742
-2483,3299,7824,3703,4501,7825,7826, 666,1003,3005,1022,3579,4218,7827,4502,1813, # 6758
-2253, 574,3822,1603, 295,1535, 705,3823,4219, 283, 858, 417,7828,7829,3224,4503, # 6774
-4504,3051,1220,1889,1046,2276,2456,4004,1393,1599, 689,2567, 388,4220,7830,2484, # 6790
- 802,7831,2798,3824,2060,1405,2254,7832,4505,3825,2109,1052,1345,3225,1585,7833, # 6806
- 809,7834,7835,7836, 575,2730,3477, 956,1552,1469,1144,2323,7837,2324,1560,2457, # 6822
-3580,3226,4005, 616,2207,3155,2180,2289,7838,1832,7839,3478,4506,7840,1319,3704, # 6838
-3705,1211,3581,1023,3227,1293,2799,7841,7842,7843,3826, 607,2306,3827, 762,2878, # 6854
-1439,4221,1360,7844,1485,3052,7845,4507,1038,4222,1450,2061,2638,4223,1379,4508, # 6870
-2585,7846,7847,4224,1352,1414,2325,2921,1172,7848,7849,3828,3829,7850,1797,1451, # 6886
-7851,7852,7853,7854,2922,4006,4007,2485,2346, 411,4008,4009,3582,3300,3101,4509, # 6902
-1561,2664,1452,4010,1375,7855,7856, 47,2959, 316,7857,1406,1591,2923,3156,7858, # 6918
-1025,2141,3102,3157, 354,2731, 884,2224,4225,2407, 508,3706, 726,3583, 996,2428, # 6934
-3584, 729,7859, 392,2191,1453,4011,4510,3707,7860,7861,2458,3585,2608,1675,2800, # 6950
- 919,2347,2960,2348,1270,4511,4012, 73,7862,7863, 647,7864,3228,2843,2255,1550, # 6966
-1346,3006,7865,1332, 883,3479,7866,7867,7868,7869,3301,2765,7870,1212, 831,1347, # 6982
-4226,4512,2326,3830,1863,3053, 720,3831,4513,4514,3832,7871,4227,7872,7873,4515, # 6998
-7874,7875,1798,4516,3708,2609,4517,3586,1645,2371,7876,7877,2924, 669,2208,2665, # 7014
-2429,7878,2879,7879,7880,1028,3229,7881,4228,2408,7882,2256,1353,7883,7884,4518, # 7030
-3158, 518,7885,4013,7886,4229,1960,7887,2142,4230,7888,7889,3007,2349,2350,3833, # 7046
- 516,1833,1454,4014,2699,4231,4519,2225,2610,1971,1129,3587,7890,2766,7891,2961, # 7062
-1422, 577,1470,3008,1524,3373,7892,7893, 432,4232,3054,3480,7894,2586,1455,2508, # 7078
-2226,1972,1175,7895,1020,2732,4015,3481,4520,7896,2733,7897,1743,1361,3055,3482, # 7094
-2639,4016,4233,4521,2290, 895, 924,4234,2170, 331,2243,3056, 166,1627,3057,1098, # 7110
-7898,1232,2880,2227,3374,4522, 657, 403,1196,2372, 542,3709,3375,1600,4235,3483, # 7126
-7899,4523,2767,3230, 576, 530,1362,7900,4524,2533,2666,3710,4017,7901, 842,3834, # 7142
-7902,2801,2031,1014,4018, 213,2700,3376, 665, 621,4236,7903,3711,2925,2430,7904, # 7158
-2431,3302,3588,3377,7905,4237,2534,4238,4525,3589,1682,4239,3484,1380,7906, 724, # 7174
-2277, 600,1670,7907,1337,1233,4526,3103,2244,7908,1621,4527,7909, 651,4240,7910, # 7190
-1612,4241,2611,7911,2844,7912,2734,2307,3058,7913, 716,2459,3059, 174,1255,2701, # 7206
-4019,3590, 548,1320,1398, 728,4020,1574,7914,1890,1197,3060,4021,7915,3061,3062, # 7222
-3712,3591,3713, 747,7916, 635,4242,4528,7917,7918,7919,4243,7920,7921,4529,7922, # 7238
-3378,4530,2432, 451,7923,3714,2535,2072,4244,2735,4245,4022,7924,1764,4531,7925, # 7254
-4246, 350,7926,2278,2390,2486,7927,4247,4023,2245,1434,4024, 488,4532, 458,4248, # 7270
-4025,3715, 771,1330,2391,3835,2568,3159,2159,2409,1553,2667,3160,4249,7928,2487, # 7286
-2881,2612,1720,2702,4250,3379,4533,7929,2536,4251,7930,3231,4252,2768,7931,2015, # 7302
-2736,7932,1155,1017,3716,3836,7933,3303,2308, 201,1864,4253,1430,7934,4026,7935, # 7318
-7936,7937,7938,7939,4254,1604,7940, 414,1865, 371,2587,4534,4535,3485,2016,3104, # 7334
-4536,1708, 960,4255, 887, 389,2171,1536,1663,1721,7941,2228,4027,2351,2926,1580, # 7350
-7942,7943,7944,1744,7945,2537,4537,4538,7946,4539,7947,2073,7948,7949,3592,3380, # 7366
-2882,4256,7950,4257,2640,3381,2802, 673,2703,2460, 709,3486,4028,3593,4258,7951, # 7382
-1148, 502, 634,7952,7953,1204,4540,3594,1575,4541,2613,3717,7954,3718,3105, 948, # 7398
-3232, 121,1745,3837,1110,7955,4259,3063,2509,3009,4029,3719,1151,1771,3838,1488, # 7414
-4030,1986,7956,2433,3487,7957,7958,2093,7959,4260,3839,1213,1407,2803, 531,2737, # 7430
-2538,3233,1011,1537,7960,2769,4261,3106,1061,7961,3720,3721,1866,2883,7962,2017, # 7446
- 120,4262,4263,2062,3595,3234,2309,3840,2668,3382,1954,4542,7963,7964,3488,1047, # 7462
-2704,1266,7965,1368,4543,2845, 649,3383,3841,2539,2738,1102,2846,2669,7966,7967, # 7478
-1999,7968,1111,3596,2962,7969,2488,3842,3597,2804,1854,3384,3722,7970,7971,3385, # 7494
-2410,2884,3304,3235,3598,7972,2569,7973,3599,2805,4031,1460, 856,7974,3600,7975, # 7510
-2885,2963,7976,2886,3843,7977,4264, 632,2510, 875,3844,1697,3845,2291,7978,7979, # 7526
-4544,3010,1239, 580,4545,4265,7980, 914, 936,2074,1190,4032,1039,2123,7981,7982, # 7542
-7983,3386,1473,7984,1354,4266,3846,7985,2172,3064,4033, 915,3305,4267,4268,3306, # 7558
-1605,1834,7986,2739, 398,3601,4269,3847,4034, 328,1912,2847,4035,3848,1331,4270, # 7574
-3011, 937,4271,7987,3602,4036,4037,3387,2160,4546,3388, 524, 742, 538,3065,1012, # 7590
-7988,7989,3849,2461,7990, 658,1103, 225,3850,7991,7992,4547,7993,4548,7994,3236, # 7606
-1243,7995,4038, 963,2246,4549,7996,2705,3603,3161,7997,7998,2588,2327,7999,4550, # 7622
-8000,8001,8002,3489,3307, 957,3389,2540,2032,1930,2927,2462, 870,2018,3604,1746, # 7638
-2770,2771,2434,2463,8003,3851,8004,3723,3107,3724,3490,3390,3725,8005,1179,3066, # 7654
-8006,3162,2373,4272,3726,2541,3163,3108,2740,4039,8007,3391,1556,2542,2292, 977, # 7670
-2887,2033,4040,1205,3392,8008,1765,3393,3164,2124,1271,1689, 714,4551,3491,8009, # 7686
-2328,3852, 533,4273,3605,2181, 617,8010,2464,3308,3492,2310,8011,8012,3165,8013, # 7702
-8014,3853,1987, 618, 427,2641,3493,3394,8015,8016,1244,1690,8017,2806,4274,4552, # 7718
-8018,3494,8019,8020,2279,1576, 473,3606,4275,3395, 972,8021,3607,8022,3067,8023, # 7734
-8024,4553,4554,8025,3727,4041,4042,8026, 153,4555, 356,8027,1891,2888,4276,2143, # 7750
- 408, 803,2352,8028,3854,8029,4277,1646,2570,2511,4556,4557,3855,8030,3856,4278, # 7766
-8031,2411,3396, 752,8032,8033,1961,2964,8034, 746,3012,2465,8035,4279,3728, 698, # 7782
-4558,1892,4280,3608,2543,4559,3609,3857,8036,3166,3397,8037,1823,1302,4043,2706, # 7798
-3858,1973,4281,8038,4282,3167, 823,1303,1288,1236,2848,3495,4044,3398, 774,3859, # 7814
-8039,1581,4560,1304,2849,3860,4561,8040,2435,2161,1083,3237,4283,4045,4284, 344, # 7830
-1173, 288,2311, 454,1683,8041,8042,1461,4562,4046,2589,8043,8044,4563, 985, 894, # 7846
-8045,3399,3168,8046,1913,2928,3729,1988,8047,2110,1974,8048,4047,8049,2571,1194, # 7862
- 425,8050,4564,3169,1245,3730,4285,8051,8052,2850,8053, 636,4565,1855,3861, 760, # 7878
-1799,8054,4286,2209,1508,4566,4048,1893,1684,2293,8055,8056,8057,4287,4288,2210, # 7894
- 479,8058,8059, 832,8060,4049,2489,8061,2965,2490,3731, 990,3109, 627,1814,2642, # 7910
-4289,1582,4290,2125,2111,3496,4567,8062, 799,4291,3170,8063,4568,2112,1737,3013, # 7926
-1018, 543, 754,4292,3309,1676,4569,4570,4050,8064,1489,8065,3497,8066,2614,2889, # 7942
-4051,8067,8068,2966,8069,8070,8071,8072,3171,4571,4572,2182,1722,8073,3238,3239, # 7958
-1842,3610,1715, 481, 365,1975,1856,8074,8075,1962,2491,4573,8076,2126,3611,3240, # 7974
- 433,1894,2063,2075,8077, 602,2741,8078,8079,8080,8081,8082,3014,1628,3400,8083, # 7990
-3172,4574,4052,2890,4575,2512,8084,2544,2772,8085,8086,8087,3310,4576,2891,8088, # 8006
-4577,8089,2851,4578,4579,1221,2967,4053,2513,8090,8091,8092,1867,1989,8093,8094, # 8022
-8095,1895,8096,8097,4580,1896,4054, 318,8098,2094,4055,4293,8099,8100, 485,8101, # 8038
- 938,3862, 553,2670, 116,8102,3863,3612,8103,3498,2671,2773,3401,3311,2807,8104, # 8054
-3613,2929,4056,1747,2930,2968,8105,8106, 207,8107,8108,2672,4581,2514,8109,3015, # 8070
- 890,3614,3864,8110,1877,3732,3402,8111,2183,2353,3403,1652,8112,8113,8114, 941, # 8086
-2294, 208,3499,4057,2019, 330,4294,3865,2892,2492,3733,4295,8115,8116,8117,8118, # 8102
-#Everything below is of no interest for detection purpose
-2515,1613,4582,8119,3312,3866,2516,8120,4058,8121,1637,4059,2466,4583,3867,8122, # 8118
-2493,3016,3734,8123,8124,2192,8125,8126,2162,8127,8128,8129,8130,8131,8132,8133, # 8134
-8134,8135,8136,8137,8138,8139,8140,8141,8142,8143,8144,8145,8146,8147,8148,8149, # 8150
-8150,8151,8152,8153,8154,8155,8156,8157,8158,8159,8160,8161,8162,8163,8164,8165, # 8166
-8166,8167,8168,8169,8170,8171,8172,8173,8174,8175,8176,8177,8178,8179,8180,8181, # 8182
-8182,8183,8184,8185,8186,8187,8188,8189,8190,8191,8192,8193,8194,8195,8196,8197, # 8198
-8198,8199,8200,8201,8202,8203,8204,8205,8206,8207,8208,8209,8210,8211,8212,8213, # 8214
-8214,8215,8216,8217,8218,8219,8220,8221,8222,8223,8224,8225,8226,8227,8228,8229, # 8230
-8230,8231,8232,8233,8234,8235,8236,8237,8238,8239,8240,8241,8242,8243,8244,8245, # 8246
-8246,8247,8248,8249,8250,8251,8252,8253,8254,8255,8256,8257,8258,8259,8260,8261, # 8262
-8262,8263,8264,8265,8266,8267,8268,8269,8270,8271,8272,8273,8274,8275,8276,8277, # 8278
-8278,8279,8280,8281,8282,8283,8284,8285,8286,8287,8288,8289,8290,8291,8292,8293, # 8294
-8294,8295,8296,8297,8298,8299,8300,8301,8302,8303,8304,8305,8306,8307,8308,8309, # 8310
-8310,8311,8312,8313,8314,8315,8316,8317,8318,8319,8320,8321,8322,8323,8324,8325, # 8326
-8326,8327,8328,8329,8330,8331,8332,8333,8334,8335,8336,8337,8338,8339,8340,8341, # 8342
-8342,8343,8344,8345,8346,8347,8348,8349,8350,8351,8352,8353,8354,8355,8356,8357, # 8358
-8358,8359,8360,8361,8362,8363,8364,8365,8366,8367,8368,8369,8370,8371,8372,8373, # 8374
-8374,8375,8376,8377,8378,8379,8380,8381,8382,8383,8384,8385,8386,8387,8388,8389, # 8390
-8390,8391,8392,8393,8394,8395,8396,8397,8398,8399,8400,8401,8402,8403,8404,8405, # 8406
-8406,8407,8408,8409,8410,8411,8412,8413,8414,8415,8416,8417,8418,8419,8420,8421, # 8422
-8422,8423,8424,8425,8426,8427,8428,8429,8430,8431,8432,8433,8434,8435,8436,8437, # 8438
-8438,8439,8440,8441,8442,8443,8444,8445,8446,8447,8448,8449,8450,8451,8452,8453, # 8454
-8454,8455,8456,8457,8458,8459,8460,8461,8462,8463,8464,8465,8466,8467,8468,8469, # 8470
-8470,8471,8472,8473,8474,8475,8476,8477,8478,8479,8480,8481,8482,8483,8484,8485, # 8486
-8486,8487,8488,8489,8490,8491,8492,8493,8494,8495,8496,8497,8498,8499,8500,8501, # 8502
-8502,8503,8504,8505,8506,8507,8508,8509,8510,8511,8512,8513,8514,8515,8516,8517, # 8518
-8518,8519,8520,8521,8522,8523,8524,8525,8526,8527,8528,8529,8530,8531,8532,8533, # 8534
-8534,8535,8536,8537,8538,8539,8540,8541,8542,8543,8544,8545,8546,8547,8548,8549, # 8550
-8550,8551,8552,8553,8554,8555,8556,8557,8558,8559,8560,8561,8562,8563,8564,8565, # 8566
-8566,8567,8568,8569,8570,8571,8572,8573,8574,8575,8576,8577,8578,8579,8580,8581, # 8582
-8582,8583,8584,8585,8586,8587,8588,8589,8590,8591,8592,8593,8594,8595,8596,8597, # 8598
-8598,8599,8600,8601,8602,8603,8604,8605,8606,8607,8608,8609,8610,8611,8612,8613, # 8614
-8614,8615,8616,8617,8618,8619,8620,8621,8622,8623,8624,8625,8626,8627,8628,8629, # 8630
-8630,8631,8632,8633,8634,8635,8636,8637,8638,8639,8640,8641,8642,8643,8644,8645, # 8646
-8646,8647,8648,8649,8650,8651,8652,8653,8654,8655,8656,8657,8658,8659,8660,8661, # 8662
-8662,8663,8664,8665,8666,8667,8668,8669,8670,8671,8672,8673,8674,8675,8676,8677, # 8678
-8678,8679,8680,8681,8682,8683,8684,8685,8686,8687,8688,8689,8690,8691,8692,8693, # 8694
-8694,8695,8696,8697,8698,8699,8700,8701,8702,8703,8704,8705,8706,8707,8708,8709, # 8710
-8710,8711,8712,8713,8714,8715,8716,8717,8718,8719,8720,8721,8722,8723,8724,8725, # 8726
-8726,8727,8728,8729,8730,8731,8732,8733,8734,8735,8736,8737,8738,8739,8740,8741) # 8742
-
-# flake8: noqa
diff --git a/script/_Lib/requests/packages/chardet/euctwprober.py b/script/_Lib/requests/packages/chardet/euctwprober.py
deleted file mode 100644
index fe652fe..0000000
--- a/script/_Lib/requests/packages/chardet/euctwprober.py
+++ /dev/null
@@ -1,41 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-######################### END LICENSE BLOCK #########################
-
-from .mbcharsetprober import MultiByteCharSetProber
-from .codingstatemachine import CodingStateMachine
-from .chardistribution import EUCTWDistributionAnalysis
-from .mbcssm import EUCTWSMModel
-
-class EUCTWProber(MultiByteCharSetProber):
- def __init__(self):
- MultiByteCharSetProber.__init__(self)
- self._mCodingSM = CodingStateMachine(EUCTWSMModel)
- self._mDistributionAnalyzer = EUCTWDistributionAnalysis()
- self.reset()
-
- def get_charset_name(self):
- return "EUC-TW"
diff --git a/script/_Lib/requests/packages/chardet/gb2312freq.py b/script/_Lib/requests/packages/chardet/gb2312freq.py
deleted file mode 100644
index 1238f51..0000000
--- a/script/_Lib/requests/packages/chardet/gb2312freq.py
+++ /dev/null
@@ -1,472 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Communicator client code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-######################### END LICENSE BLOCK #########################
-
-# GB2312 most frequently used character table
-#
-# Char to FreqOrder table , from hz6763
-
-# 512 --> 0.79 -- 0.79
-# 1024 --> 0.92 -- 0.13
-# 2048 --> 0.98 -- 0.06
-# 6768 --> 1.00 -- 0.02
-#
-# Ideal Distribution Ratio = 0.79135/(1-0.79135) = 3.79
-# Random Distribution Ration = 512 / (3755 - 512) = 0.157
-#
-# Typical Distribution Ratio about 25% of Ideal one, still much higher that RDR
-
-GB2312_TYPICAL_DISTRIBUTION_RATIO = 0.9
-
-GB2312_TABLE_SIZE = 3760
-
-GB2312CharToFreqOrder = (
-1671, 749,1443,2364,3924,3807,2330,3921,1704,3463,2691,1511,1515, 572,3191,2205,
-2361, 224,2558, 479,1711, 963,3162, 440,4060,1905,2966,2947,3580,2647,3961,3842,
-2204, 869,4207, 970,2678,5626,2944,2956,1479,4048, 514,3595, 588,1346,2820,3409,
- 249,4088,1746,1873,2047,1774, 581,1813, 358,1174,3590,1014,1561,4844,2245, 670,
-1636,3112, 889,1286, 953, 556,2327,3060,1290,3141, 613, 185,3477,1367, 850,3820,
-1715,2428,2642,2303,2732,3041,2562,2648,3566,3946,1349, 388,3098,2091,1360,3585,
- 152,1687,1539, 738,1559, 59,1232,2925,2267,1388,1249,1741,1679,2960, 151,1566,
-1125,1352,4271, 924,4296, 385,3166,4459, 310,1245,2850, 70,3285,2729,3534,3575,
-2398,3298,3466,1960,2265, 217,3647, 864,1909,2084,4401,2773,1010,3269,5152, 853,
-3051,3121,1244,4251,1895, 364,1499,1540,2313,1180,3655,2268, 562, 715,2417,3061,
- 544, 336,3768,2380,1752,4075, 950, 280,2425,4382, 183,2759,3272, 333,4297,2155,
-1688,2356,1444,1039,4540, 736,1177,3349,2443,2368,2144,2225, 565, 196,1482,3406,
- 927,1335,4147, 692, 878,1311,1653,3911,3622,1378,4200,1840,2969,3149,2126,1816,
-2534,1546,2393,2760, 737,2494, 13, 447, 245,2747, 38,2765,2129,2589,1079, 606,
- 360, 471,3755,2890, 404, 848, 699,1785,1236, 370,2221,1023,3746,2074,2026,2023,
-2388,1581,2119, 812,1141,3091,2536,1519, 804,2053, 406,1596,1090, 784, 548,4414,
-1806,2264,2936,1100, 343,4114,5096, 622,3358, 743,3668,1510,1626,5020,3567,2513,
-3195,4115,5627,2489,2991, 24,2065,2697,1087,2719, 48,1634, 315, 68, 985,2052,
- 198,2239,1347,1107,1439, 597,2366,2172, 871,3307, 919,2487,2790,1867, 236,2570,
-1413,3794, 906,3365,3381,1701,1982,1818,1524,2924,1205, 616,2586,2072,2004, 575,
- 253,3099, 32,1365,1182, 197,1714,2454,1201, 554,3388,3224,2748, 756,2587, 250,
-2567,1507,1517,3529,1922,2761,2337,3416,1961,1677,2452,2238,3153, 615, 911,1506,
-1474,2495,1265,1906,2749,3756,3280,2161, 898,2714,1759,3450,2243,2444, 563, 26,
-3286,2266,3769,3344,2707,3677, 611,1402, 531,1028,2871,4548,1375, 261,2948, 835,
-1190,4134, 353, 840,2684,1900,3082,1435,2109,1207,1674, 329,1872,2781,4055,2686,
-2104, 608,3318,2423,2957,2768,1108,3739,3512,3271,3985,2203,1771,3520,1418,2054,
-1681,1153, 225,1627,2929, 162,2050,2511,3687,1954, 124,1859,2431,1684,3032,2894,
- 585,4805,3969,2869,2704,2088,2032,2095,3656,2635,4362,2209, 256, 518,2042,2105,
-3777,3657, 643,2298,1148,1779, 190, 989,3544, 414, 11,2135,2063,2979,1471, 403,
-3678, 126, 770,1563, 671,2499,3216,2877, 600,1179, 307,2805,4937,1268,1297,2694,
- 252,4032,1448,1494,1331,1394, 127,2256, 222,1647,1035,1481,3056,1915,1048, 873,
-3651, 210, 33,1608,2516, 200,1520, 415, 102, 0,3389,1287, 817, 91,3299,2940,
- 836,1814, 549,2197,1396,1669,2987,3582,2297,2848,4528,1070, 687, 20,1819, 121,
-1552,1364,1461,1968,2617,3540,2824,2083, 177, 948,4938,2291, 110,4549,2066, 648,
-3359,1755,2110,2114,4642,4845,1693,3937,3308,1257,1869,2123, 208,1804,3159,2992,
-2531,2549,3361,2418,1350,2347,2800,2568,1291,2036,2680, 72, 842,1990, 212,1233,
-1154,1586, 75,2027,3410,4900,1823,1337,2710,2676, 728,2810,1522,3026,4995, 157,
- 755,1050,4022, 710, 785,1936,2194,2085,1406,2777,2400, 150,1250,4049,1206, 807,
-1910, 534, 529,3309,1721,1660, 274, 39,2827, 661,2670,1578, 925,3248,3815,1094,
-4278,4901,4252, 41,1150,3747,2572,2227,4501,3658,4902,3813,3357,3617,2884,2258,
- 887, 538,4187,3199,1294,2439,3042,2329,2343,2497,1255, 107, 543,1527, 521,3478,
-3568, 194,5062, 15, 961,3870,1241,1192,2664, 66,5215,3260,2111,1295,1127,2152,
-3805,4135, 901,1164,1976, 398,1278, 530,1460, 748, 904,1054,1966,1426, 53,2909,
- 509, 523,2279,1534, 536,1019, 239,1685, 460,2353, 673,1065,2401,3600,4298,2272,
-1272,2363, 284,1753,3679,4064,1695, 81, 815,2677,2757,2731,1386, 859, 500,4221,
-2190,2566, 757,1006,2519,2068,1166,1455, 337,2654,3203,1863,1682,1914,3025,1252,
-1409,1366, 847, 714,2834,2038,3209, 964,2970,1901, 885,2553,1078,1756,3049, 301,
-1572,3326, 688,2130,1996,2429,1805,1648,2930,3421,2750,3652,3088, 262,1158,1254,
- 389,1641,1812, 526,1719, 923,2073,1073,1902, 468, 489,4625,1140, 857,2375,3070,
-3319,2863, 380, 116,1328,2693,1161,2244, 273,1212,1884,2769,3011,1775,1142, 461,
-3066,1200,2147,2212, 790, 702,2695,4222,1601,1058, 434,2338,5153,3640, 67,2360,
-4099,2502, 618,3472,1329, 416,1132, 830,2782,1807,2653,3211,3510,1662, 192,2124,
- 296,3979,1739,1611,3684, 23, 118, 324, 446,1239,1225, 293,2520,3814,3795,2535,
-3116, 17,1074, 467,2692,2201, 387,2922, 45,1326,3055,1645,3659,2817, 958, 243,
-1903,2320,1339,2825,1784,3289, 356, 576, 865,2315,2381,3377,3916,1088,3122,1713,
-1655, 935, 628,4689,1034,1327, 441, 800, 720, 894,1979,2183,1528,5289,2702,1071,
-4046,3572,2399,1571,3281, 79, 761,1103, 327, 134, 758,1899,1371,1615, 879, 442,
- 215,2605,2579, 173,2048,2485,1057,2975,3317,1097,2253,3801,4263,1403,1650,2946,
- 814,4968,3487,1548,2644,1567,1285, 2, 295,2636, 97, 946,3576, 832, 141,4257,
-3273, 760,3821,3521,3156,2607, 949,1024,1733,1516,1803,1920,2125,2283,2665,3180,
-1501,2064,3560,2171,1592, 803,3518,1416, 732,3897,4258,1363,1362,2458, 119,1427,
- 602,1525,2608,1605,1639,3175, 694,3064, 10, 465, 76,2000,4846,4208, 444,3781,
-1619,3353,2206,1273,3796, 740,2483, 320,1723,2377,3660,2619,1359,1137,1762,1724,
-2345,2842,1850,1862, 912, 821,1866, 612,2625,1735,2573,3369,1093, 844, 89, 937,
- 930,1424,3564,2413,2972,1004,3046,3019,2011, 711,3171,1452,4178, 428, 801,1943,
- 432, 445,2811, 206,4136,1472, 730, 349, 73, 397,2802,2547, 998,1637,1167, 789,
- 396,3217, 154,1218, 716,1120,1780,2819,4826,1931,3334,3762,2139,1215,2627, 552,
-3664,3628,3232,1405,2383,3111,1356,2652,3577,3320,3101,1703, 640,1045,1370,1246,
-4996, 371,1575,2436,1621,2210, 984,4033,1734,2638, 16,4529, 663,2755,3255,1451,
-3917,2257,1253,1955,2234,1263,2951, 214,1229, 617, 485, 359,1831,1969, 473,2310,
- 750,2058, 165, 80,2864,2419, 361,4344,2416,2479,1134, 796,3726,1266,2943, 860,
-2715, 938, 390,2734,1313,1384, 248, 202, 877,1064,2854, 522,3907, 279,1602, 297,
-2357, 395,3740, 137,2075, 944,4089,2584,1267,3802, 62,1533,2285, 178, 176, 780,
-2440, 201,3707, 590, 478,1560,4354,2117,1075, 30, 74,4643,4004,1635,1441,2745,
- 776,2596, 238,1077,1692,1912,2844, 605, 499,1742,3947, 241,3053, 980,1749, 936,
-2640,4511,2582, 515,1543,2162,5322,2892,2993, 890,2148,1924, 665,1827,3581,1032,
- 968,3163, 339,1044,1896, 270, 583,1791,1720,4367,1194,3488,3669, 43,2523,1657,
- 163,2167, 290,1209,1622,3378, 550, 634,2508,2510, 695,2634,2384,2512,1476,1414,
- 220,1469,2341,2138,2852,3183,2900,4939,2865,3502,1211,3680, 854,3227,1299,2976,
-3172, 186,2998,1459, 443,1067,3251,1495, 321,1932,3054, 909, 753,1410,1828, 436,
-2441,1119,1587,3164,2186,1258, 227, 231,1425,1890,3200,3942, 247, 959, 725,5254,
-2741, 577,2158,2079, 929, 120, 174, 838,2813, 591,1115, 417,2024, 40,3240,1536,
-1037, 291,4151,2354, 632,1298,2406,2500,3535,1825,1846,3451, 205,1171, 345,4238,
- 18,1163, 811, 685,2208,1217, 425,1312,1508,1175,4308,2552,1033, 587,1381,3059,
-2984,3482, 340,1316,4023,3972, 792,3176, 519, 777,4690, 918, 933,4130,2981,3741,
- 90,3360,2911,2200,5184,4550, 609,3079,2030, 272,3379,2736, 363,3881,1130,1447,
- 286, 779, 357,1169,3350,3137,1630,1220,2687,2391, 747,1277,3688,2618,2682,2601,
-1156,3196,5290,4034,3102,1689,3596,3128, 874, 219,2783, 798, 508,1843,2461, 269,
-1658,1776,1392,1913,2983,3287,2866,2159,2372, 829,4076, 46,4253,2873,1889,1894,
- 915,1834,1631,2181,2318, 298, 664,2818,3555,2735, 954,3228,3117, 527,3511,2173,
- 681,2712,3033,2247,2346,3467,1652, 155,2164,3382, 113,1994, 450, 899, 494, 994,
-1237,2958,1875,2336,1926,3727, 545,1577,1550, 633,3473, 204,1305,3072,2410,1956,
-2471, 707,2134, 841,2195,2196,2663,3843,1026,4940, 990,3252,4997, 368,1092, 437,
-3212,3258,1933,1829, 675,2977,2893, 412, 943,3723,4644,3294,3283,2230,2373,5154,
-2389,2241,2661,2323,1404,2524, 593, 787, 677,3008,1275,2059, 438,2709,2609,2240,
-2269,2246,1446, 36,1568,1373,3892,1574,2301,1456,3962, 693,2276,5216,2035,1143,
-2720,1919,1797,1811,2763,4137,2597,1830,1699,1488,1198,2090, 424,1694, 312,3634,
-3390,4179,3335,2252,1214, 561,1059,3243,2295,2561, 975,5155,2321,2751,3772, 472,
-1537,3282,3398,1047,2077,2348,2878,1323,3340,3076, 690,2906, 51, 369, 170,3541,
-1060,2187,2688,3670,2541,1083,1683, 928,3918, 459, 109,4427, 599,3744,4286, 143,
-2101,2730,2490, 82,1588,3036,2121, 281,1860, 477,4035,1238,2812,3020,2716,3312,
-1530,2188,2055,1317, 843, 636,1808,1173,3495, 649, 181,1002, 147,3641,1159,2414,
-3750,2289,2795, 813,3123,2610,1136,4368, 5,3391,4541,2174, 420, 429,1728, 754,
-1228,2115,2219, 347,2223,2733, 735,1518,3003,2355,3134,1764,3948,3329,1888,2424,
-1001,1234,1972,3321,3363,1672,1021,1450,1584, 226, 765, 655,2526,3404,3244,2302,
-3665, 731, 594,2184, 319,1576, 621, 658,2656,4299,2099,3864,1279,2071,2598,2739,
- 795,3086,3699,3908,1707,2352,2402,1382,3136,2475,1465,4847,3496,3865,1085,3004,
-2591,1084, 213,2287,1963,3565,2250, 822, 793,4574,3187,1772,1789,3050, 595,1484,
-1959,2770,1080,2650, 456, 422,2996, 940,3322,4328,4345,3092,2742, 965,2784, 739,
-4124, 952,1358,2498,2949,2565, 332,2698,2378, 660,2260,2473,4194,3856,2919, 535,
-1260,2651,1208,1428,1300,1949,1303,2942, 433,2455,2450,1251,1946, 614,1269, 641,
-1306,1810,2737,3078,2912, 564,2365,1419,1415,1497,4460,2367,2185,1379,3005,1307,
-3218,2175,1897,3063, 682,1157,4040,4005,1712,1160,1941,1399, 394, 402,2952,1573,
-1151,2986,2404, 862, 299,2033,1489,3006, 346, 171,2886,3401,1726,2932, 168,2533,
- 47,2507,1030,3735,1145,3370,1395,1318,1579,3609,4560,2857,4116,1457,2529,1965,
- 504,1036,2690,2988,2405, 745,5871, 849,2397,2056,3081, 863,2359,3857,2096, 99,
-1397,1769,2300,4428,1643,3455,1978,1757,3718,1440, 35,4879,3742,1296,4228,2280,
- 160,5063,1599,2013, 166, 520,3479,1646,3345,3012, 490,1937,1545,1264,2182,2505,
-1096,1188,1369,1436,2421,1667,2792,2460,1270,2122, 727,3167,2143, 806,1706,1012,
-1800,3037, 960,2218,1882, 805, 139,2456,1139,1521, 851,1052,3093,3089, 342,2039,
- 744,5097,1468,1502,1585,2087, 223, 939, 326,2140,2577, 892,2481,1623,4077, 982,
-3708, 135,2131, 87,2503,3114,2326,1106, 876,1616, 547,2997,2831,2093,3441,4530,
-4314, 9,3256,4229,4148, 659,1462,1986,1710,2046,2913,2231,4090,4880,5255,3392,
-3274,1368,3689,4645,1477, 705,3384,3635,1068,1529,2941,1458,3782,1509, 100,1656,
-2548, 718,2339, 408,1590,2780,3548,1838,4117,3719,1345,3530, 717,3442,2778,3220,
-2898,1892,4590,3614,3371,2043,1998,1224,3483, 891, 635, 584,2559,3355, 733,1766,
-1729,1172,3789,1891,2307, 781,2982,2271,1957,1580,5773,2633,2005,4195,3097,1535,
-3213,1189,1934,5693,3262, 586,3118,1324,1598, 517,1564,2217,1868,1893,4445,3728,
-2703,3139,1526,1787,1992,3882,2875,1549,1199,1056,2224,1904,2711,5098,4287, 338,
-1993,3129,3489,2689,1809,2815,1997, 957,1855,3898,2550,3275,3057,1105,1319, 627,
-1505,1911,1883,3526, 698,3629,3456,1833,1431, 746, 77,1261,2017,2296,1977,1885,
- 125,1334,1600, 525,1798,1109,2222,1470,1945, 559,2236,1186,3443,2476,1929,1411,
-2411,3135,1777,3372,2621,1841,1613,3229, 668,1430,1839,2643,2916, 195,1989,2671,
-2358,1387, 629,3205,2293,5256,4439, 123,1310, 888,1879,4300,3021,3605,1003,1162,
-3192,2910,2010, 140,2395,2859, 55,1082,2012,2901, 662, 419,2081,1438, 680,2774,
-4654,3912,1620,1731,1625,5035,4065,2328, 512,1344, 802,5443,2163,2311,2537, 524,
-3399, 98,1155,2103,1918,2606,3925,2816,1393,2465,1504,3773,2177,3963,1478,4346,
- 180,1113,4655,3461,2028,1698, 833,2696,1235,1322,1594,4408,3623,3013,3225,2040,
-3022, 541,2881, 607,3632,2029,1665,1219, 639,1385,1686,1099,2803,3231,1938,3188,
-2858, 427, 676,2772,1168,2025, 454,3253,2486,3556, 230,1950, 580, 791,1991,1280,
-1086,1974,2034, 630, 257,3338,2788,4903,1017, 86,4790, 966,2789,1995,1696,1131,
- 259,3095,4188,1308, 179,1463,5257, 289,4107,1248, 42,3413,1725,2288, 896,1947,
- 774,4474,4254, 604,3430,4264, 392,2514,2588, 452, 237,1408,3018, 988,4531,1970,
-3034,3310, 540,2370,1562,1288,2990, 502,4765,1147, 4,1853,2708, 207, 294,2814,
-4078,2902,2509, 684, 34,3105,3532,2551, 644, 709,2801,2344, 573,1727,3573,3557,
-2021,1081,3100,4315,2100,3681, 199,2263,1837,2385, 146,3484,1195,2776,3949, 997,
-1939,3973,1008,1091,1202,1962,1847,1149,4209,5444,1076, 493, 117,5400,2521, 972,
-1490,2934,1796,4542,2374,1512,2933,2657, 413,2888,1135,2762,2314,2156,1355,2369,
- 766,2007,2527,2170,3124,2491,2593,2632,4757,2437, 234,3125,3591,1898,1750,1376,
-1942,3468,3138, 570,2127,2145,3276,4131, 962, 132,1445,4196, 19, 941,3624,3480,
-3366,1973,1374,4461,3431,2629, 283,2415,2275, 808,2887,3620,2112,2563,1353,3610,
- 955,1089,3103,1053, 96, 88,4097, 823,3808,1583, 399, 292,4091,3313, 421,1128,
- 642,4006, 903,2539,1877,2082, 596, 29,4066,1790, 722,2157, 130, 995,1569, 769,
-1485, 464, 513,2213, 288,1923,1101,2453,4316, 133, 486,2445, 50, 625, 487,2207,
- 57, 423, 481,2962, 159,3729,1558, 491, 303, 482, 501, 240,2837, 112,3648,2392,
-1783, 362, 8,3433,3422, 610,2793,3277,1390,1284,1654, 21,3823, 734, 367, 623,
- 193, 287, 374,1009,1483, 816, 476, 313,2255,2340,1262,2150,2899,1146,2581, 782,
-2116,1659,2018,1880, 255,3586,3314,1110,2867,2137,2564, 986,2767,5185,2006, 650,
- 158, 926, 762, 881,3157,2717,2362,3587, 306,3690,3245,1542,3077,2427,1691,2478,
-2118,2985,3490,2438, 539,2305, 983, 129,1754, 355,4201,2386, 827,2923, 104,1773,
-2838,2771, 411,2905,3919, 376, 767, 122,1114, 828,2422,1817,3506, 266,3460,1007,
-1609,4998, 945,2612,4429,2274, 726,1247,1964,2914,2199,2070,4002,4108, 657,3323,
-1422, 579, 455,2764,4737,1222,2895,1670, 824,1223,1487,2525, 558, 861,3080, 598,
-2659,2515,1967, 752,2583,2376,2214,4180, 977, 704,2464,4999,2622,4109,1210,2961,
- 819,1541, 142,2284, 44, 418, 457,1126,3730,4347,4626,1644,1876,3671,1864, 302,
-1063,5694, 624, 723,1984,3745,1314,1676,2488,1610,1449,3558,3569,2166,2098, 409,
-1011,2325,3704,2306, 818,1732,1383,1824,1844,3757, 999,2705,3497,1216,1423,2683,
-2426,2954,2501,2726,2229,1475,2554,5064,1971,1794,1666,2014,1343, 783, 724, 191,
-2434,1354,2220,5065,1763,2752,2472,4152, 131, 175,2885,3434, 92,1466,4920,2616,
-3871,3872,3866, 128,1551,1632, 669,1854,3682,4691,4125,1230, 188,2973,3290,1302,
-1213, 560,3266, 917, 763,3909,3249,1760, 868,1958, 764,1782,2097, 145,2277,3774,
-4462, 64,1491,3062, 971,2132,3606,2442, 221,1226,1617, 218, 323,1185,3207,3147,
- 571, 619,1473,1005,1744,2281, 449,1887,2396,3685, 275, 375,3816,1743,3844,3731,
- 845,1983,2350,4210,1377, 773, 967,3499,3052,3743,2725,4007,1697,1022,3943,1464,
-3264,2855,2722,1952,1029,2839,2467, 84,4383,2215, 820,1391,2015,2448,3672, 377,
-1948,2168, 797,2545,3536,2578,2645, 94,2874,1678, 405,1259,3071, 771, 546,1315,
- 470,1243,3083, 895,2468, 981, 969,2037, 846,4181, 653,1276,2928, 14,2594, 557,
-3007,2474, 156, 902,1338,1740,2574, 537,2518, 973,2282,2216,2433,1928, 138,2903,
-1293,2631,1612, 646,3457, 839,2935, 111, 496,2191,2847, 589,3186, 149,3994,2060,
-4031,2641,4067,3145,1870, 37,3597,2136,1025,2051,3009,3383,3549,1121,1016,3261,
-1301, 251,2446,2599,2153, 872,3246, 637, 334,3705, 831, 884, 921,3065,3140,4092,
-2198,1944, 246,2964, 108,2045,1152,1921,2308,1031, 203,3173,4170,1907,3890, 810,
-1401,2003,1690, 506, 647,1242,2828,1761,1649,3208,2249,1589,3709,2931,5156,1708,
- 498, 666,2613, 834,3817,1231, 184,2851,1124, 883,3197,2261,3710,1765,1553,2658,
-1178,2639,2351, 93,1193, 942,2538,2141,4402, 235,1821, 870,1591,2192,1709,1871,
-3341,1618,4126,2595,2334, 603, 651, 69, 701, 268,2662,3411,2555,1380,1606, 503,
- 448, 254,2371,2646, 574,1187,2309,1770, 322,2235,1292,1801, 305, 566,1133, 229,
-2067,2057, 706, 167, 483,2002,2672,3295,1820,3561,3067, 316, 378,2746,3452,1112,
- 136,1981, 507,1651,2917,1117, 285,4591, 182,2580,3522,1304, 335,3303,1835,2504,
-1795,1792,2248, 674,1018,2106,2449,1857,2292,2845, 976,3047,1781,2600,2727,1389,
-1281, 52,3152, 153, 265,3950, 672,3485,3951,4463, 430,1183, 365, 278,2169, 27,
-1407,1336,2304, 209,1340,1730,2202,1852,2403,2883, 979,1737,1062, 631,2829,2542,
-3876,2592, 825,2086,2226,3048,3625, 352,1417,3724, 542, 991, 431,1351,3938,1861,
-2294, 826,1361,2927,3142,3503,1738, 463,2462,2723, 582,1916,1595,2808, 400,3845,
-3891,2868,3621,2254, 58,2492,1123, 910,2160,2614,1372,1603,1196,1072,3385,1700,
-3267,1980, 696, 480,2430, 920, 799,1570,2920,1951,2041,4047,2540,1321,4223,2469,
-3562,2228,1271,2602, 401,2833,3351,2575,5157, 907,2312,1256, 410, 263,3507,1582,
- 996, 678,1849,2316,1480, 908,3545,2237, 703,2322, 667,1826,2849,1531,2604,2999,
-2407,3146,2151,2630,1786,3711, 469,3542, 497,3899,2409, 858, 837,4446,3393,1274,
- 786, 620,1845,2001,3311, 484, 308,3367,1204,1815,3691,2332,1532,2557,1842,2020,
-2724,1927,2333,4440, 567, 22,1673,2728,4475,1987,1858,1144,1597, 101,1832,3601,
- 12, 974,3783,4391, 951,1412, 1,3720, 453,4608,4041, 528,1041,1027,3230,2628,
-1129, 875,1051,3291,1203,2262,1069,2860,2799,2149,2615,3278, 144,1758,3040, 31,
- 475,1680, 366,2685,3184, 311,1642,4008,2466,5036,1593,1493,2809, 216,1420,1668,
- 233, 304,2128,3284, 232,1429,1768,1040,2008,3407,2740,2967,2543, 242,2133, 778,
-1565,2022,2620, 505,2189,2756,1098,2273, 372,1614, 708, 553,2846,2094,2278, 169,
-3626,2835,4161, 228,2674,3165, 809,1454,1309, 466,1705,1095, 900,3423, 880,2667,
-3751,5258,2317,3109,2571,4317,2766,1503,1342, 866,4447,1118, 63,2076, 314,1881,
-1348,1061, 172, 978,3515,1747, 532, 511,3970, 6, 601, 905,2699,3300,1751, 276,
-1467,3725,2668, 65,4239,2544,2779,2556,1604, 578,2451,1802, 992,2331,2624,1320,
-3446, 713,1513,1013, 103,2786,2447,1661, 886,1702, 916, 654,3574,2031,1556, 751,
-2178,2821,2179,1498,1538,2176, 271, 914,2251,2080,1325, 638,1953,2937,3877,2432,
-2754, 95,3265,1716, 260,1227,4083, 775, 106,1357,3254, 426,1607, 555,2480, 772,
-1985, 244,2546, 474, 495,1046,2611,1851,2061, 71,2089,1675,2590, 742,3758,2843,
-3222,1433, 267,2180,2576,2826,2233,2092,3913,2435, 956,1745,3075, 856,2113,1116,
- 451, 3,1988,2896,1398, 993,2463,1878,2049,1341,2718,2721,2870,2108, 712,2904,
-4363,2753,2324, 277,2872,2349,2649, 384, 987, 435, 691,3000, 922, 164,3939, 652,
-1500,1184,4153,2482,3373,2165,4848,2335,3775,3508,3154,2806,2830,1554,2102,1664,
-2530,1434,2408, 893,1547,2623,3447,2832,2242,2532,3169,2856,3223,2078, 49,3770,
-3469, 462, 318, 656,2259,3250,3069, 679,1629,2758, 344,1138,1104,3120,1836,1283,
-3115,2154,1437,4448, 934, 759,1999, 794,2862,1038, 533,2560,1722,2342, 855,2626,
-1197,1663,4476,3127, 85,4240,2528, 25,1111,1181,3673, 407,3470,4561,2679,2713,
- 768,1925,2841,3986,1544,1165, 932, 373,1240,2146,1930,2673, 721,4766, 354,4333,
- 391,2963, 187, 61,3364,1442,1102, 330,1940,1767, 341,3809,4118, 393,2496,2062,
-2211, 105, 331, 300, 439, 913,1332, 626, 379,3304,1557, 328, 689,3952, 309,1555,
- 931, 317,2517,3027, 325, 569, 686,2107,3084, 60,1042,1333,2794, 264,3177,4014,
-1628, 258,3712, 7,4464,1176,1043,1778, 683, 114,1975, 78,1492, 383,1886, 510,
- 386, 645,5291,2891,2069,3305,4138,3867,2939,2603,2493,1935,1066,1848,3588,1015,
-1282,1289,4609, 697,1453,3044,2666,3611,1856,2412, 54, 719,1330, 568,3778,2459,
-1748, 788, 492, 551,1191,1000, 488,3394,3763, 282,1799, 348,2016,1523,3155,2390,
-1049, 382,2019,1788,1170, 729,2968,3523, 897,3926,2785,2938,3292, 350,2319,3238,
-1718,1717,2655,3453,3143,4465, 161,2889,2980,2009,1421, 56,1908,1640,2387,2232,
-1917,1874,2477,4921, 148, 83,3438, 592,4245,2882,1822,1055, 741, 115,1496,1624,
- 381,1638,4592,1020, 516,3214, 458, 947,4575,1432, 211,1514,2926,1865,2142, 189,
- 852,1221,1400,1486, 882,2299,4036, 351, 28,1122, 700,6479,6480,6481,6482,6483, # last 512
-#Everything below is of no interest for detection purpose
-5508,6484,3900,3414,3974,4441,4024,3537,4037,5628,5099,3633,6485,3148,6486,3636,
-5509,3257,5510,5973,5445,5872,4941,4403,3174,4627,5873,6276,2286,4230,5446,5874,
-5122,6102,6103,4162,5447,5123,5323,4849,6277,3980,3851,5066,4246,5774,5067,6278,
-3001,2807,5695,3346,5775,5974,5158,5448,6487,5975,5976,5776,3598,6279,5696,4806,
-4211,4154,6280,6488,6489,6490,6281,4212,5037,3374,4171,6491,4562,4807,4722,4827,
-5977,6104,4532,4079,5159,5324,5160,4404,3858,5359,5875,3975,4288,4610,3486,4512,
-5325,3893,5360,6282,6283,5560,2522,4231,5978,5186,5449,2569,3878,6284,5401,3578,
-4415,6285,4656,5124,5979,2506,4247,4449,3219,3417,4334,4969,4329,6492,4576,4828,
-4172,4416,4829,5402,6286,3927,3852,5361,4369,4830,4477,4867,5876,4173,6493,6105,
-4657,6287,6106,5877,5450,6494,4155,4868,5451,3700,5629,4384,6288,6289,5878,3189,
-4881,6107,6290,6495,4513,6496,4692,4515,4723,5100,3356,6497,6291,3810,4080,5561,
-3570,4430,5980,6498,4355,5697,6499,4724,6108,6109,3764,4050,5038,5879,4093,3226,
-6292,5068,5217,4693,3342,5630,3504,4831,4377,4466,4309,5698,4431,5777,6293,5778,
-4272,3706,6110,5326,3752,4676,5327,4273,5403,4767,5631,6500,5699,5880,3475,5039,
-6294,5562,5125,4348,4301,4482,4068,5126,4593,5700,3380,3462,5981,5563,3824,5404,
-4970,5511,3825,4738,6295,6501,5452,4516,6111,5881,5564,6502,6296,5982,6503,4213,
-4163,3454,6504,6112,4009,4450,6113,4658,6297,6114,3035,6505,6115,3995,4904,4739,
-4563,4942,4110,5040,3661,3928,5362,3674,6506,5292,3612,4791,5565,4149,5983,5328,
-5259,5021,4725,4577,4564,4517,4364,6298,5405,4578,5260,4594,4156,4157,5453,3592,
-3491,6507,5127,5512,4709,4922,5984,5701,4726,4289,6508,4015,6116,5128,4628,3424,
-4241,5779,6299,4905,6509,6510,5454,5702,5780,6300,4365,4923,3971,6511,5161,3270,
-3158,5985,4100, 867,5129,5703,6117,5363,3695,3301,5513,4467,6118,6512,5455,4232,
-4242,4629,6513,3959,4478,6514,5514,5329,5986,4850,5162,5566,3846,4694,6119,5456,
-4869,5781,3779,6301,5704,5987,5515,4710,6302,5882,6120,4392,5364,5705,6515,6121,
-6516,6517,3736,5988,5457,5989,4695,2457,5883,4551,5782,6303,6304,6305,5130,4971,
-6122,5163,6123,4870,3263,5365,3150,4871,6518,6306,5783,5069,5706,3513,3498,4409,
-5330,5632,5366,5458,5459,3991,5990,4502,3324,5991,5784,3696,4518,5633,4119,6519,
-4630,5634,4417,5707,4832,5992,3418,6124,5993,5567,4768,5218,6520,4595,3458,5367,
-6125,5635,6126,4202,6521,4740,4924,6307,3981,4069,4385,6308,3883,2675,4051,3834,
-4302,4483,5568,5994,4972,4101,5368,6309,5164,5884,3922,6127,6522,6523,5261,5460,
-5187,4164,5219,3538,5516,4111,3524,5995,6310,6311,5369,3181,3386,2484,5188,3464,
-5569,3627,5708,6524,5406,5165,4677,4492,6312,4872,4851,5885,4468,5996,6313,5709,
-5710,6128,2470,5886,6314,5293,4882,5785,3325,5461,5101,6129,5711,5786,6525,4906,
-6526,6527,4418,5887,5712,4808,2907,3701,5713,5888,6528,3765,5636,5331,6529,6530,
-3593,5889,3637,4943,3692,5714,5787,4925,6315,6130,5462,4405,6131,6132,6316,5262,
-6531,6532,5715,3859,5716,5070,4696,5102,3929,5788,3987,4792,5997,6533,6534,3920,
-4809,5000,5998,6535,2974,5370,6317,5189,5263,5717,3826,6536,3953,5001,4883,3190,
-5463,5890,4973,5999,4741,6133,6134,3607,5570,6000,4711,3362,3630,4552,5041,6318,
-6001,2950,2953,5637,4646,5371,4944,6002,2044,4120,3429,6319,6537,5103,4833,6538,
-6539,4884,4647,3884,6003,6004,4758,3835,5220,5789,4565,5407,6540,6135,5294,4697,
-4852,6320,6321,3206,4907,6541,6322,4945,6542,6136,6543,6323,6005,4631,3519,6544,
-5891,6545,5464,3784,5221,6546,5571,4659,6547,6324,6137,5190,6548,3853,6549,4016,
-4834,3954,6138,5332,3827,4017,3210,3546,4469,5408,5718,3505,4648,5790,5131,5638,
-5791,5465,4727,4318,6325,6326,5792,4553,4010,4698,3439,4974,3638,4335,3085,6006,
-5104,5042,5166,5892,5572,6327,4356,4519,5222,5573,5333,5793,5043,6550,5639,5071,
-4503,6328,6139,6551,6140,3914,3901,5372,6007,5640,4728,4793,3976,3836,4885,6552,
-4127,6553,4451,4102,5002,6554,3686,5105,6555,5191,5072,5295,4611,5794,5296,6556,
-5893,5264,5894,4975,5466,5265,4699,4976,4370,4056,3492,5044,4886,6557,5795,4432,
-4769,4357,5467,3940,4660,4290,6141,4484,4770,4661,3992,6329,4025,4662,5022,4632,
-4835,4070,5297,4663,4596,5574,5132,5409,5895,6142,4504,5192,4664,5796,5896,3885,
-5575,5797,5023,4810,5798,3732,5223,4712,5298,4084,5334,5468,6143,4052,4053,4336,
-4977,4794,6558,5335,4908,5576,5224,4233,5024,4128,5469,5225,4873,6008,5045,4729,
-4742,4633,3675,4597,6559,5897,5133,5577,5003,5641,5719,6330,6560,3017,2382,3854,
-4406,4811,6331,4393,3964,4946,6561,2420,3722,6562,4926,4378,3247,1736,4442,6332,
-5134,6333,5226,3996,2918,5470,4319,4003,4598,4743,4744,4485,3785,3902,5167,5004,
-5373,4394,5898,6144,4874,1793,3997,6334,4085,4214,5106,5642,4909,5799,6009,4419,
-4189,3330,5899,4165,4420,5299,5720,5227,3347,6145,4081,6335,2876,3930,6146,3293,
-3786,3910,3998,5900,5300,5578,2840,6563,5901,5579,6147,3531,5374,6564,6565,5580,
-4759,5375,6566,6148,3559,5643,6336,6010,5517,6337,6338,5721,5902,3873,6011,6339,
-6567,5518,3868,3649,5722,6568,4771,4947,6569,6149,4812,6570,2853,5471,6340,6341,
-5644,4795,6342,6012,5723,6343,5724,6013,4349,6344,3160,6150,5193,4599,4514,4493,
-5168,4320,6345,4927,3666,4745,5169,5903,5005,4928,6346,5725,6014,4730,4203,5046,
-4948,3395,5170,6015,4150,6016,5726,5519,6347,5047,3550,6151,6348,4197,4310,5904,
-6571,5581,2965,6152,4978,3960,4291,5135,6572,5301,5727,4129,4026,5905,4853,5728,
-5472,6153,6349,4533,2700,4505,5336,4678,3583,5073,2994,4486,3043,4554,5520,6350,
-6017,5800,4487,6351,3931,4103,5376,6352,4011,4321,4311,4190,5136,6018,3988,3233,
-4350,5906,5645,4198,6573,5107,3432,4191,3435,5582,6574,4139,5410,6353,5411,3944,
-5583,5074,3198,6575,6354,4358,6576,5302,4600,5584,5194,5412,6577,6578,5585,5413,
-5303,4248,5414,3879,4433,6579,4479,5025,4854,5415,6355,4760,4772,3683,2978,4700,
-3797,4452,3965,3932,3721,4910,5801,6580,5195,3551,5907,3221,3471,3029,6019,3999,
-5908,5909,5266,5267,3444,3023,3828,3170,4796,5646,4979,4259,6356,5647,5337,3694,
-6357,5648,5338,4520,4322,5802,3031,3759,4071,6020,5586,4836,4386,5048,6581,3571,
-4679,4174,4949,6154,4813,3787,3402,3822,3958,3215,3552,5268,4387,3933,4950,4359,
-6021,5910,5075,3579,6358,4234,4566,5521,6359,3613,5049,6022,5911,3375,3702,3178,
-4911,5339,4521,6582,6583,4395,3087,3811,5377,6023,6360,6155,4027,5171,5649,4421,
-4249,2804,6584,2270,6585,4000,4235,3045,6156,5137,5729,4140,4312,3886,6361,4330,
-6157,4215,6158,3500,3676,4929,4331,3713,4930,5912,4265,3776,3368,5587,4470,4855,
-3038,4980,3631,6159,6160,4132,4680,6161,6362,3923,4379,5588,4255,6586,4121,6587,
-6363,4649,6364,3288,4773,4774,6162,6024,6365,3543,6588,4274,3107,3737,5050,5803,
-4797,4522,5589,5051,5730,3714,4887,5378,4001,4523,6163,5026,5522,4701,4175,2791,
-3760,6589,5473,4224,4133,3847,4814,4815,4775,3259,5416,6590,2738,6164,6025,5304,
-3733,5076,5650,4816,5590,6591,6165,6592,3934,5269,6593,3396,5340,6594,5804,3445,
-3602,4042,4488,5731,5732,3525,5591,4601,5196,6166,6026,5172,3642,4612,3202,4506,
-4798,6366,3818,5108,4303,5138,5139,4776,3332,4304,2915,3415,4434,5077,5109,4856,
-2879,5305,4817,6595,5913,3104,3144,3903,4634,5341,3133,5110,5651,5805,6167,4057,
-5592,2945,4371,5593,6596,3474,4182,6367,6597,6168,4507,4279,6598,2822,6599,4777,
-4713,5594,3829,6169,3887,5417,6170,3653,5474,6368,4216,2971,5228,3790,4579,6369,
-5733,6600,6601,4951,4746,4555,6602,5418,5475,6027,3400,4665,5806,6171,4799,6028,
-5052,6172,3343,4800,4747,5006,6370,4556,4217,5476,4396,5229,5379,5477,3839,5914,
-5652,5807,4714,3068,4635,5808,6173,5342,4192,5078,5419,5523,5734,6174,4557,6175,
-4602,6371,6176,6603,5809,6372,5735,4260,3869,5111,5230,6029,5112,6177,3126,4681,
-5524,5915,2706,3563,4748,3130,6178,4018,5525,6604,6605,5478,4012,4837,6606,4534,
-4193,5810,4857,3615,5479,6030,4082,3697,3539,4086,5270,3662,4508,4931,5916,4912,
-5811,5027,3888,6607,4397,3527,3302,3798,2775,2921,2637,3966,4122,4388,4028,4054,
-1633,4858,5079,3024,5007,3982,3412,5736,6608,3426,3236,5595,3030,6179,3427,3336,
-3279,3110,6373,3874,3039,5080,5917,5140,4489,3119,6374,5812,3405,4494,6031,4666,
-4141,6180,4166,6032,5813,4981,6609,5081,4422,4982,4112,3915,5653,3296,3983,6375,
-4266,4410,5654,6610,6181,3436,5082,6611,5380,6033,3819,5596,4535,5231,5306,5113,
-6612,4952,5918,4275,3113,6613,6376,6182,6183,5814,3073,4731,4838,5008,3831,6614,
-4888,3090,3848,4280,5526,5232,3014,5655,5009,5737,5420,5527,6615,5815,5343,5173,
-5381,4818,6616,3151,4953,6617,5738,2796,3204,4360,2989,4281,5739,5174,5421,5197,
-3132,5141,3849,5142,5528,5083,3799,3904,4839,5480,2880,4495,3448,6377,6184,5271,
-5919,3771,3193,6034,6035,5920,5010,6036,5597,6037,6378,6038,3106,5422,6618,5423,
-5424,4142,6619,4889,5084,4890,4313,5740,6620,3437,5175,5307,5816,4199,5198,5529,
-5817,5199,5656,4913,5028,5344,3850,6185,2955,5272,5011,5818,4567,4580,5029,5921,
-3616,5233,6621,6622,6186,4176,6039,6379,6380,3352,5200,5273,2908,5598,5234,3837,
-5308,6623,6624,5819,4496,4323,5309,5201,6625,6626,4983,3194,3838,4167,5530,5922,
-5274,6381,6382,3860,3861,5599,3333,4292,4509,6383,3553,5481,5820,5531,4778,6187,
-3955,3956,4324,4389,4218,3945,4325,3397,2681,5923,4779,5085,4019,5482,4891,5382,
-5383,6040,4682,3425,5275,4094,6627,5310,3015,5483,5657,4398,5924,3168,4819,6628,
-5925,6629,5532,4932,4613,6041,6630,4636,6384,4780,4204,5658,4423,5821,3989,4683,
-5822,6385,4954,6631,5345,6188,5425,5012,5384,3894,6386,4490,4104,6632,5741,5053,
-6633,5823,5926,5659,5660,5927,6634,5235,5742,5824,4840,4933,4820,6387,4859,5928,
-4955,6388,4143,3584,5825,5346,5013,6635,5661,6389,5014,5484,5743,4337,5176,5662,
-6390,2836,6391,3268,6392,6636,6042,5236,6637,4158,6638,5744,5663,4471,5347,3663,
-4123,5143,4293,3895,6639,6640,5311,5929,5826,3800,6189,6393,6190,5664,5348,3554,
-3594,4749,4603,6641,5385,4801,6043,5827,4183,6642,5312,5426,4761,6394,5665,6191,
-4715,2669,6643,6644,5533,3185,5427,5086,5930,5931,5386,6192,6044,6645,4781,4013,
-5745,4282,4435,5534,4390,4267,6045,5746,4984,6046,2743,6193,3501,4087,5485,5932,
-5428,4184,4095,5747,4061,5054,3058,3862,5933,5600,6646,5144,3618,6395,3131,5055,
-5313,6396,4650,4956,3855,6194,3896,5202,4985,4029,4225,6195,6647,5828,5486,5829,
-3589,3002,6648,6397,4782,5276,6649,6196,6650,4105,3803,4043,5237,5830,6398,4096,
-3643,6399,3528,6651,4453,3315,4637,6652,3984,6197,5535,3182,3339,6653,3096,2660,
-6400,6654,3449,5934,4250,4236,6047,6401,5831,6655,5487,3753,4062,5832,6198,6199,
-6656,3766,6657,3403,4667,6048,6658,4338,2897,5833,3880,2797,3780,4326,6659,5748,
-5015,6660,5387,4351,5601,4411,6661,3654,4424,5935,4339,4072,5277,4568,5536,6402,
-6662,5238,6663,5349,5203,6200,5204,6201,5145,4536,5016,5056,4762,5834,4399,4957,
-6202,6403,5666,5749,6664,4340,6665,5936,5177,5667,6666,6667,3459,4668,6404,6668,
-6669,4543,6203,6670,4276,6405,4480,5537,6671,4614,5205,5668,6672,3348,2193,4763,
-6406,6204,5937,5602,4177,5669,3419,6673,4020,6205,4443,4569,5388,3715,3639,6407,
-6049,4058,6206,6674,5938,4544,6050,4185,4294,4841,4651,4615,5488,6207,6408,6051,
-5178,3241,3509,5835,6208,4958,5836,4341,5489,5278,6209,2823,5538,5350,5206,5429,
-6675,4638,4875,4073,3516,4684,4914,4860,5939,5603,5389,6052,5057,3237,5490,3791,
-6676,6409,6677,4821,4915,4106,5351,5058,4243,5539,4244,5604,4842,4916,5239,3028,
-3716,5837,5114,5605,5390,5940,5430,6210,4332,6678,5540,4732,3667,3840,6053,4305,
-3408,5670,5541,6410,2744,5240,5750,6679,3234,5606,6680,5607,5671,3608,4283,4159,
-4400,5352,4783,6681,6411,6682,4491,4802,6211,6412,5941,6413,6414,5542,5751,6683,
-4669,3734,5942,6684,6415,5943,5059,3328,4670,4144,4268,6685,6686,6687,6688,4372,
-3603,6689,5944,5491,4373,3440,6416,5543,4784,4822,5608,3792,4616,5838,5672,3514,
-5391,6417,4892,6690,4639,6691,6054,5673,5839,6055,6692,6056,5392,6212,4038,5544,
-5674,4497,6057,6693,5840,4284,5675,4021,4545,5609,6418,4454,6419,6213,4113,4472,
-5314,3738,5087,5279,4074,5610,4959,4063,3179,4750,6058,6420,6214,3476,4498,4716,
-5431,4960,4685,6215,5241,6694,6421,6216,6695,5841,5945,6422,3748,5946,5179,3905,
-5752,5545,5947,4374,6217,4455,6423,4412,6218,4803,5353,6696,3832,5280,6219,4327,
-4702,6220,6221,6059,4652,5432,6424,3749,4751,6425,5753,4986,5393,4917,5948,5030,
-5754,4861,4733,6426,4703,6697,6222,4671,5949,4546,4961,5180,6223,5031,3316,5281,
-6698,4862,4295,4934,5207,3644,6427,5842,5950,6428,6429,4570,5843,5282,6430,6224,
-5088,3239,6060,6699,5844,5755,6061,6431,2701,5546,6432,5115,5676,4039,3993,3327,
-4752,4425,5315,6433,3941,6434,5677,4617,4604,3074,4581,6225,5433,6435,6226,6062,
-4823,5756,5116,6227,3717,5678,4717,5845,6436,5679,5846,6063,5847,6064,3977,3354,
-6437,3863,5117,6228,5547,5394,4499,4524,6229,4605,6230,4306,4500,6700,5951,6065,
-3693,5952,5089,4366,4918,6701,6231,5548,6232,6702,6438,4704,5434,6703,6704,5953,
-4168,6705,5680,3420,6706,5242,4407,6066,3812,5757,5090,5954,4672,4525,3481,5681,
-4618,5395,5354,5316,5955,6439,4962,6707,4526,6440,3465,4673,6067,6441,5682,6708,
-5435,5492,5758,5683,4619,4571,4674,4804,4893,4686,5493,4753,6233,6068,4269,6442,
-6234,5032,4705,5146,5243,5208,5848,6235,6443,4963,5033,4640,4226,6236,5849,3387,
-6444,6445,4436,4437,5850,4843,5494,4785,4894,6709,4361,6710,5091,5956,3331,6237,
-4987,5549,6069,6711,4342,3517,4473,5317,6070,6712,6071,4706,6446,5017,5355,6713,
-6714,4988,5436,6447,4734,5759,6715,4735,4547,4456,4754,6448,5851,6449,6450,3547,
-5852,5318,6451,6452,5092,4205,6716,6238,4620,4219,5611,6239,6072,4481,5760,5957,
-5958,4059,6240,6453,4227,4537,6241,5761,4030,4186,5244,5209,3761,4457,4876,3337,
-5495,5181,6242,5959,5319,5612,5684,5853,3493,5854,6073,4169,5613,5147,4895,6074,
-5210,6717,5182,6718,3830,6243,2798,3841,6075,6244,5855,5614,3604,4606,5496,5685,
-5118,5356,6719,6454,5960,5357,5961,6720,4145,3935,4621,5119,5962,4261,6721,6455,
-4786,5963,4375,4582,6245,6246,6247,6076,5437,4877,5856,3376,4380,6248,4160,6722,
-5148,6456,5211,6457,6723,4718,6458,6724,6249,5358,4044,3297,6459,6250,5857,5615,
-5497,5245,6460,5498,6725,6251,6252,5550,3793,5499,2959,5396,6461,6462,4572,5093,
-5500,5964,3806,4146,6463,4426,5762,5858,6077,6253,4755,3967,4220,5965,6254,4989,
-5501,6464,4352,6726,6078,4764,2290,5246,3906,5438,5283,3767,4964,2861,5763,5094,
-6255,6256,4622,5616,5859,5860,4707,6727,4285,4708,4824,5617,6257,5551,4787,5212,
-4965,4935,4687,6465,6728,6466,5686,6079,3494,4413,2995,5247,5966,5618,6729,5967,
-5764,5765,5687,5502,6730,6731,6080,5397,6467,4990,6258,6732,4538,5060,5619,6733,
-4719,5688,5439,5018,5149,5284,5503,6734,6081,4607,6259,5120,3645,5861,4583,6260,
-4584,4675,5620,4098,5440,6261,4863,2379,3306,4585,5552,5689,4586,5285,6735,4864,
-6736,5286,6082,6737,4623,3010,4788,4381,4558,5621,4587,4896,3698,3161,5248,4353,
-4045,6262,3754,5183,4588,6738,6263,6739,6740,5622,3936,6741,6468,6742,6264,5095,
-6469,4991,5968,6743,4992,6744,6083,4897,6745,4256,5766,4307,3108,3968,4444,5287,
-3889,4343,6084,4510,6085,4559,6086,4898,5969,6746,5623,5061,4919,5249,5250,5504,
-5441,6265,5320,4878,3242,5862,5251,3428,6087,6747,4237,5624,5442,6266,5553,4539,
-6748,2585,3533,5398,4262,6088,5150,4736,4438,6089,6267,5505,4966,6749,6268,6750,
-6269,5288,5554,3650,6090,6091,4624,6092,5690,6751,5863,4270,5691,4277,5555,5864,
-6752,5692,4720,4865,6470,5151,4688,4825,6753,3094,6754,6471,3235,4653,6755,5213,
-5399,6756,3201,4589,5865,4967,6472,5866,6473,5019,3016,6757,5321,4756,3957,4573,
-6093,4993,5767,4721,6474,6758,5625,6759,4458,6475,6270,6760,5556,4994,5214,5252,
-6271,3875,5768,6094,5034,5506,4376,5769,6761,2120,6476,5253,5770,6762,5771,5970,
-3990,5971,5557,5558,5772,6477,6095,2787,4641,5972,5121,6096,6097,6272,6763,3703,
-5867,5507,6273,4206,6274,4789,6098,6764,3619,3646,3833,3804,2394,3788,4936,3978,
-4866,4899,6099,6100,5559,6478,6765,3599,5868,6101,5869,5870,6275,6766,4527,6767)
-
-# flake8: noqa
diff --git a/script/_Lib/requests/packages/chardet/gb2312prober.py b/script/_Lib/requests/packages/chardet/gb2312prober.py
deleted file mode 100644
index 0325a2d..0000000
--- a/script/_Lib/requests/packages/chardet/gb2312prober.py
+++ /dev/null
@@ -1,41 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-######################### END LICENSE BLOCK #########################
-
-from .mbcharsetprober import MultiByteCharSetProber
-from .codingstatemachine import CodingStateMachine
-from .chardistribution import GB2312DistributionAnalysis
-from .mbcssm import GB2312SMModel
-
-class GB2312Prober(MultiByteCharSetProber):
- def __init__(self):
- MultiByteCharSetProber.__init__(self)
- self._mCodingSM = CodingStateMachine(GB2312SMModel)
- self._mDistributionAnalyzer = GB2312DistributionAnalysis()
- self.reset()
-
- def get_charset_name(self):
- return "GB2312"
diff --git a/script/_Lib/requests/packages/chardet/hebrewprober.py b/script/_Lib/requests/packages/chardet/hebrewprober.py
deleted file mode 100644
index ba225c5..0000000
--- a/script/_Lib/requests/packages/chardet/hebrewprober.py
+++ /dev/null
@@ -1,283 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Universal charset detector code.
-#
-# The Initial Developer of the Original Code is
-# Shy Shalom
-# Portions created by the Initial Developer are Copyright (C) 2005
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-######################### END LICENSE BLOCK #########################
-
-from .charsetprober import CharSetProber
-from .constants import eNotMe, eDetecting
-from .compat import wrap_ord
-
-# This prober doesn't actually recognize a language or a charset.
-# It is a helper prober for the use of the Hebrew model probers
-
-### General ideas of the Hebrew charset recognition ###
-#
-# Four main charsets exist in Hebrew:
-# "ISO-8859-8" - Visual Hebrew
-# "windows-1255" - Logical Hebrew
-# "ISO-8859-8-I" - Logical Hebrew
-# "x-mac-hebrew" - ?? Logical Hebrew ??
-#
-# Both "ISO" charsets use a completely identical set of code points, whereas
-# "windows-1255" and "x-mac-hebrew" are two different proper supersets of
-# these code points. windows-1255 defines additional characters in the range
-# 0x80-0x9F as some misc punctuation marks as well as some Hebrew-specific
-# diacritics and additional 'Yiddish' ligature letters in the range 0xc0-0xd6.
-# x-mac-hebrew defines similar additional code points but with a different
-# mapping.
-#
-# As far as an average Hebrew text with no diacritics is concerned, all four
-# charsets are identical with respect to code points. Meaning that for the
-# main Hebrew alphabet, all four map the same values to all 27 Hebrew letters
-# (including final letters).
-#
-# The dominant difference between these charsets is their directionality.
-# "Visual" directionality means that the text is ordered as if the renderer is
-# not aware of a BIDI rendering algorithm. The renderer sees the text and
-# draws it from left to right. The text itself when ordered naturally is read
-# backwards. A buffer of Visual Hebrew generally looks like so:
-# "[last word of first line spelled backwards] [whole line ordered backwards
-# and spelled backwards] [first word of first line spelled backwards]
-# [end of line] [last word of second line] ... etc' "
-# adding punctuation marks, numbers and English text to visual text is
-# naturally also "visual" and from left to right.
-#
-# "Logical" directionality means the text is ordered "naturally" according to
-# the order it is read. It is the responsibility of the renderer to display
-# the text from right to left. A BIDI algorithm is used to place general
-# punctuation marks, numbers and English text in the text.
-#
-# Texts in x-mac-hebrew are almost impossible to find on the Internet. From
-# what little evidence I could find, it seems that its general directionality
-# is Logical.
-#
-# To sum up all of the above, the Hebrew probing mechanism knows about two
-# charsets:
-# Visual Hebrew - "ISO-8859-8" - backwards text - Words and sentences are
-# backwards while line order is natural. For charset recognition purposes
-# the line order is unimportant (In fact, for this implementation, even
-# word order is unimportant).
-# Logical Hebrew - "windows-1255" - normal, naturally ordered text.
-#
-# "ISO-8859-8-I" is a subset of windows-1255 and doesn't need to be
-# specifically identified.
-# "x-mac-hebrew" is also identified as windows-1255. A text in x-mac-hebrew
-# that contain special punctuation marks or diacritics is displayed with
-# some unconverted characters showing as question marks. This problem might
-# be corrected using another model prober for x-mac-hebrew. Due to the fact
-# that x-mac-hebrew texts are so rare, writing another model prober isn't
-# worth the effort and performance hit.
-#
-#### The Prober ####
-#
-# The prober is divided between two SBCharSetProbers and a HebrewProber,
-# all of which are managed, created, fed data, inquired and deleted by the
-# SBCSGroupProber. The two SBCharSetProbers identify that the text is in
-# fact some kind of Hebrew, Logical or Visual. The final decision about which
-# one is it is made by the HebrewProber by combining final-letter scores
-# with the scores of the two SBCharSetProbers to produce a final answer.
-#
-# The SBCSGroupProber is responsible for stripping the original text of HTML
-# tags, English characters, numbers, low-ASCII punctuation characters, spaces
-# and new lines. It reduces any sequence of such characters to a single space.
-# The buffer fed to each prober in the SBCS group prober is pure text in
-# high-ASCII.
-# The two SBCharSetProbers (model probers) share the same language model:
-# Win1255Model.
-# The first SBCharSetProber uses the model normally as any other
-# SBCharSetProber does, to recognize windows-1255, upon which this model was
-# built. The second SBCharSetProber is told to make the pair-of-letter
-# lookup in the language model backwards. This in practice exactly simulates
-# a visual Hebrew model using the windows-1255 logical Hebrew model.
-#
-# The HebrewProber is not using any language model. All it does is look for
-# final-letter evidence suggesting the text is either logical Hebrew or visual
-# Hebrew. Disjointed from the model probers, the results of the HebrewProber
-# alone are meaningless. HebrewProber always returns 0.00 as confidence
-# since it never identifies a charset by itself. Instead, the pointer to the
-# HebrewProber is passed to the model probers as a helper "Name Prober".
-# When the Group prober receives a positive identification from any prober,
-# it asks for the name of the charset identified. If the prober queried is a
-# Hebrew model prober, the model prober forwards the call to the
-# HebrewProber to make the final decision. In the HebrewProber, the
-# decision is made according to the final-letters scores maintained and Both
-# model probers scores. The answer is returned in the form of the name of the
-# charset identified, either "windows-1255" or "ISO-8859-8".
-
-# windows-1255 / ISO-8859-8 code points of interest
-FINAL_KAF = 0xea
-NORMAL_KAF = 0xeb
-FINAL_MEM = 0xed
-NORMAL_MEM = 0xee
-FINAL_NUN = 0xef
-NORMAL_NUN = 0xf0
-FINAL_PE = 0xf3
-NORMAL_PE = 0xf4
-FINAL_TSADI = 0xf5
-NORMAL_TSADI = 0xf6
-
-# Minimum Visual vs Logical final letter score difference.
-# If the difference is below this, don't rely solely on the final letter score
-# distance.
-MIN_FINAL_CHAR_DISTANCE = 5
-
-# Minimum Visual vs Logical model score difference.
-# If the difference is below this, don't rely at all on the model score
-# distance.
-MIN_MODEL_DISTANCE = 0.01
-
-VISUAL_HEBREW_NAME = "ISO-8859-8"
-LOGICAL_HEBREW_NAME = "windows-1255"
-
-
-class HebrewProber(CharSetProber):
- def __init__(self):
- CharSetProber.__init__(self)
- self._mLogicalProber = None
- self._mVisualProber = None
- self.reset()
-
- def reset(self):
- self._mFinalCharLogicalScore = 0
- self._mFinalCharVisualScore = 0
- # The two last characters seen in the previous buffer,
- # mPrev and mBeforePrev are initialized to space in order to simulate
- # a word delimiter at the beginning of the data
- self._mPrev = ' '
- self._mBeforePrev = ' '
- # These probers are owned by the group prober.
-
- def set_model_probers(self, logicalProber, visualProber):
- self._mLogicalProber = logicalProber
- self._mVisualProber = visualProber
-
- def is_final(self, c):
- return wrap_ord(c) in [FINAL_KAF, FINAL_MEM, FINAL_NUN, FINAL_PE,
- FINAL_TSADI]
-
- def is_non_final(self, c):
- # The normal Tsadi is not a good Non-Final letter due to words like
- # 'lechotet' (to chat) containing an apostrophe after the tsadi. This
- # apostrophe is converted to a space in FilterWithoutEnglishLetters
- # causing the Non-Final tsadi to appear at an end of a word even
- # though this is not the case in the original text.
- # The letters Pe and Kaf rarely display a related behavior of not being
- # a good Non-Final letter. Words like 'Pop', 'Winamp' and 'Mubarak'
- # for example legally end with a Non-Final Pe or Kaf. However, the
- # benefit of these letters as Non-Final letters outweighs the damage
- # since these words are quite rare.
- return wrap_ord(c) in [NORMAL_KAF, NORMAL_MEM, NORMAL_NUN, NORMAL_PE]
-
- def feed(self, aBuf):
- # Final letter analysis for logical-visual decision.
- # Look for evidence that the received buffer is either logical Hebrew
- # or visual Hebrew.
- # The following cases are checked:
- # 1) A word longer than 1 letter, ending with a final letter. This is
- # an indication that the text is laid out "naturally" since the
- # final letter really appears at the end. +1 for logical score.
- # 2) A word longer than 1 letter, ending with a Non-Final letter. In
- # normal Hebrew, words ending with Kaf, Mem, Nun, Pe or Tsadi,
- # should not end with the Non-Final form of that letter. Exceptions
- # to this rule are mentioned above in isNonFinal(). This is an
- # indication that the text is laid out backwards. +1 for visual
- # score
- # 3) A word longer than 1 letter, starting with a final letter. Final
- # letters should not appear at the beginning of a word. This is an
- # indication that the text is laid out backwards. +1 for visual
- # score.
- #
- # The visual score and logical score are accumulated throughout the
- # text and are finally checked against each other in GetCharSetName().
- # No checking for final letters in the middle of words is done since
- # that case is not an indication for either Logical or Visual text.
- #
- # We automatically filter out all 7-bit characters (replace them with
- # spaces) so the word boundary detection works properly. [MAP]
-
- if self.get_state() == eNotMe:
- # Both model probers say it's not them. No reason to continue.
- return eNotMe
-
- aBuf = self.filter_high_bit_only(aBuf)
-
- for cur in aBuf:
- if cur == ' ':
- # We stand on a space - a word just ended
- if self._mBeforePrev != ' ':
- # next-to-last char was not a space so self._mPrev is not a
- # 1 letter word
- if self.is_final(self._mPrev):
- # case (1) [-2:not space][-1:final letter][cur:space]
- self._mFinalCharLogicalScore += 1
- elif self.is_non_final(self._mPrev):
- # case (2) [-2:not space][-1:Non-Final letter][
- # cur:space]
- self._mFinalCharVisualScore += 1
- else:
- # Not standing on a space
- if ((self._mBeforePrev == ' ') and
- (self.is_final(self._mPrev)) and (cur != ' ')):
- # case (3) [-2:space][-1:final letter][cur:not space]
- self._mFinalCharVisualScore += 1
- self._mBeforePrev = self._mPrev
- self._mPrev = cur
-
- # Forever detecting, till the end or until both model probers return
- # eNotMe (handled above)
- return eDetecting
-
- def get_charset_name(self):
- # Make the decision: is it Logical or Visual?
- # If the final letter score distance is dominant enough, rely on it.
- finalsub = self._mFinalCharLogicalScore - self._mFinalCharVisualScore
- if finalsub >= MIN_FINAL_CHAR_DISTANCE:
- return LOGICAL_HEBREW_NAME
- if finalsub <= -MIN_FINAL_CHAR_DISTANCE:
- return VISUAL_HEBREW_NAME
-
- # It's not dominant enough, try to rely on the model scores instead.
- modelsub = (self._mLogicalProber.get_confidence()
- - self._mVisualProber.get_confidence())
- if modelsub > MIN_MODEL_DISTANCE:
- return LOGICAL_HEBREW_NAME
- if modelsub < -MIN_MODEL_DISTANCE:
- return VISUAL_HEBREW_NAME
-
- # Still no good, back to final letter distance, maybe it'll save the
- # day.
- if finalsub < 0.0:
- return VISUAL_HEBREW_NAME
-
- # (finalsub > 0 - Logical) or (don't know what to do) default to
- # Logical.
- return LOGICAL_HEBREW_NAME
-
- def get_state(self):
- # Remain active as long as any of the model probers are active.
- if (self._mLogicalProber.get_state() == eNotMe) and \
- (self._mVisualProber.get_state() == eNotMe):
- return eNotMe
- return eDetecting
diff --git a/script/_Lib/requests/packages/chardet/jisfreq.py b/script/_Lib/requests/packages/chardet/jisfreq.py
deleted file mode 100644
index 064345b..0000000
--- a/script/_Lib/requests/packages/chardet/jisfreq.py
+++ /dev/null
@@ -1,569 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Communicator client code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-######################### END LICENSE BLOCK #########################
-
-# Sampling from about 20M text materials include literature and computer technology
-#
-# Japanese frequency table, applied to both S-JIS and EUC-JP
-# They are sorted in order.
-
-# 128 --> 0.77094
-# 256 --> 0.85710
-# 512 --> 0.92635
-# 1024 --> 0.97130
-# 2048 --> 0.99431
-#
-# Ideal Distribution Ratio = 0.92635 / (1-0.92635) = 12.58
-# Random Distribution Ration = 512 / (2965+62+83+86-512) = 0.191
-#
-# Typical Distribution Ratio, 25% of IDR
-
-JIS_TYPICAL_DISTRIBUTION_RATIO = 3.0
-
-# Char to FreqOrder table ,
-JIS_TABLE_SIZE = 4368
-
-JISCharToFreqOrder = (
- 40, 1, 6, 182, 152, 180, 295,2127, 285, 381,3295,4304,3068,4606,3165,3510, # 16
-3511,1822,2785,4607,1193,2226,5070,4608, 171,2996,1247, 18, 179,5071, 856,1661, # 32
-1262,5072, 619, 127,3431,3512,3230,1899,1700, 232, 228,1294,1298, 284, 283,2041, # 48
-2042,1061,1062, 48, 49, 44, 45, 433, 434,1040,1041, 996, 787,2997,1255,4305, # 64
-2108,4609,1684,1648,5073,5074,5075,5076,5077,5078,3687,5079,4610,5080,3927,3928, # 80
-5081,3296,3432, 290,2285,1471,2187,5082,2580,2825,1303,2140,1739,1445,2691,3375, # 96
-1691,3297,4306,4307,4611, 452,3376,1182,2713,3688,3069,4308,5083,5084,5085,5086, # 112
-5087,5088,5089,5090,5091,5092,5093,5094,5095,5096,5097,5098,5099,5100,5101,5102, # 128
-5103,5104,5105,5106,5107,5108,5109,5110,5111,5112,4097,5113,5114,5115,5116,5117, # 144
-5118,5119,5120,5121,5122,5123,5124,5125,5126,5127,5128,5129,5130,5131,5132,5133, # 160
-5134,5135,5136,5137,5138,5139,5140,5141,5142,5143,5144,5145,5146,5147,5148,5149, # 176
-5150,5151,5152,4612,5153,5154,5155,5156,5157,5158,5159,5160,5161,5162,5163,5164, # 192
-5165,5166,5167,5168,5169,5170,5171,5172,5173,5174,5175,1472, 598, 618, 820,1205, # 208
-1309,1412,1858,1307,1692,5176,5177,5178,5179,5180,5181,5182,1142,1452,1234,1172, # 224
-1875,2043,2149,1793,1382,2973, 925,2404,1067,1241, 960,1377,2935,1491, 919,1217, # 240
-1865,2030,1406,1499,2749,4098,5183,5184,5185,5186,5187,5188,2561,4099,3117,1804, # 256
-2049,3689,4309,3513,1663,5189,3166,3118,3298,1587,1561,3433,5190,3119,1625,2998, # 272
-3299,4613,1766,3690,2786,4614,5191,5192,5193,5194,2161, 26,3377, 2,3929, 20, # 288
-3691, 47,4100, 50, 17, 16, 35, 268, 27, 243, 42, 155, 24, 154, 29, 184, # 304
- 4, 91, 14, 92, 53, 396, 33, 289, 9, 37, 64, 620, 21, 39, 321, 5, # 320
- 12, 11, 52, 13, 3, 208, 138, 0, 7, 60, 526, 141, 151,1069, 181, 275, # 336
-1591, 83, 132,1475, 126, 331, 829, 15, 69, 160, 59, 22, 157, 55,1079, 312, # 352
- 109, 38, 23, 25, 10, 19, 79,5195, 61, 382,1124, 8, 30,5196,5197,5198, # 368
-5199,5200,5201,5202,5203,5204,5205,5206, 89, 62, 74, 34,2416, 112, 139, 196, # 384
- 271, 149, 84, 607, 131, 765, 46, 88, 153, 683, 76, 874, 101, 258, 57, 80, # 400
- 32, 364, 121,1508, 169,1547, 68, 235, 145,2999, 41, 360,3027, 70, 63, 31, # 416
- 43, 259, 262,1383, 99, 533, 194, 66, 93, 846, 217, 192, 56, 106, 58, 565, # 432
- 280, 272, 311, 256, 146, 82, 308, 71, 100, 128, 214, 655, 110, 261, 104,1140, # 448
- 54, 51, 36, 87, 67,3070, 185,2618,2936,2020, 28,1066,2390,2059,5207,5208, # 464
-5209,5210,5211,5212,5213,5214,5215,5216,4615,5217,5218,5219,5220,5221,5222,5223, # 480
-5224,5225,5226,5227,5228,5229,5230,5231,5232,5233,5234,5235,5236,3514,5237,5238, # 496
-5239,5240,5241,5242,5243,5244,2297,2031,4616,4310,3692,5245,3071,5246,3598,5247, # 512
-4617,3231,3515,5248,4101,4311,4618,3808,4312,4102,5249,4103,4104,3599,5250,5251, # 528
-5252,5253,5254,5255,5256,5257,5258,5259,5260,5261,5262,5263,5264,5265,5266,5267, # 544
-5268,5269,5270,5271,5272,5273,5274,5275,5276,5277,5278,5279,5280,5281,5282,5283, # 560
-5284,5285,5286,5287,5288,5289,5290,5291,5292,5293,5294,5295,5296,5297,5298,5299, # 576
-5300,5301,5302,5303,5304,5305,5306,5307,5308,5309,5310,5311,5312,5313,5314,5315, # 592
-5316,5317,5318,5319,5320,5321,5322,5323,5324,5325,5326,5327,5328,5329,5330,5331, # 608
-5332,5333,5334,5335,5336,5337,5338,5339,5340,5341,5342,5343,5344,5345,5346,5347, # 624
-5348,5349,5350,5351,5352,5353,5354,5355,5356,5357,5358,5359,5360,5361,5362,5363, # 640
-5364,5365,5366,5367,5368,5369,5370,5371,5372,5373,5374,5375,5376,5377,5378,5379, # 656
-5380,5381, 363, 642,2787,2878,2788,2789,2316,3232,2317,3434,2011, 165,1942,3930, # 672
-3931,3932,3933,5382,4619,5383,4620,5384,5385,5386,5387,5388,5389,5390,5391,5392, # 688
-5393,5394,5395,5396,5397,5398,5399,5400,5401,5402,5403,5404,5405,5406,5407,5408, # 704
-5409,5410,5411,5412,5413,5414,5415,5416,5417,5418,5419,5420,5421,5422,5423,5424, # 720
-5425,5426,5427,5428,5429,5430,5431,5432,5433,5434,5435,5436,5437,5438,5439,5440, # 736
-5441,5442,5443,5444,5445,5446,5447,5448,5449,5450,5451,5452,5453,5454,5455,5456, # 752
-5457,5458,5459,5460,5461,5462,5463,5464,5465,5466,5467,5468,5469,5470,5471,5472, # 768
-5473,5474,5475,5476,5477,5478,5479,5480,5481,5482,5483,5484,5485,5486,5487,5488, # 784
-5489,5490,5491,5492,5493,5494,5495,5496,5497,5498,5499,5500,5501,5502,5503,5504, # 800
-5505,5506,5507,5508,5509,5510,5511,5512,5513,5514,5515,5516,5517,5518,5519,5520, # 816
-5521,5522,5523,5524,5525,5526,5527,5528,5529,5530,5531,5532,5533,5534,5535,5536, # 832
-5537,5538,5539,5540,5541,5542,5543,5544,5545,5546,5547,5548,5549,5550,5551,5552, # 848
-5553,5554,5555,5556,5557,5558,5559,5560,5561,5562,5563,5564,5565,5566,5567,5568, # 864
-5569,5570,5571,5572,5573,5574,5575,5576,5577,5578,5579,5580,5581,5582,5583,5584, # 880
-5585,5586,5587,5588,5589,5590,5591,5592,5593,5594,5595,5596,5597,5598,5599,5600, # 896
-5601,5602,5603,5604,5605,5606,5607,5608,5609,5610,5611,5612,5613,5614,5615,5616, # 912
-5617,5618,5619,5620,5621,5622,5623,5624,5625,5626,5627,5628,5629,5630,5631,5632, # 928
-5633,5634,5635,5636,5637,5638,5639,5640,5641,5642,5643,5644,5645,5646,5647,5648, # 944
-5649,5650,5651,5652,5653,5654,5655,5656,5657,5658,5659,5660,5661,5662,5663,5664, # 960
-5665,5666,5667,5668,5669,5670,5671,5672,5673,5674,5675,5676,5677,5678,5679,5680, # 976
-5681,5682,5683,5684,5685,5686,5687,5688,5689,5690,5691,5692,5693,5694,5695,5696, # 992
-5697,5698,5699,5700,5701,5702,5703,5704,5705,5706,5707,5708,5709,5710,5711,5712, # 1008
-5713,5714,5715,5716,5717,5718,5719,5720,5721,5722,5723,5724,5725,5726,5727,5728, # 1024
-5729,5730,5731,5732,5733,5734,5735,5736,5737,5738,5739,5740,5741,5742,5743,5744, # 1040
-5745,5746,5747,5748,5749,5750,5751,5752,5753,5754,5755,5756,5757,5758,5759,5760, # 1056
-5761,5762,5763,5764,5765,5766,5767,5768,5769,5770,5771,5772,5773,5774,5775,5776, # 1072
-5777,5778,5779,5780,5781,5782,5783,5784,5785,5786,5787,5788,5789,5790,5791,5792, # 1088
-5793,5794,5795,5796,5797,5798,5799,5800,5801,5802,5803,5804,5805,5806,5807,5808, # 1104
-5809,5810,5811,5812,5813,5814,5815,5816,5817,5818,5819,5820,5821,5822,5823,5824, # 1120
-5825,5826,5827,5828,5829,5830,5831,5832,5833,5834,5835,5836,5837,5838,5839,5840, # 1136
-5841,5842,5843,5844,5845,5846,5847,5848,5849,5850,5851,5852,5853,5854,5855,5856, # 1152
-5857,5858,5859,5860,5861,5862,5863,5864,5865,5866,5867,5868,5869,5870,5871,5872, # 1168
-5873,5874,5875,5876,5877,5878,5879,5880,5881,5882,5883,5884,5885,5886,5887,5888, # 1184
-5889,5890,5891,5892,5893,5894,5895,5896,5897,5898,5899,5900,5901,5902,5903,5904, # 1200
-5905,5906,5907,5908,5909,5910,5911,5912,5913,5914,5915,5916,5917,5918,5919,5920, # 1216
-5921,5922,5923,5924,5925,5926,5927,5928,5929,5930,5931,5932,5933,5934,5935,5936, # 1232
-5937,5938,5939,5940,5941,5942,5943,5944,5945,5946,5947,5948,5949,5950,5951,5952, # 1248
-5953,5954,5955,5956,5957,5958,5959,5960,5961,5962,5963,5964,5965,5966,5967,5968, # 1264
-5969,5970,5971,5972,5973,5974,5975,5976,5977,5978,5979,5980,5981,5982,5983,5984, # 1280
-5985,5986,5987,5988,5989,5990,5991,5992,5993,5994,5995,5996,5997,5998,5999,6000, # 1296
-6001,6002,6003,6004,6005,6006,6007,6008,6009,6010,6011,6012,6013,6014,6015,6016, # 1312
-6017,6018,6019,6020,6021,6022,6023,6024,6025,6026,6027,6028,6029,6030,6031,6032, # 1328
-6033,6034,6035,6036,6037,6038,6039,6040,6041,6042,6043,6044,6045,6046,6047,6048, # 1344
-6049,6050,6051,6052,6053,6054,6055,6056,6057,6058,6059,6060,6061,6062,6063,6064, # 1360
-6065,6066,6067,6068,6069,6070,6071,6072,6073,6074,6075,6076,6077,6078,6079,6080, # 1376
-6081,6082,6083,6084,6085,6086,6087,6088,6089,6090,6091,6092,6093,6094,6095,6096, # 1392
-6097,6098,6099,6100,6101,6102,6103,6104,6105,6106,6107,6108,6109,6110,6111,6112, # 1408
-6113,6114,2044,2060,4621, 997,1235, 473,1186,4622, 920,3378,6115,6116, 379,1108, # 1424
-4313,2657,2735,3934,6117,3809, 636,3233, 573,1026,3693,3435,2974,3300,2298,4105, # 1440
- 854,2937,2463, 393,2581,2417, 539, 752,1280,2750,2480, 140,1161, 440, 708,1569, # 1456
- 665,2497,1746,1291,1523,3000, 164,1603, 847,1331, 537,1997, 486, 508,1693,2418, # 1472
-1970,2227, 878,1220, 299,1030, 969, 652,2751, 624,1137,3301,2619, 65,3302,2045, # 1488
-1761,1859,3120,1930,3694,3516, 663,1767, 852, 835,3695, 269, 767,2826,2339,1305, # 1504
- 896,1150, 770,1616,6118, 506,1502,2075,1012,2519, 775,2520,2975,2340,2938,4314, # 1520
-3028,2086,1224,1943,2286,6119,3072,4315,2240,1273,1987,3935,1557, 175, 597, 985, # 1536
-3517,2419,2521,1416,3029, 585, 938,1931,1007,1052,1932,1685,6120,3379,4316,4623, # 1552
- 804, 599,3121,1333,2128,2539,1159,1554,2032,3810, 687,2033,2904, 952, 675,1467, # 1568
-3436,6121,2241,1096,1786,2440,1543,1924, 980,1813,2228, 781,2692,1879, 728,1918, # 1584
-3696,4624, 548,1950,4625,1809,1088,1356,3303,2522,1944, 502, 972, 373, 513,2827, # 1600
- 586,2377,2391,1003,1976,1631,6122,2464,1084, 648,1776,4626,2141, 324, 962,2012, # 1616
-2177,2076,1384, 742,2178,1448,1173,1810, 222, 102, 301, 445, 125,2420, 662,2498, # 1632
- 277, 200,1476,1165,1068, 224,2562,1378,1446, 450,1880, 659, 791, 582,4627,2939, # 1648
-3936,1516,1274, 555,2099,3697,1020,1389,1526,3380,1762,1723,1787,2229, 412,2114, # 1664
-1900,2392,3518, 512,2597, 427,1925,2341,3122,1653,1686,2465,2499, 697, 330, 273, # 1680
- 380,2162, 951, 832, 780, 991,1301,3073, 965,2270,3519, 668,2523,2636,1286, 535, # 1696
-1407, 518, 671, 957,2658,2378, 267, 611,2197,3030,6123, 248,2299, 967,1799,2356, # 1712
- 850,1418,3437,1876,1256,1480,2828,1718,6124,6125,1755,1664,2405,6126,4628,2879, # 1728
-2829, 499,2179, 676,4629, 557,2329,2214,2090, 325,3234, 464, 811,3001, 992,2342, # 1744
-2481,1232,1469, 303,2242, 466,1070,2163, 603,1777,2091,4630,2752,4631,2714, 322, # 1760
-2659,1964,1768, 481,2188,1463,2330,2857,3600,2092,3031,2421,4632,2318,2070,1849, # 1776
-2598,4633,1302,2254,1668,1701,2422,3811,2905,3032,3123,2046,4106,1763,1694,4634, # 1792
-1604, 943,1724,1454, 917, 868,2215,1169,2940, 552,1145,1800,1228,1823,1955, 316, # 1808
-1080,2510, 361,1807,2830,4107,2660,3381,1346,1423,1134,4108,6127, 541,1263,1229, # 1824
-1148,2540, 545, 465,1833,2880,3438,1901,3074,2482, 816,3937, 713,1788,2500, 122, # 1840
-1575, 195,1451,2501,1111,6128, 859, 374,1225,2243,2483,4317, 390,1033,3439,3075, # 1856
-2524,1687, 266, 793,1440,2599, 946, 779, 802, 507, 897,1081, 528,2189,1292, 711, # 1872
-1866,1725,1167,1640, 753, 398,2661,1053, 246, 348,4318, 137,1024,3440,1600,2077, # 1888
-2129, 825,4319, 698, 238, 521, 187,2300,1157,2423,1641,1605,1464,1610,1097,2541, # 1904
-1260,1436, 759,2255,1814,2150, 705,3235, 409,2563,3304, 561,3033,2005,2564, 726, # 1920
-1956,2343,3698,4109, 949,3812,3813,3520,1669, 653,1379,2525, 881,2198, 632,2256, # 1936
-1027, 778,1074, 733,1957, 514,1481,2466, 554,2180, 702,3938,1606,1017,1398,6129, # 1952
-1380,3521, 921, 993,1313, 594, 449,1489,1617,1166, 768,1426,1360, 495,1794,3601, # 1968
-1177,3602,1170,4320,2344, 476, 425,3167,4635,3168,1424, 401,2662,1171,3382,1998, # 1984
-1089,4110, 477,3169, 474,6130,1909, 596,2831,1842, 494, 693,1051,1028,1207,3076, # 2000
- 606,2115, 727,2790,1473,1115, 743,3522, 630, 805,1532,4321,2021, 366,1057, 838, # 2016
- 684,1114,2142,4322,2050,1492,1892,1808,2271,3814,2424,1971,1447,1373,3305,1090, # 2032
-1536,3939,3523,3306,1455,2199, 336, 369,2331,1035, 584,2393, 902, 718,2600,6131, # 2048
-2753, 463,2151,1149,1611,2467, 715,1308,3124,1268, 343,1413,3236,1517,1347,2663, # 2064
-2093,3940,2022,1131,1553,2100,2941,1427,3441,2942,1323,2484,6132,1980, 872,2368, # 2080
-2441,2943, 320,2369,2116,1082, 679,1933,3941,2791,3815, 625,1143,2023, 422,2200, # 2096
-3816,6133, 730,1695, 356,2257,1626,2301,2858,2637,1627,1778, 937, 883,2906,2693, # 2112
-3002,1769,1086, 400,1063,1325,3307,2792,4111,3077, 456,2345,1046, 747,6134,1524, # 2128
- 884,1094,3383,1474,2164,1059, 974,1688,2181,2258,1047, 345,1665,1187, 358, 875, # 2144
-3170, 305, 660,3524,2190,1334,1135,3171,1540,1649,2542,1527, 927, 968,2793, 885, # 2160
-1972,1850, 482, 500,2638,1218,1109,1085,2543,1654,2034, 876, 78,2287,1482,1277, # 2176
- 861,1675,1083,1779, 724,2754, 454, 397,1132,1612,2332, 893, 672,1237, 257,2259, # 2192
-2370, 135,3384, 337,2244, 547, 352, 340, 709,2485,1400, 788,1138,2511, 540, 772, # 2208
-1682,2260,2272,2544,2013,1843,1902,4636,1999,1562,2288,4637,2201,1403,1533, 407, # 2224
- 576,3308,1254,2071, 978,3385, 170, 136,1201,3125,2664,3172,2394, 213, 912, 873, # 2240
-3603,1713,2202, 699,3604,3699, 813,3442, 493, 531,1054, 468,2907,1483, 304, 281, # 2256
-4112,1726,1252,2094, 339,2319,2130,2639, 756,1563,2944, 748, 571,2976,1588,2425, # 2272
-2715,1851,1460,2426,1528,1392,1973,3237, 288,3309, 685,3386, 296, 892,2716,2216, # 2288
-1570,2245, 722,1747,2217, 905,3238,1103,6135,1893,1441,1965, 251,1805,2371,3700, # 2304
-2601,1919,1078, 75,2182,1509,1592,1270,2640,4638,2152,6136,3310,3817, 524, 706, # 2320
-1075, 292,3818,1756,2602, 317, 98,3173,3605,3525,1844,2218,3819,2502, 814, 567, # 2336
- 385,2908,1534,6137, 534,1642,3239, 797,6138,1670,1529, 953,4323, 188,1071, 538, # 2352
- 178, 729,3240,2109,1226,1374,2000,2357,2977, 731,2468,1116,2014,2051,6139,1261, # 2368
-1593, 803,2859,2736,3443, 556, 682, 823,1541,6140,1369,2289,1706,2794, 845, 462, # 2384
-2603,2665,1361, 387, 162,2358,1740, 739,1770,1720,1304,1401,3241,1049, 627,1571, # 2400
-2427,3526,1877,3942,1852,1500, 431,1910,1503, 677, 297,2795, 286,1433,1038,1198, # 2416
-2290,1133,1596,4113,4639,2469,1510,1484,3943,6141,2442, 108, 712,4640,2372, 866, # 2432
-3701,2755,3242,1348, 834,1945,1408,3527,2395,3243,1811, 824, 994,1179,2110,1548, # 2448
-1453, 790,3003, 690,4324,4325,2832,2909,3820,1860,3821, 225,1748, 310, 346,1780, # 2464
-2470, 821,1993,2717,2796, 828, 877,3528,2860,2471,1702,2165,2910,2486,1789, 453, # 2480
- 359,2291,1676, 73,1164,1461,1127,3311, 421, 604, 314,1037, 589, 116,2487, 737, # 2496
- 837,1180, 111, 244, 735,6142,2261,1861,1362, 986, 523, 418, 581,2666,3822, 103, # 2512
- 855, 503,1414,1867,2488,1091, 657,1597, 979, 605,1316,4641,1021,2443,2078,2001, # 2528
-1209, 96, 587,2166,1032, 260,1072,2153, 173, 94, 226,3244, 819,2006,4642,4114, # 2544
-2203, 231,1744, 782, 97,2667, 786,3387, 887, 391, 442,2219,4326,1425,6143,2694, # 2560
- 633,1544,1202, 483,2015, 592,2052,1958,2472,1655, 419, 129,4327,3444,3312,1714, # 2576
-1257,3078,4328,1518,1098, 865,1310,1019,1885,1512,1734, 469,2444, 148, 773, 436, # 2592
-1815,1868,1128,1055,4329,1245,2756,3445,2154,1934,1039,4643, 579,1238, 932,2320, # 2608
- 353, 205, 801, 115,2428, 944,2321,1881, 399,2565,1211, 678, 766,3944, 335,2101, # 2624
-1459,1781,1402,3945,2737,2131,1010, 844, 981,1326,1013, 550,1816,1545,2620,1335, # 2640
-1008, 371,2881, 936,1419,1613,3529,1456,1395,2273,1834,2604,1317,2738,2503, 416, # 2656
-1643,4330, 806,1126, 229, 591,3946,1314,1981,1576,1837,1666, 347,1790, 977,3313, # 2672
- 764,2861,1853, 688,2429,1920,1462, 77, 595, 415,2002,3034, 798,1192,4115,6144, # 2688
-2978,4331,3035,2695,2582,2072,2566, 430,2430,1727, 842,1396,3947,3702, 613, 377, # 2704
- 278, 236,1417,3388,3314,3174, 757,1869, 107,3530,6145,1194, 623,2262, 207,1253, # 2720
-2167,3446,3948, 492,1117,1935, 536,1838,2757,1246,4332, 696,2095,2406,1393,1572, # 2736
-3175,1782, 583, 190, 253,1390,2230, 830,3126,3389, 934,3245,1703,1749,2979,1870, # 2752
-2545,1656,2204, 869,2346,4116,3176,1817, 496,1764,4644, 942,1504, 404,1903,1122, # 2768
-1580,3606,2945,1022, 515, 372,1735, 955,2431,3036,6146,2797,1110,2302,2798, 617, # 2784
-6147, 441, 762,1771,3447,3607,3608,1904, 840,3037, 86, 939,1385, 572,1370,2445, # 2800
-1336, 114,3703, 898, 294, 203,3315, 703,1583,2274, 429, 961,4333,1854,1951,3390, # 2816
-2373,3704,4334,1318,1381, 966,1911,2322,1006,1155, 309, 989, 458,2718,1795,1372, # 2832
-1203, 252,1689,1363,3177, 517,1936, 168,1490, 562, 193,3823,1042,4117,1835, 551, # 2848
- 470,4645, 395, 489,3448,1871,1465,2583,2641, 417,1493, 279,1295, 511,1236,1119, # 2864
- 72,1231,1982,1812,3004, 871,1564, 984,3449,1667,2696,2096,4646,2347,2833,1673, # 2880
-3609, 695,3246,2668, 807,1183,4647, 890, 388,2333,1801,1457,2911,1765,1477,1031, # 2896
-3316,3317,1278,3391,2799,2292,2526, 163,3450,4335,2669,1404,1802,6148,2323,2407, # 2912
-1584,1728,1494,1824,1269, 298, 909,3318,1034,1632, 375, 776,1683,2061, 291, 210, # 2928
-1123, 809,1249,1002,2642,3038, 206,1011,2132, 144, 975, 882,1565, 342, 667, 754, # 2944
-1442,2143,1299,2303,2062, 447, 626,2205,1221,2739,2912,1144,1214,2206,2584, 760, # 2960
-1715, 614, 950,1281,2670,2621, 810, 577,1287,2546,4648, 242,2168, 250,2643, 691, # 2976
- 123,2644, 647, 313,1029, 689,1357,2946,1650, 216, 771,1339,1306, 808,2063, 549, # 2992
- 913,1371,2913,2914,6149,1466,1092,1174,1196,1311,2605,2396,1783,1796,3079, 406, # 3008
-2671,2117,3949,4649, 487,1825,2220,6150,2915, 448,2348,1073,6151,2397,1707, 130, # 3024
- 900,1598, 329, 176,1959,2527,1620,6152,2275,4336,3319,1983,2191,3705,3610,2155, # 3040
-3706,1912,1513,1614,6153,1988, 646, 392,2304,1589,3320,3039,1826,1239,1352,1340, # 3056
-2916, 505,2567,1709,1437,2408,2547, 906,6154,2672, 384,1458,1594,1100,1329, 710, # 3072
- 423,3531,2064,2231,2622,1989,2673,1087,1882, 333, 841,3005,1296,2882,2379, 580, # 3088
-1937,1827,1293,2585, 601, 574, 249,1772,4118,2079,1120, 645, 901,1176,1690, 795, # 3104
-2207, 478,1434, 516,1190,1530, 761,2080, 930,1264, 355, 435,1552, 644,1791, 987, # 3120
- 220,1364,1163,1121,1538, 306,2169,1327,1222, 546,2645, 218, 241, 610,1704,3321, # 3136
-1984,1839,1966,2528, 451,6155,2586,3707,2568, 907,3178, 254,2947, 186,1845,4650, # 3152
- 745, 432,1757, 428,1633, 888,2246,2221,2489,3611,2118,1258,1265, 956,3127,1784, # 3168
-4337,2490, 319, 510, 119, 457,3612, 274,2035,2007,4651,1409,3128, 970,2758, 590, # 3184
-2800, 661,2247,4652,2008,3950,1420,1549,3080,3322,3951,1651,1375,2111, 485,2491, # 3200
-1429,1156,6156,2548,2183,1495, 831,1840,2529,2446, 501,1657, 307,1894,3247,1341, # 3216
- 666, 899,2156,1539,2549,1559, 886, 349,2208,3081,2305,1736,3824,2170,2759,1014, # 3232
-1913,1386, 542,1397,2948, 490, 368, 716, 362, 159, 282,2569,1129,1658,1288,1750, # 3248
-2674, 276, 649,2016, 751,1496, 658,1818,1284,1862,2209,2087,2512,3451, 622,2834, # 3264
- 376, 117,1060,2053,1208,1721,1101,1443, 247,1250,3179,1792,3952,2760,2398,3953, # 3280
-6157,2144,3708, 446,2432,1151,2570,3452,2447,2761,2835,1210,2448,3082, 424,2222, # 3296
-1251,2449,2119,2836, 504,1581,4338, 602, 817, 857,3825,2349,2306, 357,3826,1470, # 3312
-1883,2883, 255, 958, 929,2917,3248, 302,4653,1050,1271,1751,2307,1952,1430,2697, # 3328
-2719,2359, 354,3180, 777, 158,2036,4339,1659,4340,4654,2308,2949,2248,1146,2232, # 3344
-3532,2720,1696,2623,3827,6158,3129,1550,2698,1485,1297,1428, 637, 931,2721,2145, # 3360
- 914,2550,2587, 81,2450, 612, 827,2646,1242,4655,1118,2884, 472,1855,3181,3533, # 3376
-3534, 569,1353,2699,1244,1758,2588,4119,2009,2762,2171,3709,1312,1531,6159,1152, # 3392
-1938, 134,1830, 471,3710,2276,1112,1535,3323,3453,3535, 982,1337,2950, 488, 826, # 3408
- 674,1058,1628,4120,2017, 522,2399, 211, 568,1367,3454, 350, 293,1872,1139,3249, # 3424
-1399,1946,3006,1300,2360,3324, 588, 736,6160,2606, 744, 669,3536,3828,6161,1358, # 3440
- 199, 723, 848, 933, 851,1939,1505,1514,1338,1618,1831,4656,1634,3613, 443,2740, # 3456
-3829, 717,1947, 491,1914,6162,2551,1542,4121,1025,6163,1099,1223, 198,3040,2722, # 3472
- 370, 410,1905,2589, 998,1248,3182,2380, 519,1449,4122,1710, 947, 928,1153,4341, # 3488
-2277, 344,2624,1511, 615, 105, 161,1212,1076,1960,3130,2054,1926,1175,1906,2473, # 3504
- 414,1873,2801,6164,2309, 315,1319,3325, 318,2018,2146,2157, 963, 631, 223,4342, # 3520
-4343,2675, 479,3711,1197,2625,3712,2676,2361,6165,4344,4123,6166,2451,3183,1886, # 3536
-2184,1674,1330,1711,1635,1506, 799, 219,3250,3083,3954,1677,3713,3326,2081,3614, # 3552
-1652,2073,4657,1147,3041,1752, 643,1961, 147,1974,3955,6167,1716,2037, 918,3007, # 3568
-1994, 120,1537, 118, 609,3184,4345, 740,3455,1219, 332,1615,3830,6168,1621,2980, # 3584
-1582, 783, 212, 553,2350,3714,1349,2433,2082,4124, 889,6169,2310,1275,1410, 973, # 3600
- 166,1320,3456,1797,1215,3185,2885,1846,2590,2763,4658, 629, 822,3008, 763, 940, # 3616
-1990,2862, 439,2409,1566,1240,1622, 926,1282,1907,2764, 654,2210,1607, 327,1130, # 3632
-3956,1678,1623,6170,2434,2192, 686, 608,3831,3715, 903,3957,3042,6171,2741,1522, # 3648
-1915,1105,1555,2552,1359, 323,3251,4346,3457, 738,1354,2553,2311,2334,1828,2003, # 3664
-3832,1753,2351,1227,6172,1887,4125,1478,6173,2410,1874,1712,1847, 520,1204,2607, # 3680
- 264,4659, 836,2677,2102, 600,4660,3833,2278,3084,6174,4347,3615,1342, 640, 532, # 3696
- 543,2608,1888,2400,2591,1009,4348,1497, 341,1737,3616,2723,1394, 529,3252,1321, # 3712
- 983,4661,1515,2120, 971,2592, 924, 287,1662,3186,4349,2700,4350,1519, 908,1948, # 3728
-2452, 156, 796,1629,1486,2223,2055, 694,4126,1259,1036,3392,1213,2249,2742,1889, # 3744
-1230,3958,1015, 910, 408, 559,3617,4662, 746, 725, 935,4663,3959,3009,1289, 563, # 3760
- 867,4664,3960,1567,2981,2038,2626, 988,2263,2381,4351, 143,2374, 704,1895,6175, # 3776
-1188,3716,2088, 673,3085,2362,4352, 484,1608,1921,2765,2918, 215, 904,3618,3537, # 3792
- 894, 509, 976,3043,2701,3961,4353,2837,2982, 498,6176,6177,1102,3538,1332,3393, # 3808
-1487,1636,1637, 233, 245,3962, 383, 650, 995,3044, 460,1520,1206,2352, 749,3327, # 3824
- 530, 700, 389,1438,1560,1773,3963,2264, 719,2951,2724,3834, 870,1832,1644,1000, # 3840
- 839,2474,3717, 197,1630,3394, 365,2886,3964,1285,2133, 734, 922, 818,1106, 732, # 3856
- 480,2083,1774,3458, 923,2279,1350, 221,3086, 85,2233,2234,3835,1585,3010,2147, # 3872
-1387,1705,2382,1619,2475, 133, 239,2802,1991,1016,2084,2383, 411,2838,1113, 651, # 3888
-1985,1160,3328, 990,1863,3087,1048,1276,2647, 265,2627,1599,3253,2056, 150, 638, # 3904
-2019, 656, 853, 326,1479, 680,1439,4354,1001,1759, 413,3459,3395,2492,1431, 459, # 3920
-4355,1125,3329,2265,1953,1450,2065,2863, 849, 351,2678,3131,3254,3255,1104,1577, # 3936
- 227,1351,1645,2453,2193,1421,2887, 812,2121, 634, 95,2435, 201,2312,4665,1646, # 3952
-1671,2743,1601,2554,2702,2648,2280,1315,1366,2089,3132,1573,3718,3965,1729,1189, # 3968
- 328,2679,1077,1940,1136, 558,1283, 964,1195, 621,2074,1199,1743,3460,3619,1896, # 3984
-1916,1890,3836,2952,1154,2112,1064, 862, 378,3011,2066,2113,2803,1568,2839,6178, # 4000
-3088,2919,1941,1660,2004,1992,2194, 142, 707,1590,1708,1624,1922,1023,1836,1233, # 4016
-1004,2313, 789, 741,3620,6179,1609,2411,1200,4127,3719,3720,4666,2057,3721, 593, # 4032
-2840, 367,2920,1878,6180,3461,1521, 628,1168, 692,2211,2649, 300, 720,2067,2571, # 4048
-2953,3396, 959,2504,3966,3539,3462,1977, 701,6181, 954,1043, 800, 681, 183,3722, # 4064
-1803,1730,3540,4128,2103, 815,2314, 174, 467, 230,2454,1093,2134, 755,3541,3397, # 4080
-1141,1162,6182,1738,2039, 270,3256,2513,1005,1647,2185,3837, 858,1679,1897,1719, # 4096
-2954,2324,1806, 402, 670, 167,4129,1498,2158,2104, 750,6183, 915, 189,1680,1551, # 4112
- 455,4356,1501,2455, 405,1095,2955, 338,1586,1266,1819, 570, 641,1324, 237,1556, # 4128
-2650,1388,3723,6184,1368,2384,1343,1978,3089,2436, 879,3724, 792,1191, 758,3012, # 4144
-1411,2135,1322,4357, 240,4667,1848,3725,1574,6185, 420,3045,1546,1391, 714,4358, # 4160
-1967, 941,1864, 863, 664, 426, 560,1731,2680,1785,2864,1949,2363, 403,3330,1415, # 4176
-1279,2136,1697,2335, 204, 721,2097,3838, 90,6186,2085,2505, 191,3967, 124,2148, # 4192
-1376,1798,1178,1107,1898,1405, 860,4359,1243,1272,2375,2983,1558,2456,1638, 113, # 4208
-3621, 578,1923,2609, 880, 386,4130, 784,2186,2266,1422,2956,2172,1722, 497, 263, # 4224
-2514,1267,2412,2610, 177,2703,3542, 774,1927,1344, 616,1432,1595,1018, 172,4360, # 4240
-2325, 911,4361, 438,1468,3622, 794,3968,2024,2173,1681,1829,2957, 945, 895,3090, # 4256
- 575,2212,2476, 475,2401,2681, 785,2744,1745,2293,2555,1975,3133,2865, 394,4668, # 4272
-3839, 635,4131, 639, 202,1507,2195,2766,1345,1435,2572,3726,1908,1184,1181,2457, # 4288
-3727,3134,4362, 843,2611, 437, 916,4669, 234, 769,1884,3046,3047,3623, 833,6187, # 4304
-1639,2250,2402,1355,1185,2010,2047, 999, 525,1732,1290,1488,2612, 948,1578,3728, # 4320
-2413,2477,1216,2725,2159, 334,3840,1328,3624,2921,1525,4132, 564,1056, 891,4363, # 4336
-1444,1698,2385,2251,3729,1365,2281,2235,1717,6188, 864,3841,2515, 444, 527,2767, # 4352
-2922,3625, 544, 461,6189, 566, 209,2437,3398,2098,1065,2068,3331,3626,3257,2137, # 4368 #last 512
-#Everything below is of no interest for detection purpose
-2138,2122,3730,2888,1995,1820,1044,6190,6191,6192,6193,6194,6195,6196,6197,6198, # 4384
-6199,6200,6201,6202,6203,6204,6205,4670,6206,6207,6208,6209,6210,6211,6212,6213, # 4400
-6214,6215,6216,6217,6218,6219,6220,6221,6222,6223,6224,6225,6226,6227,6228,6229, # 4416
-6230,6231,6232,6233,6234,6235,6236,6237,3187,6238,6239,3969,6240,6241,6242,6243, # 4432
-6244,4671,6245,6246,4672,6247,6248,4133,6249,6250,4364,6251,2923,2556,2613,4673, # 4448
-4365,3970,6252,6253,6254,6255,4674,6256,6257,6258,2768,2353,4366,4675,4676,3188, # 4464
-4367,3463,6259,4134,4677,4678,6260,2267,6261,3842,3332,4368,3543,6262,6263,6264, # 4480
-3013,1954,1928,4135,4679,6265,6266,2478,3091,6267,4680,4369,6268,6269,1699,6270, # 4496
-3544,4136,4681,6271,4137,6272,4370,2804,6273,6274,2593,3971,3972,4682,6275,2236, # 4512
-4683,6276,6277,4684,6278,6279,4138,3973,4685,6280,6281,3258,6282,6283,6284,6285, # 4528
-3974,4686,2841,3975,6286,6287,3545,6288,6289,4139,4687,4140,6290,4141,6291,4142, # 4544
-6292,6293,3333,6294,6295,6296,4371,6297,3399,6298,6299,4372,3976,6300,6301,6302, # 4560
-4373,6303,6304,3843,3731,6305,4688,4374,6306,6307,3259,2294,6308,3732,2530,4143, # 4576
-6309,4689,6310,6311,6312,3048,6313,6314,4690,3733,2237,6315,6316,2282,3334,6317, # 4592
-6318,3844,6319,6320,4691,6321,3400,4692,6322,4693,6323,3049,6324,4375,6325,3977, # 4608
-6326,6327,6328,3546,6329,4694,3335,6330,4695,4696,6331,6332,6333,6334,4376,3978, # 4624
-6335,4697,3979,4144,6336,3980,4698,6337,6338,6339,6340,6341,4699,4700,4701,6342, # 4640
-6343,4702,6344,6345,4703,6346,6347,4704,6348,4705,4706,3135,6349,4707,6350,4708, # 4656
-6351,4377,6352,4709,3734,4145,6353,2506,4710,3189,6354,3050,4711,3981,6355,3547, # 4672
-3014,4146,4378,3735,2651,3845,3260,3136,2224,1986,6356,3401,6357,4712,2594,3627, # 4688
-3137,2573,3736,3982,4713,3628,4714,4715,2682,3629,4716,6358,3630,4379,3631,6359, # 4704
-6360,6361,3983,6362,6363,6364,6365,4147,3846,4717,6366,6367,3737,2842,6368,4718, # 4720
-2628,6369,3261,6370,2386,6371,6372,3738,3984,4719,3464,4720,3402,6373,2924,3336, # 4736
-4148,2866,6374,2805,3262,4380,2704,2069,2531,3138,2806,2984,6375,2769,6376,4721, # 4752
-4722,3403,6377,6378,3548,6379,6380,2705,3092,1979,4149,2629,3337,2889,6381,3338, # 4768
-4150,2557,3339,4381,6382,3190,3263,3739,6383,4151,4723,4152,2558,2574,3404,3191, # 4784
-6384,6385,4153,6386,4724,4382,6387,6388,4383,6389,6390,4154,6391,4725,3985,6392, # 4800
-3847,4155,6393,6394,6395,6396,6397,3465,6398,4384,6399,6400,6401,6402,6403,6404, # 4816
-4156,6405,6406,6407,6408,2123,6409,6410,2326,3192,4726,6411,6412,6413,6414,4385, # 4832
-4157,6415,6416,4158,6417,3093,3848,6418,3986,6419,6420,3849,6421,6422,6423,4159, # 4848
-6424,6425,4160,6426,3740,6427,6428,6429,6430,3987,6431,4727,6432,2238,6433,6434, # 4864
-4386,3988,6435,6436,3632,6437,6438,2843,6439,6440,6441,6442,3633,6443,2958,6444, # 4880
-6445,3466,6446,2364,4387,3850,6447,4388,2959,3340,6448,3851,6449,4728,6450,6451, # 4896
-3264,4729,6452,3193,6453,4389,4390,2706,3341,4730,6454,3139,6455,3194,6456,3051, # 4912
-2124,3852,1602,4391,4161,3853,1158,3854,4162,3989,4392,3990,4731,4732,4393,2040, # 4928
-4163,4394,3265,6457,2807,3467,3855,6458,6459,6460,3991,3468,4733,4734,6461,3140, # 4944
-2960,6462,4735,6463,6464,6465,6466,4736,4737,4738,4739,6467,6468,4164,2403,3856, # 4960
-6469,6470,2770,2844,6471,4740,6472,6473,6474,6475,6476,6477,6478,3195,6479,4741, # 4976
-4395,6480,2867,6481,4742,2808,6482,2493,4165,6483,6484,6485,6486,2295,4743,6487, # 4992
-6488,6489,3634,6490,6491,6492,6493,6494,6495,6496,2985,4744,6497,6498,4745,6499, # 5008
-6500,2925,3141,4166,6501,6502,4746,6503,6504,4747,6505,6506,6507,2890,6508,6509, # 5024
-6510,6511,6512,6513,6514,6515,6516,6517,6518,6519,3469,4167,6520,6521,6522,4748, # 5040
-4396,3741,4397,4749,4398,3342,2125,4750,6523,4751,4752,4753,3052,6524,2961,4168, # 5056
-6525,4754,6526,4755,4399,2926,4169,6527,3857,6528,4400,4170,6529,4171,6530,6531, # 5072
-2595,6532,6533,6534,6535,3635,6536,6537,6538,6539,6540,6541,6542,4756,6543,6544, # 5088
-6545,6546,6547,6548,4401,6549,6550,6551,6552,4402,3405,4757,4403,6553,6554,6555, # 5104
-4172,3742,6556,6557,6558,3992,3636,6559,6560,3053,2726,6561,3549,4173,3054,4404, # 5120
-6562,6563,3993,4405,3266,3550,2809,4406,6564,6565,6566,4758,4759,6567,3743,6568, # 5136
-4760,3744,4761,3470,6569,6570,6571,4407,6572,3745,4174,6573,4175,2810,4176,3196, # 5152
-4762,6574,4177,6575,6576,2494,2891,3551,6577,6578,3471,6579,4408,6580,3015,3197, # 5168
-6581,3343,2532,3994,3858,6582,3094,3406,4409,6583,2892,4178,4763,4410,3016,4411, # 5184
-6584,3995,3142,3017,2683,6585,4179,6586,6587,4764,4412,6588,6589,4413,6590,2986, # 5200
-6591,2962,3552,6592,2963,3472,6593,6594,4180,4765,6595,6596,2225,3267,4414,6597, # 5216
-3407,3637,4766,6598,6599,3198,6600,4415,6601,3859,3199,6602,3473,4767,2811,4416, # 5232
-1856,3268,3200,2575,3996,3997,3201,4417,6603,3095,2927,6604,3143,6605,2268,6606, # 5248
-3998,3860,3096,2771,6607,6608,3638,2495,4768,6609,3861,6610,3269,2745,4769,4181, # 5264
-3553,6611,2845,3270,6612,6613,6614,3862,6615,6616,4770,4771,6617,3474,3999,4418, # 5280
-4419,6618,3639,3344,6619,4772,4182,6620,2126,6621,6622,6623,4420,4773,6624,3018, # 5296
-6625,4774,3554,6626,4183,2025,3746,6627,4184,2707,6628,4421,4422,3097,1775,4185, # 5312
-3555,6629,6630,2868,6631,6632,4423,6633,6634,4424,2414,2533,2928,6635,4186,2387, # 5328
-6636,4775,6637,4187,6638,1891,4425,3202,3203,6639,6640,4776,6641,3345,6642,6643, # 5344
-3640,6644,3475,3346,3641,4000,6645,3144,6646,3098,2812,4188,3642,3204,6647,3863, # 5360
-3476,6648,3864,6649,4426,4001,6650,6651,6652,2576,6653,4189,4777,6654,6655,6656, # 5376
-2846,6657,3477,3205,4002,6658,4003,6659,3347,2252,6660,6661,6662,4778,6663,6664, # 5392
-6665,6666,6667,6668,6669,4779,4780,2048,6670,3478,3099,6671,3556,3747,4004,6672, # 5408
-6673,6674,3145,4005,3748,6675,6676,6677,6678,6679,3408,6680,6681,6682,6683,3206, # 5424
-3207,6684,6685,4781,4427,6686,4782,4783,4784,6687,6688,6689,4190,6690,6691,3479, # 5440
-6692,2746,6693,4428,6694,6695,6696,6697,6698,6699,4785,6700,6701,3208,2727,6702, # 5456
-3146,6703,6704,3409,2196,6705,4429,6706,6707,6708,2534,1996,6709,6710,6711,2747, # 5472
-6712,6713,6714,4786,3643,6715,4430,4431,6716,3557,6717,4432,4433,6718,6719,6720, # 5488
-6721,3749,6722,4006,4787,6723,6724,3644,4788,4434,6725,6726,4789,2772,6727,6728, # 5504
-6729,6730,6731,2708,3865,2813,4435,6732,6733,4790,4791,3480,6734,6735,6736,6737, # 5520
-4436,3348,6738,3410,4007,6739,6740,4008,6741,6742,4792,3411,4191,6743,6744,6745, # 5536
-6746,6747,3866,6748,3750,6749,6750,6751,6752,6753,6754,6755,3867,6756,4009,6757, # 5552
-4793,4794,6758,2814,2987,6759,6760,6761,4437,6762,6763,6764,6765,3645,6766,6767, # 5568
-3481,4192,6768,3751,6769,6770,2174,6771,3868,3752,6772,6773,6774,4193,4795,4438, # 5584
-3558,4796,4439,6775,4797,6776,6777,4798,6778,4799,3559,4800,6779,6780,6781,3482, # 5600
-6782,2893,6783,6784,4194,4801,4010,6785,6786,4440,6787,4011,6788,6789,6790,6791, # 5616
-6792,6793,4802,6794,6795,6796,4012,6797,6798,6799,6800,3349,4803,3483,6801,4804, # 5632
-4195,6802,4013,6803,6804,4196,6805,4014,4015,6806,2847,3271,2848,6807,3484,6808, # 5648
-6809,6810,4441,6811,4442,4197,4443,3272,4805,6812,3412,4016,1579,6813,6814,4017, # 5664
-6815,3869,6816,2964,6817,4806,6818,6819,4018,3646,6820,6821,4807,4019,4020,6822, # 5680
-6823,3560,6824,6825,4021,4444,6826,4198,6827,6828,4445,6829,6830,4199,4808,6831, # 5696
-6832,6833,3870,3019,2458,6834,3753,3413,3350,6835,4809,3871,4810,3561,4446,6836, # 5712
-6837,4447,4811,4812,6838,2459,4448,6839,4449,6840,6841,4022,3872,6842,4813,4814, # 5728
-6843,6844,4815,4200,4201,4202,6845,4023,6846,6847,4450,3562,3873,6848,6849,4816, # 5744
-4817,6850,4451,4818,2139,6851,3563,6852,6853,3351,6854,6855,3352,4024,2709,3414, # 5760
-4203,4452,6856,4204,6857,6858,3874,3875,6859,6860,4819,6861,6862,6863,6864,4453, # 5776
-3647,6865,6866,4820,6867,6868,6869,6870,4454,6871,2869,6872,6873,4821,6874,3754, # 5792
-6875,4822,4205,6876,6877,6878,3648,4206,4455,6879,4823,6880,4824,3876,6881,3055, # 5808
-4207,6882,3415,6883,6884,6885,4208,4209,6886,4210,3353,6887,3354,3564,3209,3485, # 5824
-2652,6888,2728,6889,3210,3755,6890,4025,4456,6891,4825,6892,6893,6894,6895,4211, # 5840
-6896,6897,6898,4826,6899,6900,4212,6901,4827,6902,2773,3565,6903,4828,6904,6905, # 5856
-6906,6907,3649,3650,6908,2849,3566,6909,3567,3100,6910,6911,6912,6913,6914,6915, # 5872
-4026,6916,3355,4829,3056,4457,3756,6917,3651,6918,4213,3652,2870,6919,4458,6920, # 5888
-2438,6921,6922,3757,2774,4830,6923,3356,4831,4832,6924,4833,4459,3653,2507,6925, # 5904
-4834,2535,6926,6927,3273,4027,3147,6928,3568,6929,6930,6931,4460,6932,3877,4461, # 5920
-2729,3654,6933,6934,6935,6936,2175,4835,2630,4214,4028,4462,4836,4215,6937,3148, # 5936
-4216,4463,4837,4838,4217,6938,6939,2850,4839,6940,4464,6941,6942,6943,4840,6944, # 5952
-4218,3274,4465,6945,6946,2710,6947,4841,4466,6948,6949,2894,6950,6951,4842,6952, # 5968
-4219,3057,2871,6953,6954,6955,6956,4467,6957,2711,6958,6959,6960,3275,3101,4843, # 5984
-6961,3357,3569,6962,4844,6963,6964,4468,4845,3570,6965,3102,4846,3758,6966,4847, # 6000
-3878,4848,4849,4029,6967,2929,3879,4850,4851,6968,6969,1733,6970,4220,6971,6972, # 6016
-6973,6974,6975,6976,4852,6977,6978,6979,6980,6981,6982,3759,6983,6984,6985,3486, # 6032
-3487,6986,3488,3416,6987,6988,6989,6990,6991,6992,6993,6994,6995,6996,6997,4853, # 6048
-6998,6999,4030,7000,7001,3211,7002,7003,4221,7004,7005,3571,4031,7006,3572,7007, # 6064
-2614,4854,2577,7008,7009,2965,3655,3656,4855,2775,3489,3880,4222,4856,3881,4032, # 6080
-3882,3657,2730,3490,4857,7010,3149,7011,4469,4858,2496,3491,4859,2283,7012,7013, # 6096
-7014,2365,4860,4470,7015,7016,3760,7017,7018,4223,1917,7019,7020,7021,4471,7022, # 6112
-2776,4472,7023,7024,7025,7026,4033,7027,3573,4224,4861,4034,4862,7028,7029,1929, # 6128
-3883,4035,7030,4473,3058,7031,2536,3761,3884,7032,4036,7033,2966,2895,1968,4474, # 6144
-3276,4225,3417,3492,4226,2105,7034,7035,1754,2596,3762,4227,4863,4475,3763,4864, # 6160
-3764,2615,2777,3103,3765,3658,3418,4865,2296,3766,2815,7036,7037,7038,3574,2872, # 6176
-3277,4476,7039,4037,4477,7040,7041,4038,7042,7043,7044,7045,7046,7047,2537,7048, # 6192
-7049,7050,7051,7052,7053,7054,4478,7055,7056,3767,3659,4228,3575,7057,7058,4229, # 6208
-7059,7060,7061,3660,7062,3212,7063,3885,4039,2460,7064,7065,7066,7067,7068,7069, # 6224
-7070,7071,7072,7073,7074,4866,3768,4867,7075,7076,7077,7078,4868,3358,3278,2653, # 6240
-7079,7080,4479,3886,7081,7082,4869,7083,7084,7085,7086,7087,7088,2538,7089,7090, # 6256
-7091,4040,3150,3769,4870,4041,2896,3359,4230,2930,7092,3279,7093,2967,4480,3213, # 6272
-4481,3661,7094,7095,7096,7097,7098,7099,7100,7101,7102,2461,3770,7103,7104,4231, # 6288
-3151,7105,7106,7107,4042,3662,7108,7109,4871,3663,4872,4043,3059,7110,7111,7112, # 6304
-3493,2988,7113,4873,7114,7115,7116,3771,4874,7117,7118,4232,4875,7119,3576,2336, # 6320
-4876,7120,4233,3419,4044,4877,4878,4482,4483,4879,4484,4234,7121,3772,4880,1045, # 6336
-3280,3664,4881,4882,7122,7123,7124,7125,4883,7126,2778,7127,4485,4486,7128,4884, # 6352
-3214,3887,7129,7130,3215,7131,4885,4045,7132,7133,4046,7134,7135,7136,7137,7138, # 6368
-7139,7140,7141,7142,7143,4235,7144,4886,7145,7146,7147,4887,7148,7149,7150,4487, # 6384
-4047,4488,7151,7152,4888,4048,2989,3888,7153,3665,7154,4049,7155,7156,7157,7158, # 6400
-7159,7160,2931,4889,4890,4489,7161,2631,3889,4236,2779,7162,7163,4891,7164,3060, # 6416
-7165,1672,4892,7166,4893,4237,3281,4894,7167,7168,3666,7169,3494,7170,7171,4050, # 6432
-7172,7173,3104,3360,3420,4490,4051,2684,4052,7174,4053,7175,7176,7177,2253,4054, # 6448
-7178,7179,4895,7180,3152,3890,3153,4491,3216,7181,7182,7183,2968,4238,4492,4055, # 6464
-7184,2990,7185,2479,7186,7187,4493,7188,7189,7190,7191,7192,4896,7193,4897,2969, # 6480
-4494,4898,7194,3495,7195,7196,4899,4495,7197,3105,2731,7198,4900,7199,7200,7201, # 6496
-4056,7202,3361,7203,7204,4496,4901,4902,7205,4497,7206,7207,2315,4903,7208,4904, # 6512
-7209,4905,2851,7210,7211,3577,7212,3578,4906,7213,4057,3667,4907,7214,4058,2354, # 6528
-3891,2376,3217,3773,7215,7216,7217,7218,7219,4498,7220,4908,3282,2685,7221,3496, # 6544
-4909,2632,3154,4910,7222,2337,7223,4911,7224,7225,7226,4912,4913,3283,4239,4499, # 6560
-7227,2816,7228,7229,7230,7231,7232,7233,7234,4914,4500,4501,7235,7236,7237,2686, # 6576
-7238,4915,7239,2897,4502,7240,4503,7241,2516,7242,4504,3362,3218,7243,7244,7245, # 6592
-4916,7246,7247,4505,3363,7248,7249,7250,7251,3774,4506,7252,7253,4917,7254,7255, # 6608
-3284,2991,4918,4919,3219,3892,4920,3106,3497,4921,7256,7257,7258,4922,7259,4923, # 6624
-3364,4507,4508,4059,7260,4240,3498,7261,7262,4924,7263,2992,3893,4060,3220,7264, # 6640
-7265,7266,7267,7268,7269,4509,3775,7270,2817,7271,4061,4925,4510,3776,7272,4241, # 6656
-4511,3285,7273,7274,3499,7275,7276,7277,4062,4512,4926,7278,3107,3894,7279,7280, # 6672
-4927,7281,4513,7282,7283,3668,7284,7285,4242,4514,4243,7286,2058,4515,4928,4929, # 6688
-4516,7287,3286,4244,7288,4517,7289,7290,7291,3669,7292,7293,4930,4931,4932,2355, # 6704
-4933,7294,2633,4518,7295,4245,7296,7297,4519,7298,7299,4520,4521,4934,7300,4246, # 6720
-4522,7301,7302,7303,3579,7304,4247,4935,7305,4936,7306,7307,7308,7309,3777,7310, # 6736
-4523,7311,7312,7313,4248,3580,7314,4524,3778,4249,7315,3581,7316,3287,7317,3221, # 6752
-7318,4937,7319,7320,7321,7322,7323,7324,4938,4939,7325,4525,7326,7327,7328,4063, # 6768
-7329,7330,4940,7331,7332,4941,7333,4526,7334,3500,2780,1741,4942,2026,1742,7335, # 6784
-7336,3582,4527,2388,7337,7338,7339,4528,7340,4250,4943,7341,7342,7343,4944,7344, # 6800
-7345,7346,3020,7347,4945,7348,7349,7350,7351,3895,7352,3896,4064,3897,7353,7354, # 6816
-7355,4251,7356,7357,3898,7358,3779,7359,3780,3288,7360,7361,4529,7362,4946,4530, # 6832
-2027,7363,3899,4531,4947,3222,3583,7364,4948,7365,7366,7367,7368,4949,3501,4950, # 6848
-3781,4951,4532,7369,2517,4952,4252,4953,3155,7370,4954,4955,4253,2518,4533,7371, # 6864
-7372,2712,4254,7373,7374,7375,3670,4956,3671,7376,2389,3502,4065,7377,2338,7378, # 6880
-7379,7380,7381,3061,7382,4957,7383,7384,7385,7386,4958,4534,7387,7388,2993,7389, # 6896
-3062,7390,4959,7391,7392,7393,4960,3108,4961,7394,4535,7395,4962,3421,4536,7396, # 6912
-4963,7397,4964,1857,7398,4965,7399,7400,2176,3584,4966,7401,7402,3422,4537,3900, # 6928
-3585,7403,3782,7404,2852,7405,7406,7407,4538,3783,2654,3423,4967,4539,7408,3784, # 6944
-3586,2853,4540,4541,7409,3901,7410,3902,7411,7412,3785,3109,2327,3903,7413,7414, # 6960
-2970,4066,2932,7415,7416,7417,3904,3672,3424,7418,4542,4543,4544,7419,4968,7420, # 6976
-7421,4255,7422,7423,7424,7425,7426,4067,7427,3673,3365,4545,7428,3110,2559,3674, # 6992
-7429,7430,3156,7431,7432,3503,7433,3425,4546,7434,3063,2873,7435,3223,4969,4547, # 7008
-4548,2898,4256,4068,7436,4069,3587,3786,2933,3787,4257,4970,4971,3788,7437,4972, # 7024
-3064,7438,4549,7439,7440,7441,7442,7443,4973,3905,7444,2874,7445,7446,7447,7448, # 7040
-3021,7449,4550,3906,3588,4974,7450,7451,3789,3675,7452,2578,7453,4070,7454,7455, # 7056
-7456,4258,3676,7457,4975,7458,4976,4259,3790,3504,2634,4977,3677,4551,4260,7459, # 7072
-7460,7461,7462,3907,4261,4978,7463,7464,7465,7466,4979,4980,7467,7468,2213,4262, # 7088
-7469,7470,7471,3678,4981,7472,2439,7473,4263,3224,3289,7474,3908,2415,4982,7475, # 7104
-4264,7476,4983,2655,7477,7478,2732,4552,2854,2875,7479,7480,4265,7481,4553,4984, # 7120
-7482,7483,4266,7484,3679,3366,3680,2818,2781,2782,3367,3589,4554,3065,7485,4071, # 7136
-2899,7486,7487,3157,2462,4072,4555,4073,4985,4986,3111,4267,2687,3368,4556,4074, # 7152
-3791,4268,7488,3909,2783,7489,2656,1962,3158,4557,4987,1963,3159,3160,7490,3112, # 7168
-4988,4989,3022,4990,4991,3792,2855,7491,7492,2971,4558,7493,7494,4992,7495,7496, # 7184
-7497,7498,4993,7499,3426,4559,4994,7500,3681,4560,4269,4270,3910,7501,4075,4995, # 7200
-4271,7502,7503,4076,7504,4996,7505,3225,4997,4272,4077,2819,3023,7506,7507,2733, # 7216
-4561,7508,4562,7509,3369,3793,7510,3590,2508,7511,7512,4273,3113,2994,2616,7513, # 7232
-7514,7515,7516,7517,7518,2820,3911,4078,2748,7519,7520,4563,4998,7521,7522,7523, # 7248
-7524,4999,4274,7525,4564,3682,2239,4079,4565,7526,7527,7528,7529,5000,7530,7531, # 7264
-5001,4275,3794,7532,7533,7534,3066,5002,4566,3161,7535,7536,4080,7537,3162,7538, # 7280
-7539,4567,7540,7541,7542,7543,7544,7545,5003,7546,4568,7547,7548,7549,7550,7551, # 7296
-7552,7553,7554,7555,7556,5004,7557,7558,7559,5005,7560,3795,7561,4569,7562,7563, # 7312
-7564,2821,3796,4276,4277,4081,7565,2876,7566,5006,7567,7568,2900,7569,3797,3912, # 7328
-7570,7571,7572,4278,7573,7574,7575,5007,7576,7577,5008,7578,7579,4279,2934,7580, # 7344
-7581,5009,7582,4570,7583,4280,7584,7585,7586,4571,4572,3913,7587,4573,3505,7588, # 7360
-5010,7589,7590,7591,7592,3798,4574,7593,7594,5011,7595,4281,7596,7597,7598,4282, # 7376
-5012,7599,7600,5013,3163,7601,5014,7602,3914,7603,7604,2734,4575,4576,4577,7605, # 7392
-7606,7607,7608,7609,3506,5015,4578,7610,4082,7611,2822,2901,2579,3683,3024,4579, # 7408
-3507,7612,4580,7613,3226,3799,5016,7614,7615,7616,7617,7618,7619,7620,2995,3290, # 7424
-7621,4083,7622,5017,7623,7624,7625,7626,7627,4581,3915,7628,3291,7629,5018,7630, # 7440
-7631,7632,7633,4084,7634,7635,3427,3800,7636,7637,4582,7638,5019,4583,5020,7639, # 7456
-3916,7640,3801,5021,4584,4283,7641,7642,3428,3591,2269,7643,2617,7644,4585,3592, # 7472
-7645,4586,2902,7646,7647,3227,5022,7648,4587,7649,4284,7650,7651,7652,4588,2284, # 7488
-7653,5023,7654,7655,7656,4589,5024,3802,7657,7658,5025,3508,4590,7659,7660,7661, # 7504
-1969,5026,7662,7663,3684,1821,2688,7664,2028,2509,4285,7665,2823,1841,7666,2689, # 7520
-3114,7667,3917,4085,2160,5027,5028,2972,7668,5029,7669,7670,7671,3593,4086,7672, # 7536
-4591,4087,5030,3803,7673,7674,7675,7676,7677,7678,7679,4286,2366,4592,4593,3067, # 7552
-2328,7680,7681,4594,3594,3918,2029,4287,7682,5031,3919,3370,4288,4595,2856,7683, # 7568
-3509,7684,7685,5032,5033,7686,7687,3804,2784,7688,7689,7690,7691,3371,7692,7693, # 7584
-2877,5034,7694,7695,3920,4289,4088,7696,7697,7698,5035,7699,5036,4290,5037,5038, # 7600
-5039,7700,7701,7702,5040,5041,3228,7703,1760,7704,5042,3229,4596,2106,4089,7705, # 7616
-4597,2824,5043,2107,3372,7706,4291,4090,5044,7707,4091,7708,5045,3025,3805,4598, # 7632
-4292,4293,4294,3373,7709,4599,7710,5046,7711,7712,5047,5048,3806,7713,7714,7715, # 7648
-5049,7716,7717,7718,7719,4600,5050,7720,7721,7722,5051,7723,4295,3429,7724,7725, # 7664
-7726,7727,3921,7728,3292,5052,4092,7729,7730,7731,7732,7733,7734,7735,5053,5054, # 7680
-7736,7737,7738,7739,3922,3685,7740,7741,7742,7743,2635,5055,7744,5056,4601,7745, # 7696
-7746,2560,7747,7748,7749,7750,3923,7751,7752,7753,7754,7755,4296,2903,7756,7757, # 7712
-7758,7759,7760,3924,7761,5057,4297,7762,7763,5058,4298,7764,4093,7765,7766,5059, # 7728
-3925,7767,7768,7769,7770,7771,7772,7773,7774,7775,7776,3595,7777,4299,5060,4094, # 7744
-7778,3293,5061,7779,7780,4300,7781,7782,4602,7783,3596,7784,7785,3430,2367,7786, # 7760
-3164,5062,5063,4301,7787,7788,4095,5064,5065,7789,3374,3115,7790,7791,7792,7793, # 7776
-7794,7795,7796,3597,4603,7797,7798,3686,3116,3807,5066,7799,7800,5067,7801,7802, # 7792
-4604,4302,5068,4303,4096,7803,7804,3294,7805,7806,5069,4605,2690,7807,3026,7808, # 7808
-7809,7810,7811,7812,7813,7814,7815,7816,7817,7818,7819,7820,7821,7822,7823,7824, # 7824
-7825,7826,7827,7828,7829,7830,7831,7832,7833,7834,7835,7836,7837,7838,7839,7840, # 7840
-7841,7842,7843,7844,7845,7846,7847,7848,7849,7850,7851,7852,7853,7854,7855,7856, # 7856
-7857,7858,7859,7860,7861,7862,7863,7864,7865,7866,7867,7868,7869,7870,7871,7872, # 7872
-7873,7874,7875,7876,7877,7878,7879,7880,7881,7882,7883,7884,7885,7886,7887,7888, # 7888
-7889,7890,7891,7892,7893,7894,7895,7896,7897,7898,7899,7900,7901,7902,7903,7904, # 7904
-7905,7906,7907,7908,7909,7910,7911,7912,7913,7914,7915,7916,7917,7918,7919,7920, # 7920
-7921,7922,7923,7924,3926,7925,7926,7927,7928,7929,7930,7931,7932,7933,7934,7935, # 7936
-7936,7937,7938,7939,7940,7941,7942,7943,7944,7945,7946,7947,7948,7949,7950,7951, # 7952
-7952,7953,7954,7955,7956,7957,7958,7959,7960,7961,7962,7963,7964,7965,7966,7967, # 7968
-7968,7969,7970,7971,7972,7973,7974,7975,7976,7977,7978,7979,7980,7981,7982,7983, # 7984
-7984,7985,7986,7987,7988,7989,7990,7991,7992,7993,7994,7995,7996,7997,7998,7999, # 8000
-8000,8001,8002,8003,8004,8005,8006,8007,8008,8009,8010,8011,8012,8013,8014,8015, # 8016
-8016,8017,8018,8019,8020,8021,8022,8023,8024,8025,8026,8027,8028,8029,8030,8031, # 8032
-8032,8033,8034,8035,8036,8037,8038,8039,8040,8041,8042,8043,8044,8045,8046,8047, # 8048
-8048,8049,8050,8051,8052,8053,8054,8055,8056,8057,8058,8059,8060,8061,8062,8063, # 8064
-8064,8065,8066,8067,8068,8069,8070,8071,8072,8073,8074,8075,8076,8077,8078,8079, # 8080
-8080,8081,8082,8083,8084,8085,8086,8087,8088,8089,8090,8091,8092,8093,8094,8095, # 8096
-8096,8097,8098,8099,8100,8101,8102,8103,8104,8105,8106,8107,8108,8109,8110,8111, # 8112
-8112,8113,8114,8115,8116,8117,8118,8119,8120,8121,8122,8123,8124,8125,8126,8127, # 8128
-8128,8129,8130,8131,8132,8133,8134,8135,8136,8137,8138,8139,8140,8141,8142,8143, # 8144
-8144,8145,8146,8147,8148,8149,8150,8151,8152,8153,8154,8155,8156,8157,8158,8159, # 8160
-8160,8161,8162,8163,8164,8165,8166,8167,8168,8169,8170,8171,8172,8173,8174,8175, # 8176
-8176,8177,8178,8179,8180,8181,8182,8183,8184,8185,8186,8187,8188,8189,8190,8191, # 8192
-8192,8193,8194,8195,8196,8197,8198,8199,8200,8201,8202,8203,8204,8205,8206,8207, # 8208
-8208,8209,8210,8211,8212,8213,8214,8215,8216,8217,8218,8219,8220,8221,8222,8223, # 8224
-8224,8225,8226,8227,8228,8229,8230,8231,8232,8233,8234,8235,8236,8237,8238,8239, # 8240
-8240,8241,8242,8243,8244,8245,8246,8247,8248,8249,8250,8251,8252,8253,8254,8255, # 8256
-8256,8257,8258,8259,8260,8261,8262,8263,8264,8265,8266,8267,8268,8269,8270,8271) # 8272
-
-# flake8: noqa
diff --git a/script/_Lib/requests/packages/chardet/jpcntx.py b/script/_Lib/requests/packages/chardet/jpcntx.py
deleted file mode 100644
index f7f69ba..0000000
--- a/script/_Lib/requests/packages/chardet/jpcntx.py
+++ /dev/null
@@ -1,219 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Communicator client code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-######################### END LICENSE BLOCK #########################
-
-from .compat import wrap_ord
-
-NUM_OF_CATEGORY = 6
-DONT_KNOW = -1
-ENOUGH_REL_THRESHOLD = 100
-MAX_REL_THRESHOLD = 1000
-MINIMUM_DATA_THRESHOLD = 4
-
-# This is hiragana 2-char sequence table, the number in each cell represents its frequency category
-jp2CharContext = (
-(0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1),
-(2,4,0,4,0,3,0,4,0,3,4,4,4,2,4,3,3,4,3,2,3,3,4,2,3,3,3,2,4,1,4,3,3,1,5,4,3,4,3,4,3,5,3,0,3,5,4,2,0,3,1,0,3,3,0,3,3,0,1,1,0,4,3,0,3,3,0,4,0,2,0,3,5,5,5,5,4,0,4,1,0,3,4),
-(0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2),
-(0,4,0,5,0,5,0,4,0,4,5,4,4,3,5,3,5,1,5,3,4,3,4,4,3,4,3,3,4,3,5,4,4,3,5,5,3,5,5,5,3,5,5,3,4,5,5,3,1,3,2,0,3,4,0,4,2,0,4,2,1,5,3,2,3,5,0,4,0,2,0,5,4,4,5,4,5,0,4,0,0,4,4),
-(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
-(0,3,0,4,0,3,0,3,0,4,5,4,3,3,3,3,4,3,5,4,4,3,5,4,4,3,4,3,4,4,4,4,5,3,4,4,3,4,5,5,4,5,5,1,4,5,4,3,0,3,3,1,3,3,0,4,4,0,3,3,1,5,3,3,3,5,0,4,0,3,0,4,4,3,4,3,3,0,4,1,1,3,4),
-(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
-(0,4,0,3,0,3,0,4,0,3,4,4,3,2,2,1,2,1,3,1,3,3,3,3,3,4,3,1,3,3,5,3,3,0,4,3,0,5,4,3,3,5,4,4,3,4,4,5,0,1,2,0,1,2,0,2,2,0,1,0,0,5,2,2,1,4,0,3,0,1,0,4,4,3,5,4,3,0,2,1,0,4,3),
-(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
-(0,3,0,5,0,4,0,2,1,4,4,2,4,1,4,2,4,2,4,3,3,3,4,3,3,3,3,1,4,2,3,3,3,1,4,4,1,1,1,4,3,3,2,0,2,4,3,2,0,3,3,0,3,1,1,0,0,0,3,3,0,4,2,2,3,4,0,4,0,3,0,4,4,5,3,4,4,0,3,0,0,1,4),
-(1,4,0,4,0,4,0,4,0,3,5,4,4,3,4,3,5,4,3,3,4,3,5,4,4,4,4,3,4,2,4,3,3,1,5,4,3,2,4,5,4,5,5,4,4,5,4,4,0,3,2,2,3,3,0,4,3,1,3,2,1,4,3,3,4,5,0,3,0,2,0,4,5,5,4,5,4,0,4,0,0,5,4),
-(0,5,0,5,0,4,0,3,0,4,4,3,4,3,3,3,4,0,4,4,4,3,4,3,4,3,3,1,4,2,4,3,4,0,5,4,1,4,5,4,4,5,3,2,4,3,4,3,2,4,1,3,3,3,2,3,2,0,4,3,3,4,3,3,3,4,0,4,0,3,0,4,5,4,4,4,3,0,4,1,0,1,3),
-(0,3,1,4,0,3,0,2,0,3,4,4,3,1,4,2,3,3,4,3,4,3,4,3,4,4,3,2,3,1,5,4,4,1,4,4,3,5,4,4,3,5,5,4,3,4,4,3,1,2,3,1,2,2,0,3,2,0,3,1,0,5,3,3,3,4,3,3,3,3,4,4,4,4,5,4,2,0,3,3,2,4,3),
-(0,2,0,3,0,1,0,1,0,0,3,2,0,0,2,0,1,0,2,1,3,3,3,1,2,3,1,0,1,0,4,2,1,1,3,3,0,4,3,3,1,4,3,3,0,3,3,2,0,0,0,0,1,0,0,2,0,0,0,0,0,4,1,0,2,3,2,2,2,1,3,3,3,4,4,3,2,0,3,1,0,3,3),
-(0,4,0,4,0,3,0,3,0,4,4,4,3,3,3,3,3,3,4,3,4,2,4,3,4,3,3,2,4,3,4,5,4,1,4,5,3,5,4,5,3,5,4,0,3,5,5,3,1,3,3,2,2,3,0,3,4,1,3,3,2,4,3,3,3,4,0,4,0,3,0,4,5,4,4,5,3,0,4,1,0,3,4),
-(0,2,0,3,0,3,0,0,0,2,2,2,1,0,1,0,0,0,3,0,3,0,3,0,1,3,1,0,3,1,3,3,3,1,3,3,3,0,1,3,1,3,4,0,0,3,1,1,0,3,2,0,0,0,0,1,3,0,1,0,0,3,3,2,0,3,0,0,0,0,0,3,4,3,4,3,3,0,3,0,0,2,3),
-(2,3,0,3,0,2,0,1,0,3,3,4,3,1,3,1,1,1,3,1,4,3,4,3,3,3,0,0,3,1,5,4,3,1,4,3,2,5,5,4,4,4,4,3,3,4,4,4,0,2,1,1,3,2,0,1,2,0,0,1,0,4,1,3,3,3,0,3,0,1,0,4,4,4,5,5,3,0,2,0,0,4,4),
-(0,2,0,1,0,3,1,3,0,2,3,3,3,0,3,1,0,0,3,0,3,2,3,1,3,2,1,1,0,0,4,2,1,0,2,3,1,4,3,2,0,4,4,3,1,3,1,3,0,1,0,0,1,0,0,0,1,0,0,0,0,4,1,1,1,2,0,3,0,0,0,3,4,2,4,3,2,0,1,0,0,3,3),
-(0,1,0,4,0,5,0,4,0,2,4,4,2,3,3,2,3,3,5,3,3,3,4,3,4,2,3,0,4,3,3,3,4,1,4,3,2,1,5,5,3,4,5,1,3,5,4,2,0,3,3,0,1,3,0,4,2,0,1,3,1,4,3,3,3,3,0,3,0,1,0,3,4,4,4,5,5,0,3,0,1,4,5),
-(0,2,0,3,0,3,0,0,0,2,3,1,3,0,4,0,1,1,3,0,3,4,3,2,3,1,0,3,3,2,3,1,3,0,2,3,0,2,1,4,1,2,2,0,0,3,3,0,0,2,0,0,0,1,0,0,0,0,2,2,0,3,2,1,3,3,0,2,0,2,0,0,3,3,1,2,4,0,3,0,2,2,3),
-(2,4,0,5,0,4,0,4,0,2,4,4,4,3,4,3,3,3,1,2,4,3,4,3,4,4,5,0,3,3,3,3,2,0,4,3,1,4,3,4,1,4,4,3,3,4,4,3,1,2,3,0,4,2,0,4,1,0,3,3,0,4,3,3,3,4,0,4,0,2,0,3,5,3,4,5,2,0,3,0,0,4,5),
-(0,3,0,4,0,1,0,1,0,1,3,2,2,1,3,0,3,0,2,0,2,0,3,0,2,0,0,0,1,0,1,1,0,0,3,1,0,0,0,4,0,3,1,0,2,1,3,0,0,0,0,0,0,3,0,0,0,0,0,0,0,4,2,2,3,1,0,3,0,0,0,1,4,4,4,3,0,0,4,0,0,1,4),
-(1,4,1,5,0,3,0,3,0,4,5,4,4,3,5,3,3,4,4,3,4,1,3,3,3,3,2,1,4,1,5,4,3,1,4,4,3,5,4,4,3,5,4,3,3,4,4,4,0,3,3,1,2,3,0,3,1,0,3,3,0,5,4,4,4,4,4,4,3,3,5,4,4,3,3,5,4,0,3,2,0,4,4),
-(0,2,0,3,0,1,0,0,0,1,3,3,3,2,4,1,3,0,3,1,3,0,2,2,1,1,0,0,2,0,4,3,1,0,4,3,0,4,4,4,1,4,3,1,1,3,3,1,0,2,0,0,1,3,0,0,0,0,2,0,0,4,3,2,4,3,5,4,3,3,3,4,3,3,4,3,3,0,2,1,0,3,3),
-(0,2,0,4,0,3,0,2,0,2,5,5,3,4,4,4,4,1,4,3,3,0,4,3,4,3,1,3,3,2,4,3,0,3,4,3,0,3,4,4,2,4,4,0,4,5,3,3,2,2,1,1,1,2,0,1,5,0,3,3,2,4,3,3,3,4,0,3,0,2,0,4,4,3,5,5,0,0,3,0,2,3,3),
-(0,3,0,4,0,3,0,1,0,3,4,3,3,1,3,3,3,0,3,1,3,0,4,3,3,1,1,0,3,0,3,3,0,0,4,4,0,1,5,4,3,3,5,0,3,3,4,3,0,2,0,1,1,1,0,1,3,0,1,2,1,3,3,2,3,3,0,3,0,1,0,1,3,3,4,4,1,0,1,2,2,1,3),
-(0,1,0,4,0,4,0,3,0,1,3,3,3,2,3,1,1,0,3,0,3,3,4,3,2,4,2,0,1,0,4,3,2,0,4,3,0,5,3,3,2,4,4,4,3,3,3,4,0,1,3,0,0,1,0,0,1,0,0,0,0,4,2,3,3,3,0,3,0,0,0,4,4,4,5,3,2,0,3,3,0,3,5),
-(0,2,0,3,0,0,0,3,0,1,3,0,2,0,0,0,1,0,3,1,1,3,3,0,0,3,0,0,3,0,2,3,1,0,3,1,0,3,3,2,0,4,2,2,0,2,0,0,0,4,0,0,0,0,0,0,0,0,0,0,0,2,1,2,0,1,0,1,0,0,0,1,3,1,2,0,0,0,1,0,0,1,4),
-(0,3,0,3,0,5,0,1,0,2,4,3,1,3,3,2,1,1,5,2,1,0,5,1,2,0,0,0,3,3,2,2,3,2,4,3,0,0,3,3,1,3,3,0,2,5,3,4,0,3,3,0,1,2,0,2,2,0,3,2,0,2,2,3,3,3,0,2,0,1,0,3,4,4,2,5,4,0,3,0,0,3,5),
-(0,3,0,3,0,3,0,1,0,3,3,3,3,0,3,0,2,0,2,1,1,0,2,0,1,0,0,0,2,1,0,0,1,0,3,2,0,0,3,3,1,2,3,1,0,3,3,0,0,1,0,0,0,0,0,2,0,0,0,0,0,2,3,1,2,3,0,3,0,1,0,3,2,1,0,4,3,0,1,1,0,3,3),
-(0,4,0,5,0,3,0,3,0,4,5,5,4,3,5,3,4,3,5,3,3,2,5,3,4,4,4,3,4,3,4,5,5,3,4,4,3,4,4,5,4,4,4,3,4,5,5,4,2,3,4,2,3,4,0,3,3,1,4,3,2,4,3,3,5,5,0,3,0,3,0,5,5,5,5,4,4,0,4,0,1,4,4),
-(0,4,0,4,0,3,0,3,0,3,5,4,4,2,3,2,5,1,3,2,5,1,4,2,3,2,3,3,4,3,3,3,3,2,5,4,1,3,3,5,3,4,4,0,4,4,3,1,1,3,1,0,2,3,0,2,3,0,3,0,0,4,3,1,3,4,0,3,0,2,0,4,4,4,3,4,5,0,4,0,0,3,4),
-(0,3,0,3,0,3,1,2,0,3,4,4,3,3,3,0,2,2,4,3,3,1,3,3,3,1,1,0,3,1,4,3,2,3,4,4,2,4,4,4,3,4,4,3,2,4,4,3,1,3,3,1,3,3,0,4,1,0,2,2,1,4,3,2,3,3,5,4,3,3,5,4,4,3,3,0,4,0,3,2,2,4,4),
-(0,2,0,1,0,0,0,0,0,1,2,1,3,0,0,0,0,0,2,0,1,2,1,0,0,1,0,0,0,0,3,0,0,1,0,1,1,3,1,0,0,0,1,1,0,1,1,0,0,0,0,0,2,0,0,0,0,0,0,0,0,1,1,2,2,0,3,4,0,0,0,1,1,0,0,1,0,0,0,0,0,1,1),
-(0,1,0,0,0,1,0,0,0,0,4,0,4,1,4,0,3,0,4,0,3,0,4,0,3,0,3,0,4,1,5,1,4,0,0,3,0,5,0,5,2,0,1,0,0,0,2,1,4,0,1,3,0,0,3,0,0,3,1,1,4,1,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0),
-(1,4,0,5,0,3,0,2,0,3,5,4,4,3,4,3,5,3,4,3,3,0,4,3,3,3,3,3,3,2,4,4,3,1,3,4,4,5,4,4,3,4,4,1,3,5,4,3,3,3,1,2,2,3,3,1,3,1,3,3,3,5,3,3,4,5,0,3,0,3,0,3,4,3,4,4,3,0,3,0,2,4,3),
-(0,1,0,4,0,0,0,0,0,1,4,0,4,1,4,2,4,0,3,0,1,0,1,0,0,0,0,0,2,0,3,1,1,1,0,3,0,0,0,1,2,1,0,0,1,1,1,1,0,1,0,0,0,1,0,0,3,0,0,0,0,3,2,0,2,2,0,1,0,0,0,2,3,2,3,3,0,0,0,0,2,1,0),
-(0,5,1,5,0,3,0,3,0,5,4,4,5,1,5,3,3,0,4,3,4,3,5,3,4,3,3,2,4,3,4,3,3,0,3,3,1,4,4,3,4,4,4,3,4,5,5,3,2,3,1,1,3,3,1,3,1,1,3,3,2,4,5,3,3,5,0,4,0,3,0,4,4,3,5,3,3,0,3,4,0,4,3),
-(0,5,0,5,0,3,0,2,0,4,4,3,5,2,4,3,3,3,4,4,4,3,5,3,5,3,3,1,4,0,4,3,3,0,3,3,0,4,4,4,4,5,4,3,3,5,5,3,2,3,1,2,3,2,0,1,0,0,3,2,2,4,4,3,1,5,0,4,0,3,0,4,3,1,3,2,1,0,3,3,0,3,3),
-(0,4,0,5,0,5,0,4,0,4,5,5,5,3,4,3,3,2,5,4,4,3,5,3,5,3,4,0,4,3,4,4,3,2,4,4,3,4,5,4,4,5,5,0,3,5,5,4,1,3,3,2,3,3,1,3,1,0,4,3,1,4,4,3,4,5,0,4,0,2,0,4,3,4,4,3,3,0,4,0,0,5,5),
-(0,4,0,4,0,5,0,1,1,3,3,4,4,3,4,1,3,0,5,1,3,0,3,1,3,1,1,0,3,0,3,3,4,0,4,3,0,4,4,4,3,4,4,0,3,5,4,1,0,3,0,0,2,3,0,3,1,0,3,1,0,3,2,1,3,5,0,3,0,1,0,3,2,3,3,4,4,0,2,2,0,4,4),
-(2,4,0,5,0,4,0,3,0,4,5,5,4,3,5,3,5,3,5,3,5,2,5,3,4,3,3,4,3,4,5,3,2,1,5,4,3,2,3,4,5,3,4,1,2,5,4,3,0,3,3,0,3,2,0,2,3,0,4,1,0,3,4,3,3,5,0,3,0,1,0,4,5,5,5,4,3,0,4,2,0,3,5),
-(0,5,0,4,0,4,0,2,0,5,4,3,4,3,4,3,3,3,4,3,4,2,5,3,5,3,4,1,4,3,4,4,4,0,3,5,0,4,4,4,4,5,3,1,3,4,5,3,3,3,3,3,3,3,0,2,2,0,3,3,2,4,3,3,3,5,3,4,1,3,3,5,3,2,0,0,0,0,4,3,1,3,3),
-(0,1,0,3,0,3,0,1,0,1,3,3,3,2,3,3,3,0,3,0,0,0,3,1,3,0,0,0,2,2,2,3,0,0,3,2,0,1,2,4,1,3,3,0,0,3,3,3,0,1,0,0,2,1,0,0,3,0,3,1,0,3,0,0,1,3,0,2,0,1,0,3,3,1,3,3,0,0,1,1,0,3,3),
-(0,2,0,3,0,2,1,4,0,2,2,3,1,1,3,1,1,0,2,0,3,1,2,3,1,3,0,0,1,0,4,3,2,3,3,3,1,4,2,3,3,3,3,1,0,3,1,4,0,1,1,0,1,2,0,1,1,0,1,1,0,3,1,3,2,2,0,1,0,0,0,2,3,3,3,1,0,0,0,0,0,2,3),
-(0,5,0,4,0,5,0,2,0,4,5,5,3,3,4,3,3,1,5,4,4,2,4,4,4,3,4,2,4,3,5,5,4,3,3,4,3,3,5,5,4,5,5,1,3,4,5,3,1,4,3,1,3,3,0,3,3,1,4,3,1,4,5,3,3,5,0,4,0,3,0,5,3,3,1,4,3,0,4,0,1,5,3),
-(0,5,0,5,0,4,0,2,0,4,4,3,4,3,3,3,3,3,5,4,4,4,4,4,4,5,3,3,5,2,4,4,4,3,4,4,3,3,4,4,5,5,3,3,4,3,4,3,3,4,3,3,3,3,1,2,2,1,4,3,3,5,4,4,3,4,0,4,0,3,0,4,4,4,4,4,1,0,4,2,0,2,4),
-(0,4,0,4,0,3,0,1,0,3,5,2,3,0,3,0,2,1,4,2,3,3,4,1,4,3,3,2,4,1,3,3,3,0,3,3,0,0,3,3,3,5,3,3,3,3,3,2,0,2,0,0,2,0,0,2,0,0,1,0,0,3,1,2,2,3,0,3,0,2,0,4,4,3,3,4,1,0,3,0,0,2,4),
-(0,0,0,4,0,0,0,0,0,0,1,0,1,0,2,0,0,0,0,0,1,0,2,0,1,0,0,0,0,0,3,1,3,0,3,2,0,0,0,1,0,3,2,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,4,0,2,0,0,0,0,0,0,2),
-(0,2,1,3,0,2,0,2,0,3,3,3,3,1,3,1,3,3,3,3,3,3,4,2,2,1,2,1,4,0,4,3,1,3,3,3,2,4,3,5,4,3,3,3,3,3,3,3,0,1,3,0,2,0,0,1,0,0,1,0,0,4,2,0,2,3,0,3,3,0,3,3,4,2,3,1,4,0,1,2,0,2,3),
-(0,3,0,3,0,1,0,3,0,2,3,3,3,0,3,1,2,0,3,3,2,3,3,2,3,2,3,1,3,0,4,3,2,0,3,3,1,4,3,3,2,3,4,3,1,3,3,1,1,0,1,1,0,1,0,1,0,1,0,0,0,4,1,1,0,3,0,3,1,0,2,3,3,3,3,3,1,0,0,2,0,3,3),
-(0,0,0,0,0,0,0,0,0,0,3,0,2,0,3,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,3,0,3,0,3,1,0,1,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,2,0,2,3,0,0,0,0,0,0,0,0,3),
-(0,2,0,3,1,3,0,3,0,2,3,3,3,1,3,1,3,1,3,1,3,3,3,1,3,0,2,3,1,1,4,3,3,2,3,3,1,2,2,4,1,3,3,0,1,4,2,3,0,1,3,0,3,0,0,1,3,0,2,0,0,3,3,2,1,3,0,3,0,2,0,3,4,4,4,3,1,0,3,0,0,3,3),
-(0,2,0,1,0,2,0,0,0,1,3,2,2,1,3,0,1,1,3,0,3,2,3,1,2,0,2,0,1,1,3,3,3,0,3,3,1,1,2,3,2,3,3,1,2,3,2,0,0,1,0,0,0,0,0,0,3,0,1,0,0,2,1,2,1,3,0,3,0,0,0,3,4,4,4,3,2,0,2,0,0,2,4),
-(0,0,0,1,0,1,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,0,2,2,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,3,1,0,0,0,0,0,0,0,3),
-(0,3,0,3,0,2,0,3,0,3,3,3,2,3,2,2,2,0,3,1,3,3,3,2,3,3,0,0,3,0,3,2,2,0,2,3,1,4,3,4,3,3,2,3,1,5,4,4,0,3,1,2,1,3,0,3,1,1,2,0,2,3,1,3,1,3,0,3,0,1,0,3,3,4,4,2,1,0,2,1,0,2,4),
-(0,1,0,3,0,1,0,2,0,1,4,2,5,1,4,0,2,0,2,1,3,1,4,0,2,1,0,0,2,1,4,1,1,0,3,3,0,5,1,3,2,3,3,1,0,3,2,3,0,1,0,0,0,0,0,0,1,0,0,0,0,4,0,1,0,3,0,2,0,1,0,3,3,3,4,3,3,0,0,0,0,2,3),
-(0,0,0,1,0,0,0,0,0,0,2,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,1,0,0,1,0,0,0,0,0,3),
-(0,1,0,3,0,4,0,3,0,2,4,3,1,0,3,2,2,1,3,1,2,2,3,1,1,1,2,1,3,0,1,2,0,1,3,2,1,3,0,5,5,1,0,0,1,3,2,1,0,3,0,0,1,0,0,0,0,0,3,4,0,1,1,1,3,2,0,2,0,1,0,2,3,3,1,2,3,0,1,0,1,0,4),
-(0,0,0,1,0,3,0,3,0,2,2,1,0,0,4,0,3,0,3,1,3,0,3,0,3,0,1,0,3,0,3,1,3,0,3,3,0,0,1,2,1,1,1,0,1,2,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,2,2,1,2,0,0,2,0,0,0,0,2,3,3,3,3,0,0,0,0,1,4),
-(0,0,0,3,0,3,0,0,0,0,3,1,1,0,3,0,1,0,2,0,1,0,0,0,0,0,0,0,1,0,3,0,2,0,2,3,0,0,2,2,3,1,2,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,2,0,0,0,0,2,3),
-(2,4,0,5,0,5,0,4,0,3,4,3,3,3,4,3,3,3,4,3,4,4,5,4,5,5,5,2,3,0,5,5,4,1,5,4,3,1,5,4,3,4,4,3,3,4,3,3,0,3,2,0,2,3,0,3,0,0,3,3,0,5,3,2,3,3,0,3,0,3,0,3,4,5,4,5,3,0,4,3,0,3,4),
-(0,3,0,3,0,3,0,3,0,3,3,4,3,2,3,2,3,0,4,3,3,3,3,3,3,3,3,0,3,2,4,3,3,1,3,4,3,4,4,4,3,4,4,3,2,4,4,1,0,2,0,0,1,1,0,2,0,0,3,1,0,5,3,2,1,3,0,3,0,1,2,4,3,2,4,3,3,0,3,2,0,4,4),
-(0,3,0,3,0,1,0,0,0,1,4,3,3,2,3,1,3,1,4,2,3,2,4,2,3,4,3,0,2,2,3,3,3,0,3,3,3,0,3,4,1,3,3,0,3,4,3,3,0,1,1,0,1,0,0,0,4,0,3,0,0,3,1,2,1,3,0,4,0,1,0,4,3,3,4,3,3,0,2,0,0,3,3),
-(0,3,0,4,0,1,0,3,0,3,4,3,3,0,3,3,3,1,3,1,3,3,4,3,3,3,0,0,3,1,5,3,3,1,3,3,2,5,4,3,3,4,5,3,2,5,3,4,0,1,0,0,0,0,0,2,0,0,1,1,0,4,2,2,1,3,0,3,0,2,0,4,4,3,5,3,2,0,1,1,0,3,4),
-(0,5,0,4,0,5,0,2,0,4,4,3,3,2,3,3,3,1,4,3,4,1,5,3,4,3,4,0,4,2,4,3,4,1,5,4,0,4,4,4,4,5,4,1,3,5,4,2,1,4,1,1,3,2,0,3,1,0,3,2,1,4,3,3,3,4,0,4,0,3,0,4,4,4,3,3,3,0,4,2,0,3,4),
-(1,4,0,4,0,3,0,1,0,3,3,3,1,1,3,3,2,2,3,3,1,0,3,2,2,1,2,0,3,1,2,1,2,0,3,2,0,2,2,3,3,4,3,0,3,3,1,2,0,1,1,3,1,2,0,0,3,0,1,1,0,3,2,2,3,3,0,3,0,0,0,2,3,3,4,3,3,0,1,0,0,1,4),
-(0,4,0,4,0,4,0,0,0,3,4,4,3,1,4,2,3,2,3,3,3,1,4,3,4,0,3,0,4,2,3,3,2,2,5,4,2,1,3,4,3,4,3,1,3,3,4,2,0,2,1,0,3,3,0,0,2,0,3,1,0,4,4,3,4,3,0,4,0,1,0,2,4,4,4,4,4,0,3,2,0,3,3),
-(0,0,0,1,0,4,0,0,0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,3,2,0,0,1,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,2),
-(0,2,0,3,0,4,0,4,0,1,3,3,3,0,4,0,2,1,2,1,1,1,2,0,3,1,1,0,1,0,3,1,0,0,3,3,2,0,1,1,0,0,0,0,0,1,0,2,0,2,2,0,3,1,0,0,1,0,1,1,0,1,2,0,3,0,0,0,0,1,0,0,3,3,4,3,1,0,1,0,3,0,2),
-(0,0,0,3,0,5,0,0,0,0,1,0,2,0,3,1,0,1,3,0,0,0,2,0,0,0,1,0,0,0,1,1,0,0,4,0,0,0,2,3,0,1,4,1,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,1,0,0,0,0,0,0,0,2,0,0,3,0,0,0,0,0,3),
-(0,2,0,5,0,5,0,1,0,2,4,3,3,2,5,1,3,2,3,3,3,0,4,1,2,0,3,0,4,0,2,2,1,1,5,3,0,0,1,4,2,3,2,0,3,3,3,2,0,2,4,1,1,2,0,1,1,0,3,1,0,1,3,1,2,3,0,2,0,0,0,1,3,5,4,4,4,0,3,0,0,1,3),
-(0,4,0,5,0,4,0,4,0,4,5,4,3,3,4,3,3,3,4,3,4,4,5,3,4,5,4,2,4,2,3,4,3,1,4,4,1,3,5,4,4,5,5,4,4,5,5,5,2,3,3,1,4,3,1,3,3,0,3,3,1,4,3,4,4,4,0,3,0,4,0,3,3,4,4,5,0,0,4,3,0,4,5),
-(0,4,0,4,0,3,0,3,0,3,4,4,4,3,3,2,4,3,4,3,4,3,5,3,4,3,2,1,4,2,4,4,3,1,3,4,2,4,5,5,3,4,5,4,1,5,4,3,0,3,2,2,3,2,1,3,1,0,3,3,3,5,3,3,3,5,4,4,2,3,3,4,3,3,3,2,1,0,3,2,1,4,3),
-(0,4,0,5,0,4,0,3,0,3,5,5,3,2,4,3,4,0,5,4,4,1,4,4,4,3,3,3,4,3,5,5,2,3,3,4,1,2,5,5,3,5,5,2,3,5,5,4,0,3,2,0,3,3,1,1,5,1,4,1,0,4,3,2,3,5,0,4,0,3,0,5,4,3,4,3,0,0,4,1,0,4,4),
-(1,3,0,4,0,2,0,2,0,2,5,5,3,3,3,3,3,0,4,2,3,4,4,4,3,4,0,0,3,4,5,4,3,3,3,3,2,5,5,4,5,5,5,4,3,5,5,5,1,3,1,0,1,0,0,3,2,0,4,2,0,5,2,3,2,4,1,3,0,3,0,4,5,4,5,4,3,0,4,2,0,5,4),
-(0,3,0,4,0,5,0,3,0,3,4,4,3,2,3,2,3,3,3,3,3,2,4,3,3,2,2,0,3,3,3,3,3,1,3,3,3,0,4,4,3,4,4,1,1,4,4,2,0,3,1,0,1,1,0,4,1,0,2,3,1,3,3,1,3,4,0,3,0,1,0,3,1,3,0,0,1,0,2,0,0,4,4),
-(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
-(0,3,0,3,0,2,0,3,0,1,5,4,3,3,3,1,4,2,1,2,3,4,4,2,4,4,5,0,3,1,4,3,4,0,4,3,3,3,2,3,2,5,3,4,3,2,2,3,0,0,3,0,2,1,0,1,2,0,0,0,0,2,1,1,3,1,0,2,0,4,0,3,4,4,4,5,2,0,2,0,0,1,3),
-(0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,1,1,1,0,0,1,1,0,0,0,4,2,1,1,0,1,0,3,2,0,0,3,1,1,1,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,1,0,0,0,2,0,0,0,1,4,0,4,2,1,0,0,0,0,0,1),
-(0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,1,0,0,0,0,0,0,1,0,1,0,0,0,0,3,1,0,0,0,2,0,2,1,0,0,1,2,1,0,1,1,0,0,3,0,0,0,0,0,0,0,0,0,0,0,1,3,1,0,0,0,0,0,1,0,0,2,1,0,0,0,0,0,0,0,0,2),
-(0,4,0,4,0,4,0,3,0,4,4,3,4,2,4,3,2,0,4,4,4,3,5,3,5,3,3,2,4,2,4,3,4,3,1,4,0,2,3,4,4,4,3,3,3,4,4,4,3,4,1,3,4,3,2,1,2,1,3,3,3,4,4,3,3,5,0,4,0,3,0,4,3,3,3,2,1,0,3,0,0,3,3),
-(0,4,0,3,0,3,0,3,0,3,5,5,3,3,3,3,4,3,4,3,3,3,4,4,4,3,3,3,3,4,3,5,3,3,1,3,2,4,5,5,5,5,4,3,4,5,5,3,2,2,3,3,3,3,2,3,3,1,2,3,2,4,3,3,3,4,0,4,0,2,0,4,3,2,2,1,2,0,3,0,0,4,1),
-)
-
-class JapaneseContextAnalysis:
- def __init__(self):
- self.reset()
-
- def reset(self):
- self._mTotalRel = 0 # total sequence received
- # category counters, each interger counts sequence in its category
- self._mRelSample = [0] * NUM_OF_CATEGORY
- # if last byte in current buffer is not the last byte of a character,
- # we need to know how many bytes to skip in next buffer
- self._mNeedToSkipCharNum = 0
- self._mLastCharOrder = -1 # The order of previous char
- # If this flag is set to True, detection is done and conclusion has
- # been made
- self._mDone = False
-
- def feed(self, aBuf, aLen):
- if self._mDone:
- return
-
- # The buffer we got is byte oriented, and a character may span in more than one
- # buffers. In case the last one or two byte in last buffer is not
- # complete, we record how many byte needed to complete that character
- # and skip these bytes here. We can choose to record those bytes as
- # well and analyse the character once it is complete, but since a
- # character will not make much difference, by simply skipping
- # this character will simply our logic and improve performance.
- i = self._mNeedToSkipCharNum
- while i < aLen:
- order, charLen = self.get_order(aBuf[i:i + 2])
- i += charLen
- if i > aLen:
- self._mNeedToSkipCharNum = i - aLen
- self._mLastCharOrder = -1
- else:
- if (order != -1) and (self._mLastCharOrder != -1):
- self._mTotalRel += 1
- if self._mTotalRel > MAX_REL_THRESHOLD:
- self._mDone = True
- break
- self._mRelSample[jp2CharContext[self._mLastCharOrder][order]] += 1
- self._mLastCharOrder = order
-
- def got_enough_data(self):
- return self._mTotalRel > ENOUGH_REL_THRESHOLD
-
- def get_confidence(self):
- # This is just one way to calculate confidence. It works well for me.
- if self._mTotalRel > MINIMUM_DATA_THRESHOLD:
- return (self._mTotalRel - self._mRelSample[0]) / self._mTotalRel
- else:
- return DONT_KNOW
-
- def get_order(self, aBuf):
- return -1, 1
-
-class SJISContextAnalysis(JapaneseContextAnalysis):
- def get_order(self, aBuf):
- if not aBuf:
- return -1, 1
- # find out current char's byte length
- first_char = wrap_ord(aBuf[0])
- if ((0x81 <= first_char <= 0x9F) or (0xE0 <= first_char <= 0xFC)):
- charLen = 2
- else:
- charLen = 1
-
- # return its order if it is hiragana
- if len(aBuf) > 1:
- second_char = wrap_ord(aBuf[1])
- if (first_char == 202) and (0x9F <= second_char <= 0xF1):
- return second_char - 0x9F, charLen
-
- return -1, charLen
-
-class EUCJPContextAnalysis(JapaneseContextAnalysis):
- def get_order(self, aBuf):
- if not aBuf:
- return -1, 1
- # find out current char's byte length
- first_char = wrap_ord(aBuf[0])
- if (first_char == 0x8E) or (0xA1 <= first_char <= 0xFE):
- charLen = 2
- elif first_char == 0x8F:
- charLen = 3
- else:
- charLen = 1
-
- # return its order if it is hiragana
- if len(aBuf) > 1:
- second_char = wrap_ord(aBuf[1])
- if (first_char == 0xA4) and (0xA1 <= second_char <= 0xF3):
- return second_char - 0xA1, charLen
-
- return -1, charLen
-
-# flake8: noqa
diff --git a/script/_Lib/requests/packages/chardet/langbulgarianmodel.py b/script/_Lib/requests/packages/chardet/langbulgarianmodel.py
deleted file mode 100644
index e5788fc..0000000
--- a/script/_Lib/requests/packages/chardet/langbulgarianmodel.py
+++ /dev/null
@@ -1,229 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Communicator client code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-######################### END LICENSE BLOCK #########################
-
-# 255: Control characters that usually does not exist in any text
-# 254: Carriage/Return
-# 253: symbol (punctuation) that does not belong to word
-# 252: 0 - 9
-
-# Character Mapping Table:
-# this table is modified base on win1251BulgarianCharToOrderMap, so
-# only number <64 is sure valid
-
-Latin5_BulgarianCharToOrderMap = (
-255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255, # 00
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, # 10
-253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253, # 20
-252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253, # 30
-253, 77, 90, 99,100, 72,109,107,101, 79,185, 81,102, 76, 94, 82, # 40
-110,186,108, 91, 74,119, 84, 96,111,187,115,253,253,253,253,253, # 50
-253, 65, 69, 70, 66, 63, 68,112,103, 92,194,104, 95, 86, 87, 71, # 60
-116,195, 85, 93, 97,113,196,197,198,199,200,253,253,253,253,253, # 70
-194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209, # 80
-210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225, # 90
- 81,226,227,228,229,230,105,231,232,233,234,235,236, 45,237,238, # a0
- 31, 32, 35, 43, 37, 44, 55, 47, 40, 59, 33, 46, 38, 36, 41, 30, # b0
- 39, 28, 34, 51, 48, 49, 53, 50, 54, 57, 61,239, 67,240, 60, 56, # c0
- 1, 18, 9, 20, 11, 3, 23, 15, 2, 26, 12, 10, 14, 6, 4, 13, # d0
- 7, 8, 5, 19, 29, 25, 22, 21, 27, 24, 17, 75, 52,241, 42, 16, # e0
- 62,242,243,244, 58,245, 98,246,247,248,249,250,251, 91,252,253, # f0
-)
-
-win1251BulgarianCharToOrderMap = (
-255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255, # 00
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, # 10
-253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253, # 20
-252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253, # 30
-253, 77, 90, 99,100, 72,109,107,101, 79,185, 81,102, 76, 94, 82, # 40
-110,186,108, 91, 74,119, 84, 96,111,187,115,253,253,253,253,253, # 50
-253, 65, 69, 70, 66, 63, 68,112,103, 92,194,104, 95, 86, 87, 71, # 60
-116,195, 85, 93, 97,113,196,197,198,199,200,253,253,253,253,253, # 70
-206,207,208,209,210,211,212,213,120,214,215,216,217,218,219,220, # 80
-221, 78, 64, 83,121, 98,117,105,222,223,224,225,226,227,228,229, # 90
- 88,230,231,232,233,122, 89,106,234,235,236,237,238, 45,239,240, # a0
- 73, 80,118,114,241,242,243,244,245, 62, 58,246,247,248,249,250, # b0
- 31, 32, 35, 43, 37, 44, 55, 47, 40, 59, 33, 46, 38, 36, 41, 30, # c0
- 39, 28, 34, 51, 48, 49, 53, 50, 54, 57, 61,251, 67,252, 60, 56, # d0
- 1, 18, 9, 20, 11, 3, 23, 15, 2, 26, 12, 10, 14, 6, 4, 13, # e0
- 7, 8, 5, 19, 29, 25, 22, 21, 27, 24, 17, 75, 52,253, 42, 16, # f0
-)
-
-# Model Table:
-# total sequences: 100%
-# first 512 sequences: 96.9392%
-# first 1024 sequences:3.0618%
-# rest sequences: 0.2992%
-# negative sequences: 0.0020%
-BulgarianLangModel = (
-0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,3,3,3,3,3,3,3,3,2,3,3,3,3,3,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,3,3,3,2,2,3,2,2,1,2,2,
-3,1,3,3,2,3,3,3,3,3,3,3,3,3,3,3,3,0,3,3,3,3,3,3,3,3,3,3,0,3,0,1,
-0,0,0,0,0,0,0,0,0,0,1,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,3,2,3,3,3,3,3,3,3,3,0,3,1,0,
-0,1,0,0,0,0,0,0,0,0,1,1,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
-3,2,2,2,3,3,3,3,3,3,3,3,3,3,3,3,3,1,3,2,3,3,3,3,3,3,3,3,0,3,0,0,
-0,0,0,0,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,2,3,3,2,3,3,3,3,3,3,3,3,3,3,3,3,1,3,2,3,3,3,3,3,3,3,3,0,3,0,0,
-0,0,0,0,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,2,3,2,2,1,3,3,3,3,2,2,2,1,1,2,0,1,0,1,0,0,
-0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,1,
-3,3,3,3,3,3,3,2,3,2,2,3,3,1,1,2,3,3,2,3,3,3,3,2,1,2,0,2,0,3,0,0,
-0,0,0,0,0,0,0,1,0,0,2,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,1,
-3,3,3,3,3,3,3,1,3,3,3,3,3,2,3,2,3,3,3,3,3,2,3,3,1,3,0,3,0,2,0,0,
-0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,
-3,3,3,3,3,3,3,3,1,3,3,2,3,3,3,1,3,3,2,3,2,2,2,0,0,2,0,2,0,2,0,0,
-0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,1,
-3,3,3,3,3,3,3,3,3,0,3,3,3,2,2,3,3,3,1,2,2,3,2,1,1,2,0,2,0,0,0,0,
-1,0,0,0,0,0,0,0,0,0,2,0,0,1,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,
-3,3,3,3,3,3,3,2,3,3,1,2,3,2,2,2,3,3,3,3,3,2,2,3,1,2,0,2,1,2,0,0,
-0,0,0,0,0,0,0,0,0,0,3,0,0,1,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,1,
-3,3,3,3,3,1,3,3,3,3,3,2,3,3,3,2,3,3,2,3,2,2,2,3,1,2,0,1,0,1,0,0,
-0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,
-3,3,3,3,3,3,3,3,3,3,3,1,1,1,2,2,1,3,1,3,2,2,3,0,0,1,0,1,0,1,0,0,
-0,0,0,1,0,0,0,0,1,0,2,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,
-3,3,3,3,3,2,2,3,2,2,3,1,2,1,1,1,2,3,1,3,1,2,2,0,1,1,1,1,0,1,0,0,
-0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,
-3,3,3,3,3,1,3,2,2,3,3,1,2,3,1,1,3,3,3,3,1,2,2,1,1,1,0,2,0,2,0,1,
-0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,2,2,3,3,3,2,2,1,1,2,0,2,0,1,0,0,
-0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,
-3,0,1,2,1,3,3,2,3,3,3,3,3,2,3,2,1,0,3,1,2,1,2,1,2,3,2,1,0,1,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,2,3,3,3,3,3,3,3,3,3,3,3,3,0,0,3,1,3,3,2,3,3,2,2,2,0,1,0,0,
-0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,3,3,3,3,0,3,3,3,3,3,2,1,1,2,1,3,3,0,3,1,1,1,1,3,2,0,1,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,
-3,3,2,2,2,3,3,3,3,3,3,3,3,3,3,3,1,1,3,1,3,3,2,3,2,2,2,3,0,2,0,0,
-0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,2,3,3,2,2,3,2,1,1,1,1,1,3,1,3,1,1,0,0,0,1,0,0,0,1,0,0,
-0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,2,3,2,0,3,2,0,3,0,2,0,0,2,1,3,1,0,0,1,0,0,0,1,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
-3,3,3,3,2,1,1,1,1,2,1,1,2,1,1,1,2,2,1,2,1,1,1,0,1,1,0,1,0,1,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,
-3,3,3,3,2,1,3,1,1,2,1,3,2,1,1,0,1,2,3,2,1,1,1,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,3,3,3,3,2,2,1,0,1,0,0,1,0,0,0,2,1,0,3,0,0,1,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
-3,3,3,2,3,2,3,3,1,3,2,1,1,1,2,1,1,2,1,3,0,1,0,0,0,1,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,1,1,2,2,3,3,2,3,2,2,2,3,1,2,2,1,1,2,1,1,2,2,0,1,1,0,1,0,2,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,2,1,3,1,0,2,2,1,3,2,1,0,0,2,0,2,0,1,0,0,0,0,0,0,0,1,0,0,
-0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,
-3,3,3,3,3,3,1,2,0,2,3,1,2,3,2,0,1,3,1,2,1,1,1,0,0,1,0,0,2,2,2,3,
-2,2,2,2,1,2,1,1,2,2,1,1,2,0,1,1,1,0,0,1,1,0,0,1,1,0,0,0,1,1,0,1,
-3,3,3,3,3,2,1,2,2,1,2,0,2,0,1,0,1,2,1,2,1,1,0,0,0,1,0,1,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,1,
-3,3,2,3,3,1,1,3,1,0,3,2,1,0,0,0,1,2,0,2,0,1,0,0,0,1,0,1,2,1,2,2,
-1,1,1,1,1,1,1,2,2,2,1,1,1,1,1,1,1,0,1,2,1,1,1,0,0,0,0,0,1,1,0,0,
-3,1,0,1,0,2,3,2,2,2,3,2,2,2,2,2,1,0,2,1,2,1,1,1,0,1,2,1,2,2,2,1,
-1,1,2,2,2,2,1,2,1,1,0,1,2,1,2,2,2,1,1,1,0,1,1,1,1,2,0,1,0,0,0,0,
-2,3,2,3,3,0,0,2,1,0,2,1,0,0,0,0,2,3,0,2,0,0,0,0,0,1,0,0,2,0,1,2,
-2,1,2,1,2,2,1,1,1,2,1,1,1,0,1,2,2,1,1,1,1,1,0,1,1,1,0,0,1,2,0,0,
-3,3,2,2,3,0,2,3,1,1,2,0,0,0,1,0,0,2,0,2,0,0,0,1,0,1,0,1,2,0,2,2,
-1,1,1,1,2,1,0,1,2,2,2,1,1,1,1,1,1,1,0,1,1,1,0,0,0,0,0,0,1,1,0,0,
-2,3,2,3,3,0,0,3,0,1,1,0,1,0,0,0,2,2,1,2,0,0,0,0,0,0,0,0,2,0,1,2,
-2,2,1,1,1,1,1,2,2,2,1,0,2,0,1,0,1,0,0,1,0,1,0,0,1,0,0,0,0,1,0,0,
-3,3,3,3,2,2,2,2,2,0,2,1,1,1,1,2,1,2,1,1,0,2,0,1,0,1,0,0,2,0,1,2,
-1,1,1,1,1,1,1,2,2,1,1,0,2,0,1,0,2,0,0,1,1,1,0,0,2,0,0,0,1,1,0,0,
-2,3,3,3,3,1,0,0,0,0,0,0,0,0,0,0,2,0,0,1,1,0,0,0,0,0,0,1,2,0,1,2,
-2,2,2,1,1,2,1,1,2,2,2,1,2,0,1,1,1,1,1,1,0,1,1,1,1,0,0,1,1,1,0,0,
-2,3,3,3,3,0,2,2,0,2,1,0,0,0,1,1,1,2,0,2,0,0,0,3,0,0,0,0,2,0,2,2,
-1,1,1,2,1,2,1,1,2,2,2,1,2,0,1,1,1,0,1,1,1,1,0,2,1,0,0,0,1,1,0,0,
-2,3,3,3,3,0,2,1,0,0,2,0,0,0,0,0,1,2,0,2,0,0,0,0,0,0,0,0,2,0,1,2,
-1,1,1,2,1,1,1,1,2,2,2,0,1,0,1,1,1,0,0,1,1,1,0,0,1,0,0,0,0,1,0,0,
-3,3,2,2,3,0,1,0,1,0,0,0,0,0,0,0,1,1,0,3,0,0,0,0,0,0,0,0,1,0,2,2,
-1,1,1,1,1,2,1,1,2,2,1,2,2,1,0,1,1,1,1,1,0,1,0,0,1,0,0,0,1,1,0,0,
-3,1,0,1,0,2,2,2,2,3,2,1,1,1,2,3,0,0,1,0,2,1,1,0,1,1,1,1,2,1,1,1,
-1,2,2,1,2,1,2,2,1,1,0,1,2,1,2,2,1,1,1,0,0,1,1,1,2,1,0,1,0,0,0,0,
-2,1,0,1,0,3,1,2,2,2,2,1,2,2,1,1,1,0,2,1,2,2,1,1,2,1,1,0,2,1,1,1,
-1,2,2,2,2,2,2,2,1,2,0,1,1,0,2,1,1,1,1,1,0,0,1,1,1,1,0,1,0,0,0,0,
-2,1,1,1,1,2,2,2,2,1,2,2,2,1,2,2,1,1,2,1,2,3,2,2,1,1,1,1,0,1,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,2,2,3,2,0,1,2,0,1,2,1,1,0,1,0,1,2,1,2,0,0,0,1,1,0,0,0,1,0,0,2,
-1,1,0,0,1,1,0,1,1,1,1,0,2,0,1,1,1,0,0,1,1,0,0,0,0,1,0,0,0,1,0,0,
-2,0,0,0,0,1,2,2,2,2,2,2,2,1,2,1,1,1,1,1,1,1,0,1,1,1,1,1,2,1,1,1,
-1,2,2,2,2,1,1,2,1,2,1,1,1,0,2,1,2,1,1,1,0,2,1,1,1,1,0,1,0,0,0,0,
-3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,
-1,1,0,1,0,1,1,1,1,1,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,2,2,3,2,0,0,0,0,1,0,0,0,0,0,0,1,1,0,2,0,0,0,0,0,0,0,0,1,0,1,2,
-1,1,1,1,1,1,0,0,2,2,2,2,2,0,1,1,0,1,1,1,1,1,0,0,1,0,0,0,1,1,0,1,
-2,3,1,2,1,0,1,1,0,2,2,2,0,0,1,0,0,1,1,1,1,0,0,0,0,0,0,0,1,0,1,2,
-1,1,1,1,2,1,1,1,1,1,1,1,1,0,1,1,0,1,0,1,0,1,0,0,1,0,0,0,0,1,0,0,
-2,2,2,2,2,0,0,2,0,0,2,0,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,2,0,2,2,
-1,1,1,1,1,0,0,1,2,1,1,0,1,0,1,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,
-1,2,2,2,2,0,0,2,0,1,1,0,0,0,1,0,0,2,0,2,0,0,0,0,0,0,0,0,0,0,1,1,
-0,0,0,1,1,1,1,1,1,1,1,1,1,0,1,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,
-1,2,2,3,2,0,0,1,0,0,1,0,0,0,0,0,0,1,0,2,0,0,0,1,0,0,0,0,0,0,0,2,
-1,1,0,0,1,0,0,0,1,1,0,0,1,0,1,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,
-2,1,2,2,2,1,2,1,2,2,1,1,2,1,1,1,0,1,1,1,1,2,0,1,0,1,1,1,1,0,1,1,
-1,1,2,1,1,1,1,1,1,0,0,1,2,1,1,1,1,1,1,0,0,1,1,1,0,0,0,0,0,0,0,0,
-1,0,0,1,3,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,2,2,2,1,0,0,1,0,2,0,0,0,0,0,1,1,1,0,1,0,0,0,0,0,0,0,0,2,0,0,1,
-0,2,0,1,0,0,1,1,2,0,1,0,1,0,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,
-1,2,2,2,2,0,1,1,0,2,1,0,1,1,1,0,0,1,0,2,0,1,0,0,0,0,0,0,0,0,0,1,
-0,1,0,0,1,0,0,0,1,1,0,0,1,0,0,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,
-2,2,2,2,2,0,0,1,0,0,0,1,0,1,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,1,
-0,1,0,1,1,1,0,0,1,1,1,0,1,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,
-2,0,1,0,0,1,2,1,1,1,1,1,1,2,2,1,0,0,1,0,1,0,0,0,0,1,1,1,1,0,0,0,
-1,1,2,1,1,1,1,0,0,0,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,2,1,2,1,0,0,1,0,0,0,0,0,0,0,0,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,1,
-0,0,0,0,0,0,0,0,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,0,0,1,2,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,0,0,0,
-0,1,1,0,1,1,1,0,0,1,0,0,1,0,1,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,
-1,0,1,0,0,1,1,1,1,1,1,1,1,1,1,1,0,0,1,0,2,0,0,2,0,1,0,0,1,0,0,1,
-1,1,0,0,1,1,0,1,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,
-1,1,1,1,1,1,1,2,0,0,0,0,0,0,2,1,0,1,1,0,0,1,1,1,0,1,0,0,0,0,0,0,
-2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,0,1,1,0,1,1,1,1,1,0,1,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
-)
-
-Latin5BulgarianModel = {
- 'charToOrderMap': Latin5_BulgarianCharToOrderMap,
- 'precedenceMatrix': BulgarianLangModel,
- 'mTypicalPositiveRatio': 0.969392,
- 'keepEnglishLetter': False,
- 'charsetName': "ISO-8859-5"
-}
-
-Win1251BulgarianModel = {
- 'charToOrderMap': win1251BulgarianCharToOrderMap,
- 'precedenceMatrix': BulgarianLangModel,
- 'mTypicalPositiveRatio': 0.969392,
- 'keepEnglishLetter': False,
- 'charsetName': "windows-1251"
-}
-
-
-# flake8: noqa
diff --git a/script/_Lib/requests/packages/chardet/langcyrillicmodel.py b/script/_Lib/requests/packages/chardet/langcyrillicmodel.py
deleted file mode 100644
index a86f54b..0000000
--- a/script/_Lib/requests/packages/chardet/langcyrillicmodel.py
+++ /dev/null
@@ -1,329 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Communicator client code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-######################### END LICENSE BLOCK #########################
-
-# KOI8-R language model
-# Character Mapping Table:
-KOI8R_CharToOrderMap = (
-255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255, # 00
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, # 10
-253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253, # 20
-252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253, # 30
-253,142,143,144,145,146,147,148,149,150,151,152, 74,153, 75,154, # 40
-155,156,157,158,159,160,161,162,163,164,165,253,253,253,253,253, # 50
-253, 71,172, 66,173, 65,174, 76,175, 64,176,177, 77, 72,178, 69, # 60
- 67,179, 78, 73,180,181, 79,182,183,184,185,253,253,253,253,253, # 70
-191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206, # 80
-207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222, # 90
-223,224,225, 68,226,227,228,229,230,231,232,233,234,235,236,237, # a0
-238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253, # b0
- 27, 3, 21, 28, 13, 2, 39, 19, 26, 4, 23, 11, 8, 12, 5, 1, # c0
- 15, 16, 9, 7, 6, 14, 24, 10, 17, 18, 20, 25, 30, 29, 22, 54, # d0
- 59, 37, 44, 58, 41, 48, 53, 46, 55, 42, 60, 36, 49, 38, 31, 34, # e0
- 35, 43, 45, 32, 40, 52, 56, 33, 61, 62, 51, 57, 47, 63, 50, 70, # f0
-)
-
-win1251_CharToOrderMap = (
-255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255, # 00
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, # 10
-253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253, # 20
-252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253, # 30
-253,142,143,144,145,146,147,148,149,150,151,152, 74,153, 75,154, # 40
-155,156,157,158,159,160,161,162,163,164,165,253,253,253,253,253, # 50
-253, 71,172, 66,173, 65,174, 76,175, 64,176,177, 77, 72,178, 69, # 60
- 67,179, 78, 73,180,181, 79,182,183,184,185,253,253,253,253,253, # 70
-191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,
-207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,
-223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,
-239,240,241,242,243,244,245,246, 68,247,248,249,250,251,252,253,
- 37, 44, 33, 46, 41, 48, 56, 51, 42, 60, 36, 49, 38, 31, 34, 35,
- 45, 32, 40, 52, 53, 55, 58, 50, 57, 63, 70, 62, 61, 47, 59, 43,
- 3, 21, 10, 19, 13, 2, 24, 20, 4, 23, 11, 8, 12, 5, 1, 15,
- 9, 7, 6, 14, 39, 26, 28, 22, 25, 29, 54, 18, 17, 30, 27, 16,
-)
-
-latin5_CharToOrderMap = (
-255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255, # 00
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, # 10
-253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253, # 20
-252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253, # 30
-253,142,143,144,145,146,147,148,149,150,151,152, 74,153, 75,154, # 40
-155,156,157,158,159,160,161,162,163,164,165,253,253,253,253,253, # 50
-253, 71,172, 66,173, 65,174, 76,175, 64,176,177, 77, 72,178, 69, # 60
- 67,179, 78, 73,180,181, 79,182,183,184,185,253,253,253,253,253, # 70
-191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,
-207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,
-223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,
- 37, 44, 33, 46, 41, 48, 56, 51, 42, 60, 36, 49, 38, 31, 34, 35,
- 45, 32, 40, 52, 53, 55, 58, 50, 57, 63, 70, 62, 61, 47, 59, 43,
- 3, 21, 10, 19, 13, 2, 24, 20, 4, 23, 11, 8, 12, 5, 1, 15,
- 9, 7, 6, 14, 39, 26, 28, 22, 25, 29, 54, 18, 17, 30, 27, 16,
-239, 68,240,241,242,243,244,245,246,247,248,249,250,251,252,255,
-)
-
-macCyrillic_CharToOrderMap = (
-255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255, # 00
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, # 10
-253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253, # 20
-252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253, # 30
-253,142,143,144,145,146,147,148,149,150,151,152, 74,153, 75,154, # 40
-155,156,157,158,159,160,161,162,163,164,165,253,253,253,253,253, # 50
-253, 71,172, 66,173, 65,174, 76,175, 64,176,177, 77, 72,178, 69, # 60
- 67,179, 78, 73,180,181, 79,182,183,184,185,253,253,253,253,253, # 70
- 37, 44, 33, 46, 41, 48, 56, 51, 42, 60, 36, 49, 38, 31, 34, 35,
- 45, 32, 40, 52, 53, 55, 58, 50, 57, 63, 70, 62, 61, 47, 59, 43,
-191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,
-207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,
-223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,
-239,240,241,242,243,244,245,246,247,248,249,250,251,252, 68, 16,
- 3, 21, 10, 19, 13, 2, 24, 20, 4, 23, 11, 8, 12, 5, 1, 15,
- 9, 7, 6, 14, 39, 26, 28, 22, 25, 29, 54, 18, 17, 30, 27,255,
-)
-
-IBM855_CharToOrderMap = (
-255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255, # 00
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, # 10
-253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253, # 20
-252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253, # 30
-253,142,143,144,145,146,147,148,149,150,151,152, 74,153, 75,154, # 40
-155,156,157,158,159,160,161,162,163,164,165,253,253,253,253,253, # 50
-253, 71,172, 66,173, 65,174, 76,175, 64,176,177, 77, 72,178, 69, # 60
- 67,179, 78, 73,180,181, 79,182,183,184,185,253,253,253,253,253, # 70
-191,192,193,194, 68,195,196,197,198,199,200,201,202,203,204,205,
-206,207,208,209,210,211,212,213,214,215,216,217, 27, 59, 54, 70,
- 3, 37, 21, 44, 28, 58, 13, 41, 2, 48, 39, 53, 19, 46,218,219,
-220,221,222,223,224, 26, 55, 4, 42,225,226,227,228, 23, 60,229,
-230,231,232,233,234,235, 11, 36,236,237,238,239,240,241,242,243,
- 8, 49, 12, 38, 5, 31, 1, 34, 15,244,245,246,247, 35, 16,248,
- 43, 9, 45, 7, 32, 6, 40, 14, 52, 24, 56, 10, 33, 17, 61,249,
-250, 18, 62, 20, 51, 25, 57, 30, 47, 29, 63, 22, 50,251,252,255,
-)
-
-IBM866_CharToOrderMap = (
-255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255, # 00
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, # 10
-253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253, # 20
-252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253, # 30
-253,142,143,144,145,146,147,148,149,150,151,152, 74,153, 75,154, # 40
-155,156,157,158,159,160,161,162,163,164,165,253,253,253,253,253, # 50
-253, 71,172, 66,173, 65,174, 76,175, 64,176,177, 77, 72,178, 69, # 60
- 67,179, 78, 73,180,181, 79,182,183,184,185,253,253,253,253,253, # 70
- 37, 44, 33, 46, 41, 48, 56, 51, 42, 60, 36, 49, 38, 31, 34, 35,
- 45, 32, 40, 52, 53, 55, 58, 50, 57, 63, 70, 62, 61, 47, 59, 43,
- 3, 21, 10, 19, 13, 2, 24, 20, 4, 23, 11, 8, 12, 5, 1, 15,
-191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,
-207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,
-223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,
- 9, 7, 6, 14, 39, 26, 28, 22, 25, 29, 54, 18, 17, 30, 27, 16,
-239, 68,240,241,242,243,244,245,246,247,248,249,250,251,252,255,
-)
-
-# Model Table:
-# total sequences: 100%
-# first 512 sequences: 97.6601%
-# first 1024 sequences: 2.3389%
-# rest sequences: 0.1237%
-# negative sequences: 0.0009%
-RussianLangModel = (
-0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,1,3,3,3,3,1,3,3,3,2,3,2,3,3,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,3,2,2,2,2,2,0,0,2,
-3,3,3,2,3,3,3,3,3,3,3,3,3,3,2,3,3,0,0,3,3,3,3,3,3,3,3,3,2,3,2,0,
-0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,2,2,3,3,3,3,3,3,3,3,3,2,3,3,0,0,3,3,3,3,3,3,3,3,2,3,3,1,0,
-0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,2,3,2,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,3,3,3,3,3,3,3,3,3,3,3,2,1,
-0,0,0,0,0,0,0,2,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,3,3,0,0,3,3,3,3,3,3,3,3,3,3,3,2,1,
-0,0,0,0,0,1,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,2,2,2,3,1,3,3,1,3,3,3,3,2,2,3,0,2,2,2,3,3,2,1,0,
-0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,2,3,3,3,3,3,2,2,3,2,3,3,3,2,1,2,2,0,1,2,2,2,2,2,2,0,
-0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,2,2,3,0,2,2,3,3,2,1,2,0,
-0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,1,0,0,2,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,2,3,3,1,2,3,2,2,3,2,3,3,3,3,2,2,3,0,3,2,2,3,1,1,1,0,
-0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,2,2,3,3,3,3,3,2,3,3,3,3,2,2,2,0,3,3,3,2,2,2,2,0,
-0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,2,3,2,3,3,3,3,3,3,2,3,2,2,0,1,3,2,1,2,2,1,0,
-0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,2,1,1,3,0,1,1,1,1,2,1,1,0,2,2,2,1,2,0,1,0,
-0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,2,3,3,2,2,2,2,1,3,2,3,2,3,2,1,2,2,0,1,1,2,1,2,1,2,0,
-0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,2,2,3,2,3,3,3,2,2,2,2,0,2,2,2,2,3,1,1,0,
-0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,
-3,2,3,2,2,3,3,3,3,3,3,3,3,3,1,3,2,0,0,3,3,3,3,2,3,3,3,3,2,3,2,0,
-0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,3,3,3,3,3,2,2,3,3,0,2,1,0,3,2,3,2,3,0,0,1,2,0,0,1,0,1,2,1,1,0,
-0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,0,3,0,2,3,3,3,3,2,3,3,3,3,1,2,2,0,0,2,3,2,2,2,3,2,3,2,2,3,0,0,
-0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,2,3,0,2,3,2,3,0,1,2,3,3,2,0,2,3,0,0,2,3,2,2,0,1,3,1,3,2,2,1,0,
-0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,1,3,0,2,3,3,3,3,3,3,3,3,2,1,3,2,0,0,2,2,3,3,3,2,3,3,0,2,2,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,2,2,3,3,2,2,2,3,3,0,0,1,1,1,1,1,2,0,0,1,1,1,1,0,1,0,
-0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,2,2,3,3,3,3,3,3,3,0,3,2,3,3,2,3,2,0,2,1,0,1,1,0,1,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,2,3,3,3,2,2,2,2,3,1,3,2,3,1,1,2,1,0,2,2,2,2,1,3,1,0,
-0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,
-2,2,3,3,3,3,3,1,2,2,1,3,1,0,3,0,0,3,0,0,0,1,1,0,1,2,1,0,0,0,0,0,
-0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,2,2,1,1,3,3,3,2,2,1,2,2,3,1,1,2,0,0,2,2,1,3,0,0,2,1,1,2,1,1,0,
-0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,2,3,3,3,3,1,2,2,2,1,2,1,3,3,1,1,2,1,2,1,2,2,0,2,0,0,1,1,0,1,0,
-0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,3,3,3,3,3,2,1,3,2,2,3,2,0,3,2,0,3,0,1,0,1,1,0,0,1,1,1,1,0,1,0,
-0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,2,3,3,3,2,2,2,3,3,1,2,1,2,1,0,1,0,1,1,0,1,0,0,2,1,1,1,0,1,0,
-0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,
-3,1,1,2,1,2,3,3,2,2,1,2,2,3,0,2,1,0,0,2,2,3,2,1,2,2,2,2,2,3,1,0,
-0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,1,1,0,1,1,2,2,1,1,3,0,0,1,3,1,1,1,0,0,0,1,0,1,1,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,1,3,3,3,2,0,0,0,2,1,0,1,0,2,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,0,1,0,0,2,3,2,2,2,1,2,2,2,1,2,1,0,0,1,1,1,0,2,0,1,1,1,0,0,1,1,
-1,0,0,0,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,
-2,3,3,3,3,0,0,0,0,1,0,0,0,0,3,0,1,2,1,0,0,0,0,0,0,0,1,1,0,0,1,1,
-1,0,1,0,1,2,0,0,1,1,2,1,0,1,1,1,1,0,1,1,1,1,0,1,0,0,1,0,0,1,1,0,
-2,2,3,2,2,2,3,1,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,0,1,0,1,1,1,0,2,1,
-1,1,1,1,1,1,1,1,2,1,1,1,1,1,1,1,1,1,1,0,1,0,1,1,0,1,1,1,0,1,1,0,
-3,3,3,2,2,2,2,3,2,2,1,1,2,2,2,2,1,1,3,1,2,1,2,0,0,1,1,0,1,0,2,1,
-1,1,1,1,1,2,1,0,1,1,1,1,0,1,0,0,1,1,0,0,1,0,1,0,0,1,0,0,0,1,1,0,
-2,0,0,1,0,3,2,2,2,2,1,2,1,2,1,2,0,0,0,2,1,2,2,1,1,2,2,0,1,1,0,2,
-1,1,1,1,1,0,1,1,1,2,1,1,1,2,1,0,1,2,1,1,1,1,0,1,1,1,0,0,1,0,0,1,
-1,3,2,2,2,1,1,1,2,3,0,0,0,0,2,0,2,2,1,0,0,0,0,0,0,1,0,0,0,0,1,1,
-1,0,1,1,0,1,0,1,1,0,1,1,0,2,0,0,1,1,0,0,1,0,0,0,0,0,0,0,0,1,1,0,
-2,3,2,3,2,1,2,2,2,2,1,0,0,0,2,0,0,1,1,0,0,0,0,0,0,0,1,1,0,0,2,1,
-1,1,2,1,0,2,0,0,1,0,1,0,0,1,0,0,1,1,0,1,1,0,0,0,0,0,1,0,0,0,0,0,
-3,0,0,1,0,2,2,2,3,2,2,2,2,2,2,2,0,0,0,2,1,2,1,1,1,2,2,0,0,0,1,2,
-1,1,1,1,1,0,1,2,1,1,1,1,1,1,1,0,1,1,1,1,1,1,0,1,1,1,1,1,1,0,0,1,
-2,3,2,3,3,2,0,1,1,1,0,0,1,0,2,0,1,1,3,1,0,0,0,0,0,0,0,1,0,0,2,1,
-1,1,1,1,1,1,1,0,1,0,1,1,1,1,0,1,1,1,0,0,1,1,0,1,0,0,0,0,0,0,1,0,
-2,3,3,3,3,1,2,2,2,2,0,1,1,0,2,1,1,1,2,1,0,1,1,0,0,1,0,1,0,0,2,0,
-0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,3,3,3,2,0,0,1,1,2,2,1,0,0,2,0,1,1,3,0,0,1,0,0,0,0,0,1,0,1,2,1,
-1,1,2,0,1,1,1,0,1,0,1,1,0,1,0,1,1,1,1,0,1,0,0,0,0,0,0,1,0,1,1,0,
-1,3,2,3,2,1,0,0,2,2,2,0,1,0,2,0,1,1,1,0,1,0,0,0,3,0,1,1,0,0,2,1,
-1,1,1,0,1,1,0,0,0,0,1,1,0,1,0,0,2,1,1,0,1,0,0,0,1,0,1,0,0,1,1,0,
-3,1,2,1,1,2,2,2,2,2,2,1,2,2,1,1,0,0,0,2,2,2,0,0,0,1,2,1,0,1,0,1,
-2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,2,1,1,1,0,1,0,1,1,0,1,1,1,0,0,1,
-3,0,0,0,0,2,0,1,1,1,1,1,1,1,0,1,0,0,0,1,1,1,0,1,0,1,1,0,0,1,0,1,
-1,1,0,0,1,0,0,0,1,0,1,1,0,0,1,0,1,0,1,0,0,0,0,1,0,0,0,1,0,0,0,1,
-1,3,3,2,2,0,0,0,2,2,0,0,0,1,2,0,1,1,2,0,0,0,0,0,0,0,0,1,0,0,2,1,
-0,1,1,0,0,1,1,0,0,0,1,1,0,1,1,0,1,1,0,0,1,0,0,0,0,0,0,0,0,0,1,0,
-2,3,2,3,2,0,0,0,0,1,1,0,0,0,2,0,2,0,2,0,0,0,0,0,1,0,0,1,0,0,1,1,
-1,1,2,0,1,2,1,0,1,1,2,1,1,1,1,1,2,1,1,0,1,0,0,1,1,1,1,1,0,1,1,0,
-1,3,2,2,2,1,0,0,2,2,1,0,1,2,2,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,1,1,
-0,0,1,1,0,1,1,0,0,1,1,0,1,1,0,0,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,
-1,0,0,1,0,2,3,1,2,2,2,2,2,2,1,1,0,0,0,1,0,1,0,2,1,1,1,0,0,0,0,1,
-1,1,0,1,1,0,1,1,1,1,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,0,0,0,
-2,0,2,0,0,1,0,3,2,1,2,1,2,2,0,1,0,0,0,2,1,0,0,2,1,1,1,1,0,2,0,2,
-2,1,1,1,1,1,1,1,1,1,1,1,1,2,1,0,1,1,1,1,0,0,0,1,1,1,1,0,1,0,0,1,
-1,2,2,2,2,1,0,0,1,0,0,0,0,0,2,0,1,1,1,1,0,0,0,0,1,0,1,2,0,0,2,0,
-1,0,1,1,1,2,1,0,1,0,1,1,0,0,1,0,1,1,1,0,1,0,0,0,1,0,0,1,0,1,1,0,
-2,1,2,2,2,0,3,0,1,1,0,0,0,0,2,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
-0,0,0,1,1,1,0,0,1,0,1,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,
-1,2,2,3,2,2,0,0,1,1,2,0,1,2,1,0,1,0,1,0,0,1,0,0,0,0,0,0,0,0,0,1,
-0,1,1,0,0,1,1,0,0,1,1,0,0,1,1,0,1,1,0,0,1,0,0,0,0,0,0,0,0,1,1,0,
-2,2,1,1,2,1,2,2,2,2,2,1,2,2,0,1,0,0,0,1,2,2,2,1,2,1,1,1,1,1,2,1,
-1,1,1,1,1,1,1,1,1,1,0,0,1,1,1,0,1,1,1,0,0,0,0,1,1,1,0,1,1,0,0,1,
-1,2,2,2,2,0,1,0,2,2,0,0,0,0,2,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,2,0,
-0,0,1,0,0,1,0,0,0,0,1,0,1,1,0,0,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,
-0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,2,2,2,2,0,0,0,2,2,2,0,1,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,1,1,
-0,1,1,0,0,1,1,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,2,2,2,2,0,0,0,0,1,0,0,1,1,2,0,0,0,0,1,0,1,0,0,1,0,0,2,0,0,0,1,
-0,0,1,0,0,1,0,0,0,1,1,0,0,0,0,0,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,
-1,2,2,2,1,1,2,0,2,1,1,1,1,0,2,2,0,0,0,0,0,0,0,0,0,1,1,0,0,0,1,1,
-0,0,1,0,1,1,0,0,0,0,1,0,0,0,0,0,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,
-1,0,2,1,2,0,0,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,
-0,0,1,0,1,1,0,0,0,0,1,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,
-1,0,0,0,0,2,0,1,2,1,0,1,1,1,0,1,0,0,0,1,0,1,0,0,1,0,1,0,0,0,0,1,
-0,0,0,0,0,1,0,0,1,1,0,0,1,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,1,
-2,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
-1,0,0,0,1,0,0,0,1,1,0,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0,1,0,0,0,0,0,
-2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
-1,1,1,0,1,0,1,0,0,1,1,1,1,0,0,0,1,0,0,0,0,1,0,0,0,1,0,1,0,0,0,0,
-1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
-1,1,0,1,1,0,1,0,1,0,0,0,0,1,1,0,1,1,0,0,0,0,0,1,0,1,1,0,1,0,0,0,
-0,1,1,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,
-)
-
-Koi8rModel = {
- 'charToOrderMap': KOI8R_CharToOrderMap,
- 'precedenceMatrix': RussianLangModel,
- 'mTypicalPositiveRatio': 0.976601,
- 'keepEnglishLetter': False,
- 'charsetName': "KOI8-R"
-}
-
-Win1251CyrillicModel = {
- 'charToOrderMap': win1251_CharToOrderMap,
- 'precedenceMatrix': RussianLangModel,
- 'mTypicalPositiveRatio': 0.976601,
- 'keepEnglishLetter': False,
- 'charsetName': "windows-1251"
-}
-
-Latin5CyrillicModel = {
- 'charToOrderMap': latin5_CharToOrderMap,
- 'precedenceMatrix': RussianLangModel,
- 'mTypicalPositiveRatio': 0.976601,
- 'keepEnglishLetter': False,
- 'charsetName': "ISO-8859-5"
-}
-
-MacCyrillicModel = {
- 'charToOrderMap': macCyrillic_CharToOrderMap,
- 'precedenceMatrix': RussianLangModel,
- 'mTypicalPositiveRatio': 0.976601,
- 'keepEnglishLetter': False,
- 'charsetName': "MacCyrillic"
-};
-
-Ibm866Model = {
- 'charToOrderMap': IBM866_CharToOrderMap,
- 'precedenceMatrix': RussianLangModel,
- 'mTypicalPositiveRatio': 0.976601,
- 'keepEnglishLetter': False,
- 'charsetName': "IBM866"
-}
-
-Ibm855Model = {
- 'charToOrderMap': IBM855_CharToOrderMap,
- 'precedenceMatrix': RussianLangModel,
- 'mTypicalPositiveRatio': 0.976601,
- 'keepEnglishLetter': False,
- 'charsetName': "IBM855"
-}
-
-# flake8: noqa
diff --git a/script/_Lib/requests/packages/chardet/langgreekmodel.py b/script/_Lib/requests/packages/chardet/langgreekmodel.py
deleted file mode 100644
index ddb5837..0000000
--- a/script/_Lib/requests/packages/chardet/langgreekmodel.py
+++ /dev/null
@@ -1,225 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Communicator client code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-######################### END LICENSE BLOCK #########################
-
-# 255: Control characters that usually does not exist in any text
-# 254: Carriage/Return
-# 253: symbol (punctuation) that does not belong to word
-# 252: 0 - 9
-
-# Character Mapping Table:
-Latin7_CharToOrderMap = (
-255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255, # 00
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, # 10
-253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253, # 20
-252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253, # 30
-253, 82,100,104, 94, 98,101,116,102,111,187,117, 92, 88,113, 85, # 40
- 79,118,105, 83, 67,114,119, 95, 99,109,188,253,253,253,253,253, # 50
-253, 72, 70, 80, 81, 60, 96, 93, 89, 68,120, 97, 77, 86, 69, 55, # 60
- 78,115, 65, 66, 58, 76,106,103, 87,107,112,253,253,253,253,253, # 70
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, # 80
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, # 90
-253,233, 90,253,253,253,253,253,253,253,253,253,253, 74,253,253, # a0
-253,253,253,253,247,248, 61, 36, 46, 71, 73,253, 54,253,108,123, # b0
-110, 31, 51, 43, 41, 34, 91, 40, 52, 47, 44, 53, 38, 49, 59, 39, # c0
- 35, 48,250, 37, 33, 45, 56, 50, 84, 57,120,121, 17, 18, 22, 15, # d0
-124, 1, 29, 20, 21, 3, 32, 13, 25, 5, 11, 16, 10, 6, 30, 4, # e0
- 9, 8, 14, 7, 2, 12, 28, 23, 42, 24, 64, 75, 19, 26, 27,253, # f0
-)
-
-win1253_CharToOrderMap = (
-255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255, # 00
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, # 10
-253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253, # 20
-252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253, # 30
-253, 82,100,104, 94, 98,101,116,102,111,187,117, 92, 88,113, 85, # 40
- 79,118,105, 83, 67,114,119, 95, 99,109,188,253,253,253,253,253, # 50
-253, 72, 70, 80, 81, 60, 96, 93, 89, 68,120, 97, 77, 86, 69, 55, # 60
- 78,115, 65, 66, 58, 76,106,103, 87,107,112,253,253,253,253,253, # 70
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, # 80
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, # 90
-253,233, 61,253,253,253,253,253,253,253,253,253,253, 74,253,253, # a0
-253,253,253,253,247,253,253, 36, 46, 71, 73,253, 54,253,108,123, # b0
-110, 31, 51, 43, 41, 34, 91, 40, 52, 47, 44, 53, 38, 49, 59, 39, # c0
- 35, 48,250, 37, 33, 45, 56, 50, 84, 57,120,121, 17, 18, 22, 15, # d0
-124, 1, 29, 20, 21, 3, 32, 13, 25, 5, 11, 16, 10, 6, 30, 4, # e0
- 9, 8, 14, 7, 2, 12, 28, 23, 42, 24, 64, 75, 19, 26, 27,253, # f0
-)
-
-# Model Table:
-# total sequences: 100%
-# first 512 sequences: 98.2851%
-# first 1024 sequences:1.7001%
-# rest sequences: 0.0359%
-# negative sequences: 0.0148%
-GreekLangModel = (
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,3,2,2,3,3,3,3,3,3,3,3,1,3,3,3,0,2,2,3,3,0,3,0,3,2,0,3,3,3,0,
-3,0,0,0,2,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,3,3,3,3,3,0,3,3,0,3,2,3,3,0,3,2,3,3,3,0,0,3,0,3,0,3,3,2,0,0,0,
-2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,
-0,2,3,2,2,3,3,3,3,3,3,3,3,0,3,3,3,3,0,2,3,3,0,3,3,3,3,2,3,3,3,0,
-2,0,0,0,2,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,2,3,3,2,3,3,3,3,3,3,3,3,3,3,3,3,0,2,1,3,3,3,3,2,3,3,2,3,3,2,0,
-0,0,0,0,2,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,3,3,3,3,0,3,3,3,3,3,3,0,3,3,0,3,3,3,3,3,3,3,3,3,3,0,3,2,3,3,0,
-2,0,1,0,2,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,
-0,3,3,3,3,3,2,3,0,0,0,0,3,3,0,3,1,3,3,3,0,3,3,0,3,3,3,3,0,0,0,0,
-2,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,3,3,3,3,3,0,3,0,3,3,3,3,3,0,3,2,2,2,3,0,2,3,3,3,3,3,2,3,3,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,3,3,3,3,3,3,2,2,2,3,3,3,3,0,3,1,3,3,3,3,2,3,3,3,3,3,3,3,2,2,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,3,3,3,3,3,2,0,3,0,0,0,3,3,2,3,3,3,3,3,0,0,3,2,3,0,2,3,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,3,0,3,3,3,3,0,0,3,3,0,2,3,0,3,0,3,3,3,0,0,3,0,3,0,2,2,3,3,0,0,
-0,0,1,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,3,3,3,3,3,2,0,3,2,3,3,3,3,0,3,3,3,3,3,0,3,3,2,3,2,3,3,2,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,3,3,2,3,2,3,3,3,3,3,3,0,2,3,2,3,2,2,2,3,2,3,3,2,3,0,2,2,2,3,0,
-2,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,3,0,0,0,3,3,3,2,3,3,0,0,3,0,3,0,0,0,3,2,0,3,0,3,0,0,2,0,2,0,
-0,0,0,0,2,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,3,3,3,3,0,3,3,3,3,3,3,0,3,3,0,3,0,0,0,3,3,0,3,3,3,0,0,1,2,3,0,
-3,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,3,3,3,3,3,2,0,0,3,2,2,3,3,0,3,3,3,3,3,2,1,3,0,3,2,3,3,2,1,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,3,3,0,2,3,3,3,3,3,3,0,0,3,0,3,0,0,0,3,3,0,3,2,3,0,0,3,3,3,0,
-3,0,0,0,2,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,3,3,3,3,0,3,3,3,3,3,3,0,0,3,0,3,0,0,0,3,2,0,3,2,3,0,0,3,2,3,0,
-2,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,3,1,2,2,3,3,3,3,3,3,0,2,3,0,3,0,0,0,3,3,0,3,0,2,0,0,2,3,1,0,
-2,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,3,0,3,3,3,3,0,3,0,3,3,2,3,0,3,3,3,3,3,3,0,3,3,3,0,2,3,0,0,3,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,3,0,3,3,3,0,0,3,0,0,0,3,3,0,3,0,2,3,3,0,0,3,0,3,0,3,3,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,3,0,0,0,3,3,3,3,3,3,0,0,3,0,2,0,0,0,3,3,0,3,0,3,0,0,2,0,2,0,
-0,0,0,0,1,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,3,3,3,3,3,3,0,3,0,2,0,3,2,0,3,2,3,2,3,0,0,3,2,3,2,3,3,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,3,0,0,2,3,3,3,3,3,0,0,0,3,0,2,1,0,0,3,2,2,2,0,3,0,0,2,2,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,3,0,3,3,3,2,0,3,0,3,0,3,3,0,2,1,2,3,3,0,0,3,0,3,0,3,3,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,2,3,3,3,0,3,3,3,3,3,3,0,2,3,0,3,0,0,0,2,1,0,2,2,3,0,0,2,2,2,0,
-0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,3,0,0,2,3,3,3,2,3,0,0,1,3,0,2,0,0,0,0,3,0,1,0,2,0,0,1,1,1,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,3,3,3,3,3,1,0,3,0,0,0,3,2,0,3,2,3,3,3,0,0,3,0,3,2,2,2,1,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,3,0,3,3,3,0,0,3,0,0,0,0,2,0,2,3,3,2,2,2,2,3,0,2,0,2,2,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,3,3,3,3,2,0,0,0,0,0,0,2,3,0,2,0,2,3,2,0,0,3,0,3,0,3,1,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,3,2,3,3,2,2,3,0,2,0,3,0,0,0,2,0,0,0,0,1,2,0,2,0,2,0,
-0,2,0,2,0,2,2,0,0,1,0,2,2,2,0,2,2,2,0,2,2,2,0,0,2,0,0,1,0,0,0,0,
-0,2,0,3,3,2,0,0,0,0,0,0,1,3,0,2,0,2,2,2,0,0,2,0,3,0,0,2,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,3,0,2,3,2,0,2,2,0,2,0,2,2,0,2,0,2,2,2,0,0,0,0,0,0,2,3,0,0,0,2,
-0,1,2,0,0,0,0,2,2,0,0,0,2,1,0,2,2,0,0,0,0,0,0,1,0,2,0,0,0,0,0,0,
-0,0,2,1,0,2,3,2,2,3,2,3,2,0,0,3,3,3,0,0,3,2,0,0,0,1,1,0,2,0,2,2,
-0,2,0,2,0,2,2,0,0,2,0,2,2,2,0,2,2,2,2,0,0,2,0,0,0,2,0,1,0,0,0,0,
-0,3,0,3,3,2,2,0,3,0,0,0,2,2,0,2,2,2,1,2,0,0,1,2,2,0,0,3,0,0,0,2,
-0,1,2,0,0,0,1,2,0,0,0,0,0,0,0,2,2,0,1,0,0,2,0,0,0,2,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,2,3,3,2,2,0,0,0,2,0,2,3,3,0,2,0,0,0,0,0,0,2,2,2,0,2,2,0,2,0,2,
-0,2,2,0,0,2,2,2,2,1,0,0,2,2,0,2,0,0,2,0,0,0,0,0,0,2,0,0,0,0,0,0,
-0,2,0,3,2,3,0,0,0,3,0,0,2,2,0,2,0,2,2,2,0,0,2,0,0,0,0,0,0,0,0,2,
-0,0,2,2,0,0,2,2,2,0,0,0,0,0,0,2,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,2,0,0,3,2,0,2,2,2,2,2,0,0,0,2,0,0,0,0,2,0,1,0,0,2,0,1,0,0,0,
-0,2,2,2,0,2,2,0,1,2,0,2,2,2,0,2,2,2,2,1,2,2,0,0,2,0,0,0,0,0,0,0,
-0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,
-0,2,0,2,0,2,2,0,0,0,0,1,2,1,0,0,2,2,0,0,2,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,3,2,3,0,0,2,0,0,0,2,2,0,2,0,0,0,1,0,0,2,0,2,0,2,2,0,0,0,0,
-0,0,2,0,0,0,0,2,2,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,
-0,2,2,3,2,2,0,0,0,0,0,0,1,3,0,2,0,2,2,0,0,0,1,0,2,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,2,0,2,0,3,2,0,2,0,0,0,0,0,0,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
-0,0,2,0,0,0,0,1,1,0,0,2,1,2,0,2,2,0,1,0,0,1,0,0,0,2,0,0,0,0,0,0,
-0,3,0,2,2,2,0,0,2,0,0,0,2,0,0,0,2,3,0,2,0,0,0,0,0,0,2,2,0,0,0,2,
-0,1,2,0,0,0,1,2,2,1,0,0,0,2,0,0,2,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,2,1,2,0,2,2,0,2,0,0,2,0,0,0,0,1,2,1,0,2,1,0,0,0,0,0,0,0,0,0,0,
-0,0,2,0,0,0,3,1,2,2,0,2,0,0,0,0,2,0,0,0,2,0,0,3,0,0,0,0,2,2,2,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,2,1,0,2,0,1,2,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,1,0,0,0,0,0,0,2,
-0,2,2,0,0,2,2,2,2,2,0,1,2,0,0,0,2,2,0,1,0,2,0,0,2,2,0,0,0,0,0,0,
-0,0,0,0,1,0,0,0,0,0,0,0,3,0,0,2,0,0,0,0,0,0,0,0,2,0,2,0,0,0,0,2,
-0,1,2,0,0,0,0,2,2,1,0,1,0,1,0,2,2,2,1,0,0,0,0,0,0,1,0,0,0,0,0,0,
-0,2,0,1,2,0,0,0,0,0,0,0,0,0,0,2,0,0,2,2,0,0,0,0,1,0,0,0,0,0,0,2,
-0,2,2,0,0,0,0,2,2,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,2,0,0,2,0,0,0,
-0,2,2,2,2,0,0,0,3,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,2,0,0,0,0,0,0,1,
-0,0,2,0,0,0,0,1,2,0,0,0,0,0,0,2,2,1,1,0,0,0,0,0,0,1,0,0,0,0,0,0,
-0,2,0,2,2,2,0,0,2,0,0,0,0,0,0,0,2,2,2,0,0,0,2,0,0,0,0,0,0,0,0,2,
-0,0,1,0,0,0,0,2,1,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,
-0,3,0,2,0,0,0,0,0,0,0,0,2,0,0,0,0,0,2,0,0,0,0,0,0,0,2,0,0,0,0,2,
-0,0,2,0,0,0,0,2,2,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,2,0,2,2,1,0,0,0,0,0,0,2,0,0,2,0,2,2,2,0,0,0,0,0,0,2,0,0,0,0,2,
-0,0,2,0,0,2,0,2,2,0,0,0,0,2,0,2,0,0,0,0,0,2,0,0,0,2,0,0,0,0,0,0,
-0,0,3,0,0,0,2,2,0,2,2,0,0,0,0,0,2,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,2,0,0,0,0,0,
-0,2,2,2,2,2,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,1,
-0,0,0,0,0,0,0,2,1,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,2,2,0,0,0,0,0,2,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,
-0,2,0,0,0,2,0,0,0,0,0,1,0,0,0,0,2,2,0,0,0,1,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,1,0,2,0,0,0,
-0,2,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,1,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,2,0,2,0,0,0,
-0,0,0,0,0,0,0,0,2,1,0,0,0,0,0,0,2,0,0,0,1,2,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-)
-
-Latin7GreekModel = {
- 'charToOrderMap': Latin7_CharToOrderMap,
- 'precedenceMatrix': GreekLangModel,
- 'mTypicalPositiveRatio': 0.982851,
- 'keepEnglishLetter': False,
- 'charsetName': "ISO-8859-7"
-}
-
-Win1253GreekModel = {
- 'charToOrderMap': win1253_CharToOrderMap,
- 'precedenceMatrix': GreekLangModel,
- 'mTypicalPositiveRatio': 0.982851,
- 'keepEnglishLetter': False,
- 'charsetName': "windows-1253"
-}
-
-# flake8: noqa
diff --git a/script/_Lib/requests/packages/chardet/langhebrewmodel.py b/script/_Lib/requests/packages/chardet/langhebrewmodel.py
deleted file mode 100644
index 75f2bc7..0000000
--- a/script/_Lib/requests/packages/chardet/langhebrewmodel.py
+++ /dev/null
@@ -1,201 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Universal charset detector code.
-#
-# The Initial Developer of the Original Code is
-# Simon Montagu
-# Portions created by the Initial Developer are Copyright (C) 2005
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Mark Pilgrim - port to Python
-# Shy Shalom - original C code
-# Shoshannah Forbes - original C code (?)
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-######################### END LICENSE BLOCK #########################
-
-# 255: Control characters that usually does not exist in any text
-# 254: Carriage/Return
-# 253: symbol (punctuation) that does not belong to word
-# 252: 0 - 9
-
-# Windows-1255 language model
-# Character Mapping Table:
-win1255_CharToOrderMap = (
-255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255, # 00
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, # 10
-253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253, # 20
-252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253, # 30
-253, 69, 91, 79, 80, 92, 89, 97, 90, 68,111,112, 82, 73, 95, 85, # 40
- 78,121, 86, 71, 67,102,107, 84,114,103,115,253,253,253,253,253, # 50
-253, 50, 74, 60, 61, 42, 76, 70, 64, 53,105, 93, 56, 65, 54, 49, # 60
- 66,110, 51, 43, 44, 63, 81, 77, 98, 75,108,253,253,253,253,253, # 70
-124,202,203,204,205, 40, 58,206,207,208,209,210,211,212,213,214,
-215, 83, 52, 47, 46, 72, 32, 94,216,113,217,109,218,219,220,221,
- 34,116,222,118,100,223,224,117,119,104,125,225,226, 87, 99,227,
-106,122,123,228, 55,229,230,101,231,232,120,233, 48, 39, 57,234,
- 30, 59, 41, 88, 33, 37, 36, 31, 29, 35,235, 62, 28,236,126,237,
-238, 38, 45,239,240,241,242,243,127,244,245,246,247,248,249,250,
- 9, 8, 20, 16, 3, 2, 24, 14, 22, 1, 25, 15, 4, 11, 6, 23,
- 12, 19, 13, 26, 18, 27, 21, 17, 7, 10, 5,251,252,128, 96,253,
-)
-
-# Model Table:
-# total sequences: 100%
-# first 512 sequences: 98.4004%
-# first 1024 sequences: 1.5981%
-# rest sequences: 0.087%
-# negative sequences: 0.0015%
-HebrewLangModel = (
-0,3,3,3,3,3,3,3,3,3,3,2,3,3,3,3,3,3,3,3,3,3,3,2,3,2,1,2,0,1,0,0,
-3,0,3,1,0,0,1,3,2,0,1,1,2,0,2,2,2,1,1,1,1,2,1,1,1,2,0,0,2,2,0,1,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,2,2,2,
-1,2,1,2,1,2,0,0,2,0,0,0,0,0,1,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,2,2,
-1,2,1,3,1,1,0,0,2,0,0,0,1,0,1,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,0,1,2,2,1,3,
-1,2,1,1,2,2,0,0,2,2,0,0,0,0,1,0,1,0,0,0,1,0,0,0,0,0,0,1,0,1,1,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,3,3,2,2,2,2,3,2,
-1,2,1,2,2,2,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,3,3,2,3,2,2,3,2,2,2,1,2,2,2,2,
-1,2,1,1,2,2,0,1,2,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,0,2,2,2,2,2,
-0,2,0,2,2,2,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,3,0,2,2,2,
-0,2,1,2,2,2,0,0,2,1,0,0,0,0,1,0,1,0,0,0,0,0,0,2,0,0,0,0,0,0,1,0,
-3,3,3,3,3,3,3,3,3,3,3,2,3,3,3,3,3,3,3,3,3,3,3,3,3,2,1,2,3,2,2,2,
-1,2,1,2,2,2,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,1,1,0,
-3,3,3,3,3,3,3,3,3,2,3,3,3,2,3,3,3,3,3,3,3,3,3,3,3,3,3,1,0,2,0,2,
-0,2,1,2,2,2,0,0,1,2,0,0,0,0,1,0,1,0,0,0,0,0,0,1,0,0,0,2,0,0,1,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,3,2,3,2,2,3,2,1,2,1,1,1,
-0,1,1,1,1,1,3,0,1,0,0,0,0,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,
-3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,0,1,1,0,0,1,0,0,1,0,0,0,0,
-0,0,1,0,0,0,0,0,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,2,2,2,2,2,2,
-0,2,0,1,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,
-3,3,3,3,3,3,3,3,3,2,3,3,3,2,1,2,3,3,2,3,3,3,3,2,3,2,1,2,0,2,1,2,
-0,2,0,2,2,2,0,0,1,2,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0,1,0,0,1,0,
-3,3,3,3,3,3,3,3,3,2,3,3,3,1,2,2,3,3,2,3,2,3,2,2,3,1,2,2,0,2,2,2,
-0,2,1,2,2,2,0,0,1,2,0,0,0,0,1,0,0,0,0,0,1,0,0,1,0,0,0,1,0,0,1,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,2,3,3,3,2,3,3,2,2,2,3,3,3,3,1,3,2,2,2,
-0,2,0,1,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,2,3,3,3,2,3,2,2,2,1,2,2,0,2,2,2,2,
-0,2,0,2,2,2,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,
-3,3,3,3,3,3,3,3,3,3,3,2,3,3,3,1,3,2,3,3,2,3,3,2,2,1,2,2,2,2,2,2,
-0,2,1,2,1,2,0,0,1,0,0,0,0,0,1,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,1,0,
-3,3,3,3,3,3,2,3,2,3,3,2,3,3,3,3,2,3,2,3,3,3,3,3,2,2,2,2,2,2,2,1,
-0,2,0,1,2,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,
-3,3,3,3,3,3,3,3,3,2,1,2,3,3,3,3,3,3,3,2,3,2,3,2,1,2,3,0,2,1,2,2,
-0,2,1,1,2,1,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,2,0,
-3,3,3,3,3,3,3,3,3,2,3,3,3,3,2,1,3,1,2,2,2,1,2,3,3,1,2,1,2,2,2,2,
-0,1,1,1,1,1,0,0,0,0,0,0,0,0,1,0,0,0,0,0,1,0,0,2,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,0,2,3,3,3,1,3,3,3,1,2,2,2,2,1,1,2,2,2,2,2,2,
-0,2,0,1,1,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,
-3,3,3,3,3,3,2,3,3,3,2,2,3,3,3,2,1,2,3,2,3,2,2,2,2,1,2,1,1,1,2,2,
-0,2,1,1,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,
-3,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,0,0,0,1,0,0,0,0,0,
-1,0,1,0,0,0,0,0,2,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,2,3,3,2,3,1,2,2,2,2,3,2,3,1,1,2,2,1,2,2,1,1,0,2,2,2,2,
-0,1,0,1,2,2,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,
-3,0,0,1,1,0,1,0,0,1,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,2,2,0,
-0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,0,1,0,1,0,1,1,0,1,1,0,0,0,1,1,0,1,1,1,0,0,0,0,0,0,1,0,0,0,0,0,
-0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,0,0,0,1,1,0,1,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,
-3,2,2,1,2,2,2,2,2,2,2,1,2,2,1,2,2,1,1,1,1,1,1,1,1,2,1,1,0,3,3,3,
-0,3,0,2,2,2,2,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,
-2,2,2,3,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,2,2,1,2,2,2,1,1,1,2,0,1,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,2,2,2,2,2,2,2,2,2,2,1,2,2,2,2,2,2,2,2,2,2,2,0,2,2,0,0,0,0,0,0,
-0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,3,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,2,1,0,2,1,0,
-0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,1,1,1,1,1,1,1,1,1,1,0,0,1,1,1,1,0,1,1,1,1,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,
-0,3,1,1,2,2,2,2,2,1,2,2,2,1,1,2,2,2,2,2,2,2,1,2,2,1,0,1,1,1,1,0,
-0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,2,1,1,1,1,2,1,1,2,1,0,1,1,1,1,1,1,1,1,1,1,1,0,1,0,0,0,0,0,0,0,
-0,0,2,0,0,0,0,0,0,0,0,1,1,0,0,0,0,1,1,0,0,1,1,0,0,0,0,0,0,1,0,0,
-2,1,1,2,2,2,2,2,2,2,2,2,2,2,1,2,2,2,2,2,1,2,1,2,1,1,1,1,0,0,0,0,
-0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,2,1,2,2,2,2,2,2,2,2,2,2,1,2,1,2,1,1,2,1,1,1,2,1,2,1,2,0,1,0,1,
-0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,3,1,2,2,2,1,2,2,2,2,2,2,2,2,1,2,1,1,1,1,1,1,2,1,2,1,1,0,1,0,1,
-0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,1,2,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,
-0,2,0,1,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,
-3,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,1,1,1,1,1,1,1,0,1,1,0,1,0,0,1,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,2,0,1,1,1,0,1,0,0,0,1,1,0,1,1,0,0,0,0,0,1,1,0,0,
-0,1,1,1,2,1,2,2,2,0,2,0,2,0,1,1,2,1,1,1,1,2,1,0,1,1,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,0,1,0,0,0,0,0,1,0,1,2,2,0,1,0,0,1,1,2,2,1,2,0,2,0,0,0,1,2,0,1,
-2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,2,0,2,1,2,0,2,0,0,1,1,1,1,1,1,0,1,0,0,0,1,0,0,1,
-2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,1,0,0,0,0,0,1,0,2,1,1,0,1,0,0,1,1,1,2,2,0,0,1,0,0,0,1,0,0,1,
-1,1,2,1,0,1,1,1,0,1,0,1,1,1,1,0,0,0,1,0,1,0,0,0,0,0,0,0,0,2,2,1,
-0,2,0,1,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,1,0,0,1,0,1,1,1,1,0,0,0,0,0,1,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,2,1,0,1,1,1,1,1,1,1,1,1,1,1,0,1,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,1,1,1,0,0,0,0,1,1,1,0,1,1,0,1,0,0,0,1,1,0,1,
-2,0,1,0,1,0,1,0,0,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,1,0,1,1,1,0,1,0,0,1,1,2,1,1,2,0,1,0,0,0,1,1,0,1,
-1,0,0,1,0,0,1,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,1,0,1,1,2,0,1,0,0,0,0,2,1,1,2,0,2,0,0,0,1,1,0,1,
-1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,1,0,2,1,1,0,1,0,0,2,2,1,2,1,1,0,1,0,0,0,1,1,0,1,
-2,0,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,1,2,2,0,0,0,0,0,1,1,0,1,0,0,1,0,0,0,0,1,0,1,
-1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,1,2,2,0,0,0,0,2,1,1,1,0,2,1,1,0,0,0,2,1,0,1,
-1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,1,0,1,1,2,0,1,0,0,1,1,0,2,1,1,0,1,0,0,0,1,1,0,1,
-2,2,1,1,1,0,1,1,0,1,1,0,1,0,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,1,0,2,1,1,0,1,0,0,1,1,0,1,2,1,0,2,0,0,0,1,1,0,1,
-2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,
-0,1,0,0,2,0,2,1,1,0,1,0,1,0,0,1,0,0,0,0,1,0,0,0,1,0,0,0,0,0,1,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,0,0,1,0,0,1,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,1,0,1,1,2,0,1,0,0,1,1,1,0,1,0,0,1,0,0,0,1,0,0,1,
-1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,0,0,0,0,0,0,0,1,0,1,1,0,0,1,0,0,2,1,1,1,1,1,0,1,0,0,0,0,1,0,1,
-0,1,1,1,2,1,1,1,1,0,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,1,2,1,0,0,0,0,0,1,1,1,1,1,0,1,0,0,0,1,1,0,0,
-)
-
-Win1255HebrewModel = {
- 'charToOrderMap': win1255_CharToOrderMap,
- 'precedenceMatrix': HebrewLangModel,
- 'mTypicalPositiveRatio': 0.984004,
- 'keepEnglishLetter': False,
- 'charsetName': "windows-1255"
-}
-
-# flake8: noqa
diff --git a/script/_Lib/requests/packages/chardet/langhungarianmodel.py b/script/_Lib/requests/packages/chardet/langhungarianmodel.py
deleted file mode 100644
index 49d2f0f..0000000
--- a/script/_Lib/requests/packages/chardet/langhungarianmodel.py
+++ /dev/null
@@ -1,225 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Communicator client code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-######################### END LICENSE BLOCK #########################
-
-# 255: Control characters that usually does not exist in any text
-# 254: Carriage/Return
-# 253: symbol (punctuation) that does not belong to word
-# 252: 0 - 9
-
-# Character Mapping Table:
-Latin2_HungarianCharToOrderMap = (
-255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255, # 00
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, # 10
-253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253, # 20
-252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253, # 30
-253, 28, 40, 54, 45, 32, 50, 49, 38, 39, 53, 36, 41, 34, 35, 47,
- 46, 71, 43, 33, 37, 57, 48, 64, 68, 55, 52,253,253,253,253,253,
-253, 2, 18, 26, 17, 1, 27, 12, 20, 9, 22, 7, 6, 13, 4, 8,
- 23, 67, 10, 5, 3, 21, 19, 65, 62, 16, 11,253,253,253,253,253,
-159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,
-175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,
-191,192,193,194,195,196,197, 75,198,199,200,201,202,203,204,205,
- 79,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,
-221, 51, 81,222, 78,223,224,225,226, 44,227,228,229, 61,230,231,
-232,233,234, 58,235, 66, 59,236,237,238, 60, 69, 63,239,240,241,
- 82, 14, 74,242, 70, 80,243, 72,244, 15, 83, 77, 84, 30, 76, 85,
-245,246,247, 25, 73, 42, 24,248,249,250, 31, 56, 29,251,252,253,
-)
-
-win1250HungarianCharToOrderMap = (
-255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255, # 00
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, # 10
-253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253, # 20
-252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253, # 30
-253, 28, 40, 54, 45, 32, 50, 49, 38, 39, 53, 36, 41, 34, 35, 47,
- 46, 72, 43, 33, 37, 57, 48, 64, 68, 55, 52,253,253,253,253,253,
-253, 2, 18, 26, 17, 1, 27, 12, 20, 9, 22, 7, 6, 13, 4, 8,
- 23, 67, 10, 5, 3, 21, 19, 65, 62, 16, 11,253,253,253,253,253,
-161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,
-177,178,179,180, 78,181, 69,182,183,184,185,186,187,188,189,190,
-191,192,193,194,195,196,197, 76,198,199,200,201,202,203,204,205,
- 81,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,
-221, 51, 83,222, 80,223,224,225,226, 44,227,228,229, 61,230,231,
-232,233,234, 58,235, 66, 59,236,237,238, 60, 70, 63,239,240,241,
- 84, 14, 75,242, 71, 82,243, 73,244, 15, 85, 79, 86, 30, 77, 87,
-245,246,247, 25, 74, 42, 24,248,249,250, 31, 56, 29,251,252,253,
-)
-
-# Model Table:
-# total sequences: 100%
-# first 512 sequences: 94.7368%
-# first 1024 sequences:5.2623%
-# rest sequences: 0.8894%
-# negative sequences: 0.0009%
-HungarianLangModel = (
-0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,
-3,3,3,3,3,3,3,3,3,3,2,3,3,3,3,3,3,3,3,2,2,3,3,1,1,2,2,2,2,2,1,2,
-3,2,2,3,3,3,3,3,2,3,3,3,3,3,3,1,2,3,3,3,3,2,3,3,1,1,3,3,0,1,1,1,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,
-3,2,1,3,3,3,3,3,2,3,3,3,3,3,1,1,2,3,3,3,3,3,3,3,1,1,3,2,0,1,1,1,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,
-3,3,3,3,3,3,3,3,3,3,3,1,1,2,3,3,3,1,3,3,3,3,3,1,3,3,2,2,0,3,2,3,
-0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,
-3,3,3,3,3,3,2,3,3,3,2,3,3,2,3,3,3,3,3,2,3,3,2,2,3,2,3,2,0,3,2,2,
-0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,1,0,
-3,3,3,3,3,3,2,3,3,3,3,3,2,3,3,3,1,2,3,2,2,3,1,2,3,3,2,2,0,3,3,3,
-0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,2,2,3,3,3,3,3,3,2,3,3,3,3,2,3,3,3,3,0,2,3,2,
-0,0,0,1,1,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,1,1,1,3,3,2,1,3,2,2,3,2,1,3,2,2,1,0,3,3,1,
-0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
-3,2,2,3,3,3,3,3,1,2,3,3,3,3,1,2,1,3,3,3,3,2,2,3,1,1,3,2,0,1,1,1,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,
-3,3,3,3,3,3,3,3,2,2,3,3,3,3,3,2,1,3,3,3,3,3,2,2,1,3,3,3,0,1,1,2,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,1,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,3,3,3,2,3,3,2,3,3,3,2,0,3,2,3,
-0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,1,0,
-3,3,3,3,3,3,2,3,3,3,2,3,2,3,3,3,1,3,2,2,2,3,1,1,3,3,1,1,0,3,3,2,
-0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,2,3,3,3,2,3,2,3,3,3,2,3,3,3,3,3,1,2,3,2,2,0,2,2,2,
-0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
-3,3,3,2,2,2,3,1,3,3,2,2,1,3,3,3,1,1,3,1,2,3,2,3,2,2,2,1,0,2,2,2,
-0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,
-3,1,1,3,3,3,3,3,1,2,3,3,3,3,1,2,1,3,3,3,2,2,3,2,1,0,3,2,0,1,1,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,1,1,3,3,3,3,3,1,2,3,3,3,3,1,1,0,3,3,3,3,0,2,3,0,0,2,1,0,1,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,2,2,3,3,2,2,2,2,3,3,0,1,2,3,2,3,2,2,3,2,1,2,0,2,2,2,
-0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,
-3,3,3,3,3,3,1,2,3,3,3,2,1,2,3,3,2,2,2,3,2,3,3,1,3,3,1,1,0,2,3,2,
-0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
-3,3,3,1,2,2,2,2,3,3,3,1,1,1,3,3,1,1,3,1,1,3,2,1,2,3,1,1,0,2,2,2,
-0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
-3,3,3,2,1,2,1,1,3,3,1,1,1,1,3,3,1,1,2,2,1,2,1,1,2,2,1,1,0,2,2,1,
-0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
-3,3,3,1,1,2,1,1,3,3,1,0,1,1,3,3,2,0,1,1,2,3,1,0,2,2,1,0,0,1,3,2,
-0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
-3,2,1,3,3,3,3,3,1,2,3,2,3,3,2,1,1,3,2,3,2,1,2,2,0,1,2,1,0,0,1,1,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,
-3,3,3,3,2,2,2,2,3,1,2,2,1,1,3,3,0,3,2,1,2,3,2,1,3,3,1,1,0,2,1,3,
-0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
-3,3,3,2,2,2,3,2,3,3,3,2,1,1,3,3,1,1,1,2,2,3,2,3,2,2,2,1,0,2,2,1,
-0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
-1,0,0,3,3,3,3,3,0,0,3,3,2,3,0,0,0,2,3,3,1,0,1,2,0,0,1,1,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,1,2,3,3,3,3,3,1,2,3,3,2,2,1,1,0,3,3,2,2,1,2,2,1,0,2,2,0,1,1,1,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,2,2,1,3,1,2,3,3,2,2,1,1,2,2,1,1,1,1,3,2,1,1,1,1,2,1,0,1,2,1,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,
-2,3,3,1,1,1,1,1,3,3,3,0,1,1,3,3,1,1,1,1,1,2,2,0,3,1,1,2,0,2,1,1,
-0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,
-3,1,0,1,2,1,2,2,0,1,2,3,1,2,0,0,0,2,1,1,1,1,1,2,0,0,1,1,0,0,0,0,
-1,2,1,2,2,2,1,2,1,2,0,2,0,2,2,1,1,2,1,1,2,1,1,1,0,1,0,0,0,1,1,0,
-1,1,1,2,3,2,3,3,0,1,2,2,3,1,0,1,0,2,1,2,2,0,1,1,0,0,1,1,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,0,0,3,3,2,2,1,0,0,3,2,3,2,0,0,0,1,1,3,0,0,1,1,0,0,2,1,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,1,1,2,2,3,3,1,0,1,3,2,3,1,1,1,0,1,1,1,1,1,3,1,0,0,2,2,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,1,1,1,2,2,2,1,0,1,2,3,3,2,0,0,0,2,1,1,1,2,1,1,1,0,1,1,1,0,0,0,
-1,2,2,2,2,2,1,1,1,2,0,2,1,1,1,1,1,2,1,1,1,1,1,1,0,1,1,1,0,0,1,1,
-3,2,2,1,0,0,1,1,2,2,0,3,0,1,2,1,1,0,0,1,1,1,0,1,1,1,1,0,2,1,1,1,
-2,2,1,1,1,2,1,2,1,1,1,1,1,1,1,2,1,1,1,2,3,1,1,1,1,1,1,1,1,1,0,1,
-2,3,3,0,1,0,0,0,3,3,1,0,0,1,2,2,1,0,0,0,0,2,0,0,1,1,1,0,2,1,1,1,
-2,1,1,1,1,1,1,2,1,1,0,1,1,0,1,1,1,0,1,2,1,1,0,1,1,1,1,1,1,1,0,1,
-2,3,3,0,1,0,0,0,2,2,0,0,0,0,1,2,2,0,0,0,0,1,0,0,1,1,0,0,2,0,1,0,
-2,1,1,1,1,2,1,1,1,1,1,1,1,2,1,1,1,1,1,1,1,1,1,2,0,1,1,1,1,1,0,1,
-3,2,2,0,1,0,1,0,2,3,2,0,0,1,2,2,1,0,0,1,1,1,0,0,2,1,0,1,2,2,1,1,
-2,1,1,1,1,1,1,2,1,1,1,1,1,1,0,2,1,0,1,1,0,1,1,1,0,1,1,2,1,1,0,1,
-2,2,2,0,0,1,0,0,2,2,1,1,0,0,2,1,1,0,0,0,1,2,0,0,2,1,0,0,2,1,1,1,
-2,1,1,1,1,2,1,2,1,1,1,2,2,1,1,2,1,1,1,2,1,1,1,1,1,1,1,1,1,1,0,1,
-1,2,3,0,0,0,1,0,3,2,1,0,0,1,2,1,1,0,0,0,0,2,1,0,1,1,0,0,2,1,2,1,
-1,1,0,0,0,1,0,1,1,1,1,1,2,0,0,1,0,0,0,2,0,0,1,1,1,1,1,1,1,1,0,1,
-3,0,0,2,1,2,2,1,0,0,2,1,2,2,0,0,0,2,1,1,1,0,1,1,0,0,1,1,2,0,0,0,
-1,2,1,2,2,1,1,2,1,2,0,1,1,1,1,1,1,1,1,1,2,1,1,0,0,1,1,1,1,0,0,1,
-1,3,2,0,0,0,1,0,2,2,2,0,0,0,2,2,1,0,0,0,0,3,1,1,1,1,0,0,2,1,1,1,
-2,1,0,1,1,1,0,1,1,1,1,1,1,1,0,2,1,0,0,1,0,1,1,0,1,1,1,1,1,1,0,1,
-2,3,2,0,0,0,1,0,2,2,0,0,0,0,2,1,1,0,0,0,0,2,1,0,1,1,0,0,2,1,1,0,
-2,1,1,1,1,2,1,2,1,2,0,1,1,1,0,2,1,1,1,2,1,1,1,1,0,1,1,1,1,1,0,1,
-3,1,1,2,2,2,3,2,1,1,2,2,1,1,0,1,0,2,2,1,1,1,1,1,0,0,1,1,0,1,1,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,2,2,0,0,0,0,0,2,2,0,0,0,0,2,2,1,0,0,0,1,1,0,0,1,2,0,0,2,1,1,1,
-2,2,1,1,1,2,1,2,1,1,0,1,1,1,1,2,1,1,1,2,1,1,1,1,0,1,2,1,1,1,0,1,
-1,0,0,1,2,3,2,1,0,0,2,0,1,1,0,0,0,1,1,1,1,0,1,1,0,0,1,0,0,0,0,0,
-1,2,1,2,1,2,1,1,1,2,0,2,1,1,1,0,1,2,0,0,1,1,1,0,0,0,0,0,0,0,0,0,
-2,3,2,0,0,0,0,0,1,1,2,1,0,0,1,1,1,0,0,0,0,2,0,0,1,1,0,0,2,1,1,1,
-2,1,1,1,1,1,1,2,1,0,1,1,1,1,0,2,1,1,1,1,1,1,0,1,0,1,1,1,1,1,0,1,
-1,2,2,0,1,1,1,0,2,2,2,0,0,0,3,2,1,0,0,0,1,1,0,0,1,1,0,1,1,1,0,0,
-1,1,0,1,1,1,1,1,1,1,1,2,1,1,1,1,1,1,1,2,1,1,1,0,0,1,1,1,0,1,0,1,
-2,1,0,2,1,1,2,2,1,1,2,1,1,1,0,0,0,1,1,0,1,1,1,1,0,0,1,1,1,0,0,0,
-1,2,2,2,2,2,1,1,1,2,0,2,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,0,0,0,1,0,
-1,2,3,0,0,0,1,0,2,2,0,0,0,0,2,2,0,0,0,0,0,1,0,0,1,0,0,0,2,0,1,0,
-2,1,1,1,1,1,0,2,0,0,0,1,2,1,1,1,1,0,1,2,0,1,0,1,0,1,1,1,0,1,0,1,
-2,2,2,0,0,0,1,0,2,1,2,0,0,0,1,1,2,0,0,0,0,1,0,0,1,1,0,0,2,1,0,1,
-2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,0,1,1,1,1,1,0,1,
-1,2,2,0,0,0,1,0,2,2,2,0,0,0,1,1,0,0,0,0,0,1,1,0,2,0,0,1,1,1,0,1,
-1,0,1,1,1,1,1,1,0,1,1,1,1,0,0,1,0,0,1,1,0,1,0,1,1,1,1,1,0,0,0,1,
-1,0,0,1,0,1,2,1,0,0,1,1,1,2,0,0,0,1,1,0,1,0,1,1,0,0,1,0,0,0,0,0,
-0,2,1,2,1,1,1,1,1,2,0,2,0,1,1,0,1,2,1,0,1,1,1,0,0,0,0,0,0,1,0,0,
-2,1,1,0,1,2,0,0,1,1,1,0,0,0,1,1,0,0,0,0,0,1,0,0,1,0,0,0,2,1,0,1,
-2,2,1,1,1,1,1,2,1,1,0,1,1,1,1,2,1,1,1,2,1,1,0,1,0,1,1,1,1,1,0,1,
-1,2,2,0,0,0,0,0,1,1,0,0,0,0,2,1,0,0,0,0,0,2,0,0,2,2,0,0,2,0,0,1,
-2,1,1,1,1,1,1,1,0,1,1,0,1,1,0,1,0,0,0,1,1,1,1,0,0,1,1,1,1,0,0,1,
-1,1,2,0,0,3,1,0,2,1,1,1,0,0,1,1,1,0,0,0,1,1,0,0,0,1,0,0,1,0,1,0,
-1,2,1,0,1,1,1,2,1,1,0,1,1,1,1,1,0,0,0,1,1,1,1,1,0,1,0,0,0,1,0,0,
-2,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,1,0,0,0,1,0,0,0,0,2,0,0,0,
-2,1,1,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,1,1,2,1,1,0,0,1,1,1,1,1,0,1,
-2,1,1,1,2,1,1,1,0,1,1,2,1,0,0,0,0,1,1,1,1,0,1,0,0,0,0,1,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,0,1,1,1,1,1,0,0,1,1,2,1,0,0,0,1,1,0,0,0,1,1,0,0,1,0,1,0,0,0,
-1,2,1,1,1,1,1,1,1,1,0,1,0,1,1,1,1,1,1,0,1,1,1,0,0,0,0,0,0,1,0,0,
-2,0,0,0,1,1,1,1,0,0,1,1,0,0,0,0,0,1,1,1,2,0,0,1,0,0,1,0,1,0,0,0,
-0,1,1,1,1,1,1,1,1,2,0,1,1,1,1,0,1,1,1,0,1,1,1,0,0,0,0,0,0,0,0,0,
-1,0,0,1,1,1,1,1,0,0,2,1,0,1,0,0,0,1,0,1,0,0,0,0,0,0,1,0,0,0,0,0,
-0,1,1,1,1,1,1,0,1,1,0,1,0,1,1,0,1,1,0,0,1,1,1,0,0,0,0,0,0,0,0,0,
-1,0,0,1,1,1,0,0,0,0,1,0,2,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,
-0,1,1,1,1,1,0,0,1,1,0,1,0,1,0,0,1,1,1,0,1,1,1,0,0,0,0,0,0,0,0,0,
-0,0,0,1,0,0,0,0,0,0,1,1,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,1,1,1,0,1,0,0,1,1,0,1,0,1,1,0,1,1,1,0,1,1,1,0,0,0,0,0,0,0,0,0,
-2,1,1,1,1,1,1,1,1,1,1,0,0,1,1,1,0,0,1,0,0,1,0,1,0,1,1,1,0,0,1,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,0,0,1,1,1,1,0,0,0,1,1,1,0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,
-0,1,1,1,1,1,1,0,1,1,0,1,0,1,0,0,1,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,
-)
-
-Latin2HungarianModel = {
- 'charToOrderMap': Latin2_HungarianCharToOrderMap,
- 'precedenceMatrix': HungarianLangModel,
- 'mTypicalPositiveRatio': 0.947368,
- 'keepEnglishLetter': True,
- 'charsetName': "ISO-8859-2"
-}
-
-Win1250HungarianModel = {
- 'charToOrderMap': win1250HungarianCharToOrderMap,
- 'precedenceMatrix': HungarianLangModel,
- 'mTypicalPositiveRatio': 0.947368,
- 'keepEnglishLetter': True,
- 'charsetName': "windows-1250"
-}
-
-# flake8: noqa
diff --git a/script/_Lib/requests/packages/chardet/langthaimodel.py b/script/_Lib/requests/packages/chardet/langthaimodel.py
deleted file mode 100644
index 0508b1b..0000000
--- a/script/_Lib/requests/packages/chardet/langthaimodel.py
+++ /dev/null
@@ -1,200 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Communicator client code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-######################### END LICENSE BLOCK #########################
-
-# 255: Control characters that usually does not exist in any text
-# 254: Carriage/Return
-# 253: symbol (punctuation) that does not belong to word
-# 252: 0 - 9
-
-# The following result for thai was collected from a limited sample (1M).
-
-# Character Mapping Table:
-TIS620CharToOrderMap = (
-255,255,255,255,255,255,255,255,255,255,254,255,255,254,255,255, # 00
-255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, # 10
-253,253,253,253,253,253,253,253,253,253,253,253,253,253,253,253, # 20
-252,252,252,252,252,252,252,252,252,252,253,253,253,253,253,253, # 30
-253,182,106,107,100,183,184,185,101, 94,186,187,108,109,110,111, # 40
-188,189,190, 89, 95,112,113,191,192,193,194,253,253,253,253,253, # 50
-253, 64, 72, 73,114, 74,115,116,102, 81,201,117, 90,103, 78, 82, # 60
- 96,202, 91, 79, 84,104,105, 97, 98, 92,203,253,253,253,253,253, # 70
-209,210,211,212,213, 88,214,215,216,217,218,219,220,118,221,222,
-223,224, 99, 85, 83,225,226,227,228,229,230,231,232,233,234,235,
-236, 5, 30,237, 24,238, 75, 8, 26, 52, 34, 51,119, 47, 58, 57,
- 49, 53, 55, 43, 20, 19, 44, 14, 48, 3, 17, 25, 39, 62, 31, 54,
- 45, 9, 16, 2, 61, 15,239, 12, 42, 46, 18, 21, 76, 4, 66, 63,
- 22, 10, 1, 36, 23, 13, 40, 27, 32, 35, 86,240,241,242,243,244,
- 11, 28, 41, 29, 33,245, 50, 37, 6, 7, 67, 77, 38, 93,246,247,
- 68, 56, 59, 65, 69, 60, 70, 80, 71, 87,248,249,250,251,252,253,
-)
-
-# Model Table:
-# total sequences: 100%
-# first 512 sequences: 92.6386%
-# first 1024 sequences:7.3177%
-# rest sequences: 1.0230%
-# negative sequences: 0.0436%
-ThaiLangModel = (
-0,1,3,3,3,3,0,0,3,3,0,3,3,0,3,3,3,3,3,3,3,3,0,0,3,3,3,0,3,3,3,3,
-0,3,3,0,0,0,1,3,0,3,3,2,3,3,0,1,2,3,3,3,3,0,2,0,2,0,0,3,2,1,2,2,
-3,0,3,3,2,3,0,0,3,3,0,3,3,0,3,3,3,3,3,3,3,3,3,0,3,2,3,0,2,2,2,3,
-0,2,3,0,0,0,0,1,0,1,2,3,1,1,3,2,2,0,1,1,0,0,1,0,0,0,0,0,0,0,1,1,
-3,3,3,2,3,3,3,3,3,3,3,3,3,3,3,2,2,2,2,2,2,2,3,3,2,3,2,3,3,2,2,2,
-3,1,2,3,0,3,3,2,2,1,2,3,3,1,2,0,1,3,0,1,0,0,1,0,0,0,0,0,0,0,1,1,
-3,3,2,2,3,3,3,3,1,2,3,3,3,3,3,2,2,2,2,3,3,2,2,3,3,2,2,3,2,3,2,2,
-3,3,1,2,3,1,2,2,3,3,1,0,2,1,0,0,3,1,2,1,0,0,1,0,0,0,0,0,0,1,0,1,
-3,3,3,3,3,3,2,2,3,3,3,3,2,3,2,2,3,3,2,2,3,2,2,2,2,1,1,3,1,2,1,1,
-3,2,1,0,2,1,0,1,0,1,1,0,1,1,0,0,1,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,
-3,3,3,2,3,2,3,3,2,2,3,2,3,3,2,3,1,1,2,3,2,2,2,3,2,2,2,2,2,1,2,1,
-2,2,1,1,3,3,2,1,0,1,2,2,0,1,3,0,0,0,1,1,0,0,0,0,0,2,3,0,0,2,1,1,
-3,3,2,3,3,2,0,0,3,3,0,3,3,0,2,2,3,1,2,2,1,1,1,0,2,2,2,0,2,2,1,1,
-0,2,1,0,2,0,0,2,0,1,0,0,1,0,0,0,1,1,1,1,0,0,0,0,0,0,0,0,0,0,1,0,
-3,3,2,3,3,2,0,0,3,3,0,2,3,0,2,1,2,2,2,2,1,2,0,0,2,2,2,0,2,2,1,1,
-0,2,1,0,2,0,0,2,0,1,1,0,1,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,
-3,3,2,3,2,3,2,0,2,2,1,3,2,1,3,2,1,2,3,2,2,3,0,2,3,2,2,1,2,2,2,2,
-1,2,2,0,0,0,0,2,0,1,2,0,1,1,1,0,1,0,3,1,1,0,0,0,0,0,0,0,0,0,1,0,
-3,3,2,3,3,2,3,2,2,2,3,2,2,3,2,2,1,2,3,2,2,3,1,3,2,2,2,3,2,2,2,3,
-3,2,1,3,0,1,1,1,0,2,1,1,1,1,1,0,1,0,1,1,0,0,0,0,0,0,0,0,0,2,0,0,
-1,0,0,3,0,3,3,3,3,3,0,0,3,0,2,2,3,3,3,3,3,0,0,0,1,1,3,0,0,0,0,2,
-0,0,1,0,0,0,0,0,0,0,2,3,0,0,0,3,0,2,0,0,0,0,0,3,0,0,0,0,0,0,0,0,
-2,0,3,3,3,3,0,0,2,3,0,0,3,0,3,3,2,3,3,3,3,3,0,0,3,3,3,0,0,0,3,3,
-0,0,3,0,0,0,0,2,0,0,2,1,1,3,0,0,1,0,0,2,3,0,1,0,0,0,0,0,0,0,1,0,
-3,3,3,3,2,3,3,3,3,3,3,3,1,2,1,3,3,2,2,1,2,2,2,3,1,1,2,0,2,1,2,1,
-2,2,1,0,0,0,1,1,0,1,0,1,1,0,0,0,0,0,1,1,0,0,1,0,0,0,0,0,0,0,0,0,
-3,0,2,1,2,3,3,3,0,2,0,2,2,0,2,1,3,2,2,1,2,1,0,0,2,2,1,0,2,1,2,2,
-0,1,1,0,0,0,0,1,0,1,1,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,2,1,3,3,1,1,3,0,2,3,1,1,3,2,1,1,2,0,2,2,3,2,1,1,1,1,1,2,
-3,0,0,1,3,1,2,1,2,0,3,0,0,0,1,0,3,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,
-3,3,1,1,3,2,3,3,3,1,3,2,1,3,2,1,3,2,2,2,2,1,3,3,1,2,1,3,1,2,3,0,
-2,1,1,3,2,2,2,1,2,1,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,
-3,3,2,3,2,3,3,2,3,2,3,2,3,3,2,1,0,3,2,2,2,1,2,2,2,1,2,2,1,2,1,1,
-2,2,2,3,0,1,3,1,1,1,1,0,1,1,0,2,1,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,2,3,2,2,1,1,3,2,3,2,3,2,0,3,2,2,1,2,0,2,2,2,1,2,2,2,2,1,
-3,2,1,2,2,1,0,2,0,1,0,0,1,1,0,0,0,0,0,1,1,0,1,0,0,0,0,0,0,0,0,1,
-3,3,3,3,3,2,3,1,2,3,3,2,2,3,0,1,1,2,0,3,3,2,2,3,0,1,1,3,0,0,0,0,
-3,1,0,3,3,0,2,0,2,1,0,0,3,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,2,3,2,3,3,0,1,3,1,1,2,1,2,1,1,3,1,1,0,2,3,1,1,1,1,1,1,1,1,
-3,1,1,2,2,2,2,1,1,1,0,0,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
-3,2,2,1,1,2,1,3,3,2,3,2,2,3,2,2,3,1,2,2,1,2,0,3,2,1,2,2,2,2,2,1,
-3,2,1,2,2,2,1,1,1,1,0,0,1,1,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,1,3,3,0,2,1,0,3,2,0,0,3,1,0,1,1,0,1,0,0,0,0,0,1,
-1,0,0,1,0,3,2,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,0,2,2,2,3,0,0,1,3,0,3,2,0,3,2,2,3,3,3,3,3,1,0,2,2,2,0,2,2,1,2,
-0,2,3,0,0,0,0,1,0,1,0,0,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
-3,0,2,3,1,3,3,2,3,3,0,3,3,0,3,2,2,3,2,3,3,3,0,0,2,2,3,0,1,1,1,3,
-0,0,3,0,0,0,2,2,0,1,3,0,1,2,2,2,3,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,
-3,2,3,3,2,0,3,3,2,2,3,1,3,2,1,3,2,0,1,2,2,0,2,3,2,1,0,3,0,0,0,0,
-3,0,0,2,3,1,3,0,0,3,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,1,3,2,2,2,1,2,0,1,3,1,1,3,1,3,0,0,2,1,1,1,1,2,1,1,1,0,2,1,0,1,
-1,2,0,0,0,3,1,1,0,0,0,0,1,0,1,0,0,1,0,1,0,0,0,0,0,3,1,0,0,0,1,0,
-3,3,3,3,2,2,2,2,2,1,3,1,1,1,2,0,1,1,2,1,2,1,3,2,0,0,3,1,1,1,1,1,
-3,1,0,2,3,0,0,0,3,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,2,3,0,3,3,0,2,0,0,0,0,0,0,0,3,0,0,1,0,0,0,0,0,0,0,0,0,0,0,
-0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,2,3,1,3,0,0,1,2,0,0,2,0,3,3,2,3,3,3,2,3,0,0,2,2,2,0,0,0,2,2,
-0,0,1,0,0,0,0,3,0,0,0,0,2,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,
-0,0,0,3,0,2,0,0,0,0,0,0,0,0,0,0,1,2,3,1,3,3,0,0,1,0,3,0,0,0,0,0,
-0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,1,2,3,1,2,3,1,0,3,0,2,2,1,0,2,1,1,2,0,1,0,0,1,1,1,1,0,1,0,0,
-1,0,0,0,0,1,1,0,3,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,2,1,0,1,1,1,3,1,2,2,2,2,2,2,1,1,1,1,0,3,1,0,1,3,1,1,1,1,
-1,1,0,2,0,1,3,1,1,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,2,0,1,
-3,0,2,2,1,3,3,2,3,3,0,1,1,0,2,2,1,2,1,3,3,1,0,0,3,2,0,0,0,0,2,1,
-0,1,0,0,0,0,1,2,0,1,1,3,1,1,2,2,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,
-0,0,3,0,0,1,0,0,0,3,0,0,3,0,3,1,0,1,1,1,3,2,0,0,0,3,0,0,0,0,2,0,
-0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,2,0,0,0,0,0,0,0,0,0,
-3,3,1,3,2,1,3,3,1,2,2,0,1,2,1,0,1,2,0,0,0,0,0,3,0,0,0,3,0,0,0,0,
-3,0,0,1,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,0,1,2,0,3,3,3,2,2,0,1,1,0,1,3,0,0,0,2,2,0,0,0,0,3,1,0,1,0,0,0,
-0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,0,2,3,1,2,0,0,2,1,0,3,1,0,1,2,0,1,1,1,1,3,0,0,3,1,1,0,2,2,1,1,
-0,2,0,0,0,0,0,1,0,1,0,0,1,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,0,0,3,1,2,0,0,2,2,0,1,2,0,1,0,1,3,1,2,1,0,0,0,2,0,3,0,0,0,1,0,
-0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,0,1,1,2,2,0,0,0,2,0,2,1,0,1,1,0,1,1,1,2,1,0,0,1,1,1,0,2,1,1,1,
-0,1,1,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,1,0,1,
-0,0,0,2,0,1,3,1,1,1,1,0,0,0,0,3,2,0,1,0,0,0,1,2,0,0,0,1,0,0,0,0,
-0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,3,3,3,3,1,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,0,2,3,2,2,0,0,0,1,0,0,0,0,2,3,2,1,2,2,3,0,0,0,2,3,1,0,0,0,1,1,
-0,0,1,0,0,0,0,0,0,0,1,0,0,1,0,0,0,0,0,1,1,0,1,0,0,0,0,0,0,0,0,0,
-3,3,2,2,0,1,0,0,0,0,2,0,2,0,1,0,0,0,1,1,0,0,0,2,1,0,1,0,1,1,0,0,
-0,1,0,2,0,0,1,0,3,0,1,0,0,0,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,1,0,0,1,0,0,0,0,0,1,1,2,0,0,0,0,1,0,0,1,3,1,0,0,0,0,1,1,0,0,
-0,1,0,0,0,0,3,0,0,0,0,0,0,3,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,
-3,3,1,1,1,1,2,3,0,0,2,1,1,1,1,1,0,2,1,1,0,0,0,2,1,0,1,2,1,1,0,1,
-2,1,0,3,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,3,1,0,0,0,0,0,0,0,3,0,0,0,3,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,1,
-0,0,0,2,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,2,0,0,0,0,0,0,1,2,1,0,1,1,0,2,0,0,1,0,0,2,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,2,0,0,0,1,3,0,1,0,0,0,2,0,0,0,0,0,0,0,1,2,0,0,0,0,0,
-3,3,0,0,1,1,2,0,0,1,2,1,0,1,1,1,0,1,1,0,0,2,1,1,0,1,0,0,1,1,1,0,
-0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,2,2,1,0,0,0,0,1,0,0,0,0,3,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,
-2,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,3,0,0,1,1,0,0,0,2,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,0,1,2,0,1,2,0,0,1,1,0,2,0,1,0,0,1,0,0,0,0,1,0,0,0,2,0,0,0,0,
-1,0,0,1,0,1,1,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,1,0,0,0,0,0,0,0,1,1,0,1,1,0,2,1,3,0,0,0,0,1,1,0,0,0,0,0,0,0,3,
-1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,0,1,0,1,0,0,2,0,0,2,0,0,1,1,2,0,0,1,1,0,0,0,1,0,0,0,1,1,0,0,0,
-1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,
-1,0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,1,1,0,0,0,
-2,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,0,0,0,0,2,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,1,3,0,0,0,
-2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,1,0,0,0,0,
-1,0,0,0,0,0,0,0,0,1,0,0,0,0,2,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,1,1,0,0,2,1,0,0,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-)
-
-TIS620ThaiModel = {
- 'charToOrderMap': TIS620CharToOrderMap,
- 'precedenceMatrix': ThaiLangModel,
- 'mTypicalPositiveRatio': 0.926386,
- 'keepEnglishLetter': False,
- 'charsetName': "TIS-620"
-}
-
-# flake8: noqa
diff --git a/script/_Lib/requests/packages/chardet/latin1prober.py b/script/_Lib/requests/packages/chardet/latin1prober.py
deleted file mode 100644
index ad695f5..0000000
--- a/script/_Lib/requests/packages/chardet/latin1prober.py
+++ /dev/null
@@ -1,139 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Universal charset detector code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Mark Pilgrim - port to Python
-# Shy Shalom - original C code
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-######################### END LICENSE BLOCK #########################
-
-from .charsetprober import CharSetProber
-from .constants import eNotMe
-from .compat import wrap_ord
-
-FREQ_CAT_NUM = 4
-
-UDF = 0 # undefined
-OTH = 1 # other
-ASC = 2 # ascii capital letter
-ASS = 3 # ascii small letter
-ACV = 4 # accent capital vowel
-ACO = 5 # accent capital other
-ASV = 6 # accent small vowel
-ASO = 7 # accent small other
-CLASS_NUM = 8 # total classes
-
-Latin1_CharToClass = (
- OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH, # 00 - 07
- OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH, # 08 - 0F
- OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH, # 10 - 17
- OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH, # 18 - 1F
- OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH, # 20 - 27
- OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH, # 28 - 2F
- OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH, # 30 - 37
- OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH, # 38 - 3F
- OTH, ASC, ASC, ASC, ASC, ASC, ASC, ASC, # 40 - 47
- ASC, ASC, ASC, ASC, ASC, ASC, ASC, ASC, # 48 - 4F
- ASC, ASC, ASC, ASC, ASC, ASC, ASC, ASC, # 50 - 57
- ASC, ASC, ASC, OTH, OTH, OTH, OTH, OTH, # 58 - 5F
- OTH, ASS, ASS, ASS, ASS, ASS, ASS, ASS, # 60 - 67
- ASS, ASS, ASS, ASS, ASS, ASS, ASS, ASS, # 68 - 6F
- ASS, ASS, ASS, ASS, ASS, ASS, ASS, ASS, # 70 - 77
- ASS, ASS, ASS, OTH, OTH, OTH, OTH, OTH, # 78 - 7F
- OTH, UDF, OTH, ASO, OTH, OTH, OTH, OTH, # 80 - 87
- OTH, OTH, ACO, OTH, ACO, UDF, ACO, UDF, # 88 - 8F
- UDF, OTH, OTH, OTH, OTH, OTH, OTH, OTH, # 90 - 97
- OTH, OTH, ASO, OTH, ASO, UDF, ASO, ACO, # 98 - 9F
- OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH, # A0 - A7
- OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH, # A8 - AF
- OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH, # B0 - B7
- OTH, OTH, OTH, OTH, OTH, OTH, OTH, OTH, # B8 - BF
- ACV, ACV, ACV, ACV, ACV, ACV, ACO, ACO, # C0 - C7
- ACV, ACV, ACV, ACV, ACV, ACV, ACV, ACV, # C8 - CF
- ACO, ACO, ACV, ACV, ACV, ACV, ACV, OTH, # D0 - D7
- ACV, ACV, ACV, ACV, ACV, ACO, ACO, ACO, # D8 - DF
- ASV, ASV, ASV, ASV, ASV, ASV, ASO, ASO, # E0 - E7
- ASV, ASV, ASV, ASV, ASV, ASV, ASV, ASV, # E8 - EF
- ASO, ASO, ASV, ASV, ASV, ASV, ASV, OTH, # F0 - F7
- ASV, ASV, ASV, ASV, ASV, ASO, ASO, ASO, # F8 - FF
-)
-
-# 0 : illegal
-# 1 : very unlikely
-# 2 : normal
-# 3 : very likely
-Latin1ClassModel = (
- # UDF OTH ASC ASS ACV ACO ASV ASO
- 0, 0, 0, 0, 0, 0, 0, 0, # UDF
- 0, 3, 3, 3, 3, 3, 3, 3, # OTH
- 0, 3, 3, 3, 3, 3, 3, 3, # ASC
- 0, 3, 3, 3, 1, 1, 3, 3, # ASS
- 0, 3, 3, 3, 1, 2, 1, 2, # ACV
- 0, 3, 3, 3, 3, 3, 3, 3, # ACO
- 0, 3, 1, 3, 1, 1, 1, 3, # ASV
- 0, 3, 1, 3, 1, 1, 3, 3, # ASO
-)
-
-
-class Latin1Prober(CharSetProber):
- def __init__(self):
- CharSetProber.__init__(self)
- self.reset()
-
- def reset(self):
- self._mLastCharClass = OTH
- self._mFreqCounter = [0] * FREQ_CAT_NUM
- CharSetProber.reset(self)
-
- def get_charset_name(self):
- return "windows-1252"
-
- def feed(self, aBuf):
- aBuf = self.filter_with_english_letters(aBuf)
- for c in aBuf:
- charClass = Latin1_CharToClass[wrap_ord(c)]
- freq = Latin1ClassModel[(self._mLastCharClass * CLASS_NUM)
- + charClass]
- if freq == 0:
- self._mState = eNotMe
- break
- self._mFreqCounter[freq] += 1
- self._mLastCharClass = charClass
-
- return self.get_state()
-
- def get_confidence(self):
- if self.get_state() == eNotMe:
- return 0.01
-
- total = sum(self._mFreqCounter)
- if total < 0.01:
- confidence = 0.0
- else:
- confidence = ((self._mFreqCounter[3] / total)
- - (self._mFreqCounter[1] * 20.0 / total))
- if confidence < 0.0:
- confidence = 0.0
- # lower the confidence of latin1 so that other more accurate
- # detector can take priority.
- confidence = confidence * 0.5
- return confidence
diff --git a/script/_Lib/requests/packages/chardet/mbcharsetprober.py b/script/_Lib/requests/packages/chardet/mbcharsetprober.py
deleted file mode 100644
index bb42f2f..0000000
--- a/script/_Lib/requests/packages/chardet/mbcharsetprober.py
+++ /dev/null
@@ -1,86 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Universal charset detector code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Mark Pilgrim - port to Python
-# Shy Shalom - original C code
-# Proofpoint, Inc.
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-######################### END LICENSE BLOCK #########################
-
-import sys
-from . import constants
-from .charsetprober import CharSetProber
-
-
-class MultiByteCharSetProber(CharSetProber):
- def __init__(self):
- CharSetProber.__init__(self)
- self._mDistributionAnalyzer = None
- self._mCodingSM = None
- self._mLastChar = [0, 0]
-
- def reset(self):
- CharSetProber.reset(self)
- if self._mCodingSM:
- self._mCodingSM.reset()
- if self._mDistributionAnalyzer:
- self._mDistributionAnalyzer.reset()
- self._mLastChar = [0, 0]
-
- def get_charset_name(self):
- pass
-
- def feed(self, aBuf):
- aLen = len(aBuf)
- for i in range(0, aLen):
- codingState = self._mCodingSM.next_state(aBuf[i])
- if codingState == constants.eError:
- if constants._debug:
- sys.stderr.write(self.get_charset_name()
- + ' prober hit error at byte ' + str(i)
- + '\n')
- self._mState = constants.eNotMe
- break
- elif codingState == constants.eItsMe:
- self._mState = constants.eFoundIt
- break
- elif codingState == constants.eStart:
- charLen = self._mCodingSM.get_current_charlen()
- if i == 0:
- self._mLastChar[1] = aBuf[0]
- self._mDistributionAnalyzer.feed(self._mLastChar, charLen)
- else:
- self._mDistributionAnalyzer.feed(aBuf[i - 1:i + 1],
- charLen)
-
- self._mLastChar[0] = aBuf[aLen - 1]
-
- if self.get_state() == constants.eDetecting:
- if (self._mDistributionAnalyzer.got_enough_data() and
- (self.get_confidence() > constants.SHORTCUT_THRESHOLD)):
- self._mState = constants.eFoundIt
-
- return self.get_state()
-
- def get_confidence(self):
- return self._mDistributionAnalyzer.get_confidence()
diff --git a/script/_Lib/requests/packages/chardet/mbcsgroupprober.py b/script/_Lib/requests/packages/chardet/mbcsgroupprober.py
deleted file mode 100644
index 03c9dcf..0000000
--- a/script/_Lib/requests/packages/chardet/mbcsgroupprober.py
+++ /dev/null
@@ -1,54 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Universal charset detector code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Mark Pilgrim - port to Python
-# Shy Shalom - original C code
-# Proofpoint, Inc.
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-######################### END LICENSE BLOCK #########################
-
-from .charsetgroupprober import CharSetGroupProber
-from .utf8prober import UTF8Prober
-from .sjisprober import SJISProber
-from .eucjpprober import EUCJPProber
-from .gb2312prober import GB2312Prober
-from .euckrprober import EUCKRProber
-from .cp949prober import CP949Prober
-from .big5prober import Big5Prober
-from .euctwprober import EUCTWProber
-
-
-class MBCSGroupProber(CharSetGroupProber):
- def __init__(self):
- CharSetGroupProber.__init__(self)
- self._mProbers = [
- UTF8Prober(),
- SJISProber(),
- EUCJPProber(),
- GB2312Prober(),
- EUCKRProber(),
- CP949Prober(),
- Big5Prober(),
- EUCTWProber()
- ]
- self.reset()
diff --git a/script/_Lib/requests/packages/chardet/mbcssm.py b/script/_Lib/requests/packages/chardet/mbcssm.py
deleted file mode 100644
index 3f93cfb..0000000
--- a/script/_Lib/requests/packages/chardet/mbcssm.py
+++ /dev/null
@@ -1,575 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-######################### END LICENSE BLOCK #########################
-
-from .constants import eStart, eError, eItsMe
-
-# BIG5
-
-BIG5_cls = (
- 1,1,1,1,1,1,1,1, # 00 - 07 #allow 0x00 as legal value
- 1,1,1,1,1,1,0,0, # 08 - 0f
- 1,1,1,1,1,1,1,1, # 10 - 17
- 1,1,1,0,1,1,1,1, # 18 - 1f
- 1,1,1,1,1,1,1,1, # 20 - 27
- 1,1,1,1,1,1,1,1, # 28 - 2f
- 1,1,1,1,1,1,1,1, # 30 - 37
- 1,1,1,1,1,1,1,1, # 38 - 3f
- 2,2,2,2,2,2,2,2, # 40 - 47
- 2,2,2,2,2,2,2,2, # 48 - 4f
- 2,2,2,2,2,2,2,2, # 50 - 57
- 2,2,2,2,2,2,2,2, # 58 - 5f
- 2,2,2,2,2,2,2,2, # 60 - 67
- 2,2,2,2,2,2,2,2, # 68 - 6f
- 2,2,2,2,2,2,2,2, # 70 - 77
- 2,2,2,2,2,2,2,1, # 78 - 7f
- 4,4,4,4,4,4,4,4, # 80 - 87
- 4,4,4,4,4,4,4,4, # 88 - 8f
- 4,4,4,4,4,4,4,4, # 90 - 97
- 4,4,4,4,4,4,4,4, # 98 - 9f
- 4,3,3,3,3,3,3,3, # a0 - a7
- 3,3,3,3,3,3,3,3, # a8 - af
- 3,3,3,3,3,3,3,3, # b0 - b7
- 3,3,3,3,3,3,3,3, # b8 - bf
- 3,3,3,3,3,3,3,3, # c0 - c7
- 3,3,3,3,3,3,3,3, # c8 - cf
- 3,3,3,3,3,3,3,3, # d0 - d7
- 3,3,3,3,3,3,3,3, # d8 - df
- 3,3,3,3,3,3,3,3, # e0 - e7
- 3,3,3,3,3,3,3,3, # e8 - ef
- 3,3,3,3,3,3,3,3, # f0 - f7
- 3,3,3,3,3,3,3,0 # f8 - ff
-)
-
-BIG5_st = (
- eError,eStart,eStart, 3,eError,eError,eError,eError,#00-07
- eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eError,#08-0f
- eError,eStart,eStart,eStart,eStart,eStart,eStart,eStart#10-17
-)
-
-Big5CharLenTable = (0, 1, 1, 2, 0)
-
-Big5SMModel = {'classTable': BIG5_cls,
- 'classFactor': 5,
- 'stateTable': BIG5_st,
- 'charLenTable': Big5CharLenTable,
- 'name': 'Big5'}
-
-# CP949
-
-CP949_cls = (
- 1,1,1,1,1,1,1,1, 1,1,1,1,1,1,0,0, # 00 - 0f
- 1,1,1,1,1,1,1,1, 1,1,1,0,1,1,1,1, # 10 - 1f
- 1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1, # 20 - 2f
- 1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1, # 30 - 3f
- 1,4,4,4,4,4,4,4, 4,4,4,4,4,4,4,4, # 40 - 4f
- 4,4,5,5,5,5,5,5, 5,5,5,1,1,1,1,1, # 50 - 5f
- 1,5,5,5,5,5,5,5, 5,5,5,5,5,5,5,5, # 60 - 6f
- 5,5,5,5,5,5,5,5, 5,5,5,1,1,1,1,1, # 70 - 7f
- 0,6,6,6,6,6,6,6, 6,6,6,6,6,6,6,6, # 80 - 8f
- 6,6,6,6,6,6,6,6, 6,6,6,6,6,6,6,6, # 90 - 9f
- 6,7,7,7,7,7,7,7, 7,7,7,7,7,8,8,8, # a0 - af
- 7,7,7,7,7,7,7,7, 7,7,7,7,7,7,7,7, # b0 - bf
- 7,7,7,7,7,7,9,2, 2,3,2,2,2,2,2,2, # c0 - cf
- 2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2, # d0 - df
- 2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2, # e0 - ef
- 2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,0, # f0 - ff
-)
-
-CP949_st = (
-#cls= 0 1 2 3 4 5 6 7 8 9 # previous state =
- eError,eStart, 3,eError,eStart,eStart, 4, 5,eError, 6, # eStart
- eError,eError,eError,eError,eError,eError,eError,eError,eError,eError, # eError
- eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe, # eItsMe
- eError,eError,eStart,eStart,eError,eError,eError,eStart,eStart,eStart, # 3
- eError,eError,eStart,eStart,eStart,eStart,eStart,eStart,eStart,eStart, # 4
- eError,eStart,eStart,eStart,eStart,eStart,eStart,eStart,eStart,eStart, # 5
- eError,eStart,eStart,eStart,eStart,eError,eError,eStart,eStart,eStart, # 6
-)
-
-CP949CharLenTable = (0, 1, 2, 0, 1, 1, 2, 2, 0, 2)
-
-CP949SMModel = {'classTable': CP949_cls,
- 'classFactor': 10,
- 'stateTable': CP949_st,
- 'charLenTable': CP949CharLenTable,
- 'name': 'CP949'}
-
-# EUC-JP
-
-EUCJP_cls = (
- 4,4,4,4,4,4,4,4, # 00 - 07
- 4,4,4,4,4,4,5,5, # 08 - 0f
- 4,4,4,4,4,4,4,4, # 10 - 17
- 4,4,4,5,4,4,4,4, # 18 - 1f
- 4,4,4,4,4,4,4,4, # 20 - 27
- 4,4,4,4,4,4,4,4, # 28 - 2f
- 4,4,4,4,4,4,4,4, # 30 - 37
- 4,4,4,4,4,4,4,4, # 38 - 3f
- 4,4,4,4,4,4,4,4, # 40 - 47
- 4,4,4,4,4,4,4,4, # 48 - 4f
- 4,4,4,4,4,4,4,4, # 50 - 57
- 4,4,4,4,4,4,4,4, # 58 - 5f
- 4,4,4,4,4,4,4,4, # 60 - 67
- 4,4,4,4,4,4,4,4, # 68 - 6f
- 4,4,4,4,4,4,4,4, # 70 - 77
- 4,4,4,4,4,4,4,4, # 78 - 7f
- 5,5,5,5,5,5,5,5, # 80 - 87
- 5,5,5,5,5,5,1,3, # 88 - 8f
- 5,5,5,5,5,5,5,5, # 90 - 97
- 5,5,5,5,5,5,5,5, # 98 - 9f
- 5,2,2,2,2,2,2,2, # a0 - a7
- 2,2,2,2,2,2,2,2, # a8 - af
- 2,2,2,2,2,2,2,2, # b0 - b7
- 2,2,2,2,2,2,2,2, # b8 - bf
- 2,2,2,2,2,2,2,2, # c0 - c7
- 2,2,2,2,2,2,2,2, # c8 - cf
- 2,2,2,2,2,2,2,2, # d0 - d7
- 2,2,2,2,2,2,2,2, # d8 - df
- 0,0,0,0,0,0,0,0, # e0 - e7
- 0,0,0,0,0,0,0,0, # e8 - ef
- 0,0,0,0,0,0,0,0, # f0 - f7
- 0,0,0,0,0,0,0,5 # f8 - ff
-)
-
-EUCJP_st = (
- 3, 4, 3, 5,eStart,eError,eError,eError,#00-07
- eError,eError,eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,#08-0f
- eItsMe,eItsMe,eStart,eError,eStart,eError,eError,eError,#10-17
- eError,eError,eStart,eError,eError,eError, 3,eError,#18-1f
- 3,eError,eError,eError,eStart,eStart,eStart,eStart#20-27
-)
-
-EUCJPCharLenTable = (2, 2, 2, 3, 1, 0)
-
-EUCJPSMModel = {'classTable': EUCJP_cls,
- 'classFactor': 6,
- 'stateTable': EUCJP_st,
- 'charLenTable': EUCJPCharLenTable,
- 'name': 'EUC-JP'}
-
-# EUC-KR
-
-EUCKR_cls = (
- 1,1,1,1,1,1,1,1, # 00 - 07
- 1,1,1,1,1,1,0,0, # 08 - 0f
- 1,1,1,1,1,1,1,1, # 10 - 17
- 1,1,1,0,1,1,1,1, # 18 - 1f
- 1,1,1,1,1,1,1,1, # 20 - 27
- 1,1,1,1,1,1,1,1, # 28 - 2f
- 1,1,1,1,1,1,1,1, # 30 - 37
- 1,1,1,1,1,1,1,1, # 38 - 3f
- 1,1,1,1,1,1,1,1, # 40 - 47
- 1,1,1,1,1,1,1,1, # 48 - 4f
- 1,1,1,1,1,1,1,1, # 50 - 57
- 1,1,1,1,1,1,1,1, # 58 - 5f
- 1,1,1,1,1,1,1,1, # 60 - 67
- 1,1,1,1,1,1,1,1, # 68 - 6f
- 1,1,1,1,1,1,1,1, # 70 - 77
- 1,1,1,1,1,1,1,1, # 78 - 7f
- 0,0,0,0,0,0,0,0, # 80 - 87
- 0,0,0,0,0,0,0,0, # 88 - 8f
- 0,0,0,0,0,0,0,0, # 90 - 97
- 0,0,0,0,0,0,0,0, # 98 - 9f
- 0,2,2,2,2,2,2,2, # a0 - a7
- 2,2,2,2,2,3,3,3, # a8 - af
- 2,2,2,2,2,2,2,2, # b0 - b7
- 2,2,2,2,2,2,2,2, # b8 - bf
- 2,2,2,2,2,2,2,2, # c0 - c7
- 2,3,2,2,2,2,2,2, # c8 - cf
- 2,2,2,2,2,2,2,2, # d0 - d7
- 2,2,2,2,2,2,2,2, # d8 - df
- 2,2,2,2,2,2,2,2, # e0 - e7
- 2,2,2,2,2,2,2,2, # e8 - ef
- 2,2,2,2,2,2,2,2, # f0 - f7
- 2,2,2,2,2,2,2,0 # f8 - ff
-)
-
-EUCKR_st = (
- eError,eStart, 3,eError,eError,eError,eError,eError,#00-07
- eItsMe,eItsMe,eItsMe,eItsMe,eError,eError,eStart,eStart #08-0f
-)
-
-EUCKRCharLenTable = (0, 1, 2, 0)
-
-EUCKRSMModel = {'classTable': EUCKR_cls,
- 'classFactor': 4,
- 'stateTable': EUCKR_st,
- 'charLenTable': EUCKRCharLenTable,
- 'name': 'EUC-KR'}
-
-# EUC-TW
-
-EUCTW_cls = (
- 2,2,2,2,2,2,2,2, # 00 - 07
- 2,2,2,2,2,2,0,0, # 08 - 0f
- 2,2,2,2,2,2,2,2, # 10 - 17
- 2,2,2,0,2,2,2,2, # 18 - 1f
- 2,2,2,2,2,2,2,2, # 20 - 27
- 2,2,2,2,2,2,2,2, # 28 - 2f
- 2,2,2,2,2,2,2,2, # 30 - 37
- 2,2,2,2,2,2,2,2, # 38 - 3f
- 2,2,2,2,2,2,2,2, # 40 - 47
- 2,2,2,2,2,2,2,2, # 48 - 4f
- 2,2,2,2,2,2,2,2, # 50 - 57
- 2,2,2,2,2,2,2,2, # 58 - 5f
- 2,2,2,2,2,2,2,2, # 60 - 67
- 2,2,2,2,2,2,2,2, # 68 - 6f
- 2,2,2,2,2,2,2,2, # 70 - 77
- 2,2,2,2,2,2,2,2, # 78 - 7f
- 0,0,0,0,0,0,0,0, # 80 - 87
- 0,0,0,0,0,0,6,0, # 88 - 8f
- 0,0,0,0,0,0,0,0, # 90 - 97
- 0,0,0,0,0,0,0,0, # 98 - 9f
- 0,3,4,4,4,4,4,4, # a0 - a7
- 5,5,1,1,1,1,1,1, # a8 - af
- 1,1,1,1,1,1,1,1, # b0 - b7
- 1,1,1,1,1,1,1,1, # b8 - bf
- 1,1,3,1,3,3,3,3, # c0 - c7
- 3,3,3,3,3,3,3,3, # c8 - cf
- 3,3,3,3,3,3,3,3, # d0 - d7
- 3,3,3,3,3,3,3,3, # d8 - df
- 3,3,3,3,3,3,3,3, # e0 - e7
- 3,3,3,3,3,3,3,3, # e8 - ef
- 3,3,3,3,3,3,3,3, # f0 - f7
- 3,3,3,3,3,3,3,0 # f8 - ff
-)
-
-EUCTW_st = (
- eError,eError,eStart, 3, 3, 3, 4,eError,#00-07
- eError,eError,eError,eError,eError,eError,eItsMe,eItsMe,#08-0f
- eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eError,eStart,eError,#10-17
- eStart,eStart,eStart,eError,eError,eError,eError,eError,#18-1f
- 5,eError,eError,eError,eStart,eError,eStart,eStart,#20-27
- eStart,eError,eStart,eStart,eStart,eStart,eStart,eStart #28-2f
-)
-
-EUCTWCharLenTable = (0, 0, 1, 2, 2, 2, 3)
-
-EUCTWSMModel = {'classTable': EUCTW_cls,
- 'classFactor': 7,
- 'stateTable': EUCTW_st,
- 'charLenTable': EUCTWCharLenTable,
- 'name': 'x-euc-tw'}
-
-# GB2312
-
-GB2312_cls = (
- 1,1,1,1,1,1,1,1, # 00 - 07
- 1,1,1,1,1,1,0,0, # 08 - 0f
- 1,1,1,1,1,1,1,1, # 10 - 17
- 1,1,1,0,1,1,1,1, # 18 - 1f
- 1,1,1,1,1,1,1,1, # 20 - 27
- 1,1,1,1,1,1,1,1, # 28 - 2f
- 3,3,3,3,3,3,3,3, # 30 - 37
- 3,3,1,1,1,1,1,1, # 38 - 3f
- 2,2,2,2,2,2,2,2, # 40 - 47
- 2,2,2,2,2,2,2,2, # 48 - 4f
- 2,2,2,2,2,2,2,2, # 50 - 57
- 2,2,2,2,2,2,2,2, # 58 - 5f
- 2,2,2,2,2,2,2,2, # 60 - 67
- 2,2,2,2,2,2,2,2, # 68 - 6f
- 2,2,2,2,2,2,2,2, # 70 - 77
- 2,2,2,2,2,2,2,4, # 78 - 7f
- 5,6,6,6,6,6,6,6, # 80 - 87
- 6,6,6,6,6,6,6,6, # 88 - 8f
- 6,6,6,6,6,6,6,6, # 90 - 97
- 6,6,6,6,6,6,6,6, # 98 - 9f
- 6,6,6,6,6,6,6,6, # a0 - a7
- 6,6,6,6,6,6,6,6, # a8 - af
- 6,6,6,6,6,6,6,6, # b0 - b7
- 6,6,6,6,6,6,6,6, # b8 - bf
- 6,6,6,6,6,6,6,6, # c0 - c7
- 6,6,6,6,6,6,6,6, # c8 - cf
- 6,6,6,6,6,6,6,6, # d0 - d7
- 6,6,6,6,6,6,6,6, # d8 - df
- 6,6,6,6,6,6,6,6, # e0 - e7
- 6,6,6,6,6,6,6,6, # e8 - ef
- 6,6,6,6,6,6,6,6, # f0 - f7
- 6,6,6,6,6,6,6,0 # f8 - ff
-)
-
-GB2312_st = (
- eError,eStart,eStart,eStart,eStart,eStart, 3,eError,#00-07
- eError,eError,eError,eError,eError,eError,eItsMe,eItsMe,#08-0f
- eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eError,eError,eStart,#10-17
- 4,eError,eStart,eStart,eError,eError,eError,eError,#18-1f
- eError,eError, 5,eError,eError,eError,eItsMe,eError,#20-27
- eError,eError,eStart,eStart,eStart,eStart,eStart,eStart #28-2f
-)
-
-# To be accurate, the length of class 6 can be either 2 or 4.
-# But it is not necessary to discriminate between the two since
-# it is used for frequency analysis only, and we are validing
-# each code range there as well. So it is safe to set it to be
-# 2 here.
-GB2312CharLenTable = (0, 1, 1, 1, 1, 1, 2)
-
-GB2312SMModel = {'classTable': GB2312_cls,
- 'classFactor': 7,
- 'stateTable': GB2312_st,
- 'charLenTable': GB2312CharLenTable,
- 'name': 'GB2312'}
-
-# Shift_JIS
-
-SJIS_cls = (
- 1,1,1,1,1,1,1,1, # 00 - 07
- 1,1,1,1,1,1,0,0, # 08 - 0f
- 1,1,1,1,1,1,1,1, # 10 - 17
- 1,1,1,0,1,1,1,1, # 18 - 1f
- 1,1,1,1,1,1,1,1, # 20 - 27
- 1,1,1,1,1,1,1,1, # 28 - 2f
- 1,1,1,1,1,1,1,1, # 30 - 37
- 1,1,1,1,1,1,1,1, # 38 - 3f
- 2,2,2,2,2,2,2,2, # 40 - 47
- 2,2,2,2,2,2,2,2, # 48 - 4f
- 2,2,2,2,2,2,2,2, # 50 - 57
- 2,2,2,2,2,2,2,2, # 58 - 5f
- 2,2,2,2,2,2,2,2, # 60 - 67
- 2,2,2,2,2,2,2,2, # 68 - 6f
- 2,2,2,2,2,2,2,2, # 70 - 77
- 2,2,2,2,2,2,2,1, # 78 - 7f
- 3,3,3,3,3,3,3,3, # 80 - 87
- 3,3,3,3,3,3,3,3, # 88 - 8f
- 3,3,3,3,3,3,3,3, # 90 - 97
- 3,3,3,3,3,3,3,3, # 98 - 9f
- #0xa0 is illegal in sjis encoding, but some pages does
- #contain such byte. We need to be more error forgiven.
- 2,2,2,2,2,2,2,2, # a0 - a7
- 2,2,2,2,2,2,2,2, # a8 - af
- 2,2,2,2,2,2,2,2, # b0 - b7
- 2,2,2,2,2,2,2,2, # b8 - bf
- 2,2,2,2,2,2,2,2, # c0 - c7
- 2,2,2,2,2,2,2,2, # c8 - cf
- 2,2,2,2,2,2,2,2, # d0 - d7
- 2,2,2,2,2,2,2,2, # d8 - df
- 3,3,3,3,3,3,3,3, # e0 - e7
- 3,3,3,3,3,4,4,4, # e8 - ef
- 4,4,4,4,4,4,4,4, # f0 - f7
- 4,4,4,4,4,0,0,0 # f8 - ff
-)
-
-
-SJIS_st = (
- eError,eStart,eStart, 3,eError,eError,eError,eError,#00-07
- eError,eError,eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,#08-0f
- eItsMe,eItsMe,eError,eError,eStart,eStart,eStart,eStart #10-17
-)
-
-SJISCharLenTable = (0, 1, 1, 2, 0, 0)
-
-SJISSMModel = {'classTable': SJIS_cls,
- 'classFactor': 6,
- 'stateTable': SJIS_st,
- 'charLenTable': SJISCharLenTable,
- 'name': 'Shift_JIS'}
-
-# UCS2-BE
-
-UCS2BE_cls = (
- 0,0,0,0,0,0,0,0, # 00 - 07
- 0,0,1,0,0,2,0,0, # 08 - 0f
- 0,0,0,0,0,0,0,0, # 10 - 17
- 0,0,0,3,0,0,0,0, # 18 - 1f
- 0,0,0,0,0,0,0,0, # 20 - 27
- 0,3,3,3,3,3,0,0, # 28 - 2f
- 0,0,0,0,0,0,0,0, # 30 - 37
- 0,0,0,0,0,0,0,0, # 38 - 3f
- 0,0,0,0,0,0,0,0, # 40 - 47
- 0,0,0,0,0,0,0,0, # 48 - 4f
- 0,0,0,0,0,0,0,0, # 50 - 57
- 0,0,0,0,0,0,0,0, # 58 - 5f
- 0,0,0,0,0,0,0,0, # 60 - 67
- 0,0,0,0,0,0,0,0, # 68 - 6f
- 0,0,0,0,0,0,0,0, # 70 - 77
- 0,0,0,0,0,0,0,0, # 78 - 7f
- 0,0,0,0,0,0,0,0, # 80 - 87
- 0,0,0,0,0,0,0,0, # 88 - 8f
- 0,0,0,0,0,0,0,0, # 90 - 97
- 0,0,0,0,0,0,0,0, # 98 - 9f
- 0,0,0,0,0,0,0,0, # a0 - a7
- 0,0,0,0,0,0,0,0, # a8 - af
- 0,0,0,0,0,0,0,0, # b0 - b7
- 0,0,0,0,0,0,0,0, # b8 - bf
- 0,0,0,0,0,0,0,0, # c0 - c7
- 0,0,0,0,0,0,0,0, # c8 - cf
- 0,0,0,0,0,0,0,0, # d0 - d7
- 0,0,0,0,0,0,0,0, # d8 - df
- 0,0,0,0,0,0,0,0, # e0 - e7
- 0,0,0,0,0,0,0,0, # e8 - ef
- 0,0,0,0,0,0,0,0, # f0 - f7
- 0,0,0,0,0,0,4,5 # f8 - ff
-)
-
-UCS2BE_st = (
- 5, 7, 7,eError, 4, 3,eError,eError,#00-07
- eError,eError,eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,#08-0f
- eItsMe,eItsMe, 6, 6, 6, 6,eError,eError,#10-17
- 6, 6, 6, 6, 6,eItsMe, 6, 6,#18-1f
- 6, 6, 6, 6, 5, 7, 7,eError,#20-27
- 5, 8, 6, 6,eError, 6, 6, 6,#28-2f
- 6, 6, 6, 6,eError,eError,eStart,eStart #30-37
-)
-
-UCS2BECharLenTable = (2, 2, 2, 0, 2, 2)
-
-UCS2BESMModel = {'classTable': UCS2BE_cls,
- 'classFactor': 6,
- 'stateTable': UCS2BE_st,
- 'charLenTable': UCS2BECharLenTable,
- 'name': 'UTF-16BE'}
-
-# UCS2-LE
-
-UCS2LE_cls = (
- 0,0,0,0,0,0,0,0, # 00 - 07
- 0,0,1,0,0,2,0,0, # 08 - 0f
- 0,0,0,0,0,0,0,0, # 10 - 17
- 0,0,0,3,0,0,0,0, # 18 - 1f
- 0,0,0,0,0,0,0,0, # 20 - 27
- 0,3,3,3,3,3,0,0, # 28 - 2f
- 0,0,0,0,0,0,0,0, # 30 - 37
- 0,0,0,0,0,0,0,0, # 38 - 3f
- 0,0,0,0,0,0,0,0, # 40 - 47
- 0,0,0,0,0,0,0,0, # 48 - 4f
- 0,0,0,0,0,0,0,0, # 50 - 57
- 0,0,0,0,0,0,0,0, # 58 - 5f
- 0,0,0,0,0,0,0,0, # 60 - 67
- 0,0,0,0,0,0,0,0, # 68 - 6f
- 0,0,0,0,0,0,0,0, # 70 - 77
- 0,0,0,0,0,0,0,0, # 78 - 7f
- 0,0,0,0,0,0,0,0, # 80 - 87
- 0,0,0,0,0,0,0,0, # 88 - 8f
- 0,0,0,0,0,0,0,0, # 90 - 97
- 0,0,0,0,0,0,0,0, # 98 - 9f
- 0,0,0,0,0,0,0,0, # a0 - a7
- 0,0,0,0,0,0,0,0, # a8 - af
- 0,0,0,0,0,0,0,0, # b0 - b7
- 0,0,0,0,0,0,0,0, # b8 - bf
- 0,0,0,0,0,0,0,0, # c0 - c7
- 0,0,0,0,0,0,0,0, # c8 - cf
- 0,0,0,0,0,0,0,0, # d0 - d7
- 0,0,0,0,0,0,0,0, # d8 - df
- 0,0,0,0,0,0,0,0, # e0 - e7
- 0,0,0,0,0,0,0,0, # e8 - ef
- 0,0,0,0,0,0,0,0, # f0 - f7
- 0,0,0,0,0,0,4,5 # f8 - ff
-)
-
-UCS2LE_st = (
- 6, 6, 7, 6, 4, 3,eError,eError,#00-07
- eError,eError,eError,eError,eItsMe,eItsMe,eItsMe,eItsMe,#08-0f
- eItsMe,eItsMe, 5, 5, 5,eError,eItsMe,eError,#10-17
- 5, 5, 5,eError, 5,eError, 6, 6,#18-1f
- 7, 6, 8, 8, 5, 5, 5,eError,#20-27
- 5, 5, 5,eError,eError,eError, 5, 5,#28-2f
- 5, 5, 5,eError, 5,eError,eStart,eStart #30-37
-)
-
-UCS2LECharLenTable = (2, 2, 2, 2, 2, 2)
-
-UCS2LESMModel = {'classTable': UCS2LE_cls,
- 'classFactor': 6,
- 'stateTable': UCS2LE_st,
- 'charLenTable': UCS2LECharLenTable,
- 'name': 'UTF-16LE'}
-
-# UTF-8
-
-UTF8_cls = (
- 1,1,1,1,1,1,1,1, # 00 - 07 #allow 0x00 as a legal value
- 1,1,1,1,1,1,0,0, # 08 - 0f
- 1,1,1,1,1,1,1,1, # 10 - 17
- 1,1,1,0,1,1,1,1, # 18 - 1f
- 1,1,1,1,1,1,1,1, # 20 - 27
- 1,1,1,1,1,1,1,1, # 28 - 2f
- 1,1,1,1,1,1,1,1, # 30 - 37
- 1,1,1,1,1,1,1,1, # 38 - 3f
- 1,1,1,1,1,1,1,1, # 40 - 47
- 1,1,1,1,1,1,1,1, # 48 - 4f
- 1,1,1,1,1,1,1,1, # 50 - 57
- 1,1,1,1,1,1,1,1, # 58 - 5f
- 1,1,1,1,1,1,1,1, # 60 - 67
- 1,1,1,1,1,1,1,1, # 68 - 6f
- 1,1,1,1,1,1,1,1, # 70 - 77
- 1,1,1,1,1,1,1,1, # 78 - 7f
- 2,2,2,2,3,3,3,3, # 80 - 87
- 4,4,4,4,4,4,4,4, # 88 - 8f
- 4,4,4,4,4,4,4,4, # 90 - 97
- 4,4,4,4,4,4,4,4, # 98 - 9f
- 5,5,5,5,5,5,5,5, # a0 - a7
- 5,5,5,5,5,5,5,5, # a8 - af
- 5,5,5,5,5,5,5,5, # b0 - b7
- 5,5,5,5,5,5,5,5, # b8 - bf
- 0,0,6,6,6,6,6,6, # c0 - c7
- 6,6,6,6,6,6,6,6, # c8 - cf
- 6,6,6,6,6,6,6,6, # d0 - d7
- 6,6,6,6,6,6,6,6, # d8 - df
- 7,8,8,8,8,8,8,8, # e0 - e7
- 8,8,8,8,8,9,8,8, # e8 - ef
- 10,11,11,11,11,11,11,11, # f0 - f7
- 12,13,13,13,14,15,0,0 # f8 - ff
-)
-
-UTF8_st = (
- eError,eStart,eError,eError,eError,eError, 12, 10,#00-07
- 9, 11, 8, 7, 6, 5, 4, 3,#08-0f
- eError,eError,eError,eError,eError,eError,eError,eError,#10-17
- eError,eError,eError,eError,eError,eError,eError,eError,#18-1f
- eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,#20-27
- eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,eItsMe,#28-2f
- eError,eError, 5, 5, 5, 5,eError,eError,#30-37
- eError,eError,eError,eError,eError,eError,eError,eError,#38-3f
- eError,eError,eError, 5, 5, 5,eError,eError,#40-47
- eError,eError,eError,eError,eError,eError,eError,eError,#48-4f
- eError,eError, 7, 7, 7, 7,eError,eError,#50-57
- eError,eError,eError,eError,eError,eError,eError,eError,#58-5f
- eError,eError,eError,eError, 7, 7,eError,eError,#60-67
- eError,eError,eError,eError,eError,eError,eError,eError,#68-6f
- eError,eError, 9, 9, 9, 9,eError,eError,#70-77
- eError,eError,eError,eError,eError,eError,eError,eError,#78-7f
- eError,eError,eError,eError,eError, 9,eError,eError,#80-87
- eError,eError,eError,eError,eError,eError,eError,eError,#88-8f
- eError,eError, 12, 12, 12, 12,eError,eError,#90-97
- eError,eError,eError,eError,eError,eError,eError,eError,#98-9f
- eError,eError,eError,eError,eError, 12,eError,eError,#a0-a7
- eError,eError,eError,eError,eError,eError,eError,eError,#a8-af
- eError,eError, 12, 12, 12,eError,eError,eError,#b0-b7
- eError,eError,eError,eError,eError,eError,eError,eError,#b8-bf
- eError,eError,eStart,eStart,eStart,eStart,eError,eError,#c0-c7
- eError,eError,eError,eError,eError,eError,eError,eError #c8-cf
-)
-
-UTF8CharLenTable = (0, 1, 0, 0, 0, 0, 2, 3, 3, 3, 4, 4, 5, 5, 6, 6)
-
-UTF8SMModel = {'classTable': UTF8_cls,
- 'classFactor': 16,
- 'stateTable': UTF8_st,
- 'charLenTable': UTF8CharLenTable,
- 'name': 'UTF-8'}
-
-# flake8: noqa
diff --git a/script/_Lib/requests/packages/chardet/sbcharsetprober.py b/script/_Lib/requests/packages/chardet/sbcharsetprober.py
deleted file mode 100644
index 37291bd..0000000
--- a/script/_Lib/requests/packages/chardet/sbcharsetprober.py
+++ /dev/null
@@ -1,120 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Universal charset detector code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Mark Pilgrim - port to Python
-# Shy Shalom - original C code
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-######################### END LICENSE BLOCK #########################
-
-import sys
-from . import constants
-from .charsetprober import CharSetProber
-from .compat import wrap_ord
-
-SAMPLE_SIZE = 64
-SB_ENOUGH_REL_THRESHOLD = 1024
-POSITIVE_SHORTCUT_THRESHOLD = 0.95
-NEGATIVE_SHORTCUT_THRESHOLD = 0.05
-SYMBOL_CAT_ORDER = 250
-NUMBER_OF_SEQ_CAT = 4
-POSITIVE_CAT = NUMBER_OF_SEQ_CAT - 1
-#NEGATIVE_CAT = 0
-
-
-class SingleByteCharSetProber(CharSetProber):
- def __init__(self, model, reversed=False, nameProber=None):
- CharSetProber.__init__(self)
- self._mModel = model
- # TRUE if we need to reverse every pair in the model lookup
- self._mReversed = reversed
- # Optional auxiliary prober for name decision
- self._mNameProber = nameProber
- self.reset()
-
- def reset(self):
- CharSetProber.reset(self)
- # char order of last character
- self._mLastOrder = 255
- self._mSeqCounters = [0] * NUMBER_OF_SEQ_CAT
- self._mTotalSeqs = 0
- self._mTotalChar = 0
- # characters that fall in our sampling range
- self._mFreqChar = 0
-
- def get_charset_name(self):
- if self._mNameProber:
- return self._mNameProber.get_charset_name()
- else:
- return self._mModel['charsetName']
-
- def feed(self, aBuf):
- if not self._mModel['keepEnglishLetter']:
- aBuf = self.filter_without_english_letters(aBuf)
- aLen = len(aBuf)
- if not aLen:
- return self.get_state()
- for c in aBuf:
- order = self._mModel['charToOrderMap'][wrap_ord(c)]
- if order < SYMBOL_CAT_ORDER:
- self._mTotalChar += 1
- if order < SAMPLE_SIZE:
- self._mFreqChar += 1
- if self._mLastOrder < SAMPLE_SIZE:
- self._mTotalSeqs += 1
- if not self._mReversed:
- i = (self._mLastOrder * SAMPLE_SIZE) + order
- model = self._mModel['precedenceMatrix'][i]
- else: # reverse the order of the letters in the lookup
- i = (order * SAMPLE_SIZE) + self._mLastOrder
- model = self._mModel['precedenceMatrix'][i]
- self._mSeqCounters[model] += 1
- self._mLastOrder = order
-
- if self.get_state() == constants.eDetecting:
- if self._mTotalSeqs > SB_ENOUGH_REL_THRESHOLD:
- cf = self.get_confidence()
- if cf > POSITIVE_SHORTCUT_THRESHOLD:
- if constants._debug:
- sys.stderr.write('%s confidence = %s, we have a'
- 'winner\n' %
- (self._mModel['charsetName'], cf))
- self._mState = constants.eFoundIt
- elif cf < NEGATIVE_SHORTCUT_THRESHOLD:
- if constants._debug:
- sys.stderr.write('%s confidence = %s, below negative'
- 'shortcut threshhold %s\n' %
- (self._mModel['charsetName'], cf,
- NEGATIVE_SHORTCUT_THRESHOLD))
- self._mState = constants.eNotMe
-
- return self.get_state()
-
- def get_confidence(self):
- r = 0.01
- if self._mTotalSeqs > 0:
- r = ((1.0 * self._mSeqCounters[POSITIVE_CAT]) / self._mTotalSeqs
- / self._mModel['mTypicalPositiveRatio'])
- r = r * self._mFreqChar / self._mTotalChar
- if r >= 1.0:
- r = 0.99
- return r
diff --git a/script/_Lib/requests/packages/chardet/sbcsgroupprober.py b/script/_Lib/requests/packages/chardet/sbcsgroupprober.py
deleted file mode 100644
index 1b6196c..0000000
--- a/script/_Lib/requests/packages/chardet/sbcsgroupprober.py
+++ /dev/null
@@ -1,69 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Universal charset detector code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Mark Pilgrim - port to Python
-# Shy Shalom - original C code
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-######################### END LICENSE BLOCK #########################
-
-from .charsetgroupprober import CharSetGroupProber
-from .sbcharsetprober import SingleByteCharSetProber
-from .langcyrillicmodel import (Win1251CyrillicModel, Koi8rModel,
- Latin5CyrillicModel, MacCyrillicModel,
- Ibm866Model, Ibm855Model)
-from .langgreekmodel import Latin7GreekModel, Win1253GreekModel
-from .langbulgarianmodel import Latin5BulgarianModel, Win1251BulgarianModel
-from .langhungarianmodel import Latin2HungarianModel, Win1250HungarianModel
-from .langthaimodel import TIS620ThaiModel
-from .langhebrewmodel import Win1255HebrewModel
-from .hebrewprober import HebrewProber
-
-
-class SBCSGroupProber(CharSetGroupProber):
- def __init__(self):
- CharSetGroupProber.__init__(self)
- self._mProbers = [
- SingleByteCharSetProber(Win1251CyrillicModel),
- SingleByteCharSetProber(Koi8rModel),
- SingleByteCharSetProber(Latin5CyrillicModel),
- SingleByteCharSetProber(MacCyrillicModel),
- SingleByteCharSetProber(Ibm866Model),
- SingleByteCharSetProber(Ibm855Model),
- SingleByteCharSetProber(Latin7GreekModel),
- SingleByteCharSetProber(Win1253GreekModel),
- SingleByteCharSetProber(Latin5BulgarianModel),
- SingleByteCharSetProber(Win1251BulgarianModel),
- SingleByteCharSetProber(Latin2HungarianModel),
- SingleByteCharSetProber(Win1250HungarianModel),
- SingleByteCharSetProber(TIS620ThaiModel),
- ]
- hebrewProber = HebrewProber()
- logicalHebrewProber = SingleByteCharSetProber(Win1255HebrewModel,
- False, hebrewProber)
- visualHebrewProber = SingleByteCharSetProber(Win1255HebrewModel, True,
- hebrewProber)
- hebrewProber.set_model_probers(logicalHebrewProber, visualHebrewProber)
- self._mProbers.extend([hebrewProber, logicalHebrewProber,
- visualHebrewProber])
-
- self.reset()
diff --git a/script/_Lib/requests/packages/chardet/sjisprober.py b/script/_Lib/requests/packages/chardet/sjisprober.py
deleted file mode 100644
index b173614..0000000
--- a/script/_Lib/requests/packages/chardet/sjisprober.py
+++ /dev/null
@@ -1,91 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-######################### END LICENSE BLOCK #########################
-
-import sys
-from .mbcharsetprober import MultiByteCharSetProber
-from .codingstatemachine import CodingStateMachine
-from .chardistribution import SJISDistributionAnalysis
-from .jpcntx import SJISContextAnalysis
-from .mbcssm import SJISSMModel
-from . import constants
-
-
-class SJISProber(MultiByteCharSetProber):
- def __init__(self):
- MultiByteCharSetProber.__init__(self)
- self._mCodingSM = CodingStateMachine(SJISSMModel)
- self._mDistributionAnalyzer = SJISDistributionAnalysis()
- self._mContextAnalyzer = SJISContextAnalysis()
- self.reset()
-
- def reset(self):
- MultiByteCharSetProber.reset(self)
- self._mContextAnalyzer.reset()
-
- def get_charset_name(self):
- return "SHIFT_JIS"
-
- def feed(self, aBuf):
- aLen = len(aBuf)
- for i in range(0, aLen):
- codingState = self._mCodingSM.next_state(aBuf[i])
- if codingState == constants.eError:
- if constants._debug:
- sys.stderr.write(self.get_charset_name()
- + ' prober hit error at byte ' + str(i)
- + '\n')
- self._mState = constants.eNotMe
- break
- elif codingState == constants.eItsMe:
- self._mState = constants.eFoundIt
- break
- elif codingState == constants.eStart:
- charLen = self._mCodingSM.get_current_charlen()
- if i == 0:
- self._mLastChar[1] = aBuf[0]
- self._mContextAnalyzer.feed(self._mLastChar[2 - charLen:],
- charLen)
- self._mDistributionAnalyzer.feed(self._mLastChar, charLen)
- else:
- self._mContextAnalyzer.feed(aBuf[i + 1 - charLen:i + 3
- - charLen], charLen)
- self._mDistributionAnalyzer.feed(aBuf[i - 1:i + 1],
- charLen)
-
- self._mLastChar[0] = aBuf[aLen - 1]
-
- if self.get_state() == constants.eDetecting:
- if (self._mContextAnalyzer.got_enough_data() and
- (self.get_confidence() > constants.SHORTCUT_THRESHOLD)):
- self._mState = constants.eFoundIt
-
- return self.get_state()
-
- def get_confidence(self):
- contxtCf = self._mContextAnalyzer.get_confidence()
- distribCf = self._mDistributionAnalyzer.get_confidence()
- return max(contxtCf, distribCf)
diff --git a/script/_Lib/requests/packages/chardet/universaldetector.py b/script/_Lib/requests/packages/chardet/universaldetector.py
deleted file mode 100644
index 9a03ad3..0000000
--- a/script/_Lib/requests/packages/chardet/universaldetector.py
+++ /dev/null
@@ -1,170 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is Mozilla Universal charset detector code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Mark Pilgrim - port to Python
-# Shy Shalom - original C code
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-######################### END LICENSE BLOCK #########################
-
-from . import constants
-import sys
-import codecs
-from .latin1prober import Latin1Prober # windows-1252
-from .mbcsgroupprober import MBCSGroupProber # multi-byte character sets
-from .sbcsgroupprober import SBCSGroupProber # single-byte character sets
-from .escprober import EscCharSetProber # ISO-2122, etc.
-import re
-
-MINIMUM_THRESHOLD = 0.20
-ePureAscii = 0
-eEscAscii = 1
-eHighbyte = 2
-
-
-class UniversalDetector:
- def __init__(self):
- self._highBitDetector = re.compile(b'[\x80-\xFF]')
- self._escDetector = re.compile(b'(\033|~{)')
- self._mEscCharSetProber = None
- self._mCharSetProbers = []
- self.reset()
-
- def reset(self):
- self.result = {'encoding': None, 'confidence': 0.0}
- self.done = False
- self._mStart = True
- self._mGotData = False
- self._mInputState = ePureAscii
- self._mLastChar = b''
- if self._mEscCharSetProber:
- self._mEscCharSetProber.reset()
- for prober in self._mCharSetProbers:
- prober.reset()
-
- def feed(self, aBuf):
- if self.done:
- return
-
- aLen = len(aBuf)
- if not aLen:
- return
-
- if not self._mGotData:
- # If the data starts with BOM, we know it is UTF
- if aBuf[:3] == codecs.BOM:
- # EF BB BF UTF-8 with BOM
- self.result = {'encoding': "UTF-8", 'confidence': 1.0}
- elif aBuf[:4] == codecs.BOM_UTF32_LE:
- # FF FE 00 00 UTF-32, little-endian BOM
- self.result = {'encoding': "UTF-32LE", 'confidence': 1.0}
- elif aBuf[:4] == codecs.BOM_UTF32_BE:
- # 00 00 FE FF UTF-32, big-endian BOM
- self.result = {'encoding': "UTF-32BE", 'confidence': 1.0}
- elif aBuf[:4] == b'\xFE\xFF\x00\x00':
- # FE FF 00 00 UCS-4, unusual octet order BOM (3412)
- self.result = {
- 'encoding': "X-ISO-10646-UCS-4-3412",
- 'confidence': 1.0
- }
- elif aBuf[:4] == b'\x00\x00\xFF\xFE':
- # 00 00 FF FE UCS-4, unusual octet order BOM (2143)
- self.result = {
- 'encoding': "X-ISO-10646-UCS-4-2143",
- 'confidence': 1.0
- }
- elif aBuf[:2] == codecs.BOM_LE:
- # FF FE UTF-16, little endian BOM
- self.result = {'encoding': "UTF-16LE", 'confidence': 1.0}
- elif aBuf[:2] == codecs.BOM_BE:
- # FE FF UTF-16, big endian BOM
- self.result = {'encoding': "UTF-16BE", 'confidence': 1.0}
-
- self._mGotData = True
- if self.result['encoding'] and (self.result['confidence'] > 0.0):
- self.done = True
- return
-
- if self._mInputState == ePureAscii:
- if self._highBitDetector.search(aBuf):
- self._mInputState = eHighbyte
- elif ((self._mInputState == ePureAscii) and
- self._escDetector.search(self._mLastChar + aBuf)):
- self._mInputState = eEscAscii
-
- self._mLastChar = aBuf[-1:]
-
- if self._mInputState == eEscAscii:
- if not self._mEscCharSetProber:
- self._mEscCharSetProber = EscCharSetProber()
- if self._mEscCharSetProber.feed(aBuf) == constants.eFoundIt:
- self.result = {'encoding': self._mEscCharSetProber.get_charset_name(),
- 'confidence': self._mEscCharSetProber.get_confidence()}
- self.done = True
- elif self._mInputState == eHighbyte:
- if not self._mCharSetProbers:
- self._mCharSetProbers = [MBCSGroupProber(), SBCSGroupProber(),
- Latin1Prober()]
- for prober in self._mCharSetProbers:
- if prober.feed(aBuf) == constants.eFoundIt:
- self.result = {'encoding': prober.get_charset_name(),
- 'confidence': prober.get_confidence()}
- self.done = True
- break
-
- def close(self):
- if self.done:
- return
- if not self._mGotData:
- if constants._debug:
- sys.stderr.write('no data received!\n')
- return
- self.done = True
-
- if self._mInputState == ePureAscii:
- self.result = {'encoding': 'ascii', 'confidence': 1.0}
- return self.result
-
- if self._mInputState == eHighbyte:
- proberConfidence = None
- maxProberConfidence = 0.0
- maxProber = None
- for prober in self._mCharSetProbers:
- if not prober:
- continue
- proberConfidence = prober.get_confidence()
- if proberConfidence > maxProberConfidence:
- maxProberConfidence = proberConfidence
- maxProber = prober
- if maxProber and (maxProberConfidence > MINIMUM_THRESHOLD):
- self.result = {'encoding': maxProber.get_charset_name(),
- 'confidence': maxProber.get_confidence()}
- return self.result
-
- if constants._debug:
- sys.stderr.write('no probers hit minimum threshhold\n')
- for prober in self._mCharSetProbers[0].mProbers:
- if not prober:
- continue
- sys.stderr.write('%s confidence = %s\n' %
- (prober.get_charset_name(),
- prober.get_confidence()))
diff --git a/script/_Lib/requests/packages/chardet/utf8prober.py b/script/_Lib/requests/packages/chardet/utf8prober.py
deleted file mode 100644
index 1c0bb5d..0000000
--- a/script/_Lib/requests/packages/chardet/utf8prober.py
+++ /dev/null
@@ -1,76 +0,0 @@
-######################## BEGIN LICENSE BLOCK ########################
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Mark Pilgrim - port to Python
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-######################### END LICENSE BLOCK #########################
-
-from . import constants
-from .charsetprober import CharSetProber
-from .codingstatemachine import CodingStateMachine
-from .mbcssm import UTF8SMModel
-
-ONE_CHAR_PROB = 0.5
-
-
-class UTF8Prober(CharSetProber):
- def __init__(self):
- CharSetProber.__init__(self)
- self._mCodingSM = CodingStateMachine(UTF8SMModel)
- self.reset()
-
- def reset(self):
- CharSetProber.reset(self)
- self._mCodingSM.reset()
- self._mNumOfMBChar = 0
-
- def get_charset_name(self):
- return "utf-8"
-
- def feed(self, aBuf):
- for c in aBuf:
- codingState = self._mCodingSM.next_state(c)
- if codingState == constants.eError:
- self._mState = constants.eNotMe
- break
- elif codingState == constants.eItsMe:
- self._mState = constants.eFoundIt
- break
- elif codingState == constants.eStart:
- if self._mCodingSM.get_current_charlen() >= 2:
- self._mNumOfMBChar += 1
-
- if self.get_state() == constants.eDetecting:
- if self.get_confidence() > constants.SHORTCUT_THRESHOLD:
- self._mState = constants.eFoundIt
-
- return self.get_state()
-
- def get_confidence(self):
- unlike = 0.99
- if self._mNumOfMBChar < 6:
- for i in range(0, self._mNumOfMBChar):
- unlike = unlike * ONE_CHAR_PROB
- return 1.0 - unlike
- else:
- return unlike
diff --git a/script/_Lib/requests/packages/urllib3/__init__.py b/script/_Lib/requests/packages/urllib3/__init__.py
deleted file mode 100644
index 4b36b5a..0000000
--- a/script/_Lib/requests/packages/urllib3/__init__.py
+++ /dev/null
@@ -1,66 +0,0 @@
-"""
-urllib3 - Thread-safe connection pooling and re-using.
-"""
-
-__author__ = 'Andrey Petrov (andrey.petrov@shazow.net)'
-__license__ = 'MIT'
-__version__ = 'dev'
-
-
-from .connectionpool import (
- HTTPConnectionPool,
- HTTPSConnectionPool,
- connection_from_url
-)
-
-from . import exceptions
-from .filepost import encode_multipart_formdata
-from .poolmanager import PoolManager, ProxyManager, proxy_from_url
-from .response import HTTPResponse
-from .util.request import make_headers
-from .util.url import get_host
-from .util.timeout import Timeout
-from .util.retry import Retry
-
-
-# Set default logging handler to avoid "No handler found" warnings.
-import logging
-try: # Python 2.7+
- from logging import NullHandler
-except ImportError:
- class NullHandler(logging.Handler):
- def emit(self, record):
- pass
-
-logging.getLogger(__name__).addHandler(NullHandler())
-
-def add_stderr_logger(level=logging.DEBUG):
- """
- Helper for quickly adding a StreamHandler to the logger. Useful for
- debugging.
-
- Returns the handler after adding it.
- """
- # This method needs to be in this __init__.py to get the __name__ correct
- # even if urllib3 is vendored within another package.
- logger = logging.getLogger(__name__)
- handler = logging.StreamHandler()
- handler.setFormatter(logging.Formatter('%(asctime)s %(levelname)s %(message)s'))
- logger.addHandler(handler)
- logger.setLevel(level)
- logger.debug('Added a stderr logging handler to logger: %s' % __name__)
- return handler
-
-# ... Clean up.
-del NullHandler
-
-
-# Set security warning to only go off once by default.
-import warnings
-warnings.simplefilter('module', exceptions.SecurityWarning)
-
-def disable_warnings(category=exceptions.HTTPWarning):
- """
- Helper for quickly disabling all urllib3 warnings.
- """
- warnings.simplefilter('ignore', category)
diff --git a/script/_Lib/requests/packages/urllib3/_collections.py b/script/_Lib/requests/packages/urllib3/_collections.py
deleted file mode 100644
index d77ebb8..0000000
--- a/script/_Lib/requests/packages/urllib3/_collections.py
+++ /dev/null
@@ -1,199 +0,0 @@
-from collections import Mapping, MutableMapping
-try:
- from threading import RLock
-except ImportError: # Platform-specific: No threads available
- class RLock:
- def __enter__(self):
- pass
-
- def __exit__(self, exc_type, exc_value, traceback):
- pass
-
-
-try: # Python 2.7+
- from collections import OrderedDict
-except ImportError:
- from .packages.ordered_dict import OrderedDict
-from .packages.six import itervalues
-
-
-__all__ = ['RecentlyUsedContainer', 'HTTPHeaderDict']
-
-
-_Null = object()
-
-
-class RecentlyUsedContainer(MutableMapping):
- """
- Provides a thread-safe dict-like container which maintains up to
- ``maxsize`` keys while throwing away the least-recently-used keys beyond
- ``maxsize``.
-
- :param maxsize:
- Maximum number of recent elements to retain.
-
- :param dispose_func:
- Every time an item is evicted from the container,
- ``dispose_func(value)`` is called. Callback which will get called
- """
-
- ContainerCls = OrderedDict
-
- def __init__(self, maxsize=10, dispose_func=None):
- self._maxsize = maxsize
- self.dispose_func = dispose_func
-
- self._container = self.ContainerCls()
- self.lock = RLock()
-
- def __getitem__(self, key):
- # Re-insert the item, moving it to the end of the eviction line.
- with self.lock:
- item = self._container.pop(key)
- self._container[key] = item
- return item
-
- def __setitem__(self, key, value):
- evicted_value = _Null
- with self.lock:
- # Possibly evict the existing value of 'key'
- evicted_value = self._container.get(key, _Null)
- self._container[key] = value
-
- # If we didn't evict an existing value, we might have to evict the
- # least recently used item from the beginning of the container.
- if len(self._container) > self._maxsize:
- _key, evicted_value = self._container.popitem(last=False)
-
- if self.dispose_func and evicted_value is not _Null:
- self.dispose_func(evicted_value)
-
- def __delitem__(self, key):
- with self.lock:
- value = self._container.pop(key)
-
- if self.dispose_func:
- self.dispose_func(value)
-
- def __len__(self):
- with self.lock:
- return len(self._container)
-
- def __iter__(self):
- raise NotImplementedError('Iteration over this class is unlikely to be threadsafe.')
-
- def clear(self):
- with self.lock:
- # Copy pointers to all values, then wipe the mapping
- # under Python 2, this copies the list of values twice :-|
- values = list(self._container.values())
- self._container.clear()
-
- if self.dispose_func:
- for value in values:
- self.dispose_func(value)
-
- def keys(self):
- with self.lock:
- return self._container.keys()
-
-
-class HTTPHeaderDict(MutableMapping):
- """
- :param headers:
- An iterable of field-value pairs. Must not contain multiple field names
- when compared case-insensitively.
-
- :param kwargs:
- Additional field-value pairs to pass in to ``dict.update``.
-
- A ``dict`` like container for storing HTTP Headers.
-
- Field names are stored and compared case-insensitively in compliance with
- RFC 7230. Iteration provides the first case-sensitive key seen for each
- case-insensitive pair.
-
- Using ``__setitem__`` syntax overwrites fields that compare equal
- case-insensitively in order to maintain ``dict``'s api. For fields that
- compare equal, instead create a new ``HTTPHeaderDict`` and use ``.add``
- in a loop.
-
- If multiple fields that are equal case-insensitively are passed to the
- constructor or ``.update``, the behavior is undefined and some will be
- lost.
-
- >>> headers = HTTPHeaderDict()
- >>> headers.add('Set-Cookie', 'foo=bar')
- >>> headers.add('set-cookie', 'baz=quxx')
- >>> headers['content-length'] = '7'
- >>> headers['SET-cookie']
- 'foo=bar, baz=quxx'
- >>> headers['Content-Length']
- '7'
-
- If you want to access the raw headers with their original casing
- for debugging purposes you can access the private ``._data`` attribute
- which is a normal python ``dict`` that maps the case-insensitive key to a
- list of tuples stored as (case-sensitive-original-name, value). Using the
- structure from above as our example:
-
- >>> headers._data
- {'set-cookie': [('Set-Cookie', 'foo=bar'), ('set-cookie', 'baz=quxx')],
- 'content-length': [('content-length', '7')]}
- """
-
- def __init__(self, headers=None, **kwargs):
- self._data = {}
- if headers is None:
- headers = {}
- self.update(headers, **kwargs)
-
- def add(self, key, value):
- """Adds a (name, value) pair, doesn't overwrite the value if it already
- exists.
-
- >>> headers = HTTPHeaderDict(foo='bar')
- >>> headers.add('Foo', 'baz')
- >>> headers['foo']
- 'bar, baz'
- """
- self._data.setdefault(key.lower(), []).append((key, value))
-
- def getlist(self, key):
- """Returns a list of all the values for the named field. Returns an
- empty list if the key doesn't exist."""
- return self[key].split(', ') if key in self else []
-
- def copy(self):
- h = HTTPHeaderDict()
- for key in self._data:
- for rawkey, value in self._data[key]:
- h.add(rawkey, value)
- return h
-
- def __eq__(self, other):
- if not isinstance(other, Mapping):
- return False
- other = HTTPHeaderDict(other)
- return dict((k1, self[k1]) for k1 in self._data) == \
- dict((k2, other[k2]) for k2 in other._data)
-
- def __getitem__(self, key):
- values = self._data[key.lower()]
- return ', '.join(value[1] for value in values)
-
- def __setitem__(self, key, value):
- self._data[key.lower()] = [(key, value)]
-
- def __delitem__(self, key):
- del self._data[key.lower()]
-
- def __len__(self):
- return len(self._data)
-
- def __iter__(self):
- for headers in itervalues(self._data):
- yield headers[0][0]
-
- def __repr__(self):
- return '%s(%r)' % (self.__class__.__name__, dict(self.items()))
diff --git a/script/_Lib/requests/packages/urllib3/connection.py b/script/_Lib/requests/packages/urllib3/connection.py
deleted file mode 100644
index c6e1959..0000000
--- a/script/_Lib/requests/packages/urllib3/connection.py
+++ /dev/null
@@ -1,246 +0,0 @@
-import datetime
-import sys
-import socket
-from socket import timeout as SocketTimeout
-import warnings
-
-try: # Python 3
- from http.client import HTTPConnection as _HTTPConnection, HTTPException
-except ImportError:
- from httplib import HTTPConnection as _HTTPConnection, HTTPException
-
-
-class DummyConnection(object):
- "Used to detect a failed ConnectionCls import."
- pass
-
-
-try: # Compiled with SSL?
- HTTPSConnection = DummyConnection
- import ssl
- BaseSSLError = ssl.SSLError
-except (ImportError, AttributeError): # Platform-specific: No SSL.
- ssl = None
-
- class BaseSSLError(BaseException):
- pass
-
-
-from .exceptions import (
- ConnectTimeoutError,
- SystemTimeWarning,
-)
-from .packages.ssl_match_hostname import match_hostname
-from .packages import six
-
-from .util.ssl_ import (
- resolve_cert_reqs,
- resolve_ssl_version,
- ssl_wrap_socket,
- assert_fingerprint,
-)
-
-from .util import connection
-
-
-port_by_scheme = {
- 'http': 80,
- 'https': 443,
-}
-
-RECENT_DATE = datetime.date(2014, 1, 1)
-
-
-class HTTPConnection(_HTTPConnection, object):
- """
- Based on httplib.HTTPConnection but provides an extra constructor
- backwards-compatibility layer between older and newer Pythons.
-
- Additional keyword parameters are used to configure attributes of the connection.
- Accepted parameters include:
-
- - ``strict``: See the documentation on :class:`urllib3.connectionpool.HTTPConnectionPool`
- - ``source_address``: Set the source address for the current connection.
-
- .. note:: This is ignored for Python 2.6. It is only applied for 2.7 and 3.x
-
- - ``socket_options``: Set specific options on the underlying socket. If not specified, then
- defaults are loaded from ``HTTPConnection.default_socket_options`` which includes disabling
- Nagle's algorithm (sets TCP_NODELAY to 1) unless the connection is behind a proxy.
-
- For example, if you wish to enable TCP Keep Alive in addition to the defaults,
- you might pass::
-
- HTTPConnection.default_socket_options + [
- (socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1),
- ]
-
- Or you may want to disable the defaults by passing an empty list (e.g., ``[]``).
- """
-
- default_port = port_by_scheme['http']
-
- #: Disable Nagle's algorithm by default.
- #: ``[(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)]``
- default_socket_options = [(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)]
-
- #: Whether this connection verifies the host's certificate.
- is_verified = False
-
- def __init__(self, *args, **kw):
- if six.PY3: # Python 3
- kw.pop('strict', None)
-
- # Pre-set source_address in case we have an older Python like 2.6.
- self.source_address = kw.get('source_address')
-
- if sys.version_info < (2, 7): # Python 2.6
- # _HTTPConnection on Python 2.6 will balk at this keyword arg, but
- # not newer versions. We can still use it when creating a
- # connection though, so we pop it *after* we have saved it as
- # self.source_address.
- kw.pop('source_address', None)
-
- #: The socket options provided by the user. If no options are
- #: provided, we use the default options.
- self.socket_options = kw.pop('socket_options', self.default_socket_options)
-
- # Superclass also sets self.source_address in Python 2.7+.
- _HTTPConnection.__init__(self, *args, **kw)
-
- def _new_conn(self):
- """ Establish a socket connection and set nodelay settings on it.
-
- :return: New socket connection.
- """
- extra_kw = {}
- if self.source_address:
- extra_kw['source_address'] = self.source_address
-
- if self.socket_options:
- extra_kw['socket_options'] = self.socket_options
-
- try:
- conn = connection.create_connection(
- (self.host, self.port), self.timeout, **extra_kw)
-
- except SocketTimeout:
- raise ConnectTimeoutError(
- self, "Connection to %s timed out. (connect timeout=%s)" %
- (self.host, self.timeout))
-
- return conn
-
- def _prepare_conn(self, conn):
- self.sock = conn
- # the _tunnel_host attribute was added in python 2.6.3 (via
- # http://hg.python.org/cpython/rev/0f57b30a152f) so pythons 2.6(0-2) do
- # not have them.
- if getattr(self, '_tunnel_host', None):
- # TODO: Fix tunnel so it doesn't depend on self.sock state.
- self._tunnel()
- # Mark this connection as not reusable
- self.auto_open = 0
-
- def connect(self):
- conn = self._new_conn()
- self._prepare_conn(conn)
-
-
-class HTTPSConnection(HTTPConnection):
- default_port = port_by_scheme['https']
-
- def __init__(self, host, port=None, key_file=None, cert_file=None,
- strict=None, timeout=socket._GLOBAL_DEFAULT_TIMEOUT, **kw):
-
- HTTPConnection.__init__(self, host, port, strict=strict,
- timeout=timeout, **kw)
-
- self.key_file = key_file
- self.cert_file = cert_file
-
- # Required property for Google AppEngine 1.9.0 which otherwise causes
- # HTTPS requests to go out as HTTP. (See Issue #356)
- self._protocol = 'https'
-
- def connect(self):
- conn = self._new_conn()
- self._prepare_conn(conn)
- self.sock = ssl.wrap_socket(conn, self.key_file, self.cert_file)
-
-
-class VerifiedHTTPSConnection(HTTPSConnection):
- """
- Based on httplib.HTTPSConnection but wraps the socket with
- SSL certification.
- """
- cert_reqs = None
- ca_certs = None
- ssl_version = None
- assert_fingerprint = None
-
- def set_cert(self, key_file=None, cert_file=None,
- cert_reqs=None, ca_certs=None,
- assert_hostname=None, assert_fingerprint=None):
-
- self.key_file = key_file
- self.cert_file = cert_file
- self.cert_reqs = cert_reqs
- self.ca_certs = ca_certs
- self.assert_hostname = assert_hostname
- self.assert_fingerprint = assert_fingerprint
-
- def connect(self):
- # Add certificate verification
- conn = self._new_conn()
-
- resolved_cert_reqs = resolve_cert_reqs(self.cert_reqs)
- resolved_ssl_version = resolve_ssl_version(self.ssl_version)
-
- hostname = self.host
- if getattr(self, '_tunnel_host', None):
- # _tunnel_host was added in Python 2.6.3
- # (See: http://hg.python.org/cpython/rev/0f57b30a152f)
-
- self.sock = conn
- # Calls self._set_hostport(), so self.host is
- # self._tunnel_host below.
- self._tunnel()
- # Mark this connection as not reusable
- self.auto_open = 0
-
- # Override the host with the one we're requesting data from.
- hostname = self._tunnel_host
-
- is_time_off = datetime.date.today() < RECENT_DATE
- if is_time_off:
- warnings.warn((
- 'System time is way off (before {0}). This will probably '
- 'lead to SSL verification errors').format(RECENT_DATE),
- SystemTimeWarning
- )
-
- # Wrap socket using verification with the root certs in
- # trusted_root_certs
- self.sock = ssl_wrap_socket(conn, self.key_file, self.cert_file,
- cert_reqs=resolved_cert_reqs,
- ca_certs=self.ca_certs,
- server_hostname=hostname,
- ssl_version=resolved_ssl_version)
-
- if self.assert_fingerprint:
- assert_fingerprint(self.sock.getpeercert(binary_form=True),
- self.assert_fingerprint)
- elif resolved_cert_reqs != ssl.CERT_NONE \
- and self.assert_hostname is not False:
- match_hostname(self.sock.getpeercert(),
- self.assert_hostname or hostname)
-
- self.is_verified = (resolved_cert_reqs == ssl.CERT_REQUIRED
- or self.assert_fingerprint is not None)
-
-
-if ssl:
- # Make a copy for testing.
- UnverifiedHTTPSConnection = HTTPSConnection
- HTTPSConnection = VerifiedHTTPSConnection
diff --git a/script/_Lib/requests/packages/urllib3/connectionpool.py b/script/_Lib/requests/packages/urllib3/connectionpool.py
deleted file mode 100644
index 60c3b86..0000000
--- a/script/_Lib/requests/packages/urllib3/connectionpool.py
+++ /dev/null
@@ -1,757 +0,0 @@
-import errno
-import logging
-import sys
-import warnings
-
-from socket import error as SocketError, timeout as SocketTimeout
-import socket
-
-try: # Python 3
- from queue import LifoQueue, Empty, Full
-except ImportError:
- from Queue import LifoQueue, Empty, Full
- import Queue as _ # Platform-specific: Windows
-
-
-from .exceptions import (
- ClosedPoolError,
- ProtocolError,
- EmptyPoolError,
- HostChangedError,
- LocationValueError,
- MaxRetryError,
- ProxyError,
- ReadTimeoutError,
- SSLError,
- TimeoutError,
- InsecureRequestWarning,
-)
-from .packages.ssl_match_hostname import CertificateError
-from .packages import six
-from .connection import (
- port_by_scheme,
- DummyConnection,
- HTTPConnection, HTTPSConnection, VerifiedHTTPSConnection,
- HTTPException, BaseSSLError,
-)
-from .request import RequestMethods
-from .response import HTTPResponse
-
-from .util.connection import is_connection_dropped
-from .util.retry import Retry
-from .util.timeout import Timeout
-from .util.url import get_host
-
-
-xrange = six.moves.xrange
-
-log = logging.getLogger(__name__)
-
-_Default = object()
-
-
-## Pool objects
-class ConnectionPool(object):
- """
- Base class for all connection pools, such as
- :class:`.HTTPConnectionPool` and :class:`.HTTPSConnectionPool`.
- """
-
- scheme = None
- QueueCls = LifoQueue
-
- def __init__(self, host, port=None):
- if not host:
- raise LocationValueError("No host specified.")
-
- # httplib doesn't like it when we include brackets in ipv6 addresses
- self.host = host.strip('[]')
- self.port = port
-
- def __str__(self):
- return '%s(host=%r, port=%r)' % (type(self).__name__,
- self.host, self.port)
-
-# This is taken from http://hg.python.org/cpython/file/7aaba721ebc0/Lib/socket.py#l252
-_blocking_errnos = set([errno.EAGAIN, errno.EWOULDBLOCK])
-
-
-class HTTPConnectionPool(ConnectionPool, RequestMethods):
- """
- Thread-safe connection pool for one host.
-
- :param host:
- Host used for this HTTP Connection (e.g. "localhost"), passed into
- :class:`httplib.HTTPConnection`.
-
- :param port:
- Port used for this HTTP Connection (None is equivalent to 80), passed
- into :class:`httplib.HTTPConnection`.
-
- :param strict:
- Causes BadStatusLine to be raised if the status line can't be parsed
- as a valid HTTP/1.0 or 1.1 status line, passed into
- :class:`httplib.HTTPConnection`.
-
- .. note::
- Only works in Python 2. This parameter is ignored in Python 3.
-
- :param timeout:
- Socket timeout in seconds for each individual connection. This can
- be a float or integer, which sets the timeout for the HTTP request,
- or an instance of :class:`urllib3.util.Timeout` which gives you more
- fine-grained control over request timeouts. After the constructor has
- been parsed, this is always a `urllib3.util.Timeout` object.
-
- :param maxsize:
- Number of connections to save that can be reused. More than 1 is useful
- in multithreaded situations. If ``block`` is set to false, more
- connections will be created but they will not be saved once they've
- been used.
-
- :param block:
- If set to True, no more than ``maxsize`` connections will be used at
- a time. When no free connections are available, the call will block
- until a connection has been released. This is a useful side effect for
- particular multithreaded situations where one does not want to use more
- than maxsize connections per host to prevent flooding.
-
- :param headers:
- Headers to include with all requests, unless other headers are given
- explicitly.
-
- :param retries:
- Retry configuration to use by default with requests in this pool.
-
- :param _proxy:
- Parsed proxy URL, should not be used directly, instead, see
- :class:`urllib3.connectionpool.ProxyManager`"
-
- :param _proxy_headers:
- A dictionary with proxy headers, should not be used directly,
- instead, see :class:`urllib3.connectionpool.ProxyManager`"
-
- :param \**conn_kw:
- Additional parameters are used to create fresh :class:`urllib3.connection.HTTPConnection`,
- :class:`urllib3.connection.HTTPSConnection` instances.
- """
-
- scheme = 'http'
- ConnectionCls = HTTPConnection
-
- def __init__(self, host, port=None, strict=False,
- timeout=Timeout.DEFAULT_TIMEOUT, maxsize=1, block=False,
- headers=None, retries=None,
- _proxy=None, _proxy_headers=None,
- **conn_kw):
- ConnectionPool.__init__(self, host, port)
- RequestMethods.__init__(self, headers)
-
- self.strict = strict
-
- if not isinstance(timeout, Timeout):
- timeout = Timeout.from_float(timeout)
-
- if retries is None:
- retries = Retry.DEFAULT
-
- self.timeout = timeout
- self.retries = retries
-
- self.pool = self.QueueCls(maxsize)
- self.block = block
-
- self.proxy = _proxy
- self.proxy_headers = _proxy_headers or {}
-
- # Fill the queue up so that doing get() on it will block properly
- for _ in xrange(maxsize):
- self.pool.put(None)
-
- # These are mostly for testing and debugging purposes.
- self.num_connections = 0
- self.num_requests = 0
- self.conn_kw = conn_kw
-
- if self.proxy:
- # Enable Nagle's algorithm for proxies, to avoid packet fragmentation.
- # We cannot know if the user has added default socket options, so we cannot replace the
- # list.
- self.conn_kw.setdefault('socket_options', [])
-
- def _new_conn(self):
- """
- Return a fresh :class:`HTTPConnection`.
- """
- self.num_connections += 1
- log.info("Starting new HTTP connection (%d): %s" %
- (self.num_connections, self.host))
-
- conn = self.ConnectionCls(host=self.host, port=self.port,
- timeout=self.timeout.connect_timeout,
- strict=self.strict, **self.conn_kw)
- return conn
-
- def _get_conn(self, timeout=None):
- """
- Get a connection. Will return a pooled connection if one is available.
-
- If no connections are available and :prop:`.block` is ``False``, then a
- fresh connection is returned.
-
- :param timeout:
- Seconds to wait before giving up and raising
- :class:`urllib3.exceptions.EmptyPoolError` if the pool is empty and
- :prop:`.block` is ``True``.
- """
- conn = None
- try:
- conn = self.pool.get(block=self.block, timeout=timeout)
-
- except AttributeError: # self.pool is None
- raise ClosedPoolError(self, "Pool is closed.")
-
- except Empty:
- if self.block:
- raise EmptyPoolError(self,
- "Pool reached maximum size and no more "
- "connections are allowed.")
- pass # Oh well, we'll create a new connection then
-
- # If this is a persistent connection, check if it got disconnected
- if conn and is_connection_dropped(conn):
- log.info("Resetting dropped connection: %s" % self.host)
- conn.close()
- if getattr(conn, 'auto_open', 1) == 0:
- # This is a proxied connection that has been mutated by
- # httplib._tunnel() and cannot be reused (since it would
- # attempt to bypass the proxy)
- conn = None
-
- return conn or self._new_conn()
-
- def _put_conn(self, conn):
- """
- Put a connection back into the pool.
-
- :param conn:
- Connection object for the current host and port as returned by
- :meth:`._new_conn` or :meth:`._get_conn`.
-
- If the pool is already full, the connection is closed and discarded
- because we exceeded maxsize. If connections are discarded frequently,
- then maxsize should be increased.
-
- If the pool is closed, then the connection will be closed and discarded.
- """
- try:
- self.pool.put(conn, block=False)
- return # Everything is dandy, done.
- except AttributeError:
- # self.pool is None.
- pass
- except Full:
- # This should never happen if self.block == True
- log.warning(
- "Connection pool is full, discarding connection: %s" %
- self.host)
-
- # Connection never got put back into the pool, close it.
- if conn:
- conn.close()
-
- def _validate_conn(self, conn):
- """
- Called right before a request is made, after the socket is created.
- """
- pass
-
- def _get_timeout(self, timeout):
- """ Helper that always returns a :class:`urllib3.util.Timeout` """
- if timeout is _Default:
- return self.timeout.clone()
-
- if isinstance(timeout, Timeout):
- return timeout.clone()
- else:
- # User passed us an int/float. This is for backwards compatibility,
- # can be removed later
- return Timeout.from_float(timeout)
-
- def _make_request(self, conn, method, url, timeout=_Default,
- **httplib_request_kw):
- """
- Perform a request on a given urllib connection object taken from our
- pool.
-
- :param conn:
- a connection from one of our connection pools
-
- :param timeout:
- Socket timeout in seconds for the request. This can be a
- float or integer, which will set the same timeout value for
- the socket connect and the socket read, or an instance of
- :class:`urllib3.util.Timeout`, which gives you more fine-grained
- control over your timeouts.
- """
- self.num_requests += 1
-
- timeout_obj = self._get_timeout(timeout)
- timeout_obj.start_connect()
- conn.timeout = timeout_obj.connect_timeout
-
- # Trigger any extra validation we need to do.
- self._validate_conn(conn)
-
- # conn.request() calls httplib.*.request, not the method in
- # urllib3.request. It also calls makefile (recv) on the socket.
- conn.request(method, url, **httplib_request_kw)
-
- # Reset the timeout for the recv() on the socket
- read_timeout = timeout_obj.read_timeout
-
- # App Engine doesn't have a sock attr
- if getattr(conn, 'sock', None):
- # In Python 3 socket.py will catch EAGAIN and return None when you
- # try and read into the file pointer created by http.client, which
- # instead raises a BadStatusLine exception. Instead of catching
- # the exception and assuming all BadStatusLine exceptions are read
- # timeouts, check for a zero timeout before making the request.
- if read_timeout == 0:
- raise ReadTimeoutError(
- self, url, "Read timed out. (read timeout=%s)" % read_timeout)
- if read_timeout is Timeout.DEFAULT_TIMEOUT:
- conn.sock.settimeout(socket.getdefaulttimeout())
- else: # None or a value
- conn.sock.settimeout(read_timeout)
-
- # Receive the response from the server
- try:
- try: # Python 2.7+, use buffering of HTTP responses
- httplib_response = conn.getresponse(buffering=True)
- except TypeError: # Python 2.6 and older
- httplib_response = conn.getresponse()
- except SocketTimeout:
- raise ReadTimeoutError(
- self, url, "Read timed out. (read timeout=%s)" % read_timeout)
-
- except BaseSSLError, e:
- # Catch possible read timeouts thrown as SSL errors. If not the
- # case, rethrow the original. We need to do this because of:
- # http://bugs.python.org/issue10272
- if 'timed out' in str(e) or \
- 'did not complete (read)' in str(e): # Python 2.6
- raise ReadTimeoutError(
- self, url, "Read timed out. (read timeout=%s)" % read_timeout)
-
- raise
-
- except SocketError, e: # Platform-specific: Python 2
- # See the above comment about EAGAIN in Python 3. In Python 2 we
- # have to specifically catch it and throw the timeout error
- if e.errno in _blocking_errnos:
- raise ReadTimeoutError(
- self, url, "Read timed out. (read timeout=%s)" % read_timeout)
-
- raise
-
- # AppEngine doesn't have a version attr.
- http_version = getattr(conn, '_http_vsn_str', 'HTTP/?')
- log.debug("\"%s %s %s\" %s %s" % (method, url, http_version,
- httplib_response.status,
- httplib_response.length))
- return httplib_response
-
- def close(self):
- """
- Close all pooled connections and disable the pool.
- """
- # Disable access to the pool
- old_pool, self.pool = self.pool, None
-
- try:
- while True:
- conn = old_pool.get(block=False)
- if conn:
- conn.close()
-
- except Empty:
- pass # Done.
-
- def is_same_host(self, url):
- """
- Check if the given ``url`` is a member of the same host as this
- connection pool.
- """
- if url.startswith('/'):
- return True
-
- # TODO: Add optional support for socket.gethostbyname checking.
- scheme, host, port = get_host(url)
-
- # Use explicit default port for comparison when none is given
- if self.port and not port:
- port = port_by_scheme.get(scheme)
- elif not self.port and port == port_by_scheme.get(scheme):
- port = None
-
- return (scheme, host, port) == (self.scheme, self.host, self.port)
-
- def urlopen(self, method, url, body=None, headers=None, retries=None,
- redirect=True, assert_same_host=True, timeout=_Default,
- pool_timeout=None, release_conn=None, **response_kw):
- """
- Get a connection from the pool and perform an HTTP request. This is the
- lowest level call for making a request, so you'll need to specify all
- the raw details.
-
- .. note::
-
- More commonly, it's appropriate to use a convenience method provided
- by :class:`.RequestMethods`, such as :meth:`request`.
-
- .. note::
-
- `release_conn` will only behave as expected if
- `preload_content=False` because we want to make
- `preload_content=False` the default behaviour someday soon without
- breaking backwards compatibility.
-
- :param method:
- HTTP request method (such as GET, POST, PUT, etc.)
-
- :param body:
- Data to send in the request body (useful for creating
- POST requests, see HTTPConnectionPool.post_url for
- more convenience).
-
- :param headers:
- Dictionary of custom headers to send, such as User-Agent,
- If-None-Match, etc. If None, pool headers are used. If provided,
- these headers completely replace any pool-specific headers.
-
- :param retries:
- Configure the number of retries to allow before raising a
- :class:`~urllib3.exceptions.MaxRetryError` exception.
-
- Pass ``None`` to retry until you receive a response. Pass a
- :class:`~urllib3.util.retry.Retry` object for fine-grained control
- over different types of retries.
- Pass an integer number to retry connection errors that many times,
- but no other types of errors. Pass zero to never retry.
-
- If ``False``, then retries are disabled and any exception is raised
- immediately. Also, instead of raising a MaxRetryError on redirects,
- the redirect response will be returned.
-
- :type retries: :class:`~urllib3.util.retry.Retry`, False, or an int.
-
- :param redirect:
- If True, automatically handle redirects (status codes 301, 302,
- 303, 307, 308). Each redirect counts as a retry. Disabling retries
- will disable redirect, too.
-
- :param assert_same_host:
- If ``True``, will make sure that the host of the pool requests is
- consistent else will raise HostChangedError. When False, you can
- use the pool on an HTTP proxy and request foreign hosts.
-
- :param timeout:
- If specified, overrides the default timeout for this one
- request. It may be a float (in seconds) or an instance of
- :class:`urllib3.util.Timeout`.
-
- :param pool_timeout:
- If set and the pool is set to block=True, then this method will
- block for ``pool_timeout`` seconds and raise EmptyPoolError if no
- connection is available within the time period.
-
- :param release_conn:
- If False, then the urlopen call will not release the connection
- back into the pool once a response is received (but will release if
- you read the entire contents of the response such as when
- `preload_content=True`). This is useful if you're not preloading
- the response's content immediately. You will need to call
- ``r.release_conn()`` on the response ``r`` to return the connection
- back into the pool. If None, it takes the value of
- ``response_kw.get('preload_content', True)``.
-
- :param \**response_kw:
- Additional parameters are passed to
- :meth:`urllib3.response.HTTPResponse.from_httplib`
- """
- if headers is None:
- headers = self.headers
-
- if not isinstance(retries, Retry):
- retries = Retry.from_int(retries, redirect=redirect, default=self.retries)
-
- if release_conn is None:
- release_conn = response_kw.get('preload_content', True)
-
- # Check host
- if assert_same_host and not self.is_same_host(url):
- raise HostChangedError(self, url, retries)
-
- conn = None
-
- # Merge the proxy headers. Only do this in HTTP. We have to copy the
- # headers dict so we can safely change it without those changes being
- # reflected in anyone else's copy.
- if self.scheme == 'http':
- headers = headers.copy()
- headers.update(self.proxy_headers)
-
- # Must keep the exception bound to a separate variable or else Python 3
- # complains about UnboundLocalError.
- err = None
-
- try:
- # Request a connection from the queue.
- conn = self._get_conn(timeout=pool_timeout)
-
- # Make the request on the httplib connection object.
- httplib_response = self._make_request(conn, method, url,
- timeout=timeout,
- body=body, headers=headers)
-
- # If we're going to release the connection in ``finally:``, then
- # the request doesn't need to know about the connection. Otherwise
- # it will also try to release it and we'll have a double-release
- # mess.
- response_conn = not release_conn and conn
-
- # Import httplib's response into our own wrapper object
- response = HTTPResponse.from_httplib(httplib_response,
- pool=self,
- connection=response_conn,
- **response_kw)
-
- # else:
- # The connection will be put back into the pool when
- # ``response.release_conn()`` is called (implicitly by
- # ``response.read()``)
-
- except Empty:
- # Timed out by queue.
- raise EmptyPoolError(self, "No pool connections are available.")
-
- except (BaseSSLError, CertificateError), e:
- # Release connection unconditionally because there is no way to
- # close it externally in case of exception.
- release_conn = True
- raise SSLError(e)
-
- except (TimeoutError, HTTPException, SocketError), e:
- if conn:
- # Discard the connection for these exceptions. It will be
- # be replaced during the next _get_conn() call.
- conn.close()
- conn = None
-
- stacktrace = sys.exc_info()[2]
- if isinstance(e, SocketError) and self.proxy:
- e = ProxyError('Cannot connect to proxy.', e)
- elif isinstance(e, (SocketError, HTTPException)):
- e = ProtocolError('Connection aborted.', e)
-
- retries = retries.increment(method, url, error=e,
- _pool=self, _stacktrace=stacktrace)
- retries.sleep()
-
- # Keep track of the error for the retry warning.
- err = e
-
- finally:
- if release_conn:
- # Put the connection back to be reused. If the connection is
- # expired then it will be None, which will get replaced with a
- # fresh connection during _get_conn.
- self._put_conn(conn)
-
- if not conn:
- # Try again
- log.warning("Retrying (%r) after connection "
- "broken by '%r': %s" % (retries, err, url))
- return self.urlopen(method, url, body, headers, retries,
- redirect, assert_same_host,
- timeout=timeout, pool_timeout=pool_timeout,
- release_conn=release_conn, **response_kw)
-
- # Handle redirect?
- redirect_location = redirect and response.get_redirect_location()
- if redirect_location:
- if response.status == 303:
- method = 'GET'
-
- try:
- retries = retries.increment(method, url, response=response, _pool=self)
- except MaxRetryError:
- if retries.raise_on_redirect:
- raise
- return response
-
- log.info("Redirecting %s -> %s" % (url, redirect_location))
- return self.urlopen(method, redirect_location, body, headers,
- retries=retries, redirect=redirect,
- assert_same_host=assert_same_host,
- timeout=timeout, pool_timeout=pool_timeout,
- release_conn=release_conn, **response_kw)
-
- # Check if we should retry the HTTP response.
- if retries.is_forced_retry(method, status_code=response.status):
- retries = retries.increment(method, url, response=response, _pool=self)
- retries.sleep()
- log.info("Forced retry: %s" % url)
- return self.urlopen(method, url, body, headers,
- retries=retries, redirect=redirect,
- assert_same_host=assert_same_host,
- timeout=timeout, pool_timeout=pool_timeout,
- release_conn=release_conn, **response_kw)
-
- return response
-
-
-class HTTPSConnectionPool(HTTPConnectionPool):
- """
- Same as :class:`.HTTPConnectionPool`, but HTTPS.
-
- When Python is compiled with the :mod:`ssl` module, then
- :class:`.VerifiedHTTPSConnection` is used, which *can* verify certificates,
- instead of :class:`.HTTPSConnection`.
-
- :class:`.VerifiedHTTPSConnection` uses one of ``assert_fingerprint``,
- ``assert_hostname`` and ``host`` in this order to verify connections.
- If ``assert_hostname`` is False, no verification is done.
-
- The ``key_file``, ``cert_file``, ``cert_reqs``, ``ca_certs`` and
- ``ssl_version`` are only used if :mod:`ssl` is available and are fed into
- :meth:`urllib3.util.ssl_wrap_socket` to upgrade the connection socket
- into an SSL socket.
- """
-
- scheme = 'https'
- ConnectionCls = HTTPSConnection
-
- def __init__(self, host, port=None,
- strict=False, timeout=Timeout.DEFAULT_TIMEOUT, maxsize=1,
- block=False, headers=None, retries=None,
- _proxy=None, _proxy_headers=None,
- key_file=None, cert_file=None, cert_reqs=None,
- ca_certs=None, ssl_version=None,
- assert_hostname=None, assert_fingerprint=None,
- **conn_kw):
-
- HTTPConnectionPool.__init__(self, host, port, strict, timeout, maxsize,
- block, headers, retries, _proxy, _proxy_headers,
- **conn_kw)
- self.key_file = key_file
- self.cert_file = cert_file
- self.cert_reqs = cert_reqs
- self.ca_certs = ca_certs
- self.ssl_version = ssl_version
- self.assert_hostname = assert_hostname
- self.assert_fingerprint = assert_fingerprint
-
- def _prepare_conn(self, conn):
- """
- Prepare the ``connection`` for :meth:`urllib3.util.ssl_wrap_socket`
- and establish the tunnel if proxy is used.
- """
-
- if isinstance(conn, VerifiedHTTPSConnection):
- conn.set_cert(key_file=self.key_file,
- cert_file=self.cert_file,
- cert_reqs=self.cert_reqs,
- ca_certs=self.ca_certs,
- assert_hostname=self.assert_hostname,
- assert_fingerprint=self.assert_fingerprint)
- conn.ssl_version = self.ssl_version
-
- if self.proxy is not None:
- # Python 2.7+
- try:
- set_tunnel = conn.set_tunnel
- except AttributeError: # Platform-specific: Python 2.6
- set_tunnel = conn._set_tunnel
-
- if sys.version_info <= (2, 6, 4) and not self.proxy_headers: # Python 2.6.4 and older
- set_tunnel(self.host, self.port)
- else:
- set_tunnel(self.host, self.port, self.proxy_headers)
-
- # Establish tunnel connection early, because otherwise httplib
- # would improperly set Host: header to proxy's IP:port.
- conn.connect()
-
- return conn
-
- def _new_conn(self):
- """
- Return a fresh :class:`httplib.HTTPSConnection`.
- """
- self.num_connections += 1
- log.info("Starting new HTTPS connection (%d): %s"
- % (self.num_connections, self.host))
-
- if not self.ConnectionCls or self.ConnectionCls is DummyConnection:
- # Platform-specific: Python without ssl
- raise SSLError("Can't connect to HTTPS URL because the SSL "
- "module is not available.")
-
- actual_host = self.host
- actual_port = self.port
- if self.proxy is not None:
- actual_host = self.proxy.host
- actual_port = self.proxy.port
-
- conn = self.ConnectionCls(host=actual_host, port=actual_port,
- timeout=self.timeout.connect_timeout,
- strict=self.strict, **self.conn_kw)
-
- return self._prepare_conn(conn)
-
- def _validate_conn(self, conn):
- """
- Called right before a request is made, after the socket is created.
- """
- super(HTTPSConnectionPool, self)._validate_conn(conn)
-
- # Force connect early to allow us to validate the connection.
- if not getattr(conn, 'sock', None): # AppEngine might not have `.sock`
- conn.connect()
-
- if not conn.is_verified:
- warnings.warn((
- 'Unverified HTTPS request is being made. '
- 'Adding certificate verification is strongly advised. See: '
- 'https://urllib3.readthedocs.org/en/latest/security.html '
- '(This warning will only appear once by default.)'),
- InsecureRequestWarning)
-
-
-def connection_from_url(url, **kw):
- """
- Given a url, return an :class:`.ConnectionPool` instance of its host.
-
- This is a shortcut for not having to parse out the scheme, host, and port
- of the url before creating an :class:`.ConnectionPool` instance.
-
- :param url:
- Absolute URL string that must include the scheme. Port is optional.
-
- :param \**kw:
- Passes additional parameters to the constructor of the appropriate
- :class:`.ConnectionPool`. Useful for specifying things like
- timeout, maxsize, headers, etc.
-
- Example::
-
- >>> conn = connection_from_url('http://google.com/')
- >>> r = conn.request('GET', '/')
- """
- scheme, host, port = get_host(url)
- if scheme == 'https':
- return HTTPSConnectionPool(host, port=port, **kw)
- else:
- return HTTPConnectionPool(host, port=port, **kw)
diff --git a/script/_Lib/requests/packages/urllib3/contrib/__init__.py b/script/_Lib/requests/packages/urllib3/contrib/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/script/_Lib/requests/packages/urllib3/contrib/ntlmpool.py b/script/_Lib/requests/packages/urllib3/contrib/ntlmpool.py
deleted file mode 100644
index c6b266f..0000000
--- a/script/_Lib/requests/packages/urllib3/contrib/ntlmpool.py
+++ /dev/null
@@ -1,114 +0,0 @@
-"""
-NTLM authenticating pool, contributed by erikcederstran
-
-Issue #10, see: http://code.google.com/p/urllib3/issues/detail?id=10
-"""
-
-try:
- from http.client import HTTPSConnection
-except ImportError:
- from httplib import HTTPSConnection
-from logging import getLogger
-from ntlm import ntlm
-
-from urllib3 import HTTPSConnectionPool
-
-
-log = getLogger(__name__)
-
-
-class NTLMConnectionPool(HTTPSConnectionPool):
- """
- Implements an NTLM authentication version of an urllib3 connection pool
- """
-
- scheme = 'https'
-
- def __init__(self, user, pw, authurl, *args, **kwargs):
- """
- authurl is a random URL on the server that is protected by NTLM.
- user is the Windows user, probably in the DOMAIN\\username format.
- pw is the password for the user.
- """
- super(NTLMConnectionPool, self).__init__(*args, **kwargs)
- self.authurl = authurl
- self.rawuser = user
- user_parts = user.split('\\', 1)
- self.domain = user_parts[0].upper()
- self.user = user_parts[1]
- self.pw = pw
-
- def _new_conn(self):
- # Performs the NTLM handshake that secures the connection. The socket
- # must be kept open while requests are performed.
- self.num_connections += 1
- log.debug('Starting NTLM HTTPS connection no. %d: https://%s%s' %
- (self.num_connections, self.host, self.authurl))
-
- headers = {}
- headers['Connection'] = 'Keep-Alive'
- req_header = 'Authorization'
- resp_header = 'www-authenticate'
-
- conn = HTTPSConnection(host=self.host, port=self.port)
-
- # Send negotiation message
- headers[req_header] = (
- 'NTLM %s' % ntlm.create_NTLM_NEGOTIATE_MESSAGE(self.rawuser))
- log.debug('Request headers: %s' % headers)
- conn.request('GET', self.authurl, None, headers)
- res = conn.getresponse()
- reshdr = dict(res.getheaders())
- log.debug('Response status: %s %s' % (res.status, res.reason))
- log.debug('Response headers: %s' % reshdr)
- log.debug('Response data: %s [...]' % res.read(100))
-
- # Remove the reference to the socket, so that it can not be closed by
- # the response object (we want to keep the socket open)
- res.fp = None
-
- # Server should respond with a challenge message
- auth_header_values = reshdr[resp_header].split(', ')
- auth_header_value = None
- for s in auth_header_values:
- if s[:5] == 'NTLM ':
- auth_header_value = s[5:]
- if auth_header_value is None:
- raise Exception('Unexpected %s response header: %s' %
- (resp_header, reshdr[resp_header]))
-
- # Send authentication message
- ServerChallenge, NegotiateFlags = \
- ntlm.parse_NTLM_CHALLENGE_MESSAGE(auth_header_value)
- auth_msg = ntlm.create_NTLM_AUTHENTICATE_MESSAGE(ServerChallenge,
- self.user,
- self.domain,
- self.pw,
- NegotiateFlags)
- headers[req_header] = 'NTLM %s' % auth_msg
- log.debug('Request headers: %s' % headers)
- conn.request('GET', self.authurl, None, headers)
- res = conn.getresponse()
- log.debug('Response status: %s %s' % (res.status, res.reason))
- log.debug('Response headers: %s' % dict(res.getheaders()))
- log.debug('Response data: %s [...]' % res.read()[:100])
- if res.status != 200:
- if res.status == 401:
- raise Exception('Server rejected request: wrong '
- 'username or password')
- raise Exception('Wrong server response: %s %s' %
- (res.status, res.reason))
-
- res.fp = None
- log.debug('Connection established')
- return conn
-
- def urlopen(self, method, url, body=None, headers=None, retries=3,
- redirect=True, assert_same_host=True):
- if headers is None:
- headers = {}
- headers['Connection'] = 'Keep-Alive'
- return super(NTLMConnectionPool, self).urlopen(method, url, body,
- headers, retries,
- redirect,
- assert_same_host)
diff --git a/script/_Lib/requests/packages/urllib3/contrib/pyopenssl.py b/script/_Lib/requests/packages/urllib3/contrib/pyopenssl.py
deleted file mode 100644
index 24de9e4..0000000
--- a/script/_Lib/requests/packages/urllib3/contrib/pyopenssl.py
+++ /dev/null
@@ -1,284 +0,0 @@
-'''SSL with SNI_-support for Python 2. Follow these instructions if you would
-like to verify SSL certificates in Python 2. Note, the default libraries do
-*not* do certificate checking; you need to do additional work to validate
-certificates yourself.
-
-This needs the following packages installed:
-
-* pyOpenSSL (tested with 0.13)
-* ndg-httpsclient (tested with 0.3.2)
-* pyasn1 (tested with 0.1.6)
-
-You can install them with the following command:
-
- pip install pyopenssl ndg-httpsclient pyasn1
-
-To activate certificate checking, call
-:func:`~urllib3.contrib.pyopenssl.inject_into_urllib3` from your Python code
-before you begin making HTTP requests. This can be done in a ``sitecustomize``
-module, or at any other time before your application begins using ``urllib3``,
-like this::
-
- try:
- import urllib3.contrib.pyopenssl
- urllib3.contrib.pyopenssl.inject_into_urllib3()
- except ImportError:
- pass
-
-Now you can use :mod:`urllib3` as you normally would, and it will support SNI
-when the required modules are installed.
-
-Activating this module also has the positive side effect of disabling SSL/TLS
-encryption in Python 2 (see `CRIME attack`_).
-
-If you want to configure the default list of supported cipher suites, you can
-set the ``urllib3.contrib.pyopenssl.DEFAULT_SSL_CIPHER_LIST`` variable.
-
-Module Variables
-----------------
-
-:var DEFAULT_SSL_CIPHER_LIST: The list of supported SSL/TLS cipher suites.
- Default: ``ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:
- ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+3DES:!aNULL:!MD5:!DSS``
-
-.. _sni: https://en.wikipedia.org/wiki/Server_Name_Indication
-.. _crime attack: https://en.wikipedia.org/wiki/CRIME_(security_exploit)
-
-'''
-
-try:
- from ndg.httpsclient.ssl_peer_verification import SUBJ_ALT_NAME_SUPPORT
- from ndg.httpsclient.subj_alt_name import SubjectAltName as BaseSubjectAltName
-except SyntaxError as e:
- raise ImportError(e)
-
-import OpenSSL.SSL
-from pyasn1.codec.der import decoder as der_decoder
-from pyasn1.type import univ, constraint
-from socket import _fileobject, timeout
-import ssl
-import select
-
-from .. import connection
-from .. import util
-
-__all__ = ['inject_into_urllib3', 'extract_from_urllib3']
-
-# SNI only *really* works if we can read the subjectAltName of certificates.
-HAS_SNI = SUBJ_ALT_NAME_SUPPORT
-
-# Map from urllib3 to PyOpenSSL compatible parameter-values.
-_openssl_versions = {
- ssl.PROTOCOL_SSLv23: OpenSSL.SSL.SSLv23_METHOD,
- ssl.PROTOCOL_SSLv3: OpenSSL.SSL.SSLv3_METHOD,
- ssl.PROTOCOL_TLSv1: OpenSSL.SSL.TLSv1_METHOD,
-}
-_openssl_verify = {
- ssl.CERT_NONE: OpenSSL.SSL.VERIFY_NONE,
- ssl.CERT_OPTIONAL: OpenSSL.SSL.VERIFY_PEER,
- ssl.CERT_REQUIRED: OpenSSL.SSL.VERIFY_PEER
- + OpenSSL.SSL.VERIFY_FAIL_IF_NO_PEER_CERT,
-}
-
-# A secure default.
-# Sources for more information on TLS ciphers:
-#
-# - https://wiki.mozilla.org/Security/Server_Side_TLS
-# - https://www.ssllabs.com/projects/best-practices/index.html
-# - https://hynek.me/articles/hardening-your-web-servers-ssl-ciphers/
-#
-# The general intent is:
-# - Prefer cipher suites that offer perfect forward secrecy (DHE/ECDHE),
-# - prefer ECDHE over DHE for better performance,
-# - prefer any AES-GCM over any AES-CBC for better performance and security,
-# - use 3DES as fallback which is secure but slow,
-# - disable NULL authentication, MD5 MACs and DSS for security reasons.
-DEFAULT_SSL_CIPHER_LIST = "ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:" + \
- "ECDH+AES128:DH+AES:ECDH+3DES:DH+3DES:RSA+AESGCM:RSA+AES:RSA+3DES:" + \
- "!aNULL:!MD5:!DSS"
-
-
-orig_util_HAS_SNI = util.HAS_SNI
-orig_connection_ssl_wrap_socket = connection.ssl_wrap_socket
-
-
-def inject_into_urllib3():
- 'Monkey-patch urllib3 with PyOpenSSL-backed SSL-support.'
-
- connection.ssl_wrap_socket = ssl_wrap_socket
- util.HAS_SNI = HAS_SNI
-
-
-def extract_from_urllib3():
- 'Undo monkey-patching by :func:`inject_into_urllib3`.'
-
- connection.ssl_wrap_socket = orig_connection_ssl_wrap_socket
- util.HAS_SNI = orig_util_HAS_SNI
-
-
-### Note: This is a slightly bug-fixed version of same from ndg-httpsclient.
-class SubjectAltName(BaseSubjectAltName):
- '''ASN.1 implementation for subjectAltNames support'''
-
- # There is no limit to how many SAN certificates a certificate may have,
- # however this needs to have some limit so we'll set an arbitrarily high
- # limit.
- sizeSpec = univ.SequenceOf.sizeSpec + \
- constraint.ValueSizeConstraint(1, 1024)
-
-
-### Note: This is a slightly bug-fixed version of same from ndg-httpsclient.
-def get_subj_alt_name(peer_cert):
- # Search through extensions
- dns_name = []
- if not SUBJ_ALT_NAME_SUPPORT:
- return dns_name
-
- general_names = SubjectAltName()
- for i in range(peer_cert.get_extension_count()):
- ext = peer_cert.get_extension(i)
- ext_name = ext.get_short_name()
- if ext_name != 'subjectAltName':
- continue
-
- # PyOpenSSL returns extension data in ASN.1 encoded form
- ext_dat = ext.get_data()
- decoded_dat = der_decoder.decode(ext_dat,
- asn1Spec=general_names)
-
- for name in decoded_dat:
- if not isinstance(name, SubjectAltName):
- continue
- for entry in range(len(name)):
- component = name.getComponentByPosition(entry)
- if component.getName() != 'dNSName':
- continue
- dns_name.append(str(component.getComponent()))
-
- return dns_name
-
-
-class WrappedSocket(object):
- '''API-compatibility wrapper for Python OpenSSL's Connection-class.
-
- Note: _makefile_refs, _drop() and _reuse() are needed for the garbage
- collector of pypy.
- '''
-
- def __init__(self, connection, socket, suppress_ragged_eofs=True):
- self.connection = connection
- self.socket = socket
- self.suppress_ragged_eofs = suppress_ragged_eofs
- self._makefile_refs = 0
-
- def fileno(self):
- return self.socket.fileno()
-
- def makefile(self, mode, bufsize=-1):
- self._makefile_refs += 1
- return _fileobject(self, mode, bufsize, close=True)
-
- def recv(self, *args, **kwargs):
- try:
- data = self.connection.recv(*args, **kwargs)
- except OpenSSL.SSL.SysCallError as e:
- if self.suppress_ragged_eofs and e.args == (-1, 'Unexpected EOF'):
- return b''
- else:
- raise
- except OpenSSL.SSL.WantReadError:
- rd, wd, ed = select.select(
- [self.socket], [], [], self.socket.gettimeout())
- if not rd:
- raise timeout('The read operation timed out')
- else:
- return self.recv(*args, **kwargs)
- else:
- return data
-
- def settimeout(self, timeout):
- return self.socket.settimeout(timeout)
-
- def sendall(self, data):
- return self.connection.sendall(data)
-
- def close(self):
- if self._makefile_refs < 1:
- return self.connection.shutdown()
- else:
- self._makefile_refs -= 1
-
- def getpeercert(self, binary_form=False):
- x509 = self.connection.get_peer_certificate()
-
- if not x509:
- return x509
-
- if binary_form:
- return OpenSSL.crypto.dump_certificate(
- OpenSSL.crypto.FILETYPE_ASN1,
- x509)
-
- return {
- 'subject': (
- (('commonName', x509.get_subject().CN),),
- ),
- 'subjectAltName': [
- ('DNS', value)
- for value in get_subj_alt_name(x509)
- ]
- }
-
- def _reuse(self):
- self._makefile_refs += 1
-
- def _drop(self):
- if self._makefile_refs < 1:
- self.close()
- else:
- self._makefile_refs -= 1
-
-
-def _verify_callback(cnx, x509, err_no, err_depth, return_code):
- return err_no == 0
-
-
-def ssl_wrap_socket(sock, keyfile=None, certfile=None, cert_reqs=None,
- ca_certs=None, server_hostname=None,
- ssl_version=None):
- ctx = OpenSSL.SSL.Context(_openssl_versions[ssl_version])
- if certfile:
- ctx.use_certificate_file(certfile)
- if keyfile:
- ctx.use_privatekey_file(keyfile)
- if cert_reqs != ssl.CERT_NONE:
- ctx.set_verify(_openssl_verify[cert_reqs], _verify_callback)
- if ca_certs:
- try:
- ctx.load_verify_locations(ca_certs, None)
- except OpenSSL.SSL.Error as e:
- raise ssl.SSLError('bad ca_certs: %r' % ca_certs, e)
- else:
- ctx.set_default_verify_paths()
-
- # Disable TLS compression to migitate CRIME attack (issue #309)
- OP_NO_COMPRESSION = 0x20000
- ctx.set_options(OP_NO_COMPRESSION)
-
- # Set list of supported ciphersuites.
- ctx.set_cipher_list(DEFAULT_SSL_CIPHER_LIST)
-
- cnx = OpenSSL.SSL.Connection(ctx, sock)
- cnx.set_tlsext_host_name(server_hostname)
- cnx.set_connect_state()
- while True:
- try:
- cnx.do_handshake()
- except OpenSSL.SSL.WantReadError:
- select.select([sock], [], [])
- continue
- except OpenSSL.SSL.Error as e:
- raise ssl.SSLError('bad handshake', e)
- break
-
- return WrappedSocket(cnx, sock)
diff --git a/script/_Lib/requests/packages/urllib3/exceptions.py b/script/_Lib/requests/packages/urllib3/exceptions.py
deleted file mode 100644
index 7519ba9..0000000
--- a/script/_Lib/requests/packages/urllib3/exceptions.py
+++ /dev/null
@@ -1,156 +0,0 @@
-
-## Base Exceptions
-
-class HTTPError(Exception):
- "Base exception used by this module."
- pass
-
-class HTTPWarning(Warning):
- "Base warning used by this module."
- pass
-
-
-
-class PoolError(HTTPError):
- "Base exception for errors caused within a pool."
- def __init__(self, pool, message):
- self.pool = pool
- HTTPError.__init__(self, "%s: %s" % (pool, message))
-
- def __reduce__(self):
- # For pickling purposes.
- return self.__class__, (None, None)
-
-
-class RequestError(PoolError):
- "Base exception for PoolErrors that have associated URLs."
- def __init__(self, pool, url, message):
- self.url = url
- PoolError.__init__(self, pool, message)
-
- def __reduce__(self):
- # For pickling purposes.
- return self.__class__, (None, self.url, None)
-
-
-class SSLError(HTTPError):
- "Raised when SSL certificate fails in an HTTPS connection."
- pass
-
-
-class ProxyError(HTTPError):
- "Raised when the connection to a proxy fails."
- pass
-
-
-class DecodeError(HTTPError):
- "Raised when automatic decoding based on Content-Type fails."
- pass
-
-
-class ProtocolError(HTTPError):
- "Raised when something unexpected happens mid-request/response."
- pass
-
-
-#: Renamed to ProtocolError but aliased for backwards compatibility.
-ConnectionError = ProtocolError
-
-
-## Leaf Exceptions
-
-class MaxRetryError(RequestError):
- """Raised when the maximum number of retries is exceeded.
-
- :param pool: The connection pool
- :type pool: :class:`~urllib3.connectionpool.HTTPConnectionPool`
- :param string url: The requested Url
- :param exceptions.Exception reason: The underlying error
-
- """
-
- def __init__(self, pool, url, reason=None):
- self.reason = reason
-
- message = "Max retries exceeded with url: %s" % url
- if reason:
- message += " (Caused by %r)" % reason
- else:
- message += " (Caused by redirect)"
-
- RequestError.__init__(self, pool, url, message)
-
-
-class HostChangedError(RequestError):
- "Raised when an existing pool gets a request for a foreign host."
-
- def __init__(self, pool, url, retries=3):
- message = "Tried to open a foreign host with url: %s" % url
- RequestError.__init__(self, pool, url, message)
- self.retries = retries
-
-
-class TimeoutStateError(HTTPError):
- """ Raised when passing an invalid state to a timeout """
- pass
-
-
-class TimeoutError(HTTPError):
- """ Raised when a socket timeout error occurs.
-
- Catching this error will catch both :exc:`ReadTimeoutErrors
- ` and :exc:`ConnectTimeoutErrors `.
- """
- pass
-
-
-class ReadTimeoutError(TimeoutError, RequestError):
- "Raised when a socket timeout occurs while receiving data from a server"
- pass
-
-
-# This timeout error does not have a URL attached and needs to inherit from the
-# base HTTPError
-class ConnectTimeoutError(TimeoutError):
- "Raised when a socket timeout occurs while connecting to a server"
- pass
-
-
-class EmptyPoolError(PoolError):
- "Raised when a pool runs out of connections and no more are allowed."
- pass
-
-
-class ClosedPoolError(PoolError):
- "Raised when a request enters a pool after the pool has been closed."
- pass
-
-
-class LocationValueError(ValueError, HTTPError):
- "Raised when there is something wrong with a given URL input."
- pass
-
-
-class LocationParseError(LocationValueError):
- "Raised when get_host or similar fails to parse the URL input."
-
- def __init__(self, location):
- message = "Failed to parse: %s" % location
- HTTPError.__init__(self, message)
-
- self.location = location
-
-
-class SecurityWarning(HTTPWarning):
- "Warned when perfoming security reducing actions"
- pass
-
-
-class InsecureRequestWarning(SecurityWarning):
- "Warned when making an unverified HTTPS request."
- pass
-
-
-class SystemTimeWarning(SecurityWarning):
- "Warned when system time is suspected to be wrong"
- pass
diff --git a/script/_Lib/requests/packages/urllib3/fields.py b/script/_Lib/requests/packages/urllib3/fields.py
deleted file mode 100644
index c853f8d..0000000
--- a/script/_Lib/requests/packages/urllib3/fields.py
+++ /dev/null
@@ -1,177 +0,0 @@
-import email.utils
-import mimetypes
-
-from .packages import six
-
-
-def guess_content_type(filename, default='application/octet-stream'):
- """
- Guess the "Content-Type" of a file.
-
- :param filename:
- The filename to guess the "Content-Type" of using :mod:`mimetypes`.
- :param default:
- If no "Content-Type" can be guessed, default to `default`.
- """
- if filename:
- return mimetypes.guess_type(filename)[0] or default
- return default
-
-
-def format_header_param(name, value):
- """
- Helper function to format and quote a single header parameter.
-
- Particularly useful for header parameters which might contain
- non-ASCII values, like file names. This follows RFC 2231, as
- suggested by RFC 2388 Section 4.4.
-
- :param name:
- The name of the parameter, a string expected to be ASCII only.
- :param value:
- The value of the parameter, provided as a unicode string.
- """
- if not any(ch in value for ch in '"\\\r\n'):
- result = '%s="%s"' % (name, value)
- try:
- result.encode('ascii')
- except UnicodeEncodeError:
- pass
- else:
- return result
- if not six.PY3: # Python 2:
- value = value.encode('utf-8')
- value = email.utils.encode_rfc2231(value, 'utf-8')
- value = '%s*=%s' % (name, value)
- return value
-
-
-class RequestField(object):
- """
- A data container for request body parameters.
-
- :param name:
- The name of this request field.
- :param data:
- The data/value body.
- :param filename:
- An optional filename of the request field.
- :param headers:
- An optional dict-like object of headers to initially use for the field.
- """
- def __init__(self, name, data, filename=None, headers=None):
- self._name = name
- self._filename = filename
- self.data = data
- self.headers = {}
- if headers:
- self.headers = dict(headers)
-
- @classmethod
- def from_tuples(cls, fieldname, value):
- """
- A :class:`~urllib3.fields.RequestField` factory from old-style tuple parameters.
-
- Supports constructing :class:`~urllib3.fields.RequestField` from
- parameter of key/value strings AND key/filetuple. A filetuple is a
- (filename, data, MIME type) tuple where the MIME type is optional.
- For example::
-
- 'foo': 'bar',
- 'fakefile': ('foofile.txt', 'contents of foofile'),
- 'realfile': ('barfile.txt', open('realfile').read()),
- 'typedfile': ('bazfile.bin', open('bazfile').read(), 'image/jpeg'),
- 'nonamefile': 'contents of nonamefile field',
-
- Field names and filenames must be unicode.
- """
- if isinstance(value, tuple):
- if len(value) == 3:
- filename, data, content_type = value
- else:
- filename, data = value
- content_type = guess_content_type(filename)
- else:
- filename = None
- content_type = None
- data = value
-
- request_param = cls(fieldname, data, filename=filename)
- request_param.make_multipart(content_type=content_type)
-
- return request_param
-
- def _render_part(self, name, value):
- """
- Overridable helper function to format a single header parameter.
-
- :param name:
- The name of the parameter, a string expected to be ASCII only.
- :param value:
- The value of the parameter, provided as a unicode string.
- """
- return format_header_param(name, value)
-
- def _render_parts(self, header_parts):
- """
- Helper function to format and quote a single header.
-
- Useful for single headers that are composed of multiple items. E.g.,
- 'Content-Disposition' fields.
-
- :param header_parts:
- A sequence of (k, v) typles or a :class:`dict` of (k, v) to format
- as `k1="v1"; k2="v2"; ...`.
- """
- parts = []
- iterable = header_parts
- if isinstance(header_parts, dict):
- iterable = header_parts.items()
-
- for name, value in iterable:
- if value:
- parts.append(self._render_part(name, value))
-
- return '; '.join(parts)
-
- def render_headers(self):
- """
- Renders the headers for this request field.
- """
- lines = []
-
- sort_keys = ['Content-Disposition', 'Content-Type', 'Content-Location']
- for sort_key in sort_keys:
- if self.headers.get(sort_key, False):
- lines.append('%s: %s' % (sort_key, self.headers[sort_key]))
-
- for header_name, header_value in self.headers.items():
- if header_name not in sort_keys:
- if header_value:
- lines.append('%s: %s' % (header_name, header_value))
-
- lines.append('\r\n')
- return '\r\n'.join(lines)
-
- def make_multipart(self, content_disposition=None, content_type=None,
- content_location=None):
- """
- Makes this request field into a multipart request field.
-
- This method overrides "Content-Disposition", "Content-Type" and
- "Content-Location" headers to the request parameter.
-
- :param content_type:
- The 'Content-Type' of the request body.
- :param content_location:
- The 'Content-Location' of the request body.
-
- """
- self.headers['Content-Disposition'] = content_disposition or 'form-data'
- self.headers['Content-Disposition'] += '; '.join([
- '', self._render_parts(
- (('name', self._name), ('filename', self._filename))
- )
- ])
- self.headers['Content-Type'] = content_type
- self.headers['Content-Location'] = content_location
diff --git a/script/_Lib/requests/packages/urllib3/filepost.py b/script/_Lib/requests/packages/urllib3/filepost.py
deleted file mode 100644
index 0fbf488..0000000
--- a/script/_Lib/requests/packages/urllib3/filepost.py
+++ /dev/null
@@ -1,93 +0,0 @@
-import codecs
-
-from uuid import uuid4
-from io import BytesIO
-
-from .packages import six
-from .packages.six import b
-from .fields import RequestField
-
-writer = codecs.lookup('utf-8')[3]
-
-
-def choose_boundary():
- """
- Our embarassingly-simple replacement for mimetools.choose_boundary.
- """
- return uuid4().hex
-
-
-def iter_field_objects(fields):
- """
- Iterate over fields.
-
- Supports list of (k, v) tuples and dicts, and lists of
- :class:`~urllib3.fields.RequestField`.
-
- """
- if isinstance(fields, dict):
- i = six.iteritems(fields)
- else:
- i = iter(fields)
-
- for field in i:
- if isinstance(field, RequestField):
- yield field
- else:
- yield RequestField.from_tuples(*field)
-
-
-def iter_fields(fields):
- """
- .. deprecated:: 1.6
-
- Iterate over fields.
-
- The addition of :class:`~urllib3.fields.RequestField` makes this function
- obsolete. Instead, use :func:`iter_field_objects`, which returns
- :class:`~urllib3.fields.RequestField` objects.
-
- Supports list of (k, v) tuples and dicts.
- """
- if isinstance(fields, dict):
- return ((k, v) for k, v in six.iteritems(fields))
-
- return ((k, v) for k, v in fields)
-
-
-def encode_multipart_formdata(fields, boundary=None):
- """
- Encode a dictionary of ``fields`` using the multipart/form-data MIME format.
-
- :param fields:
- Dictionary of fields or list of (key, :class:`~urllib3.fields.RequestField`).
-
- :param boundary:
- If not specified, then a random boundary will be generated using
- :func:`mimetools.choose_boundary`.
- """
- body = BytesIO()
- if boundary is None:
- boundary = choose_boundary()
-
- for field in iter_field_objects(fields):
- body.write(b('--%s\r\n' % (boundary)))
-
- writer(body).write(field.render_headers())
- data = field.data
-
- if isinstance(data, int):
- data = str(data) # Backwards compatibility
-
- if isinstance(data, six.text_type):
- writer(body).write(data)
- else:
- body.write(data)
-
- body.write(b'\r\n')
-
- body.write(b('--%s--\r\n' % (boundary)))
-
- content_type = str('multipart/form-data; boundary=%s' % boundary)
-
- return body.getvalue(), content_type
diff --git a/script/_Lib/requests/packages/urllib3/packages/__init__.py b/script/_Lib/requests/packages/urllib3/packages/__init__.py
deleted file mode 100644
index 37e8351..0000000
--- a/script/_Lib/requests/packages/urllib3/packages/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from __future__ import absolute_import
-
-from . import ssl_match_hostname
-
diff --git a/script/_Lib/requests/packages/urllib3/packages/ordered_dict.py b/script/_Lib/requests/packages/urllib3/packages/ordered_dict.py
deleted file mode 100644
index 4479363..0000000
--- a/script/_Lib/requests/packages/urllib3/packages/ordered_dict.py
+++ /dev/null
@@ -1,259 +0,0 @@
-# Backport of OrderedDict() class that runs on Python 2.4, 2.5, 2.6, 2.7 and pypy.
-# Passes Python2.7's test suite and incorporates all the latest updates.
-# Copyright 2009 Raymond Hettinger, released under the MIT License.
-# http://code.activestate.com/recipes/576693/
-try:
- from thread import get_ident as _get_ident
-except ImportError:
- from dummy_thread import get_ident as _get_ident
-
-try:
- from _abcoll import KeysView, ValuesView, ItemsView
-except ImportError:
- pass
-
-
-class OrderedDict(dict):
- 'Dictionary that remembers insertion order'
- # An inherited dict maps keys to values.
- # The inherited dict provides __getitem__, __len__, __contains__, and get.
- # The remaining methods are order-aware.
- # Big-O running times for all methods are the same as for regular dictionaries.
-
- # The internal self.__map dictionary maps keys to links in a doubly linked list.
- # The circular doubly linked list starts and ends with a sentinel element.
- # The sentinel element never gets deleted (this simplifies the algorithm).
- # Each link is stored as a list of length three: [PREV, NEXT, KEY].
-
- def __init__(self, *args, **kwds):
- '''Initialize an ordered dictionary. Signature is the same as for
- regular dictionaries, but keyword arguments are not recommended
- because their insertion order is arbitrary.
-
- '''
- if len(args) > 1:
- raise TypeError('expected at most 1 arguments, got %d' % len(args))
- try:
- self.__root
- except AttributeError:
- self.__root = root = [] # sentinel node
- root[:] = [root, root, None]
- self.__map = {}
- self.__update(*args, **kwds)
-
- def __setitem__(self, key, value, dict_setitem=dict.__setitem__):
- 'od.__setitem__(i, y) <==> od[i]=y'
- # Setting a new item creates a new link which goes at the end of the linked
- # list, and the inherited dictionary is updated with the new key/value pair.
- if key not in self:
- root = self.__root
- last = root[0]
- last[1] = root[0] = self.__map[key] = [last, root, key]
- dict_setitem(self, key, value)
-
- def __delitem__(self, key, dict_delitem=dict.__delitem__):
- 'od.__delitem__(y) <==> del od[y]'
- # Deleting an existing item uses self.__map to find the link which is
- # then removed by updating the links in the predecessor and successor nodes.
- dict_delitem(self, key)
- link_prev, link_next, key = self.__map.pop(key)
- link_prev[1] = link_next
- link_next[0] = link_prev
-
- def __iter__(self):
- 'od.__iter__() <==> iter(od)'
- root = self.__root
- curr = root[1]
- while curr is not root:
- yield curr[2]
- curr = curr[1]
-
- def __reversed__(self):
- 'od.__reversed__() <==> reversed(od)'
- root = self.__root
- curr = root[0]
- while curr is not root:
- yield curr[2]
- curr = curr[0]
-
- def clear(self):
- 'od.clear() -> None. Remove all items from od.'
- try:
- for node in self.__map.itervalues():
- del node[:]
- root = self.__root
- root[:] = [root, root, None]
- self.__map.clear()
- except AttributeError:
- pass
- dict.clear(self)
-
- def popitem(self, last=True):
- '''od.popitem() -> (k, v), return and remove a (key, value) pair.
- Pairs are returned in LIFO order if last is true or FIFO order if false.
-
- '''
- if not self:
- raise KeyError('dictionary is empty')
- root = self.__root
- if last:
- link = root[0]
- link_prev = link[0]
- link_prev[1] = root
- root[0] = link_prev
- else:
- link = root[1]
- link_next = link[1]
- root[1] = link_next
- link_next[0] = root
- key = link[2]
- del self.__map[key]
- value = dict.pop(self, key)
- return key, value
-
- # -- the following methods do not depend on the internal structure --
-
- def keys(self):
- 'od.keys() -> list of keys in od'
- return list(self)
-
- def values(self):
- 'od.values() -> list of values in od'
- return [self[key] for key in self]
-
- def items(self):
- 'od.items() -> list of (key, value) pairs in od'
- return [(key, self[key]) for key in self]
-
- def iterkeys(self):
- 'od.iterkeys() -> an iterator over the keys in od'
- return iter(self)
-
- def itervalues(self):
- 'od.itervalues -> an iterator over the values in od'
- for k in self:
- yield self[k]
-
- def iteritems(self):
- 'od.iteritems -> an iterator over the (key, value) items in od'
- for k in self:
- yield (k, self[k])
-
- def update(*args, **kwds):
- '''od.update(E, **F) -> None. Update od from dict/iterable E and F.
-
- If E is a dict instance, does: for k in E: od[k] = E[k]
- If E has a .keys() method, does: for k in E.keys(): od[k] = E[k]
- Or if E is an iterable of items, does: for k, v in E: od[k] = v
- In either case, this is followed by: for k, v in F.items(): od[k] = v
-
- '''
- if len(args) > 2:
- raise TypeError('update() takes at most 2 positional '
- 'arguments (%d given)' % (len(args),))
- elif not args:
- raise TypeError('update() takes at least 1 argument (0 given)')
- self = args[0]
- # Make progressively weaker assumptions about "other"
- other = ()
- if len(args) == 2:
- other = args[1]
- if isinstance(other, dict):
- for key in other:
- self[key] = other[key]
- elif hasattr(other, 'keys'):
- for key in other.keys():
- self[key] = other[key]
- else:
- for key, value in other:
- self[key] = value
- for key, value in kwds.items():
- self[key] = value
-
- __update = update # let subclasses override update without breaking __init__
-
- __marker = object()
-
- def pop(self, key, default=__marker):
- '''od.pop(k[,d]) -> v, remove specified key and return the corresponding value.
- If key is not found, d is returned if given, otherwise KeyError is raised.
-
- '''
- if key in self:
- result = self[key]
- del self[key]
- return result
- if default is self.__marker:
- raise KeyError(key)
- return default
-
- def setdefault(self, key, default=None):
- 'od.setdefault(k[,d]) -> od.get(k,d), also set od[k]=d if k not in od'
- if key in self:
- return self[key]
- self[key] = default
- return default
-
- def __repr__(self, _repr_running={}):
- 'od.__repr__() <==> repr(od)'
- call_key = id(self), _get_ident()
- if call_key in _repr_running:
- return '...'
- _repr_running[call_key] = 1
- try:
- if not self:
- return '%s()' % (self.__class__.__name__,)
- return '%s(%r)' % (self.__class__.__name__, self.items())
- finally:
- del _repr_running[call_key]
-
- def __reduce__(self):
- 'Return state information for pickling'
- items = [[k, self[k]] for k in self]
- inst_dict = vars(self).copy()
- for k in vars(OrderedDict()):
- inst_dict.pop(k, None)
- if inst_dict:
- return (self.__class__, (items,), inst_dict)
- return self.__class__, (items,)
-
- def copy(self):
- 'od.copy() -> a shallow copy of od'
- return self.__class__(self)
-
- @classmethod
- def fromkeys(cls, iterable, value=None):
- '''OD.fromkeys(S[, v]) -> New ordered dictionary with keys from S
- and values equal to v (which defaults to None).
-
- '''
- d = cls()
- for key in iterable:
- d[key] = value
- return d
-
- def __eq__(self, other):
- '''od.__eq__(y) <==> od==y. Comparison to another OD is order-sensitive
- while comparison to a regular mapping is order-insensitive.
-
- '''
- if isinstance(other, OrderedDict):
- return len(self)==len(other) and self.items() == other.items()
- return dict.__eq__(self, other)
-
- def __ne__(self, other):
- return not self == other
-
- # -- the following methods are only used in Python 2.7 --
-
- def viewkeys(self):
- "od.viewkeys() -> a set-like object providing a view on od's keys"
- return KeysView(self)
-
- def viewvalues(self):
- "od.viewvalues() -> an object providing a view on od's values"
- return ValuesView(self)
-
- def viewitems(self):
- "od.viewitems() -> a set-like object providing a view on od's items"
- return ItemsView(self)
diff --git a/script/_Lib/requests/packages/urllib3/packages/six.py b/script/_Lib/requests/packages/urllib3/packages/six.py
deleted file mode 100644
index 27d8011..0000000
--- a/script/_Lib/requests/packages/urllib3/packages/six.py
+++ /dev/null
@@ -1,385 +0,0 @@
-"""Utilities for writing code that runs on Python 2 and 3"""
-
-#Copyright (c) 2010-2011 Benjamin Peterson
-
-#Permission is hereby granted, free of charge, to any person obtaining a copy of
-#this software and associated documentation files (the "Software"), to deal in
-#the Software without restriction, including without limitation the rights to
-#use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-#the Software, and to permit persons to whom the Software is furnished to do so,
-#subject to the following conditions:
-
-#The above copyright notice and this permission notice shall be included in all
-#copies or substantial portions of the Software.
-
-#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-#IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-#FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-#COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-#IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-#CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-import operator
-import sys
-import types
-
-__author__ = "Benjamin Peterson "
-__version__ = "1.2.0" # Revision 41c74fef2ded
-
-
-# True if we are running on Python 3.
-PY3 = sys.version_info[0] == 3
-
-if PY3:
- string_types = str,
- integer_types = int,
- class_types = type,
- text_type = str
- binary_type = bytes
-
- MAXSIZE = sys.maxsize
-else:
- string_types = basestring,
- integer_types = (int, long)
- class_types = (type, types.ClassType)
- text_type = unicode
- binary_type = str
-
- if sys.platform.startswith("java"):
- # Jython always uses 32 bits.
- MAXSIZE = int((1 << 31) - 1)
- else:
- # It's possible to have sizeof(long) != sizeof(Py_ssize_t).
- class X(object):
- def __len__(self):
- return 1 << 31
- try:
- len(X())
- except OverflowError:
- # 32-bit
- MAXSIZE = int((1 << 31) - 1)
- else:
- # 64-bit
- MAXSIZE = int((1 << 63) - 1)
- del X
-
-
-def _add_doc(func, doc):
- """Add documentation to a function."""
- func.__doc__ = doc
-
-
-def _import_module(name):
- """Import module, returning the module after the last dot."""
- __import__(name)
- return sys.modules[name]
-
-
-class _LazyDescr(object):
-
- def __init__(self, name):
- self.name = name
-
- def __get__(self, obj, tp):
- result = self._resolve()
- setattr(obj, self.name, result)
- # This is a bit ugly, but it avoids running this again.
- delattr(tp, self.name)
- return result
-
-
-class MovedModule(_LazyDescr):
-
- def __init__(self, name, old, new=None):
- super(MovedModule, self).__init__(name)
- if PY3:
- if new is None:
- new = name
- self.mod = new
- else:
- self.mod = old
-
- def _resolve(self):
- return _import_module(self.mod)
-
-
-class MovedAttribute(_LazyDescr):
-
- def __init__(self, name, old_mod, new_mod, old_attr=None, new_attr=None):
- super(MovedAttribute, self).__init__(name)
- if PY3:
- if new_mod is None:
- new_mod = name
- self.mod = new_mod
- if new_attr is None:
- if old_attr is None:
- new_attr = name
- else:
- new_attr = old_attr
- self.attr = new_attr
- else:
- self.mod = old_mod
- if old_attr is None:
- old_attr = name
- self.attr = old_attr
-
- def _resolve(self):
- module = _import_module(self.mod)
- return getattr(module, self.attr)
-
-
-
-class _MovedItems(types.ModuleType):
- """Lazy loading of moved objects"""
-
-
-_moved_attributes = [
- MovedAttribute("cStringIO", "cStringIO", "io", "StringIO"),
- MovedAttribute("filter", "itertools", "builtins", "ifilter", "filter"),
- MovedAttribute("input", "__builtin__", "builtins", "raw_input", "input"),
- MovedAttribute("map", "itertools", "builtins", "imap", "map"),
- MovedAttribute("reload_module", "__builtin__", "imp", "reload"),
- MovedAttribute("reduce", "__builtin__", "functools"),
- MovedAttribute("StringIO", "StringIO", "io"),
- MovedAttribute("xrange", "__builtin__", "builtins", "xrange", "range"),
- MovedAttribute("zip", "itertools", "builtins", "izip", "zip"),
-
- MovedModule("builtins", "__builtin__"),
- MovedModule("configparser", "ConfigParser"),
- MovedModule("copyreg", "copy_reg"),
- MovedModule("http_cookiejar", "cookielib", "http.cookiejar"),
- MovedModule("http_cookies", "Cookie", "http.cookies"),
- MovedModule("html_entities", "htmlentitydefs", "html.entities"),
- MovedModule("html_parser", "HTMLParser", "html.parser"),
- MovedModule("http_client", "httplib", "http.client"),
- MovedModule("BaseHTTPServer", "BaseHTTPServer", "http.server"),
- MovedModule("CGIHTTPServer", "CGIHTTPServer", "http.server"),
- MovedModule("SimpleHTTPServer", "SimpleHTTPServer", "http.server"),
- MovedModule("cPickle", "cPickle", "pickle"),
- MovedModule("queue", "Queue"),
- MovedModule("reprlib", "repr"),
- MovedModule("socketserver", "SocketServer"),
- MovedModule("tkinter", "Tkinter"),
- MovedModule("tkinter_dialog", "Dialog", "tkinter.dialog"),
- MovedModule("tkinter_filedialog", "FileDialog", "tkinter.filedialog"),
- MovedModule("tkinter_scrolledtext", "ScrolledText", "tkinter.scrolledtext"),
- MovedModule("tkinter_simpledialog", "SimpleDialog", "tkinter.simpledialog"),
- MovedModule("tkinter_tix", "Tix", "tkinter.tix"),
- MovedModule("tkinter_constants", "Tkconstants", "tkinter.constants"),
- MovedModule("tkinter_dnd", "Tkdnd", "tkinter.dnd"),
- MovedModule("tkinter_colorchooser", "tkColorChooser",
- "tkinter.colorchooser"),
- MovedModule("tkinter_commondialog", "tkCommonDialog",
- "tkinter.commondialog"),
- MovedModule("tkinter_tkfiledialog", "tkFileDialog", "tkinter.filedialog"),
- MovedModule("tkinter_font", "tkFont", "tkinter.font"),
- MovedModule("tkinter_messagebox", "tkMessageBox", "tkinter.messagebox"),
- MovedModule("tkinter_tksimpledialog", "tkSimpleDialog",
- "tkinter.simpledialog"),
- MovedModule("urllib_robotparser", "robotparser", "urllib.robotparser"),
- MovedModule("winreg", "_winreg"),
-]
-for attr in _moved_attributes:
- setattr(_MovedItems, attr.name, attr)
-del attr
-
-moves = sys.modules[__name__ + ".moves"] = _MovedItems("moves")
-
-
-def add_move(move):
- """Add an item to six.moves."""
- setattr(_MovedItems, move.name, move)
-
-
-def remove_move(name):
- """Remove item from six.moves."""
- try:
- delattr(_MovedItems, name)
- except AttributeError:
- try:
- del moves.__dict__[name]
- except KeyError:
- raise AttributeError("no such move, %r" % (name,))
-
-
-if PY3:
- _meth_func = "__func__"
- _meth_self = "__self__"
-
- _func_code = "__code__"
- _func_defaults = "__defaults__"
-
- _iterkeys = "keys"
- _itervalues = "values"
- _iteritems = "items"
-else:
- _meth_func = "im_func"
- _meth_self = "im_self"
-
- _func_code = "func_code"
- _func_defaults = "func_defaults"
-
- _iterkeys = "iterkeys"
- _itervalues = "itervalues"
- _iteritems = "iteritems"
-
-
-try:
- advance_iterator = next
-except NameError:
- def advance_iterator(it):
- return it.next()
-next = advance_iterator
-
-
-if PY3:
- def get_unbound_function(unbound):
- return unbound
-
- Iterator = object
-
- def callable(obj):
- return any("__call__" in klass.__dict__ for klass in type(obj).__mro__)
-else:
- def get_unbound_function(unbound):
- return unbound.im_func
-
- class Iterator(object):
-
- def next(self):
- return type(self).__next__(self)
-
- callable = callable
-_add_doc(get_unbound_function,
- """Get the function out of a possibly unbound function""")
-
-
-get_method_function = operator.attrgetter(_meth_func)
-get_method_self = operator.attrgetter(_meth_self)
-get_function_code = operator.attrgetter(_func_code)
-get_function_defaults = operator.attrgetter(_func_defaults)
-
-
-def iterkeys(d):
- """Return an iterator over the keys of a dictionary."""
- return iter(getattr(d, _iterkeys)())
-
-def itervalues(d):
- """Return an iterator over the values of a dictionary."""
- return iter(getattr(d, _itervalues)())
-
-def iteritems(d):
- """Return an iterator over the (key, value) pairs of a dictionary."""
- return iter(getattr(d, _iteritems)())
-
-
-if PY3:
- def b(s):
- return s.encode("latin-1")
- def u(s):
- return s
- if sys.version_info[1] <= 1:
- def int2byte(i):
- return bytes((i,))
- else:
- # This is about 2x faster than the implementation above on 3.2+
- int2byte = operator.methodcaller("to_bytes", 1, "big")
- import io
- StringIO = io.StringIO
- BytesIO = io.BytesIO
-else:
- def b(s):
- return s
- def u(s):
- return unicode(s, "unicode_escape")
- int2byte = chr
- import StringIO
- StringIO = BytesIO = StringIO.StringIO
-_add_doc(b, """Byte literal""")
-_add_doc(u, """Text literal""")
-
-
-if PY3:
- import builtins
- exec_ = getattr(builtins, "exec")
-
-
- def reraise(tp, value, tb=None):
- if value.__traceback__ is not tb:
- raise value.with_traceback(tb)
- raise value
-
-
- print_ = getattr(builtins, "print")
- del builtins
-
-else:
- def exec_(code, globs=None, locs=None):
- """Execute code in a namespace."""
- if globs is None:
- frame = sys._getframe(1)
- globs = frame.f_globals
- if locs is None:
- locs = frame.f_locals
- del frame
- elif locs is None:
- locs = globs
- exec("""exec code in globs, locs""")
-
-
- exec_("""def reraise(tp, value, tb=None):
- raise tp, value, tb
-""")
-
-
- def print_(*args, **kwargs):
- """The new-style print function."""
- fp = kwargs.pop("file", sys.stdout)
- if fp is None:
- return
- def write(data):
- if not isinstance(data, basestring):
- data = str(data)
- fp.write(data)
- want_unicode = False
- sep = kwargs.pop("sep", None)
- if sep is not None:
- if isinstance(sep, unicode):
- want_unicode = True
- elif not isinstance(sep, str):
- raise TypeError("sep must be None or a string")
- end = kwargs.pop("end", None)
- if end is not None:
- if isinstance(end, unicode):
- want_unicode = True
- elif not isinstance(end, str):
- raise TypeError("end must be None or a string")
- if kwargs:
- raise TypeError("invalid keyword arguments to print()")
- if not want_unicode:
- for arg in args:
- if isinstance(arg, unicode):
- want_unicode = True
- break
- if want_unicode:
- newline = unicode("\n")
- space = unicode(" ")
- else:
- newline = "\n"
- space = " "
- if sep is None:
- sep = space
- if end is None:
- end = newline
- for i, arg in enumerate(args):
- if i:
- write(sep)
- write(arg)
- write(end)
-
-_add_doc(reraise, """Reraise an exception.""")
-
-
-def with_metaclass(meta, base=object):
- """Create a base class with a metaclass."""
- return meta("NewBase", (base,), {})
diff --git a/script/_Lib/requests/packages/urllib3/packages/ssl_match_hostname/__init__.py b/script/_Lib/requests/packages/urllib3/packages/ssl_match_hostname/__init__.py
deleted file mode 100644
index dd59a75..0000000
--- a/script/_Lib/requests/packages/urllib3/packages/ssl_match_hostname/__init__.py
+++ /dev/null
@@ -1,13 +0,0 @@
-try:
- # Python 3.2+
- from ssl import CertificateError, match_hostname
-except ImportError:
- try:
- # Backport of the function from a pypi module
- from backports.ssl_match_hostname import CertificateError, match_hostname
- except ImportError:
- # Our vendored copy
- from ._implementation import CertificateError, match_hostname
-
-# Not needed, but documenting what we provide.
-__all__ = ('CertificateError', 'match_hostname')
diff --git a/script/_Lib/requests/packages/urllib3/packages/ssl_match_hostname/_implementation.py b/script/_Lib/requests/packages/urllib3/packages/ssl_match_hostname/_implementation.py
deleted file mode 100644
index 52f4287..0000000
--- a/script/_Lib/requests/packages/urllib3/packages/ssl_match_hostname/_implementation.py
+++ /dev/null
@@ -1,105 +0,0 @@
-"""The match_hostname() function from Python 3.3.3, essential when using SSL."""
-
-# Note: This file is under the PSF license as the code comes from the python
-# stdlib. http://docs.python.org/3/license.html
-
-import re
-
-__version__ = '3.4.0.2'
-
-class CertificateError(ValueError):
- pass
-
-
-def _dnsname_match(dn, hostname, max_wildcards=1):
- """Matching according to RFC 6125, section 6.4.3
-
- http://tools.ietf.org/html/rfc6125#section-6.4.3
- """
- pats = []
- if not dn:
- return False
-
- # Ported from python3-syntax:
- # leftmost, *remainder = dn.split(r'.')
- parts = dn.split(r'.')
- leftmost = parts[0]
- remainder = parts[1:]
-
- wildcards = leftmost.count('*')
- if wildcards > max_wildcards:
- # Issue #17980: avoid denials of service by refusing more
- # than one wildcard per fragment. A survey of established
- # policy among SSL implementations showed it to be a
- # reasonable choice.
- raise CertificateError(
- "too many wildcards in certificate DNS name: " + repr(dn))
-
- # speed up common case w/o wildcards
- if not wildcards:
- return dn.lower() == hostname.lower()
-
- # RFC 6125, section 6.4.3, subitem 1.
- # The client SHOULD NOT attempt to match a presented identifier in which
- # the wildcard character comprises a label other than the left-most label.
- if leftmost == '*':
- # When '*' is a fragment by itself, it matches a non-empty dotless
- # fragment.
- pats.append('[^.]+')
- elif leftmost.startswith('xn--') or hostname.startswith('xn--'):
- # RFC 6125, section 6.4.3, subitem 3.
- # The client SHOULD NOT attempt to match a presented identifier
- # where the wildcard character is embedded within an A-label or
- # U-label of an internationalized domain name.
- pats.append(re.escape(leftmost))
- else:
- # Otherwise, '*' matches any dotless string, e.g. www*
- pats.append(re.escape(leftmost).replace(r'\*', '[^.]*'))
-
- # add the remaining fragments, ignore any wildcards
- for frag in remainder:
- pats.append(re.escape(frag))
-
- pat = re.compile(r'\A' + r'\.'.join(pats) + r'\Z', re.IGNORECASE)
- return pat.match(hostname)
-
-
-def match_hostname(cert, hostname):
- """Verify that *cert* (in decoded format as returned by
- SSLSocket.getpeercert()) matches the *hostname*. RFC 2818 and RFC 6125
- rules are followed, but IP addresses are not accepted for *hostname*.
-
- CertificateError is raised on failure. On success, the function
- returns nothing.
- """
- if not cert:
- raise ValueError("empty or no certificate")
- dnsnames = []
- san = cert.get('subjectAltName', ())
- for key, value in san:
- if key == 'DNS':
- if _dnsname_match(value, hostname):
- return
- dnsnames.append(value)
- if not dnsnames:
- # The subject is only checked when there is no dNSName entry
- # in subjectAltName
- for sub in cert.get('subject', ()):
- for key, value in sub:
- # XXX according to RFC 2818, the most specific Common Name
- # must be used.
- if key == 'commonName':
- if _dnsname_match(value, hostname):
- return
- dnsnames.append(value)
- if len(dnsnames) > 1:
- raise CertificateError("hostname %r "
- "doesn't match either of %s"
- % (hostname, ', '.join(map(repr, dnsnames))))
- elif len(dnsnames) == 1:
- raise CertificateError("hostname %r "
- "doesn't match %r"
- % (hostname, dnsnames[0]))
- else:
- raise CertificateError("no appropriate commonName or "
- "subjectAltName fields were found")
diff --git a/script/_Lib/requests/packages/urllib3/poolmanager.py b/script/_Lib/requests/packages/urllib3/poolmanager.py
deleted file mode 100644
index 515dc96..0000000
--- a/script/_Lib/requests/packages/urllib3/poolmanager.py
+++ /dev/null
@@ -1,265 +0,0 @@
-import logging
-
-try: # Python 3
- from urllib.parse import urljoin
-except ImportError:
- from urlparse import urljoin
-
-from ._collections import RecentlyUsedContainer
-from .connectionpool import HTTPConnectionPool, HTTPSConnectionPool
-from .connectionpool import port_by_scheme
-from .exceptions import LocationValueError
-from .request import RequestMethods
-from .util.url import parse_url
-from .util.retry import Retry
-
-
-__all__ = ['PoolManager', 'ProxyManager', 'proxy_from_url']
-
-
-pool_classes_by_scheme = {
- 'http': HTTPConnectionPool,
- 'https': HTTPSConnectionPool,
-}
-
-log = logging.getLogger(__name__)
-
-SSL_KEYWORDS = ('key_file', 'cert_file', 'cert_reqs', 'ca_certs',
- 'ssl_version')
-
-
-class PoolManager(RequestMethods):
- """
- Allows for arbitrary requests while transparently keeping track of
- necessary connection pools for you.
-
- :param num_pools:
- Number of connection pools to cache before discarding the least
- recently used pool.
-
- :param headers:
- Headers to include with all requests, unless other headers are given
- explicitly.
-
- :param \**connection_pool_kw:
- Additional parameters are used to create fresh
- :class:`urllib3.connectionpool.ConnectionPool` instances.
-
- Example::
-
- >>> manager = PoolManager(num_pools=2)
- >>> r = manager.request('GET', 'http://google.com/')
- >>> r = manager.request('GET', 'http://google.com/mail')
- >>> r = manager.request('GET', 'http://yahoo.com/')
- >>> len(manager.pools)
- 2
-
- """
-
- proxy = None
-
- def __init__(self, num_pools=10, headers=None, **connection_pool_kw):
- RequestMethods.__init__(self, headers)
- self.connection_pool_kw = connection_pool_kw
- self.pools = RecentlyUsedContainer(num_pools,
- dispose_func=lambda p: p.close())
-
- def _new_pool(self, scheme, host, port):
- """
- Create a new :class:`ConnectionPool` based on host, port and scheme.
-
- This method is used to actually create the connection pools handed out
- by :meth:`connection_from_url` and companion methods. It is intended
- to be overridden for customization.
- """
- pool_cls = pool_classes_by_scheme[scheme]
- kwargs = self.connection_pool_kw
- if scheme == 'http':
- kwargs = self.connection_pool_kw.copy()
- for kw in SSL_KEYWORDS:
- kwargs.pop(kw, None)
-
- return pool_cls(host, port, **kwargs)
-
- def clear(self):
- """
- Empty our store of pools and direct them all to close.
-
- This will not affect in-flight connections, but they will not be
- re-used after completion.
- """
- self.pools.clear()
-
- def connection_from_host(self, host, port=None, scheme='http'):
- """
- Get a :class:`ConnectionPool` based on the host, port, and scheme.
-
- If ``port`` isn't given, it will be derived from the ``scheme`` using
- ``urllib3.connectionpool.port_by_scheme``.
- """
-
- if not host:
- raise LocationValueError("No host specified.")
-
- scheme = scheme or 'http'
- port = port or port_by_scheme.get(scheme, 80)
- pool_key = (scheme, host, port)
-
- with self.pools.lock:
- # If the scheme, host, or port doesn't match existing open
- # connections, open a new ConnectionPool.
- pool = self.pools.get(pool_key)
- if pool:
- return pool
-
- # Make a fresh ConnectionPool of the desired type
- pool = self._new_pool(scheme, host, port)
- self.pools[pool_key] = pool
-
- return pool
-
- def connection_from_url(self, url):
- """
- Similar to :func:`urllib3.connectionpool.connection_from_url` but
- doesn't pass any additional parameters to the
- :class:`urllib3.connectionpool.ConnectionPool` constructor.
-
- Additional parameters are taken from the :class:`.PoolManager`
- constructor.
- """
- u = parse_url(url)
- return self.connection_from_host(u.host, port=u.port, scheme=u.scheme)
-
- def urlopen(self, method, url, redirect=True, **kw):
- """
- Same as :meth:`urllib3.connectionpool.HTTPConnectionPool.urlopen`
- with custom cross-host redirect logic and only sends the request-uri
- portion of the ``url``.
-
- The given ``url`` parameter must be absolute, such that an appropriate
- :class:`urllib3.connectionpool.ConnectionPool` can be chosen for it.
- """
- u = parse_url(url)
- conn = self.connection_from_host(u.host, port=u.port, scheme=u.scheme)
-
- kw['assert_same_host'] = False
- kw['redirect'] = False
- if 'headers' not in kw:
- kw['headers'] = self.headers
-
- if self.proxy is not None and u.scheme == "http":
- response = conn.urlopen(method, url, **kw)
- else:
- response = conn.urlopen(method, u.request_uri, **kw)
-
- redirect_location = redirect and response.get_redirect_location()
- if not redirect_location:
- return response
-
- # Support relative URLs for redirecting.
- redirect_location = urljoin(url, redirect_location)
-
- # RFC 7231, Section 6.4.4
- if response.status == 303:
- method = 'GET'
-
- retries = kw.get('retries')
- if not isinstance(retries, Retry):
- retries = Retry.from_int(retries, redirect=redirect)
-
- kw['retries'] = retries.increment(method, redirect_location)
- kw['redirect'] = redirect
-
- log.info("Redirecting %s -> %s" % (url, redirect_location))
- return self.urlopen(method, redirect_location, **kw)
-
-
-class ProxyManager(PoolManager):
- """
- Behaves just like :class:`PoolManager`, but sends all requests through
- the defined proxy, using the CONNECT method for HTTPS URLs.
-
- :param proxy_url:
- The URL of the proxy to be used.
-
- :param proxy_headers:
- A dictionary contaning headers that will be sent to the proxy. In case
- of HTTP they are being sent with each request, while in the
- HTTPS/CONNECT case they are sent only once. Could be used for proxy
- authentication.
-
- Example:
- >>> proxy = urllib3.ProxyManager('http://localhost:3128/')
- >>> r1 = proxy.request('GET', 'http://google.com/')
- >>> r2 = proxy.request('GET', 'http://httpbin.org/')
- >>> len(proxy.pools)
- 1
- >>> r3 = proxy.request('GET', 'https://httpbin.org/')
- >>> r4 = proxy.request('GET', 'https://twitter.com/')
- >>> len(proxy.pools)
- 3
-
- """
-
- def __init__(self, proxy_url, num_pools=10, headers=None,
- proxy_headers=None, **connection_pool_kw):
-
- if isinstance(proxy_url, HTTPConnectionPool):
- proxy_url = '%s://%s:%i' % (proxy_url.scheme, proxy_url.host,
- proxy_url.port)
- proxy = parse_url(proxy_url)
- if not proxy.port:
- port = port_by_scheme.get(proxy.scheme, 80)
- proxy = proxy._replace(port=port)
-
- assert proxy.scheme in ("http", "https"), \
- 'Not supported proxy scheme %s' % proxy.scheme
-
- self.proxy = proxy
- self.proxy_headers = proxy_headers or {}
-
- connection_pool_kw['_proxy'] = self.proxy
- connection_pool_kw['_proxy_headers'] = self.proxy_headers
-
- super(ProxyManager, self).__init__(
- num_pools, headers, **connection_pool_kw)
-
- def connection_from_host(self, host, port=None, scheme='http'):
- if scheme == "https":
- return super(ProxyManager, self).connection_from_host(
- host, port, scheme)
-
- return super(ProxyManager, self).connection_from_host(
- self.proxy.host, self.proxy.port, self.proxy.scheme)
-
- def _set_proxy_headers(self, url, headers=None):
- """
- Sets headers needed by proxies: specifically, the Accept and Host
- headers. Only sets headers not provided by the user.
- """
- headers_ = {'Accept': '*/*'}
-
- netloc = parse_url(url).netloc
- if netloc:
- headers_['Host'] = netloc
-
- if headers:
- headers_.update(headers)
- return headers_
-
- def urlopen(self, method, url, redirect=True, **kw):
- "Same as HTTP(S)ConnectionPool.urlopen, ``url`` must be absolute."
- u = parse_url(url)
-
- if u.scheme == "http":
- # For proxied HTTPS requests, httplib sets the necessary headers
- # on the CONNECT to the proxy. For HTTP, we'll definitely
- # need to set 'Host' at the very least.
- headers = kw.get('headers', self.headers)
- kw['headers'] = self._set_proxy_headers(url, headers)
-
- return super(ProxyManager, self).urlopen(method, url, redirect=redirect, **kw)
-
-
-def proxy_from_url(url, **kw):
- return ProxyManager(proxy_url=url, **kw)
diff --git a/script/_Lib/requests/packages/urllib3/request.py b/script/_Lib/requests/packages/urllib3/request.py
deleted file mode 100644
index 51fe238..0000000
--- a/script/_Lib/requests/packages/urllib3/request.py
+++ /dev/null
@@ -1,135 +0,0 @@
-try:
- from urllib.parse import urlencode
-except ImportError:
- from urllib import urlencode
-
-from .filepost import encode_multipart_formdata
-
-
-__all__ = ['RequestMethods']
-
-
-class RequestMethods(object):
- """
- Convenience mixin for classes who implement a :meth:`urlopen` method, such
- as :class:`~urllib3.connectionpool.HTTPConnectionPool` and
- :class:`~urllib3.poolmanager.PoolManager`.
-
- Provides behavior for making common types of HTTP request methods and
- decides which type of request field encoding to use.
-
- Specifically,
-
- :meth:`.request_encode_url` is for sending requests whose fields are
- encoded in the URL (such as GET, HEAD, DELETE).
-
- :meth:`.request_encode_body` is for sending requests whose fields are
- encoded in the *body* of the request using multipart or www-form-urlencoded
- (such as for POST, PUT, PATCH).
-
- :meth:`.request` is for making any kind of request, it will look up the
- appropriate encoding format and use one of the above two methods to make
- the request.
-
- Initializer parameters:
-
- :param headers:
- Headers to include with all requests, unless other headers are given
- explicitly.
- """
-
- _encode_url_methods = set(['DELETE', 'GET', 'HEAD', 'OPTIONS'])
-
- def __init__(self, headers=None):
- self.headers = headers or {}
-
- def urlopen(self, method, url, body=None, headers=None,
- encode_multipart=True, multipart_boundary=None,
- **kw): # Abstract
- raise NotImplemented("Classes extending RequestMethods must implement "
- "their own ``urlopen`` method.")
-
- def request(self, method, url, fields=None, headers=None, **urlopen_kw):
- """
- Make a request using :meth:`urlopen` with the appropriate encoding of
- ``fields`` based on the ``method`` used.
-
- This is a convenience method that requires the least amount of manual
- effort. It can be used in most situations, while still having the
- option to drop down to more specific methods when necessary, such as
- :meth:`request_encode_url`, :meth:`request_encode_body`,
- or even the lowest level :meth:`urlopen`.
- """
- method = method.upper()
-
- if method in self._encode_url_methods:
- return self.request_encode_url(method, url, fields=fields,
- headers=headers,
- **urlopen_kw)
- else:
- return self.request_encode_body(method, url, fields=fields,
- headers=headers,
- **urlopen_kw)
-
- def request_encode_url(self, method, url, fields=None, **urlopen_kw):
- """
- Make a request using :meth:`urlopen` with the ``fields`` encoded in
- the url. This is useful for request methods like GET, HEAD, DELETE, etc.
- """
- if fields:
- url += '?' + urlencode(fields)
- return self.urlopen(method, url, **urlopen_kw)
-
- def request_encode_body(self, method, url, fields=None, headers=None,
- encode_multipart=True, multipart_boundary=None,
- **urlopen_kw):
- """
- Make a request using :meth:`urlopen` with the ``fields`` encoded in
- the body. This is useful for request methods like POST, PUT, PATCH, etc.
-
- When ``encode_multipart=True`` (default), then
- :meth:`urllib3.filepost.encode_multipart_formdata` is used to encode
- the payload with the appropriate content type. Otherwise
- :meth:`urllib.urlencode` is used with the
- 'application/x-www-form-urlencoded' content type.
-
- Multipart encoding must be used when posting files, and it's reasonably
- safe to use it in other times too. However, it may break request
- signing, such as with OAuth.
-
- Supports an optional ``fields`` parameter of key/value strings AND
- key/filetuple. A filetuple is a (filename, data, MIME type) tuple where
- the MIME type is optional. For example::
-
- fields = {
- 'foo': 'bar',
- 'fakefile': ('foofile.txt', 'contents of foofile'),
- 'realfile': ('barfile.txt', open('realfile').read()),
- 'typedfile': ('bazfile.bin', open('bazfile').read(),
- 'image/jpeg'),
- 'nonamefile': 'contents of nonamefile field',
- }
-
- When uploading a file, providing a filename (the first parameter of the
- tuple) is optional but recommended to best mimick behavior of browsers.
-
- Note that if ``headers`` are supplied, the 'Content-Type' header will
- be overwritten because it depends on the dynamic random boundary string
- which is used to compose the body of the request. The random boundary
- string can be explicitly set with the ``multipart_boundary`` parameter.
- """
- if encode_multipart:
- body, content_type = encode_multipart_formdata(
- fields or {}, boundary=multipart_boundary)
- else:
- body, content_type = (urlencode(fields or {}),
- 'application/x-www-form-urlencoded')
-
- if headers is None:
- headers = self.headers
-
- headers_ = {'Content-Type': content_type}
- headers_.update(headers)
-
- return self.urlopen(method, url, body=body, headers=headers_,
- **urlopen_kw)
diff --git a/script/_Lib/requests/packages/urllib3/response.py b/script/_Lib/requests/packages/urllib3/response.py
deleted file mode 100644
index e69de95..0000000
--- a/script/_Lib/requests/packages/urllib3/response.py
+++ /dev/null
@@ -1,333 +0,0 @@
-import zlib
-import io
-from socket import timeout as SocketTimeout
-
-from ._collections import HTTPHeaderDict
-from .exceptions import ProtocolError, DecodeError, ReadTimeoutError
-from .packages.six import string_types as basestring, binary_type
-from .connection import HTTPException, BaseSSLError
-from .util.response import is_fp_closed
-
-
-
-class DeflateDecoder(object):
-
- def __init__(self):
- self._first_try = True
- self._data = binary_type()
- self._obj = zlib.decompressobj()
-
- def __getattr__(self, name):
- return getattr(self._obj, name)
-
- def decompress(self, data):
- if not self._first_try:
- return self._obj.decompress(data)
-
- self._data += data
- try:
- return self._obj.decompress(data)
- except zlib.error:
- self._first_try = False
- self._obj = zlib.decompressobj(-zlib.MAX_WBITS)
- try:
- return self.decompress(self._data)
- finally:
- self._data = None
-
-
-def _get_decoder(mode):
- if mode == 'gzip':
- return zlib.decompressobj(16 + zlib.MAX_WBITS)
-
- return DeflateDecoder()
-
-
-class HTTPResponse(io.IOBase):
- """
- HTTP Response container.
-
- Backwards-compatible to httplib's HTTPResponse but the response ``body`` is
- loaded and decoded on-demand when the ``data`` property is accessed. This
- class is also compatible with the Python standard library's :mod:`io`
- module, and can hence be treated as a readable object in the context of that
- framework.
-
- Extra parameters for behaviour not present in httplib.HTTPResponse:
-
- :param preload_content:
- If True, the response's body will be preloaded during construction.
-
- :param decode_content:
- If True, attempts to decode specific content-encoding's based on headers
- (like 'gzip' and 'deflate') will be skipped and raw data will be used
- instead.
-
- :param original_response:
- When this HTTPResponse wrapper is generated from an httplib.HTTPResponse
- object, it's convenient to include the original for debug purposes. It's
- otherwise unused.
- """
-
- CONTENT_DECODERS = ['gzip', 'deflate']
- REDIRECT_STATUSES = [301, 302, 303, 307, 308]
-
- def __init__(self, body='', headers=None, status=0, version=0, reason=None,
- strict=0, preload_content=True, decode_content=True,
- original_response=None, pool=None, connection=None):
-
- self.headers = HTTPHeaderDict()
- if headers:
- self.headers.update(headers)
- self.status = status
- self.version = version
- self.reason = reason
- self.strict = strict
- self.decode_content = decode_content
-
- self._decoder = None
- self._body = None
- self._fp = None
- self._original_response = original_response
- self._fp_bytes_read = 0
-
- if body and isinstance(body, (basestring, binary_type)):
- self._body = body
-
- self._pool = pool
- self._connection = connection
-
- if hasattr(body, 'read'):
- self._fp = body
-
- if preload_content and not self._body:
- self._body = self.read(decode_content=decode_content)
-
- def get_redirect_location(self):
- """
- Should we redirect and where to?
-
- :returns: Truthy redirect location string if we got a redirect status
- code and valid location. ``None`` if redirect status and no
- location. ``False`` if not a redirect status code.
- """
- if self.status in self.REDIRECT_STATUSES:
- return self.headers.get('location')
-
- return False
-
- def release_conn(self):
- if not self._pool or not self._connection:
- return
-
- self._pool._put_conn(self._connection)
- self._connection = None
-
- @property
- def data(self):
- # For backwords-compat with earlier urllib3 0.4 and earlier.
- if self._body:
- return self._body
-
- if self._fp:
- return self.read(cache_content=True)
-
- def tell(self):
- """
- Obtain the number of bytes pulled over the wire so far. May differ from
- the amount of content returned by :meth:``HTTPResponse.read`` if bytes
- are encoded on the wire (e.g, compressed).
- """
- return self._fp_bytes_read
-
- def read(self, amt=None, decode_content=None, cache_content=False):
- """
- Similar to :meth:`httplib.HTTPResponse.read`, but with two additional
- parameters: ``decode_content`` and ``cache_content``.
-
- :param amt:
- How much of the content to read. If specified, caching is skipped
- because it doesn't make sense to cache partial content as the full
- response.
-
- :param decode_content:
- If True, will attempt to decode the body based on the
- 'content-encoding' header.
-
- :param cache_content:
- If True, will save the returned data such that the same result is
- returned despite of the state of the underlying file object. This
- is useful if you want the ``.data`` property to continue working
- after having ``.read()`` the file object. (Overridden if ``amt`` is
- set.)
- """
- # Note: content-encoding value should be case-insensitive, per RFC 7230
- # Section 3.2
- content_encoding = self.headers.get('content-encoding', '').lower()
- if self._decoder is None:
- if content_encoding in self.CONTENT_DECODERS:
- self._decoder = _get_decoder(content_encoding)
- if decode_content is None:
- decode_content = self.decode_content
-
- if self._fp is None:
- return
-
- flush_decoder = False
-
- try:
- try:
- if amt is None:
- # cStringIO doesn't like amt=None
- data = self._fp.read()
- flush_decoder = True
- else:
- cache_content = False
- data = self._fp.read(amt)
- if amt != 0 and not data: # Platform-specific: Buggy versions of Python.
- # Close the connection when no data is returned
- #
- # This is redundant to what httplib/http.client _should_
- # already do. However, versions of python released before
- # December 15, 2012 (http://bugs.python.org/issue16298) do
- # not properly close the connection in all cases. There is
- # no harm in redundantly calling close.
- self._fp.close()
- flush_decoder = True
-
- except SocketTimeout:
- # FIXME: Ideally we'd like to include the url in the ReadTimeoutError but
- # there is yet no clean way to get at it from this context.
- raise ReadTimeoutError(self._pool, None, 'Read timed out.')
-
- except BaseSSLError as e:
- # FIXME: Is there a better way to differentiate between SSLErrors?
- if not 'read operation timed out' in str(e): # Defensive:
- # This shouldn't happen but just in case we're missing an edge
- # case, let's avoid swallowing SSL errors.
- raise
-
- raise ReadTimeoutError(self._pool, None, 'Read timed out.')
-
- except HTTPException as e:
- # This includes IncompleteRead.
- raise ProtocolError('Connection broken: %r' % e, e)
-
- self._fp_bytes_read += len(data)
-
- try:
- if decode_content and self._decoder:
- data = self._decoder.decompress(data)
- except (IOError, zlib.error) as e:
- raise DecodeError(
- "Received response with content-encoding: %s, but "
- "failed to decode it." % content_encoding, e)
-
- if flush_decoder and decode_content and self._decoder:
- buf = self._decoder.decompress(binary_type())
- data += buf + self._decoder.flush()
-
- if cache_content:
- self._body = data
-
- return data
-
- finally:
- if self._original_response and self._original_response.isclosed():
- self.release_conn()
-
- def stream(self, amt=2**16, decode_content=None):
- """
- A generator wrapper for the read() method. A call will block until
- ``amt`` bytes have been read from the connection or until the
- connection is closed.
-
- :param amt:
- How much of the content to read. The generator will return up to
- much data per iteration, but may return less. This is particularly
- likely when using compressed data. However, the empty string will
- never be returned.
-
- :param decode_content:
- If True, will attempt to decode the body based on the
- 'content-encoding' header.
- """
- while not is_fp_closed(self._fp):
- data = self.read(amt=amt, decode_content=decode_content)
-
- if data:
- yield data
-
- @classmethod
- def from_httplib(ResponseCls, r, **response_kw):
- """
- Given an :class:`httplib.HTTPResponse` instance ``r``, return a
- corresponding :class:`urllib3.response.HTTPResponse` object.
-
- Remaining parameters are passed to the HTTPResponse constructor, along
- with ``original_response=r``.
- """
-
- headers = HTTPHeaderDict()
- for k, v in r.getheaders():
- headers.add(k, v)
-
- # HTTPResponse objects in Python 3 don't have a .strict attribute
- strict = getattr(r, 'strict', 0)
- return ResponseCls(body=r,
- headers=headers,
- status=r.status,
- version=r.version,
- reason=r.reason,
- strict=strict,
- original_response=r,
- **response_kw)
-
- # Backwards-compatibility methods for httplib.HTTPResponse
- def getheaders(self):
- return self.headers
-
- def getheader(self, name, default=None):
- return self.headers.get(name, default)
-
- # Overrides from io.IOBase
- def close(self):
- if not self.closed:
- self._fp.close()
-
- @property
- def closed(self):
- if self._fp is None:
- return True
- elif hasattr(self._fp, 'closed'):
- return self._fp.closed
- elif hasattr(self._fp, 'isclosed'): # Python 2
- return self._fp.isclosed()
- else:
- return True
-
- def fileno(self):
- if self._fp is None:
- raise IOError("HTTPResponse has no file to get a fileno from")
- elif hasattr(self._fp, "fileno"):
- return self._fp.fileno()
- else:
- raise IOError("The file-like object this HTTPResponse is wrapped "
- "around has no file descriptor")
-
- def flush(self):
- if self._fp is not None and hasattr(self._fp, 'flush'):
- return self._fp.flush()
-
- def readable(self):
- # This method is required for `io` module compatibility.
- return True
-
- def readinto(self, b):
- # This method is required for `io` module compatibility.
- temp = self.read(len(b))
- if len(temp) == 0:
- return 0
- else:
- b[:len(temp)] = temp
- return len(temp)
diff --git a/script/_Lib/requests/packages/urllib3/util/__init__.py b/script/_Lib/requests/packages/urllib3/util/__init__.py
deleted file mode 100644
index 8becc81..0000000
--- a/script/_Lib/requests/packages/urllib3/util/__init__.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# For backwards compatibility, provide imports that used to be here.
-from .connection import is_connection_dropped
-from .request import make_headers
-from .response import is_fp_closed
-from .ssl_ import (
- SSLContext,
- HAS_SNI,
- assert_fingerprint,
- resolve_cert_reqs,
- resolve_ssl_version,
- ssl_wrap_socket,
-)
-from .timeout import (
- current_time,
- Timeout,
-)
-
-from .retry import Retry
-from .url import (
- get_host,
- parse_url,
- split_first,
- Url,
-)
diff --git a/script/_Lib/requests/packages/urllib3/util/connection.py b/script/_Lib/requests/packages/urllib3/util/connection.py
deleted file mode 100644
index 2156993..0000000
--- a/script/_Lib/requests/packages/urllib3/util/connection.py
+++ /dev/null
@@ -1,97 +0,0 @@
-import socket
-try:
- from select import poll, POLLIN
-except ImportError: # `poll` doesn't exist on OSX and other platforms
- poll = False
- try:
- from select import select
- except ImportError: # `select` doesn't exist on AppEngine.
- select = False
-
-
-def is_connection_dropped(conn): # Platform-specific
- """
- Returns True if the connection is dropped and should be closed.
-
- :param conn:
- :class:`httplib.HTTPConnection` object.
-
- Note: For platforms like AppEngine, this will always return ``False`` to
- let the platform handle connection recycling transparently for us.
- """
- sock = getattr(conn, 'sock', False)
- if sock is False: # Platform-specific: AppEngine
- return False
- if sock is None: # Connection already closed (such as by httplib).
- return True
-
- if not poll:
- if not select: # Platform-specific: AppEngine
- return False
-
- try:
- return select([sock], [], [], 0.0)[0]
- except socket.error:
- return True
-
- # This version is better on platforms that support it.
- p = poll()
- p.register(sock, POLLIN)
- for (fno, ev) in p.poll(0.0):
- if fno == sock.fileno():
- # Either data is buffered (bad), or the connection is dropped.
- return True
-
-
-# This function is copied from socket.py in the Python 2.7 standard
-# library test suite. Added to its signature is only `socket_options`.
-def create_connection(address, timeout=socket._GLOBAL_DEFAULT_TIMEOUT,
- source_address=None, socket_options=None):
- """Connect to *address* and return the socket object.
-
- Convenience function. Connect to *address* (a 2-tuple ``(host,
- port)``) and return the socket object. Passing the optional
- *timeout* parameter will set the timeout on the socket instance
- before attempting to connect. If no *timeout* is supplied, the
- global default timeout setting returned by :func:`getdefaulttimeout`
- is used. If *source_address* is set it must be a tuple of (host, port)
- for the socket to bind as a source address before making the connection.
- An host of '' or port 0 tells the OS to use the default.
- """
-
- host, port = address
- err = None
- for res in socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM):
- af, socktype, proto, canonname, sa = res
- sock = None
- try:
- sock = socket.socket(af, socktype, proto)
-
- # If provided, set socket level options before connecting.
- # This is the only addition urllib3 makes to this function.
- _set_socket_options(sock, socket_options)
-
- if timeout is not socket._GLOBAL_DEFAULT_TIMEOUT:
- sock.settimeout(timeout)
- if source_address:
- sock.bind(source_address)
- sock.connect(sa)
- return sock
-
- except socket.error as _:
- err = _
- if sock is not None:
- sock.close()
-
- if err is not None:
- raise err
- else:
- raise socket.error("getaddrinfo returns an empty list")
-
-
-def _set_socket_options(sock, options):
- if options is None:
- return
-
- for opt in options:
- sock.setsockopt(*opt)
diff --git a/script/_Lib/requests/packages/urllib3/util/request.py b/script/_Lib/requests/packages/urllib3/util/request.py
deleted file mode 100644
index bc64f6b..0000000
--- a/script/_Lib/requests/packages/urllib3/util/request.py
+++ /dev/null
@@ -1,71 +0,0 @@
-from base64 import b64encode
-
-from ..packages.six import b
-
-ACCEPT_ENCODING = 'gzip,deflate'
-
-
-def make_headers(keep_alive=None, accept_encoding=None, user_agent=None,
- basic_auth=None, proxy_basic_auth=None, disable_cache=None):
- """
- Shortcuts for generating request headers.
-
- :param keep_alive:
- If ``True``, adds 'connection: keep-alive' header.
-
- :param accept_encoding:
- Can be a boolean, list, or string.
- ``True`` translates to 'gzip,deflate'.
- List will get joined by comma.
- String will be used as provided.
-
- :param user_agent:
- String representing the user-agent you want, such as
- "python-urllib3/0.6"
-
- :param basic_auth:
- Colon-separated username:password string for 'authorization: basic ...'
- auth header.
-
- :param proxy_basic_auth:
- Colon-separated username:password string for 'proxy-authorization: basic ...'
- auth header.
-
- :param disable_cache:
- If ``True``, adds 'cache-control: no-cache' header.
-
- Example::
-
- >>> make_headers(keep_alive=True, user_agent="Batman/1.0")
- {'connection': 'keep-alive', 'user-agent': 'Batman/1.0'}
- >>> make_headers(accept_encoding=True)
- {'accept-encoding': 'gzip,deflate'}
- """
- headers = {}
- if accept_encoding:
- if isinstance(accept_encoding, str):
- pass
- elif isinstance(accept_encoding, list):
- accept_encoding = ','.join(accept_encoding)
- else:
- accept_encoding = ACCEPT_ENCODING
- headers['accept-encoding'] = accept_encoding
-
- if user_agent:
- headers['user-agent'] = user_agent
-
- if keep_alive:
- headers['connection'] = 'keep-alive'
-
- if basic_auth:
- headers['authorization'] = 'Basic ' + \
- b64encode(b(basic_auth)).decode('utf-8')
-
- if proxy_basic_auth:
- headers['proxy-authorization'] = 'Basic ' + \
- b64encode(b(proxy_basic_auth)).decode('utf-8')
-
- if disable_cache:
- headers['cache-control'] = 'no-cache'
-
- return headers
diff --git a/script/_Lib/requests/packages/urllib3/util/response.py b/script/_Lib/requests/packages/urllib3/util/response.py
deleted file mode 100644
index 45fff55..0000000
--- a/script/_Lib/requests/packages/urllib3/util/response.py
+++ /dev/null
@@ -1,22 +0,0 @@
-def is_fp_closed(obj):
- """
- Checks whether a given file-like object is closed.
-
- :param obj:
- The file-like object to check.
- """
-
- try:
- # Check via the official file-like-object way.
- return obj.closed
- except AttributeError:
- pass
-
- try:
- # Check if the object is a container for another file-like object that
- # gets released on exhaustion (e.g. HTTPResponse).
- return obj.fp is None
- except AttributeError:
- pass
-
- raise ValueError("Unable to determine whether fp is closed.")
diff --git a/script/_Lib/requests/packages/urllib3/util/retry.py b/script/_Lib/requests/packages/urllib3/util/retry.py
deleted file mode 100644
index eb560df..0000000
--- a/script/_Lib/requests/packages/urllib3/util/retry.py
+++ /dev/null
@@ -1,279 +0,0 @@
-import time
-import logging
-
-from ..exceptions import (
- ProtocolError,
- ConnectTimeoutError,
- ReadTimeoutError,
- MaxRetryError,
-)
-from ..packages import six
-
-
-log = logging.getLogger(__name__)
-
-
-class Retry(object):
- """ Retry configuration.
-
- Each retry attempt will create a new Retry object with updated values, so
- they can be safely reused.
-
- Retries can be defined as a default for a pool::
-
- retries = Retry(connect=5, read=2, redirect=5)
- http = PoolManager(retries=retries)
- response = http.request('GET', 'http://example.com/')
-
- Or per-request (which overrides the default for the pool)::
-
- response = http.request('GET', 'http://example.com/', retries=Retry(10))
-
- Retries can be disabled by passing ``False``::
-
- response = http.request('GET', 'http://example.com/', retries=False)
-
- Errors will be wrapped in :class:`~urllib3.exceptions.MaxRetryError` unless
- retries are disabled, in which case the causing exception will be raised.
-
-
- :param int total:
- Total number of retries to allow. Takes precedence over other counts.
-
- Set to ``None`` to remove this constraint and fall back on other
- counts. It's a good idea to set this to some sensibly-high value to
- account for unexpected edge cases and avoid infinite retry loops.
-
- Set to ``0`` to fail on the first retry.
-
- Set to ``False`` to disable and imply ``raise_on_redirect=False``.
-
- :param int connect:
- How many connection-related errors to retry on.
-
- These are errors raised before the request is sent to the remote server,
- which we assume has not triggered the server to process the request.
-
- Set to ``0`` to fail on the first retry of this type.
-
- :param int read:
- How many times to retry on read errors.
-
- These errors are raised after the request was sent to the server, so the
- request may have side-effects.
-
- Set to ``0`` to fail on the first retry of this type.
-
- :param int redirect:
- How many redirects to perform. Limit this to avoid infinite redirect
- loops.
-
- A redirect is a HTTP response with a status code 301, 302, 303, 307 or
- 308.
-
- Set to ``0`` to fail on the first retry of this type.
-
- Set to ``False`` to disable and imply ``raise_on_redirect=False``.
-
- :param iterable method_whitelist:
- Set of uppercased HTTP method verbs that we should retry on.
-
- By default, we only retry on methods which are considered to be
- indempotent (multiple requests with the same parameters end with the
- same state). See :attr:`Retry.DEFAULT_METHOD_WHITELIST`.
-
- :param iterable status_forcelist:
- A set of HTTP status codes that we should force a retry on.
-
- By default, this is disabled with ``None``.
-
- :param float backoff_factor:
- A backoff factor to apply between attempts. urllib3 will sleep for::
-
- {backoff factor} * (2 ^ ({number of total retries} - 1))
-
- seconds. If the backoff_factor is 0.1, then :func:`.sleep` will sleep
- for [0.1s, 0.2s, 0.4s, ...] between retries. It will never be longer
- than :attr:`Retry.MAX_BACKOFF`.
-
- By default, backoff is disabled (set to 0).
-
- :param bool raise_on_redirect: Whether, if the number of redirects is
- exhausted, to raise a MaxRetryError, or to return a response with a
- response code in the 3xx range.
- """
-
- DEFAULT_METHOD_WHITELIST = frozenset([
- 'HEAD', 'GET', 'PUT', 'DELETE', 'OPTIONS', 'TRACE'])
-
- #: Maximum backoff time.
- BACKOFF_MAX = 120
-
- def __init__(self, total=10, connect=None, read=None, redirect=None,
- method_whitelist=DEFAULT_METHOD_WHITELIST, status_forcelist=None,
- backoff_factor=0, raise_on_redirect=True, _observed_errors=0):
-
- self.total = total
- self.connect = connect
- self.read = read
-
- if redirect is False or total is False:
- redirect = 0
- raise_on_redirect = False
-
- self.redirect = redirect
- self.status_forcelist = status_forcelist or set()
- self.method_whitelist = method_whitelist
- self.backoff_factor = backoff_factor
- self.raise_on_redirect = raise_on_redirect
- self._observed_errors = _observed_errors # TODO: use .history instead?
-
- def new(self, **kw):
- params = dict(
- total=self.total,
- connect=self.connect, read=self.read, redirect=self.redirect,
- method_whitelist=self.method_whitelist,
- status_forcelist=self.status_forcelist,
- backoff_factor=self.backoff_factor,
- raise_on_redirect=self.raise_on_redirect,
- _observed_errors=self._observed_errors,
- )
- params.update(kw)
- return type(self)(**params)
-
- @classmethod
- def from_int(cls, retries, redirect=True, default=None):
- """ Backwards-compatibility for the old retries format."""
- if retries is None:
- retries = default if default is not None else cls.DEFAULT
-
- if isinstance(retries, Retry):
- return retries
-
- redirect = bool(redirect) and None
- new_retries = cls(retries, redirect=redirect)
- log.debug("Converted retries value: %r -> %r" % (retries, new_retries))
- return new_retries
-
- def get_backoff_time(self):
- """ Formula for computing the current backoff
-
- :rtype: float
- """
- if self._observed_errors <= 1:
- return 0
-
- backoff_value = self.backoff_factor * (2 ** (self._observed_errors - 1))
- return min(self.BACKOFF_MAX, backoff_value)
-
- def sleep(self):
- """ Sleep between retry attempts using an exponential backoff.
-
- By default, the backoff factor is 0 and this method will return
- immediately.
- """
- backoff = self.get_backoff_time()
- if backoff <= 0:
- return
- time.sleep(backoff)
-
- def _is_connection_error(self, err):
- """ Errors when we're fairly sure that the server did not receive the
- request, so it should be safe to retry.
- """
- return isinstance(err, ConnectTimeoutError)
-
- def _is_read_error(self, err):
- """ Errors that occur after the request has been started, so we can't
- assume that the server did not process any of it.
- """
- return isinstance(err, (ReadTimeoutError, ProtocolError))
-
- def is_forced_retry(self, method, status_code):
- """ Is this method/response retryable? (Based on method/codes whitelists)
- """
- if self.method_whitelist and method.upper() not in self.method_whitelist:
- return False
-
- return self.status_forcelist and status_code in self.status_forcelist
-
- def is_exhausted(self):
- """ Are we out of retries?
- """
- retry_counts = (self.total, self.connect, self.read, self.redirect)
- retry_counts = list(filter(None, retry_counts))
- if not retry_counts:
- return False
-
- return min(retry_counts) < 0
-
- def increment(self, method=None, url=None, response=None, error=None, _pool=None, _stacktrace=None):
- """ Return a new Retry object with incremented retry counters.
-
- :param response: A response object, or None, if the server did not
- return a response.
- :type response: :class:`~urllib3.response.HTTPResponse`
- :param Exception error: An error encountered during the request, or
- None if the response was received successfully.
-
- :return: A new ``Retry`` object.
- """
- if self.total is False and error:
- # Disabled, indicate to re-raise the error.
- raise six.reraise(type(error), error, _stacktrace)
-
- total = self.total
- if total is not None:
- total -= 1
-
- _observed_errors = self._observed_errors
- connect = self.connect
- read = self.read
- redirect = self.redirect
-
- if error and self._is_connection_error(error):
- # Connect retry?
- if connect is False:
- raise six.reraise(type(error), error, _stacktrace)
- elif connect is not None:
- connect -= 1
- _observed_errors += 1
-
- elif error and self._is_read_error(error):
- # Read retry?
- if read is False:
- raise six.reraise(type(error), error, _stacktrace)
- elif read is not None:
- read -= 1
- _observed_errors += 1
-
- elif response and response.get_redirect_location():
- # Redirect retry?
- if redirect is not None:
- redirect -= 1
-
- else:
- # FIXME: Nothing changed, scenario doesn't make sense.
- _observed_errors += 1
-
- new_retry = self.new(
- total=total,
- connect=connect, read=read, redirect=redirect,
- _observed_errors=_observed_errors)
-
- if new_retry.is_exhausted():
- raise MaxRetryError(_pool, url, error)
-
- log.debug("Incremented Retry for (url='%s'): %r" % (url, new_retry))
-
- return new_retry
-
-
- def __repr__(self):
- return ('{cls.__name__}(total={self.total}, connect={self.connect}, '
- 'read={self.read}, redirect={self.redirect})').format(
- cls=type(self), self=self)
-
-
-# For backwards compatibility (equivalent to pre-v1.9):
-Retry.DEFAULT = Retry(3)
diff --git a/script/_Lib/requests/packages/urllib3/util/ssl_.py b/script/_Lib/requests/packages/urllib3/util/ssl_.py
deleted file mode 100644
index 9cfe2d2..0000000
--- a/script/_Lib/requests/packages/urllib3/util/ssl_.py
+++ /dev/null
@@ -1,132 +0,0 @@
-from binascii import hexlify, unhexlify
-from hashlib import md5, sha1
-
-from ..exceptions import SSLError
-
-
-try: # Test for SSL features
- SSLContext = None
- HAS_SNI = False
-
- import ssl
- from ssl import wrap_socket, CERT_NONE, PROTOCOL_SSLv23
- from ssl import SSLContext # Modern SSL?
- from ssl import HAS_SNI # Has SNI?
-except ImportError:
- pass
-
-
-def assert_fingerprint(cert, fingerprint):
- """
- Checks if given fingerprint matches the supplied certificate.
-
- :param cert:
- Certificate as bytes object.
- :param fingerprint:
- Fingerprint as string of hexdigits, can be interspersed by colons.
- """
-
- # Maps the length of a digest to a possible hash function producing
- # this digest.
- hashfunc_map = {
- 16: md5,
- 20: sha1
- }
-
- fingerprint = fingerprint.replace(':', '').lower()
- digest_length, odd = divmod(len(fingerprint), 2)
-
- if odd or digest_length not in hashfunc_map:
- raise SSLError('Fingerprint is of invalid length.')
-
- # We need encode() here for py32; works on py2 and p33.
- fingerprint_bytes = unhexlify(fingerprint.encode())
-
- hashfunc = hashfunc_map[digest_length]
-
- cert_digest = hashfunc(cert).digest()
-
- if not cert_digest == fingerprint_bytes:
- raise SSLError('Fingerprints did not match. Expected "{0}", got "{1}".'
- .format(hexlify(fingerprint_bytes),
- hexlify(cert_digest)))
-
-
-def resolve_cert_reqs(candidate):
- """
- Resolves the argument to a numeric constant, which can be passed to
- the wrap_socket function/method from the ssl module.
- Defaults to :data:`ssl.CERT_NONE`.
- If given a string it is assumed to be the name of the constant in the
- :mod:`ssl` module or its abbrevation.
- (So you can specify `REQUIRED` instead of `CERT_REQUIRED`.
- If it's neither `None` nor a string we assume it is already the numeric
- constant which can directly be passed to wrap_socket.
- """
- if candidate is None:
- return CERT_NONE
-
- if isinstance(candidate, str):
- res = getattr(ssl, candidate, None)
- if res is None:
- res = getattr(ssl, 'CERT_' + candidate)
- return res
-
- return candidate
-
-
-def resolve_ssl_version(candidate):
- """
- like resolve_cert_reqs
- """
- if candidate is None:
- return PROTOCOL_SSLv23
-
- if isinstance(candidate, str):
- res = getattr(ssl, candidate, None)
- if res is None:
- res = getattr(ssl, 'PROTOCOL_' + candidate)
- return res
-
- return candidate
-
-
-if SSLContext is not None: # Python 3.2+
- def ssl_wrap_socket(sock, keyfile=None, certfile=None, cert_reqs=None,
- ca_certs=None, server_hostname=None,
- ssl_version=None):
- """
- All arguments except `server_hostname` have the same meaning as for
- :func:`ssl.wrap_socket`
-
- :param server_hostname:
- Hostname of the expected certificate
- """
- context = SSLContext(ssl_version)
- context.verify_mode = cert_reqs
-
- # Disable TLS compression to migitate CRIME attack (issue #309)
- OP_NO_COMPRESSION = 0x20000
- context.options |= OP_NO_COMPRESSION
-
- if ca_certs:
- try:
- context.load_verify_locations(ca_certs)
- # Py32 raises IOError
- # Py33 raises FileNotFoundError
- except Exception as e: # Reraise as SSLError
- raise SSLError(e)
- if certfile:
- # FIXME: This block needs a test.
- context.load_cert_chain(certfile, keyfile)
- if HAS_SNI: # Platform-specific: OpenSSL with enabled SNI
- return context.wrap_socket(sock, server_hostname=server_hostname)
- return context.wrap_socket(sock)
-
-else: # Python 3.1 and earlier
- def ssl_wrap_socket(sock, keyfile=None, certfile=None, cert_reqs=None,
- ca_certs=None, server_hostname=None,
- ssl_version=None):
- return wrap_socket(sock, keyfile=keyfile, certfile=certfile,
- ca_certs=ca_certs, cert_reqs=cert_reqs,
- ssl_version=ssl_version)
diff --git a/script/_Lib/requests/packages/urllib3/util/timeout.py b/script/_Lib/requests/packages/urllib3/util/timeout.py
deleted file mode 100644
index ea7027f..0000000
--- a/script/_Lib/requests/packages/urllib3/util/timeout.py
+++ /dev/null
@@ -1,240 +0,0 @@
-# The default socket timeout, used by httplib to indicate that no timeout was
-# specified by the user
-from socket import _GLOBAL_DEFAULT_TIMEOUT
-import time
-
-from ..exceptions import TimeoutStateError
-
-# A sentinel value to indicate that no timeout was specified by the user in
-# urllib3
-_Default = object()
-
-def current_time():
- """
- Retrieve the current time. This function is mocked out in unit testing.
- """
- return time.time()
-
-
-class Timeout(object):
- """ Timeout configuration.
-
- Timeouts can be defined as a default for a pool::
-
- timeout = Timeout(connect=2.0, read=7.0)
- http = PoolManager(timeout=timeout)
- response = http.request('GET', 'http://example.com/')
-
- Or per-request (which overrides the default for the pool)::
-
- response = http.request('GET', 'http://example.com/', timeout=Timeout(10))
-
- Timeouts can be disabled by setting all the parameters to ``None``::
-
- no_timeout = Timeout(connect=None, read=None)
- response = http.request('GET', 'http://example.com/, timeout=no_timeout)
-
-
- :param total:
- This combines the connect and read timeouts into one; the read timeout
- will be set to the time leftover from the connect attempt. In the
- event that both a connect timeout and a total are specified, or a read
- timeout and a total are specified, the shorter timeout will be applied.
-
- Defaults to None.
-
- :type total: integer, float, or None
-
- :param connect:
- The maximum amount of time to wait for a connection attempt to a server
- to succeed. Omitting the parameter will default the connect timeout to
- the system default, probably `the global default timeout in socket.py
- `_.
- None will set an infinite timeout for connection attempts.
-
- :type connect: integer, float, or None
-
- :param read:
- The maximum amount of time to wait between consecutive
- read operations for a response from the server. Omitting
- the parameter will default the read timeout to the system
- default, probably `the global default timeout in socket.py
- `_.
- None will set an infinite timeout.
-
- :type read: integer, float, or None
-
- .. note::
-
- Many factors can affect the total amount of time for urllib3 to return
- an HTTP response.
-
- For example, Python's DNS resolver does not obey the timeout specified
- on the socket. Other factors that can affect total request time include
- high CPU load, high swap, the program running at a low priority level,
- or other behaviors.
-
- In addition, the read and total timeouts only measure the time between
- read operations on the socket connecting the client and the server,
- not the total amount of time for the request to return a complete
- response. For most requests, the timeout is raised because the server
- has not sent the first byte in the specified time. This is not always
- the case; if a server streams one byte every fifteen seconds, a timeout
- of 20 seconds will not trigger, even though the request will take
- several minutes to complete.
-
- If your goal is to cut off any request after a set amount of wall clock
- time, consider having a second "watcher" thread to cut off a slow
- request.
- """
-
- #: A sentinel object representing the default timeout value
- DEFAULT_TIMEOUT = _GLOBAL_DEFAULT_TIMEOUT
-
- def __init__(self, total=None, connect=_Default, read=_Default):
- self._connect = self._validate_timeout(connect, 'connect')
- self._read = self._validate_timeout(read, 'read')
- self.total = self._validate_timeout(total, 'total')
- self._start_connect = None
-
- def __str__(self):
- return '%s(connect=%r, read=%r, total=%r)' % (
- type(self).__name__, self._connect, self._read, self.total)
-
- @classmethod
- def _validate_timeout(cls, value, name):
- """ Check that a timeout attribute is valid.
-
- :param value: The timeout value to validate
- :param name: The name of the timeout attribute to validate. This is
- used to specify in error messages.
- :return: The validated and casted version of the given value.
- :raises ValueError: If the type is not an integer or a float, or if it
- is a numeric value less than zero.
- """
- if value is _Default:
- return cls.DEFAULT_TIMEOUT
-
- if value is None or value is cls.DEFAULT_TIMEOUT:
- return value
-
- try:
- float(value)
- except (TypeError, ValueError):
- raise ValueError("Timeout value %s was %s, but it must be an "
- "int or float." % (name, value))
-
- try:
- if value < 0:
- raise ValueError("Attempted to set %s timeout to %s, but the "
- "timeout cannot be set to a value less "
- "than 0." % (name, value))
- except TypeError: # Python 3
- raise ValueError("Timeout value %s was %s, but it must be an "
- "int or float." % (name, value))
-
- return value
-
- @classmethod
- def from_float(cls, timeout):
- """ Create a new Timeout from a legacy timeout value.
-
- The timeout value used by httplib.py sets the same timeout on the
- connect(), and recv() socket requests. This creates a :class:`Timeout`
- object that sets the individual timeouts to the ``timeout`` value
- passed to this function.
-
- :param timeout: The legacy timeout value.
- :type timeout: integer, float, sentinel default object, or None
- :return: Timeout object
- :rtype: :class:`Timeout`
- """
- return Timeout(read=timeout, connect=timeout)
-
- def clone(self):
- """ Create a copy of the timeout object
-
- Timeout properties are stored per-pool but each request needs a fresh
- Timeout object to ensure each one has its own start/stop configured.
-
- :return: a copy of the timeout object
- :rtype: :class:`Timeout`
- """
- # We can't use copy.deepcopy because that will also create a new object
- # for _GLOBAL_DEFAULT_TIMEOUT, which socket.py uses as a sentinel to
- # detect the user default.
- return Timeout(connect=self._connect, read=self._read,
- total=self.total)
-
- def start_connect(self):
- """ Start the timeout clock, used during a connect() attempt
-
- :raises urllib3.exceptions.TimeoutStateError: if you attempt
- to start a timer that has been started already.
- """
- if self._start_connect is not None:
- raise TimeoutStateError("Timeout timer has already been started.")
- self._start_connect = current_time()
- return self._start_connect
-
- def get_connect_duration(self):
- """ Gets the time elapsed since the call to :meth:`start_connect`.
-
- :return: Elapsed time.
- :rtype: float
- :raises urllib3.exceptions.TimeoutStateError: if you attempt
- to get duration for a timer that hasn't been started.
- """
- if self._start_connect is None:
- raise TimeoutStateError("Can't get connect duration for timer "
- "that has not started.")
- return current_time() - self._start_connect
-
- @property
- def connect_timeout(self):
- """ Get the value to use when setting a connection timeout.
-
- This will be a positive float or integer, the value None
- (never timeout), or the default system timeout.
-
- :return: Connect timeout.
- :rtype: int, float, :attr:`Timeout.DEFAULT_TIMEOUT` or None
- """
- if self.total is None:
- return self._connect
-
- if self._connect is None or self._connect is self.DEFAULT_TIMEOUT:
- return self.total
-
- return min(self._connect, self.total)
-
- @property
- def read_timeout(self):
- """ Get the value for the read timeout.
-
- This assumes some time has elapsed in the connection timeout and
- computes the read timeout appropriately.
-
- If self.total is set, the read timeout is dependent on the amount of
- time taken by the connect timeout. If the connection time has not been
- established, a :exc:`~urllib3.exceptions.TimeoutStateError` will be
- raised.
-
- :return: Value to use for the read timeout.
- :rtype: int, float, :attr:`Timeout.DEFAULT_TIMEOUT` or None
- :raises urllib3.exceptions.TimeoutStateError: If :meth:`start_connect`
- has not yet been called on this object.
- """
- if (self.total is not None and
- self.total is not self.DEFAULT_TIMEOUT and
- self._read is not None and
- self._read is not self.DEFAULT_TIMEOUT):
- # In case the connect timeout has not yet been established.
- if self._start_connect is None:
- return self._read
- return max(0, min(self.total - self.get_connect_duration(),
- self._read))
- elif self.total is not None and self.total is not self.DEFAULT_TIMEOUT:
- return max(0, self.total - self.get_connect_duration())
- else:
- return self._read
diff --git a/script/_Lib/requests/packages/urllib3/util/url.py b/script/_Lib/requests/packages/urllib3/util/url.py
deleted file mode 100644
index 487d456..0000000
--- a/script/_Lib/requests/packages/urllib3/util/url.py
+++ /dev/null
@@ -1,171 +0,0 @@
-from collections import namedtuple
-
-from ..exceptions import LocationParseError
-
-
-url_attrs = ['scheme', 'auth', 'host', 'port', 'path', 'query', 'fragment']
-
-
-class Url(namedtuple('Url', url_attrs)):
- """
- Datastructure for representing an HTTP URL. Used as a return value for
- :func:`parse_url`.
- """
- slots = ()
-
- def __new__(cls, scheme=None, auth=None, host=None, port=None, path=None,
- query=None, fragment=None):
- return super(Url, cls).__new__(cls, scheme, auth, host, port, path,
- query, fragment)
-
- @property
- def hostname(self):
- """For backwards-compatibility with urlparse. We're nice like that."""
- return self.host
-
- @property
- def request_uri(self):
- """Absolute path including the query string."""
- uri = self.path or '/'
-
- if self.query is not None:
- uri += '?' + self.query
-
- return uri
-
- @property
- def netloc(self):
- """Network location including host and port"""
- if self.port:
- return '%s:%d' % (self.host, self.port)
- return self.host
-
-
-def split_first(s, delims):
- """
- Given a string and an iterable of delimiters, split on the first found
- delimiter. Return two split parts and the matched delimiter.
-
- If not found, then the first part is the full input string.
-
- Example::
-
- >>> split_first('foo/bar?baz', '?/=')
- ('foo', 'bar?baz', '/')
- >>> split_first('foo/bar?baz', '123')
- ('foo/bar?baz', '', None)
-
- Scales linearly with number of delims. Not ideal for large number of delims.
- """
- min_idx = None
- min_delim = None
- for d in delims:
- idx = s.find(d)
- if idx < 0:
- continue
-
- if min_idx is None or idx < min_idx:
- min_idx = idx
- min_delim = d
-
- if min_idx is None or min_idx < 0:
- return s, '', None
-
- return s[:min_idx], s[min_idx+1:], min_delim
-
-
-def parse_url(url):
- """
- Given a url, return a parsed :class:`.Url` namedtuple. Best-effort is
- performed to parse incomplete urls. Fields not provided will be None.
-
- Partly backwards-compatible with :mod:`urlparse`.
-
- Example::
-
- >>> parse_url('http://google.com/mail/')
- Url(scheme='http', host='google.com', port=None, path='/', ...)
- >>> parse_url('google.com:80')
- Url(scheme=None, host='google.com', port=80, path=None, ...)
- >>> parse_url('/foo?bar')
- Url(scheme=None, host=None, port=None, path='/foo', query='bar', ...)
- """
-
- # While this code has overlap with stdlib's urlparse, it is much
- # simplified for our needs and less annoying.
- # Additionally, this implementations does silly things to be optimal
- # on CPython.
-
- if not url:
- # Empty
- return Url()
-
- scheme = None
- auth = None
- host = None
- port = None
- path = None
- fragment = None
- query = None
-
- # Scheme
- if '://' in url:
- scheme, url = url.split('://', 1)
-
- # Find the earliest Authority Terminator
- # (http://tools.ietf.org/html/rfc3986#section-3.2)
- url, path_, delim = split_first(url, ['/', '?', '#'])
-
- if delim:
- # Reassemble the path
- path = delim + path_
-
- # Auth
- if '@' in url:
- # Last '@' denotes end of auth part
- auth, url = url.rsplit('@', 1)
-
- # IPv6
- if url and url[0] == '[':
- host, url = url.split(']', 1)
- host += ']'
-
- # Port
- if ':' in url:
- _host, port = url.split(':', 1)
-
- if not host:
- host = _host
-
- if port:
- # If given, ports must be integers.
- if not port.isdigit():
- raise LocationParseError(url)
- port = int(port)
- else:
- # Blank ports are cool, too. (rfc3986#section-3.2.3)
- port = None
-
- elif not host and url:
- host = url
-
- if not path:
- return Url(scheme, auth, host, port, path, query, fragment)
-
- # Fragment
- if '#' in path:
- path, fragment = path.split('#', 1)
-
- # Query
- if '?' in path:
- path, query = path.split('?', 1)
-
- return Url(scheme, auth, host, port, path, query, fragment)
-
-
-def get_host(url):
- """
- Deprecated. Use :func:`.parse_url` instead.
- """
- p = parse_url(url)
- return p.scheme or 'http', p.hostname, p.port
diff --git a/script/_Lib/requests/sessions.py b/script/_Lib/requests/sessions.py
deleted file mode 100644
index d701ff2..0000000
--- a/script/_Lib/requests/sessions.py
+++ /dev/null
@@ -1,671 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-requests.session
-~~~~~~~~~~~~~~~~
-
-This module provides a Session object to manage and persist settings across
-requests (cookies, auth, proxies).
-
-"""
-import os
-from collections import Mapping
-from datetime import datetime
-
-from .auth import _basic_auth_str
-from .compat import cookielib, OrderedDict, urljoin, urlparse, builtin_str
-from .cookies import (
- cookiejar_from_dict, extract_cookies_to_jar, RequestsCookieJar, merge_cookies)
-from .models import Request, PreparedRequest, DEFAULT_REDIRECT_LIMIT
-from .hooks import default_hooks, dispatch_hook
-from .utils import to_key_val_list, default_headers, to_native_string
-from .exceptions import (
- TooManyRedirects, InvalidSchema, ChunkedEncodingError, ContentDecodingError)
-from .structures import CaseInsensitiveDict
-
-from .adapters import HTTPAdapter
-
-from .utils import (
- requote_uri, get_environ_proxies, get_netrc_auth, should_bypass_proxies,
- get_auth_from_url
-)
-
-from .status_codes import codes
-
-# formerly defined here, reexposed here for backward compatibility
-from .models import REDIRECT_STATI
-
-
-def merge_setting(request_setting, session_setting, dict_class=OrderedDict):
- """
- Determines appropriate setting for a given request, taking into account the
- explicit setting on that request, and the setting in the session. If a
- setting is a dictionary, they will be merged together using `dict_class`
- """
-
- if session_setting is None:
- return request_setting
-
- if request_setting is None:
- return session_setting
-
- # Bypass if not a dictionary (e.g. verify)
- if not (
- isinstance(session_setting, Mapping) and
- isinstance(request_setting, Mapping)
- ):
- return request_setting
-
- merged_setting = dict_class(to_key_val_list(session_setting))
- merged_setting.update(to_key_val_list(request_setting))
-
- # Remove keys that are set to None.
- for (k, v) in request_setting.items():
- if v is None:
- del merged_setting[k]
-
- merged_setting = dict((k, v) for (k, v) in merged_setting.items() if v is not None)
-
- return merged_setting
-
-
-def merge_hooks(request_hooks, session_hooks, dict_class=OrderedDict):
- """
- Properly merges both requests and session hooks.
-
- This is necessary because when request_hooks == {'response': []}, the
- merge breaks Session hooks entirely.
- """
- if session_hooks is None or session_hooks.get('response') == []:
- return request_hooks
-
- if request_hooks is None or request_hooks.get('response') == []:
- return session_hooks
-
- return merge_setting(request_hooks, session_hooks, dict_class)
-
-
-class SessionRedirectMixin(object):
- def resolve_redirects(self, resp, req, stream=False, timeout=None,
- verify=True, cert=None, proxies=None):
- """Receives a Response. Returns a generator of Responses."""
-
- i = 0
- hist = [] # keep track of history
-
- while resp.is_redirect:
- prepared_request = req.copy()
-
- if i > 0:
- # Update history and keep track of redirects.
- hist.append(resp)
- new_hist = list(hist)
- resp.history = new_hist
-
- try:
- resp.content # Consume socket so it can be released
- except (ChunkedEncodingError, ContentDecodingError, RuntimeError):
- resp.raw.read(decode_content=False)
-
- if i >= self.max_redirects:
- raise TooManyRedirects('Exceeded %s redirects.' % self.max_redirects)
-
- # Release the connection back into the pool.
- resp.close()
-
- url = resp.headers['location']
- method = req.method
-
- # Handle redirection without scheme (see: RFC 1808 Section 4)
- if url.startswith('//'):
- parsed_rurl = urlparse(resp.url)
- url = '%s:%s' % (parsed_rurl.scheme, url)
-
- # The scheme should be lower case...
- parsed = urlparse(url)
- url = parsed.geturl()
-
- # Facilitate relative 'location' headers, as allowed by RFC 7231.
- # (e.g. '/path/to/resource' instead of 'http://domain.tld/path/to/resource')
- # Compliant with RFC3986, we percent encode the url.
- if not urlparse(url).netloc:
- url = urljoin(resp.url, requote_uri(url))
- else:
- url = requote_uri(url)
-
- prepared_request.url = to_native_string(url)
- # Cache the url, unless it redirects to itself.
- if resp.is_permanent_redirect and req.url != prepared_request.url:
- self.redirect_cache[req.url] = prepared_request.url
-
- # http://tools.ietf.org/html/rfc7231#section-6.4.4
- if (resp.status_code == codes.see_other and
- method != 'HEAD'):
- method = 'GET'
-
- # Do what the browsers do, despite standards...
- # First, turn 302s into GETs.
- if resp.status_code == codes.found and method != 'HEAD':
- method = 'GET'
-
- # Second, if a POST is responded to with a 301, turn it into a GET.
- # This bizarre behaviour is explained in Issue 1704.
- if resp.status_code == codes.moved and method == 'POST':
- method = 'GET'
-
- prepared_request.method = method
-
- # https://github.com/kennethreitz/requests/issues/1084
- if resp.status_code not in (codes.temporary_redirect, codes.permanent_redirect):
- if 'Content-Length' in prepared_request.headers:
- del prepared_request.headers['Content-Length']
-
- prepared_request.body = None
-
- headers = prepared_request.headers
- try:
- del headers['Cookie']
- except KeyError:
- pass
-
- extract_cookies_to_jar(prepared_request._cookies, prepared_request, resp.raw)
- prepared_request._cookies.update(self.cookies)
- prepared_request.prepare_cookies(prepared_request._cookies)
-
- # Rebuild auth and proxy information.
- proxies = self.rebuild_proxies(prepared_request, proxies)
- self.rebuild_auth(prepared_request, resp)
-
- # Override the original request.
- req = prepared_request
-
- resp = self.send(
- req,
- stream=stream,
- timeout=timeout,
- verify=verify,
- cert=cert,
- proxies=proxies,
- allow_redirects=False,
- )
-
- extract_cookies_to_jar(self.cookies, prepared_request, resp.raw)
-
- i += 1
- yield resp
-
- def rebuild_auth(self, prepared_request, response):
- """
- When being redirected we may want to strip authentication from the
- request to avoid leaking credentials. This method intelligently removes
- and reapplies authentication where possible to avoid credential loss.
- """
- headers = prepared_request.headers
- url = prepared_request.url
-
- if 'Authorization' in headers:
- # If we get redirected to a new host, we should strip out any
- # authentication headers.
- original_parsed = urlparse(response.request.url)
- redirect_parsed = urlparse(url)
-
- if (original_parsed.hostname != redirect_parsed.hostname):
- del headers['Authorization']
-
- # .netrc might have more auth for us on our new host.
- new_auth = get_netrc_auth(url) if self.trust_env else None
- if new_auth is not None:
- prepared_request.prepare_auth(new_auth)
-
- return
-
- def rebuild_proxies(self, prepared_request, proxies):
- """
- This method re-evaluates the proxy configuration by considering the
- environment variables. If we are redirected to a URL covered by
- NO_PROXY, we strip the proxy configuration. Otherwise, we set missing
- proxy keys for this URL (in case they were stripped by a previous
- redirect).
-
- This method also replaces the Proxy-Authorization header where
- necessary.
- """
- headers = prepared_request.headers
- url = prepared_request.url
- scheme = urlparse(url).scheme
- new_proxies = proxies.copy() if proxies is not None else {}
-
- if self.trust_env and not should_bypass_proxies(url):
- environ_proxies = get_environ_proxies(url)
-
- proxy = environ_proxies.get(scheme)
-
- if proxy:
- new_proxies.setdefault(scheme, environ_proxies[scheme])
-
- if 'Proxy-Authorization' in headers:
- del headers['Proxy-Authorization']
-
- try:
- username, password = get_auth_from_url(new_proxies[scheme])
- except KeyError:
- username, password = None, None
-
- if username and password:
- headers['Proxy-Authorization'] = _basic_auth_str(username, password)
-
- return new_proxies
-
-
-class Session(SessionRedirectMixin):
- """A Requests session.
-
- Provides cookie persistence, connection-pooling, and configuration.
-
- Basic Usage::
-
- >>> import requests
- >>> s = requests.Session()
- >>> s.get('http://httpbin.org/get')
- 200
- """
-
- __attrs__ = [
- 'headers', 'cookies', 'auth', 'proxies', 'hooks', 'params', 'verify',
- 'cert', 'prefetch', 'adapters', 'stream', 'trust_env',
- 'max_redirects', 'redirect_cache'
- ]
-
- def __init__(self):
-
- #: A case-insensitive dictionary of headers to be sent on each
- #: :class:`Request ` sent from this
- #: :class:`Session `.
- self.headers = default_headers()
-
- #: Default Authentication tuple or object to attach to
- #: :class:`Request `.
- self.auth = None
-
- #: Dictionary mapping protocol to the URL of the proxy (e.g.
- #: {'http': 'foo.bar:3128'}) to be used on each
- #: :class:`Request `.
- self.proxies = {}
-
- #: Event-handling hooks.
- self.hooks = default_hooks()
-
- #: Dictionary of querystring data to attach to each
- #: :class:`Request `. The dictionary values may be lists for
- #: representing multivalued query parameters.
- self.params = {}
-
- #: Stream response content default.
- self.stream = False
-
- #: SSL Verification default.
- self.verify = True
-
- #: SSL certificate default.
- self.cert = None
-
- #: Maximum number of redirects allowed. If the request exceeds this
- #: limit, a :class:`TooManyRedirects` exception is raised.
- self.max_redirects = DEFAULT_REDIRECT_LIMIT
-
- #: Should we trust the environment?
- self.trust_env = True
-
- #: A CookieJar containing all currently outstanding cookies set on this
- #: session. By default it is a
- #: :class:`RequestsCookieJar `, but
- #: may be any other ``cookielib.CookieJar`` compatible object.
- self.cookies = cookiejar_from_dict({})
-
- # Default connection adapters.
- self.adapters = OrderedDict()
- self.mount('https://', HTTPAdapter())
- self.mount('http://', HTTPAdapter())
-
- self.redirect_cache = {}
-
- def __enter__(self):
- return self
-
- def __exit__(self, *args):
- self.close()
-
- def prepare_request(self, request):
- """Constructs a :class:`PreparedRequest ` for
- transmission and returns it. The :class:`PreparedRequest` has settings
- merged from the :class:`Request ` instance and those of the
- :class:`Session`.
-
- :param request: :class:`Request` instance to prepare with this
- session's settings.
- """
- cookies = request.cookies or {}
-
- # Bootstrap CookieJar.
- if not isinstance(cookies, cookielib.CookieJar):
- cookies = cookiejar_from_dict(cookies)
-
- # Merge with session cookies
- merged_cookies = merge_cookies(
- merge_cookies(RequestsCookieJar(), self.cookies), cookies)
-
-
- # Set environment's basic authentication if not explicitly set.
- auth = request.auth
- if self.trust_env and not auth and not self.auth:
- auth = get_netrc_auth(request.url)
-
- p = PreparedRequest()
- p.prepare(
- method=request.method.upper(),
- url=request.url,
- files=request.files,
- data=request.data,
- json=request.json,
- headers=merge_setting(request.headers, self.headers, dict_class=CaseInsensitiveDict),
- params=merge_setting(request.params, self.params),
- auth=merge_setting(auth, self.auth),
- cookies=merged_cookies,
- hooks=merge_hooks(request.hooks, self.hooks),
- )
- return p
-
- def request(self, method, url,
- params=None,
- data=None,
- headers=None,
- cookies=None,
- files=None,
- auth=None,
- timeout=None,
- allow_redirects=True,
- proxies=None,
- hooks=None,
- stream=None,
- verify=None,
- cert=None,
- json=None):
- """Constructs a :class:`Request `, prepares it and sends it.
- Returns :class:`Response ` object.
-
- :param method: method for the new :class:`Request` object.
- :param url: URL for the new :class:`Request` object.
- :param params: (optional) Dictionary or bytes to be sent in the query
- string for the :class:`Request`.
- :param data: (optional) Dictionary or bytes to send in the body of the
- :class:`Request`.
- :param json: (optional) json to send in the body of the
- :class:`Request`.
- :param headers: (optional) Dictionary of HTTP Headers to send with the
- :class:`Request`.
- :param cookies: (optional) Dict or CookieJar object to send with the
- :class:`Request`.
- :param files: (optional) Dictionary of ``'filename': file-like-objects``
- for multipart encoding upload.
- :param auth: (optional) Auth tuple or callable to enable
- Basic/Digest/Custom HTTP Auth.
- :param timeout: (optional) How long to wait for the server to send
- data before giving up, as a float, or a (`connect timeout, read
- timeout `_) tuple.
- :type timeout: float or tuple
- :param allow_redirects: (optional) Set to True by default.
- :type allow_redirects: bool
- :param proxies: (optional) Dictionary mapping protocol to the URL of
- the proxy.
- :param stream: (optional) whether to immediately download the response
- content. Defaults to ``False``.
- :param verify: (optional) if ``True``, the SSL cert will be verified.
- A CA_BUNDLE path can also be provided.
- :param cert: (optional) if String, path to ssl client cert file (.pem).
- If Tuple, ('cert', 'key') pair.
- """
-
- method = builtin_str(method)
-
- # Create the Request.
- req = Request(
- method = method.upper(),
- url = url,
- headers = headers,
- files = files,
- data = data or {},
- json = json,
- params = params or {},
- auth = auth,
- cookies = cookies,
- hooks = hooks,
- )
- prep = self.prepare_request(req)
-
- proxies = proxies or {}
-
- settings = self.merge_environment_settings(
- prep.url, proxies, stream, verify, cert
- )
-
- # Send the request.
- send_kwargs = {
- 'timeout': timeout,
- 'allow_redirects': allow_redirects,
- }
- send_kwargs.update(settings)
- resp = self.send(prep, **send_kwargs)
-
- return resp
-
- def get(self, url, **kwargs):
- """Sends a GET request. Returns :class:`Response` object.
-
- :param url: URL for the new :class:`Request` object.
- :param \*\*kwargs: Optional arguments that ``request`` takes.
- """
-
- kwargs.setdefault('allow_redirects', True)
- return self.request('GET', url, **kwargs)
-
- def options(self, url, **kwargs):
- """Sends a OPTIONS request. Returns :class:`Response` object.
-
- :param url: URL for the new :class:`Request` object.
- :param \*\*kwargs: Optional arguments that ``request`` takes.
- """
-
- kwargs.setdefault('allow_redirects', True)
- return self.request('OPTIONS', url, **kwargs)
-
- def head(self, url, **kwargs):
- """Sends a HEAD request. Returns :class:`Response` object.
-
- :param url: URL for the new :class:`Request` object.
- :param \*\*kwargs: Optional arguments that ``request`` takes.
- """
-
- kwargs.setdefault('allow_redirects', False)
- return self.request('HEAD', url, **kwargs)
-
- def post(self, url, data=None, json=None, **kwargs):
- """Sends a POST request. Returns :class:`Response` object.
-
- :param url: URL for the new :class:`Request` object.
- :param data: (optional) Dictionary, bytes, or file-like object to send in the body of the :class:`Request`.
- :param json: (optional) json to send in the body of the :class:`Request`.
- :param \*\*kwargs: Optional arguments that ``request`` takes.
- """
-
- return self.request('POST', url, data=data, json=json, **kwargs)
-
- def put(self, url, data=None, **kwargs):
- """Sends a PUT request. Returns :class:`Response` object.
-
- :param url: URL for the new :class:`Request` object.
- :param data: (optional) Dictionary, bytes, or file-like object to send in the body of the :class:`Request`.
- :param \*\*kwargs: Optional arguments that ``request`` takes.
- """
-
- return self.request('PUT', url, data=data, **kwargs)
-
- def patch(self, url, data=None, **kwargs):
- """Sends a PATCH request. Returns :class:`Response` object.
-
- :param url: URL for the new :class:`Request` object.
- :param data: (optional) Dictionary, bytes, or file-like object to send in the body of the :class:`Request`.
- :param \*\*kwargs: Optional arguments that ``request`` takes.
- """
-
- return self.request('PATCH', url, data=data, **kwargs)
-
- def delete(self, url, **kwargs):
- """Sends a DELETE request. Returns :class:`Response` object.
-
- :param url: URL for the new :class:`Request` object.
- :param \*\*kwargs: Optional arguments that ``request`` takes.
- """
-
- return self.request('DELETE', url, **kwargs)
-
- def send(self, request, **kwargs):
- """Send a given PreparedRequest."""
- # Set defaults that the hooks can utilize to ensure they always have
- # the correct parameters to reproduce the previous request.
- kwargs.setdefault('stream', self.stream)
- kwargs.setdefault('verify', self.verify)
- kwargs.setdefault('cert', self.cert)
- kwargs.setdefault('proxies', self.proxies)
-
- # It's possible that users might accidentally send a Request object.
- # Guard against that specific failure case.
- if not isinstance(request, PreparedRequest):
- raise ValueError('You can only send PreparedRequests.')
-
- checked_urls = set()
- while request.url in self.redirect_cache:
- checked_urls.add(request.url)
- new_url = self.redirect_cache.get(request.url)
- if new_url in checked_urls:
- break
- request.url = new_url
-
- # Set up variables needed for resolve_redirects and dispatching of hooks
- allow_redirects = kwargs.pop('allow_redirects', True)
- stream = kwargs.get('stream')
- timeout = kwargs.get('timeout')
- verify = kwargs.get('verify')
- cert = kwargs.get('cert')
- proxies = kwargs.get('proxies')
- hooks = request.hooks
-
- # Get the appropriate adapter to use
- adapter = self.get_adapter(url=request.url)
-
- # Start time (approximately) of the request
- start = datetime.utcnow()
-
- # Send the request
- r = adapter.send(request, **kwargs)
-
- # Total elapsed time of the request (approximately)
- r.elapsed = datetime.utcnow() - start
-
- # Response manipulation hooks
- r = dispatch_hook('response', hooks, r, **kwargs)
-
- # Persist cookies
- if r.history:
-
- # If the hooks create history then we want those cookies too
- for resp in r.history:
- extract_cookies_to_jar(self.cookies, resp.request, resp.raw)
-
- extract_cookies_to_jar(self.cookies, request, r.raw)
-
- # Redirect resolving generator.
- gen = self.resolve_redirects(r, request,
- stream=stream,
- timeout=timeout,
- verify=verify,
- cert=cert,
- proxies=proxies)
-
- # Resolve redirects if allowed.
- history = [resp for resp in gen] if allow_redirects else []
-
- # Shuffle things around if there's history.
- if history:
- # Insert the first (original) request at the start
- history.insert(0, r)
- # Get the last request made
- r = history.pop()
- r.history = history
-
- if not stream:
- r.content
-
- return r
-
- def merge_environment_settings(self, url, proxies, stream, verify, cert):
- """Check the environment and merge it with some settings."""
- # Gather clues from the surrounding environment.
- if self.trust_env:
- # Set environment's proxies.
- env_proxies = get_environ_proxies(url) or {}
- for (k, v) in env_proxies.items():
- proxies.setdefault(k, v)
-
- # Look for requests environment configuration and be compatible
- # with cURL.
- if verify is True or verify is None:
- verify = (os.environ.get('REQUESTS_CA_BUNDLE') or
- os.environ.get('CURL_CA_BUNDLE'))
-
- # Merge all the kwargs.
- proxies = merge_setting(proxies, self.proxies)
- stream = merge_setting(stream, self.stream)
- verify = merge_setting(verify, self.verify)
- cert = merge_setting(cert, self.cert)
-
- return {'verify': verify, 'proxies': proxies, 'stream': stream,
- 'cert': cert}
-
- def get_adapter(self, url):
- """Returns the appropriate connnection adapter for the given URL."""
- for (prefix, adapter) in self.adapters.items():
-
- if url.lower().startswith(prefix):
- return adapter
-
- # Nothing matches :-/
- raise InvalidSchema("No connection adapters were found for '%s'" % url)
-
- def close(self):
- """Closes all adapters and as such the session"""
- for v in self.adapters.values():
- v.close()
-
- def mount(self, prefix, adapter):
- """Registers a connection adapter to a prefix.
-
- Adapters are sorted in descending order by key length."""
-
- self.adapters[prefix] = adapter
- keys_to_move = [k for k in self.adapters if len(k) < len(prefix)]
-
- for key in keys_to_move:
- self.adapters[key] = self.adapters.pop(key)
-
- def __getstate__(self):
- return dict((attr, getattr(self, attr, None)) for attr in self.__attrs__)
-
- def __setstate__(self, state):
- for attr, value in state.items():
- setattr(self, attr, value)
-
-
-def session():
- """Returns a :class:`Session` for context-management."""
-
- return Session()
diff --git a/script/_Lib/requests/status_codes.py b/script/_Lib/requests/status_codes.py
deleted file mode 100644
index e0887f2..0000000
--- a/script/_Lib/requests/status_codes.py
+++ /dev/null
@@ -1,89 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from .structures import LookupDict
-
-_codes = {
-
- # Informational.
- 100: ('continue',),
- 101: ('switching_protocols',),
- 102: ('processing',),
- 103: ('checkpoint',),
- 122: ('uri_too_long', 'request_uri_too_long'),
- 200: ('ok', 'okay', 'all_ok', 'all_okay', 'all_good', '\\o/', '✓'),
- 201: ('created',),
- 202: ('accepted',),
- 203: ('non_authoritative_info', 'non_authoritative_information'),
- 204: ('no_content',),
- 205: ('reset_content', 'reset'),
- 206: ('partial_content', 'partial'),
- 207: ('multi_status', 'multiple_status', 'multi_stati', 'multiple_stati'),
- 208: ('already_reported',),
- 226: ('im_used',),
-
- # Redirection.
- 300: ('multiple_choices',),
- 301: ('moved_permanently', 'moved', '\\o-'),
- 302: ('found',),
- 303: ('see_other', 'other'),
- 304: ('not_modified',),
- 305: ('use_proxy',),
- 306: ('switch_proxy',),
- 307: ('temporary_redirect', 'temporary_moved', 'temporary'),
- 308: ('permanent_redirect',
- 'resume_incomplete', 'resume',), # These 2 to be removed in 3.0
-
- # Client Error.
- 400: ('bad_request', 'bad'),
- 401: ('unauthorized',),
- 402: ('payment_required', 'payment'),
- 403: ('forbidden',),
- 404: ('not_found', '-o-'),
- 405: ('method_not_allowed', 'not_allowed'),
- 406: ('not_acceptable',),
- 407: ('proxy_authentication_required', 'proxy_auth', 'proxy_authentication'),
- 408: ('request_timeout', 'timeout'),
- 409: ('conflict',),
- 410: ('gone',),
- 411: ('length_required',),
- 412: ('precondition_failed', 'precondition'),
- 413: ('request_entity_too_large',),
- 414: ('request_uri_too_large',),
- 415: ('unsupported_media_type', 'unsupported_media', 'media_type'),
- 416: ('requested_range_not_satisfiable', 'requested_range', 'range_not_satisfiable'),
- 417: ('expectation_failed',),
- 418: ('im_a_teapot', 'teapot', 'i_am_a_teapot'),
- 422: ('unprocessable_entity', 'unprocessable'),
- 423: ('locked',),
- 424: ('failed_dependency', 'dependency'),
- 425: ('unordered_collection', 'unordered'),
- 426: ('upgrade_required', 'upgrade'),
- 428: ('precondition_required', 'precondition'),
- 429: ('too_many_requests', 'too_many'),
- 431: ('header_fields_too_large', 'fields_too_large'),
- 444: ('no_response', 'none'),
- 449: ('retry_with', 'retry'),
- 450: ('blocked_by_windows_parental_controls', 'parental_controls'),
- 451: ('unavailable_for_legal_reasons', 'legal_reasons'),
- 499: ('client_closed_request',),
-
- # Server Error.
- 500: ('internal_server_error', 'server_error', '/o\\', '✗'),
- 501: ('not_implemented',),
- 502: ('bad_gateway',),
- 503: ('service_unavailable', 'unavailable'),
- 504: ('gateway_timeout',),
- 505: ('http_version_not_supported', 'http_version'),
- 506: ('variant_also_negotiates',),
- 507: ('insufficient_storage',),
- 509: ('bandwidth_limit_exceeded', 'bandwidth'),
- 510: ('not_extended',),
-}
-
-codes = LookupDict(name='status_codes')
-
-for (code, titles) in list(_codes.items()):
- for title in titles:
- setattr(codes, title, code)
- if not title.startswith('\\'):
- setattr(codes, title.upper(), code)
diff --git a/script/_Lib/requests/structures.py b/script/_Lib/requests/structures.py
deleted file mode 100644
index 3e5f2fa..0000000
--- a/script/_Lib/requests/structures.py
+++ /dev/null
@@ -1,104 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-requests.structures
-~~~~~~~~~~~~~~~~~~~
-
-Data structures that power Requests.
-
-"""
-
-import collections
-
-
-class CaseInsensitiveDict(collections.MutableMapping):
- """
- A case-insensitive ``dict``-like object.
-
- Implements all methods and operations of
- ``collections.MutableMapping`` as well as dict's ``copy``. Also
- provides ``lower_items``.
-
- All keys are expected to be strings. The structure remembers the
- case of the last key to be set, and ``iter(instance)``,
- ``keys()``, ``items()``, ``iterkeys()``, and ``iteritems()``
- will contain case-sensitive keys. However, querying and contains
- testing is case insensitive::
-
- cid = CaseInsensitiveDict()
- cid['Accept'] = 'application/json'
- cid['aCCEPT'] == 'application/json' # True
- list(cid) == ['Accept'] # True
-
- For example, ``headers['content-encoding']`` will return the
- value of a ``'Content-Encoding'`` response header, regardless
- of how the header name was originally stored.
-
- If the constructor, ``.update``, or equality comparison
- operations are given keys that have equal ``.lower()``s, the
- behavior is undefined.
-
- """
- def __init__(self, data=None, **kwargs):
- self._store = dict()
- if data is None:
- data = {}
- self.update(data, **kwargs)
-
- def __setitem__(self, key, value):
- # Use the lowercased key for lookups, but store the actual
- # key alongside the value.
- self._store[key.lower()] = (key, value)
-
- def __getitem__(self, key):
- return self._store[key.lower()][1]
-
- def __delitem__(self, key):
- del self._store[key.lower()]
-
- def __iter__(self):
- return (casedkey for casedkey, mappedvalue in self._store.values())
-
- def __len__(self):
- return len(self._store)
-
- def lower_items(self):
- """Like iteritems(), but with all lowercase keys."""
- return (
- (lowerkey, keyval[1])
- for (lowerkey, keyval)
- in self._store.items()
- )
-
- def __eq__(self, other):
- if isinstance(other, collections.Mapping):
- other = CaseInsensitiveDict(other)
- else:
- return NotImplemented
- # Compare insensitively
- return dict(self.lower_items()) == dict(other.lower_items())
-
- # Copy is required
- def copy(self):
- return CaseInsensitiveDict(self._store.values())
-
- def __repr__(self):
- return str(dict(self.items()))
-
-class LookupDict(dict):
- """Dictionary lookup object."""
-
- def __init__(self, name=None):
- self.name = name
- super(LookupDict, self).__init__()
-
- def __repr__(self):
- return '' % (self.name)
-
- def __getitem__(self, key):
- # We allow fall-through here, so values default to None
-
- return self.__dict__.get(key, None)
-
- def get(self, key, default=None):
- return self.__dict__.get(key, default)
diff --git a/script/_Lib/requests/utils.py b/script/_Lib/requests/utils.py
deleted file mode 100644
index 3c86975..0000000
--- a/script/_Lib/requests/utils.py
+++ /dev/null
@@ -1,686 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-requests.utils
-~~~~~~~~~~~~~~
-
-This module provides utility functions that are used within Requests
-that are also useful for external consumption.
-
-"""
-
-import cgi
-import codecs
-import collections
-import io
-import os
-import platform
-import re
-import sys
-import socket
-import struct
-
-from . import __version__
-from . import certs
-from .compat import parse_http_list as _parse_list_header
-from .compat import (quote, urlparse, bytes, str, OrderedDict, unquote, is_py2,
- builtin_str, getproxies, proxy_bypass, urlunparse)
-from .cookies import RequestsCookieJar, cookiejar_from_dict
-from .structures import CaseInsensitiveDict
-from .exceptions import InvalidURL
-
-_hush_pyflakes = (RequestsCookieJar,)
-
-NETRC_FILES = ('.netrc', '_netrc')
-
-DEFAULT_CA_BUNDLE_PATH = certs.where()
-
-
-def dict_to_sequence(d):
- """Returns an internal sequence dictionary update."""
-
- if hasattr(d, 'items'):
- d = d.items()
-
- return d
-
-
-def super_len(o):
- if hasattr(o, '__len__'):
- return len(o)
-
- if hasattr(o, 'len'):
- return o.len
-
- if hasattr(o, 'fileno'):
- try:
- fileno = o.fileno()
- except io.UnsupportedOperation:
- pass
- else:
- return os.fstat(fileno).st_size
-
- if hasattr(o, 'getvalue'):
- # e.g. BytesIO, cStringIO.StringIO
- return len(o.getvalue())
-
-
-def get_netrc_auth(url):
- """Returns the Requests tuple auth for a given url from netrc."""
-
- try:
- from netrc import netrc, NetrcParseError
-
- netrc_path = None
-
- for f in NETRC_FILES:
- try:
- loc = os.path.expanduser('~/{0}'.format(f))
- except KeyError:
- # os.path.expanduser can fail when $HOME is undefined and
- # getpwuid fails. See http://bugs.python.org/issue20164 &
- # https://github.com/kennethreitz/requests/issues/1846
- return
-
- if os.path.exists(loc):
- netrc_path = loc
- break
-
- # Abort early if there isn't one.
- if netrc_path is None:
- return
-
- ri = urlparse(url)
-
- # Strip port numbers from netloc
- host = ri.netloc.split(':')[0]
-
- try:
- _netrc = netrc(netrc_path).authenticators(host)
- if _netrc:
- # Return with login / password
- login_i = (0 if _netrc[0] else 1)
- return (_netrc[login_i], _netrc[2])
- except (NetrcParseError, IOError):
- # If there was a parsing error or a permissions issue reading the file,
- # we'll just skip netrc auth
- pass
-
- # AppEngine hackiness.
- except (ImportError, AttributeError):
- pass
-
-
-def guess_filename(obj):
- """Tries to guess the filename of the given object."""
- name = getattr(obj, 'name', None)
- if name and name[0] != '<' and name[-1] != '>':
- return os.path.basename(name)
-
-
-def from_key_val_list(value):
- """Take an object and test to see if it can be represented as a
- dictionary. Unless it can not be represented as such, return an
- OrderedDict, e.g.,
-
- ::
-
- >>> from_key_val_list([('key', 'val')])
- OrderedDict([('key', 'val')])
- >>> from_key_val_list('string')
- ValueError: need more than 1 value to unpack
- >>> from_key_val_list({'key': 'val'})
- OrderedDict([('key', 'val')])
- """
- if value is None:
- return None
-
- if isinstance(value, (str, bytes, bool, int)):
- raise ValueError('cannot encode objects that are not 2-tuples')
-
- return OrderedDict(value)
-
-
-def to_key_val_list(value):
- """Take an object and test to see if it can be represented as a
- dictionary. If it can be, return a list of tuples, e.g.,
-
- ::
-
- >>> to_key_val_list([('key', 'val')])
- [('key', 'val')]
- >>> to_key_val_list({'key': 'val'})
- [('key', 'val')]
- >>> to_key_val_list('string')
- ValueError: cannot encode objects that are not 2-tuples.
- """
- if value is None:
- return None
-
- if isinstance(value, (str, bytes, bool, int)):
- raise ValueError('cannot encode objects that are not 2-tuples')
-
- if isinstance(value, collections.Mapping):
- value = value.items()
-
- return list(value)
-
-
-# From mitsuhiko/werkzeug (used with permission).
-def parse_list_header(value):
- """Parse lists as described by RFC 2068 Section 2.
-
- In particular, parse comma-separated lists where the elements of
- the list may include quoted-strings. A quoted-string could
- contain a comma. A non-quoted string could have quotes in the
- middle. Quotes are removed automatically after parsing.
-
- It basically works like :func:`parse_set_header` just that items
- may appear multiple times and case sensitivity is preserved.
-
- The return value is a standard :class:`list`:
-
- >>> parse_list_header('token, "quoted value"')
- ['token', 'quoted value']
-
- To create a header from the :class:`list` again, use the
- :func:`dump_header` function.
-
- :param value: a string with a list header.
- :return: :class:`list`
- """
- result = []
- for item in _parse_list_header(value):
- if item[:1] == item[-1:] == '"':
- item = unquote_header_value(item[1:-1])
- result.append(item)
- return result
-
-
-# From mitsuhiko/werkzeug (used with permission).
-def parse_dict_header(value):
- """Parse lists of key, value pairs as described by RFC 2068 Section 2 and
- convert them into a python dict:
-
- >>> d = parse_dict_header('foo="is a fish", bar="as well"')
- >>> type(d) is dict
- True
- >>> sorted(d.items())
- [('bar', 'as well'), ('foo', 'is a fish')]
-
- If there is no value for a key it will be `None`:
-
- >>> parse_dict_header('key_without_value')
- {'key_without_value': None}
-
- To create a header from the :class:`dict` again, use the
- :func:`dump_header` function.
-
- :param value: a string with a dict header.
- :return: :class:`dict`
- """
- result = {}
- for item in _parse_list_header(value):
- if '=' not in item:
- result[item] = None
- continue
- name, value = item.split('=', 1)
- if value[:1] == value[-1:] == '"':
- value = unquote_header_value(value[1:-1])
- result[name] = value
- return result
-
-
-# From mitsuhiko/werkzeug (used with permission).
-def unquote_header_value(value, is_filename=False):
- r"""Unquotes a header value. (Reversal of :func:`quote_header_value`).
- This does not use the real unquoting but what browsers are actually
- using for quoting.
-
- :param value: the header value to unquote.
- """
- if value and value[0] == value[-1] == '"':
- # this is not the real unquoting, but fixing this so that the
- # RFC is met will result in bugs with internet explorer and
- # probably some other browsers as well. IE for example is
- # uploading files with "C:\foo\bar.txt" as filename
- value = value[1:-1]
-
- # if this is a filename and the starting characters look like
- # a UNC path, then just return the value without quotes. Using the
- # replace sequence below on a UNC path has the effect of turning
- # the leading double slash into a single slash and then
- # _fix_ie_filename() doesn't work correctly. See #458.
- if not is_filename or value[:2] != '\\\\':
- return value.replace('\\\\', '\\').replace('\\"', '"')
- return value
-
-
-def dict_from_cookiejar(cj):
- """Returns a key/value dictionary from a CookieJar.
-
- :param cj: CookieJar object to extract cookies from.
- """
-
- cookie_dict = {}
-
- for cookie in cj:
- cookie_dict[cookie.name] = cookie.value
-
- return cookie_dict
-
-
-def add_dict_to_cookiejar(cj, cookie_dict):
- """Returns a CookieJar from a key/value dictionary.
-
- :param cj: CookieJar to insert cookies into.
- :param cookie_dict: Dict of key/values to insert into CookieJar.
- """
-
- cj2 = cookiejar_from_dict(cookie_dict)
- cj.update(cj2)
- return cj
-
-
-def get_encodings_from_content(content):
- """Returns encodings from given content string.
-
- :param content: bytestring to extract encodings from.
- """
-
- charset_re = re.compile(r']', flags=re.I)
- pragma_re = re.compile(r']', flags=re.I)
- xml_re = re.compile(r'^<\?xml.*?encoding=["\']*(.+?)["\'>]')
-
- return (charset_re.findall(content) +
- pragma_re.findall(content) +
- xml_re.findall(content))
-
-
-def get_encoding_from_headers(headers):
- """Returns encodings from given HTTP Header Dict.
-
- :param headers: dictionary to extract encoding from.
- """
-
- content_type = headers.get('content-type')
-
- if not content_type:
- return None
-
- content_type, params = cgi.parse_header(content_type)
-
- if 'charset' in params:
- return params['charset'].strip("'\"")
-
- if 'text' in content_type:
- return 'ISO-8859-1'
-
-
-def stream_decode_response_unicode(iterator, r):
- """Stream decodes a iterator."""
-
- if r.encoding is None:
- for item in iterator:
- yield item
- return
-
- decoder = codecs.getincrementaldecoder(r.encoding)(errors='replace')
- for chunk in iterator:
- rv = decoder.decode(chunk)
- if rv:
- yield rv
- rv = decoder.decode('', final=True)
- if rv:
- yield rv
-
-
-def iter_slices(string, slice_length):
- """Iterate over slices of a string."""
- pos = 0
- while pos < len(string):
- yield string[pos:pos + slice_length]
- pos += slice_length
-
-
-def get_unicode_from_response(r):
- """Returns the requested content back in unicode.
-
- :param r: Response object to get unicode content from.
-
- Tried:
-
- 1. charset from content-type
- 2. fall back and replace all unicode characters
-
- """
-
- tried_encodings = []
-
- # Try charset from content-type
- encoding = get_encoding_from_headers(r.headers)
-
- if encoding:
- try:
- return str(r.content, encoding)
- except UnicodeError:
- tried_encodings.append(encoding)
-
- # Fall back:
- try:
- return str(r.content, encoding, errors='replace')
- except TypeError:
- return r.content
-
-
-# The unreserved URI characters (RFC 3986)
-UNRESERVED_SET = frozenset(
- "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
- + "0123456789-._~")
-
-
-def unquote_unreserved(uri):
- """Un-escape any percent-escape sequences in a URI that are unreserved
- characters. This leaves all reserved, illegal and non-ASCII bytes encoded.
- """
- parts = uri.split('%')
- for i in range(1, len(parts)):
- h = parts[i][0:2]
- if len(h) == 2 and h.isalnum():
- try:
- c = chr(int(h, 16))
- except ValueError:
- raise InvalidURL("Invalid percent-escape sequence: '%s'" % h)
-
- if c in UNRESERVED_SET:
- parts[i] = c + parts[i][2:]
- else:
- parts[i] = '%' + parts[i]
- else:
- parts[i] = '%' + parts[i]
- return ''.join(parts)
-
-
-def requote_uri(uri):
- """Re-quote the given URI.
-
- This function passes the given URI through an unquote/quote cycle to
- ensure that it is fully and consistently quoted.
- """
- # Unquote only the unreserved characters
- # Then quote only illegal characters (do not quote reserved, unreserved,
- # or '%')
- return quote(unquote_unreserved(uri), safe="!#$%&'()*+,/:;=?@[]~")
-
-
-def address_in_network(ip, net):
- """
- This function allows you to check if on IP belongs to a network subnet
- Example: returns True if ip = 192.168.1.1 and net = 192.168.1.0/24
- returns False if ip = 192.168.1.1 and net = 192.168.100.0/24
- """
- ipaddr = struct.unpack('=L', socket.inet_aton(ip))[0]
- netaddr, bits = net.split('/')
- netmask = struct.unpack('=L', socket.inet_aton(dotted_netmask(int(bits))))[0]
- network = struct.unpack('=L', socket.inet_aton(netaddr))[0] & netmask
- return (ipaddr & netmask) == (network & netmask)
-
-
-def dotted_netmask(mask):
- """
- Converts mask from /xx format to xxx.xxx.xxx.xxx
- Example: if mask is 24 function returns 255.255.255.0
- """
- bits = 0xffffffff ^ (1 << 32 - mask) - 1
- return socket.inet_ntoa(struct.pack('>I', bits))
-
-
-def is_ipv4_address(string_ip):
- try:
- socket.inet_aton(string_ip)
- except socket.error:
- return False
- return True
-
-
-def is_valid_cidr(string_network):
- """Very simple check of the cidr format in no_proxy variable"""
- if string_network.count('/') == 1:
- try:
- mask = int(string_network.split('/')[1])
- except ValueError:
- return False
-
- if mask < 1 or mask > 32:
- return False
-
- try:
- socket.inet_aton(string_network.split('/')[0])
- except socket.error:
- return False
- else:
- return False
- return True
-
-
-def should_bypass_proxies(url):
- """
- Returns whether we should bypass proxies or not.
- """
- get_proxy = lambda k: os.environ.get(k) or os.environ.get(k.upper())
-
- # First check whether no_proxy is defined. If it is, check that the URL
- # we're getting isn't in the no_proxy list.
- no_proxy = get_proxy('no_proxy')
- netloc = urlparse(url).netloc
-
- if no_proxy:
- # We need to check whether we match here. We need to see if we match
- # the end of the netloc, both with and without the port.
- no_proxy = no_proxy.replace(' ', '').split(',')
-
- ip = netloc.split(':')[0]
- if is_ipv4_address(ip):
- for proxy_ip in no_proxy:
- if is_valid_cidr(proxy_ip):
- if address_in_network(ip, proxy_ip):
- return True
- else:
- for host in no_proxy:
- if netloc.endswith(host) or netloc.split(':')[0].endswith(host):
- # The URL does match something in no_proxy, so we don't want
- # to apply the proxies on this URL.
- return True
-
- # If the system proxy settings indicate that this URL should be bypassed,
- # don't proxy.
- # The proxy_bypass function is incredibly buggy on OS X in early versions
- # of Python 2.6, so allow this call to fail. Only catch the specific
- # exceptions we've seen, though: this call failing in other ways can reveal
- # legitimate problems.
- try:
- bypass = proxy_bypass(netloc)
- except (TypeError, socket.gaierror):
- bypass = False
-
- if bypass:
- return True
-
- return False
-
-def get_environ_proxies(url):
- """Return a dict of environment proxies."""
- if should_bypass_proxies(url):
- return {}
- else:
- return getproxies()
-
-
-def default_user_agent(name="python-requests"):
- """Return a string representing the default user agent."""
- _implementation = platform.python_implementation()
-
- if _implementation == 'CPython':
- _implementation_version = platform.python_version()
- elif _implementation == 'PyPy':
- _implementation_version = '%s.%s.%s' % (sys.pypy_version_info.major,
- sys.pypy_version_info.minor,
- sys.pypy_version_info.micro)
- if sys.pypy_version_info.releaselevel != 'final':
- _implementation_version = ''.join([_implementation_version, sys.pypy_version_info.releaselevel])
- elif _implementation == 'Jython':
- _implementation_version = platform.python_version() # Complete Guess
- elif _implementation == 'IronPython':
- _implementation_version = platform.python_version() # Complete Guess
- else:
- _implementation_version = 'Unknown'
-
- try:
- p_system = platform.system()
- p_release = platform.release()
- except IOError:
- p_system = 'Unknown'
- p_release = 'Unknown'
-
- return " ".join(['%s/%s' % (name, __version__),
- '%s/%s' % (_implementation, _implementation_version),
- '%s/%s' % (p_system, p_release)])
-
-
-def default_headers():
- return CaseInsensitiveDict({
- 'User-Agent': default_user_agent(),
- 'Accept-Encoding': ', '.join(('gzip', 'deflate')),
- 'Accept': '*/*',
- 'Connection': 'keep-alive',
- })
-
-
-def parse_header_links(value):
- """Return a dict of parsed link headers proxies.
-
- i.e. Link: ; rel=front; type="image/jpeg",; rel=back;type="image/jpeg"
-
- """
-
- links = []
-
- replace_chars = " '\""
-
- for val in value.split(","):
- try:
- url, params = val.split(";", 1)
- except ValueError:
- url, params = val, ''
-
- link = {}
-
- link["url"] = url.strip("<> '\"")
-
- for param in params.split(";"):
- try:
- key, value = param.split("=")
- except ValueError:
- break
-
- link[key.strip(replace_chars)] = value.strip(replace_chars)
-
- links.append(link)
-
- return links
-
-
-# Null bytes; no need to recreate these on each call to guess_json_utf
-_null = '\x00'.encode('ascii') # encoding to ASCII for Python 3
-_null2 = _null * 2
-_null3 = _null * 3
-
-
-def guess_json_utf(data):
- # JSON always starts with two ASCII characters, so detection is as
- # easy as counting the nulls and from their location and count
- # determine the encoding. Also detect a BOM, if present.
- sample = data[:4]
- if sample in (codecs.BOM_UTF32_LE, codecs.BOM32_BE):
- return 'utf-32' # BOM included
- if sample[:3] == codecs.BOM_UTF8:
- return 'utf-8-sig' # BOM included, MS style (discouraged)
- if sample[:2] in (codecs.BOM_UTF16_LE, codecs.BOM_UTF16_BE):
- return 'utf-16' # BOM included
- nullcount = sample.count(_null)
- if nullcount == 0:
- return 'utf-8'
- if nullcount == 2:
- if sample[::2] == _null2: # 1st and 3rd are null
- return 'utf-16-be'
- if sample[1::2] == _null2: # 2nd and 4th are null
- return 'utf-16-le'
- # Did not detect 2 valid UTF-16 ascii-range characters
- if nullcount == 3:
- if sample[:3] == _null3:
- return 'utf-32-be'
- if sample[1:] == _null3:
- return 'utf-32-le'
- # Did not detect a valid UTF-32 ascii-range character
- return None
-
-
-def prepend_scheme_if_needed(url, new_scheme):
- '''Given a URL that may or may not have a scheme, prepend the given scheme.
- Does not replace a present scheme with the one provided as an argument.'''
- scheme, netloc, path, params, query, fragment = urlparse(url, new_scheme)
-
- # urlparse is a finicky beast, and sometimes decides that there isn't a
- # netloc present. Assume that it's being over-cautious, and switch netloc
- # and path if urlparse decided there was no netloc.
- if not netloc:
- netloc, path = path, netloc
-
- return urlunparse((scheme, netloc, path, params, query, fragment))
-
-
-def get_auth_from_url(url):
- """Given a url with authentication components, extract them into a tuple of
- username,password."""
- parsed = urlparse(url)
-
- try:
- auth = (unquote(parsed.username), unquote(parsed.password))
- except (AttributeError, TypeError):
- auth = ('', '')
-
- return auth
-
-
-def to_native_string(string, encoding='ascii'):
- """
- Given a string object, regardless of type, returns a representation of that
- string in the native string type, encoding and decoding where necessary.
- This assumes ASCII unless told otherwise.
- """
- out = None
-
- if isinstance(string, builtin_str):
- out = string
- else:
- if is_py2:
- out = string.encode(encoding)
- else:
- out = string.decode(encoding)
-
- return out
-
-
-def urldefragauth(url):
- """
- Given a url remove the fragment and the authentication part
- """
- scheme, netloc, path, params, query, fragment = urlparse(url)
-
- # see func:`prepend_scheme_if_needed`
- if not netloc:
- netloc, path = path, netloc
-
- netloc = netloc.rsplit('@', 1)[-1]
-
- return urlunparse((scheme, netloc, path, params, query, ''))
diff --git a/script/_Lib/startup.groovy b/script/_Lib/startup.groovy
deleted file mode 100644
index 6bcea1a..0000000
--- a/script/_Lib/startup.groovy
+++ /dev/null
@@ -1,1422 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// Global definitions and built-in functions
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-import java.lang.Class as Class
-import java.lang.Object as Object
-import java.beans.PropertyChangeListener
-import java.util.concurrent.Callable
-import java.util.List
-import java.util.Map
-import java.lang.reflect.Array
-
-import ch.psi.utils.Threading as Threading
-import ch.psi.utils.State as State
-import ch.psi.utils.Convert as Convert
-import ch.psi.pshell.core.Context
-import ch.psi.pshell.data.PlotDescriptor as PlotDescriptor
-import ch.psi.pshell.device.Device as Device
-import ch.psi.pshell.device.DeviceBase as DeviceBase
-import ch.psi.pshell.device.Interlock as Interlock
-import ch.psi.pshell.device.Readable as Readable
-import ch.psi.pshell.device.Readable.ReadableArray as ReadableArray
-import ch.psi.pshell.device.Readable.ReadableMatrix as ReadableMatrix
-import ch.psi.pshell.device.Writable as Writable
-import ch.psi.pshell.device.DeviceListener as DeviceListener
-import ch.psi.pshell.device.MoveMode as MoveMode
-import ch.psi.pshell.epics.Epics as Epics
-import ch.psi.pshell.epics.EpicsScan as EpicsScan
-import ch.psi.pshell.imaging.Source as Source
-import ch.psi.pshell.imaging.SourceBase as SourceBase
-import ch.psi.pshell.plot.LinePlotSeries as LinePlotSeries
-import ch.psi.pshell.plot.MatrixPlotSeries as MatrixPlotSeries
-import ch.psi.pshell.scan.LineScan
-import ch.psi.pshell.scan.ContinuousScan
-import ch.psi.pshell.scan.AreaScan
-import ch.psi.pshell.scan.VectorScan
-import ch.psi.pshell.scan.ManualScan
-import ch.psi.pshell.scan.RegionScan
-import ch.psi.pshell.scan.HardwareScan
-import ch.psi.pshell.scan.ScanRecord
-import ch.psi.pshell.scan.TimeScan
-import ch.psi.pshell.bs.BsScan
-import ch.psi.pshell.bs.Stream
-import ch.psi.pshell.scripting.ViewPreference as Preference
-import ch.psi.pshell.scripting.ScriptUtils as ScriptUtils
-
-
-def get_context(){
- return ch.psi.pshell.core.Context.getInstance();
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// Type conversion and checking
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-def get_rank(obj){
- def rank = 0;
-
- while (obj != null) {
- Class type = obj.getClass();
- if (type.isArray()){
- while (type.isArray()) {
- rank++;
- type = type.getComponentType();
- }
- return rank
- } else if (obj instanceof List){
- while (obj instanceof List){
- rank++;
- if (((List)obj).size() == 0) return rank;
- obj = obj.get(0);
- }
- } else {
- break;
- }
- }
-
- return rank;
-}
-
-def get_length(obj){
- if (obj == null) return 0
- if (obj instanceof List) return obj.size()
- if (obj.getClass().isArray()) return obj.length
- return 1
-}
-
-def to_array(obj, type){
- if (obj==null) {
- return null;
- }
-
- def rank = get_rank(obj);
- if (rank == 0) {
- rank = 1;
- obj = [obj]
- }
- def size = get_length(obj)
- //Custom class
- if (!ScriptUtils.isStandardType(type)) {
- def ret = java.lang.reflect.Array.newInstance(java.lang.Class.forName(type), size)
- for (def i = 0; i < size; i++) {
- ret[i] = obj[i]
- }
- return ret;
- }
- def name = ScriptUtils.getType(type).getName()
- if (type[0] != "[") {
- def array_type = "[" + type;
- name = ScriptUtils.getType(array_type).getName()
- for (def i = 1; i < rank; i++) {
- name = "[" + name;
- }
- }
- def ret
- switch(name) {
- case "[B": ret = new byte[size] ; break
- case "[S": ret = new short[size] ; break
- case "[I": ret = new int[size] ; break
- case "[J": ret = new long[size] ; break
- case "[C": ret = new char[size] ; break
- case "[F": ret = new float[size] ; break
- case "[D": ret = new double[size] ; break
- default:
- ret = java.lang.reflect.Array.newInstance(java.lang.Class.forName( name [1..-1]), size)//Remove first array marker because Array.newInstance will create an array of type
- }
-
- for (def i = 0; i < size; i++) {
- if (obj[i] instanceof List || obj[i].getClass().isArray()){
- ret[i] = to_array(obj[i],type)
- } else {
- ret[i] = obj[i]
- }
- }
- return ret
-}
-
-def to_list(array){
- return Arrays.asList(array)
-}
-//
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// Standard scan commands
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-def lscan(writables, readables, start, end, steps, latency=0.0, relative=false, passes=1, zigzag =false, Closure before_read=null, Closure after_read=null, title=null) {
- /*
- Line Scan: positioners change together, linearly from start to end positions.
-
- Args:
- writables(list of Writable): Positioners set on each step.
- readables(list of Readable): Sensors to be sampled on each step.
- start(list of float): start positions of writables.
- end(list of float): final positions of writables.
- steps(int or float or list of float): number of scan steps (int) or step size (float).
- relative (bool, optional): if true, start and end positions are relative to
- current at start of the scan
- latency(float, optional): sleep time in each step before readout, defaults to 0.0.
- passes(int, optional): number of passes
- zigzag(bool, optional): if true writables invert direction on each pass.
- before_read (function): callback on each step, before each readout. Callback may have as
- optional parameters list of positions.
- after_read (function): callback on each step, after each readout. Callback may have as
- optional parameters a ScanRecord object.
- title(str, optional): plotting window name.
-
- Returns:
- ScanResult object.
- */
- def int latency_ms = latency * 1000
- writables = to_array(string_to_obj(writables), "ch.psi.pshell.device.Writable")
- readables = to_array(string_to_obj(readables), "ch.psi.pshell.device.Readable")
- start = to_array(start, 'd')
- end = to_array(end, 'd')
- steps = get_rank(steps)>0 ? to_array(steps, steps[0].getClass()==java.lang.Integer ? 'i' : 'd') : (int)steps
- def scan = new LineScan(writables, readables, start, end, steps, relative, (int)latency_ms, passes, zigzag) {
- protected void onBeforeReadout(double[] pos) {
- if (before_read!=null) before_read(pos)
- }
- protected void onAfterReadout(ScanRecord record) {
- if (after_read!=null) after_read(record)
- }
- }
- scan.setPlotTitle(title)
- scan.start()
- return scan.getResult()
-}
-
-def vscan(writables, readables, vector, line, latency=0.0, relative=false, passes=1, zigzag=false, Closure before_read=null, Closure after_read=null, title=null) {
- /*
- Vector Scan: positioners change following values provided in a vector.
-
- Args:
- writables(list of Writable): Positioners set on each step.
- readables(list of Readable): Sensors to be sampled on each step.
- vector(list of list of float): table of positioner values.
- line (bool, optional): if true, processs as line scan (1d)
- relative (bool, optional): if true, start and end positions are relative to current at
- start of the scan
- latency(float, optional): sleep time in each step before readout, defaults to 0.0.
- passes(int, optional): number of passes
- zigzag(bool, optional): if true writables invert direction on each pass.
- before_read (function): callback on each step, before each readout.
- after_read (function): callback on each step, after each readout.
- title(str, optional): plotting window name.
-
- Returns:
- ScanResult object.
- */
- def int latency_ms = latency * 1000
- writables = to_array(string_to_obj(writables), "ch.psi.pshell.device.Writable")
- readables = to_array(string_to_obj(readables), "ch.psi.pshell.device.Readable")
- if (get_length(vector) == 0)
- vector.append([])
- vector = to_array(vector, 'd')
- def scan = new VectorScan(writables, readables, vector, line, relative, (int)latency_ms, passes, zigzag) {
- protected void onBeforeReadout(double[] pos) {
- if (before_read!=null) before_read(pos)
- }
- protected void onAfterReadout(ScanRecord record) {
- if (after_read!=null) after_read(record)
- }
- }
- scan.setPlotTitle(title)
- scan.start()
- return scan.getResult()
-}
-
-def ascan(writables, readables, start, end, steps, latency=0.0, relative=false, passes=1, zigzag=false, Closure before_read=null, Closure after_read=null, title=null) {
- /*
- Area Scan: multi-dimentional scan, each positioner is a dimention.
-
- Args:
- writables(list of Writable): Positioners set on each step.
- readables(list of Readable): Sensors to be sampled on each step.
- start(list of float): start positions of writables.
- end(list of float): final positions of writables.
- steps(list of int or list of float): number of scan steps (int) or step size (float).
- relative (bool, optional): if true, start and end positions are relative to current at
- start of the scan
- latency(float, optional): sleep time in each step before readout, defaults to 0.0.
- passes(int, optional): number of passes
- zigzag (bool, optional): if true writables invert direction on each row.
- before_read (function): callback on each step, before each readout.
- after_read (function): callback on each step, after each readout.
- title(str, optional): plotting window name.
-
- Returns:
- ScanResult object.
- */
-
- def int latency_ms = latency * 1000
- writables = to_array(string_to_obj(writables), "ch.psi.pshell.device.Writable")
- readables = to_array(string_to_obj(readables), "ch.psi.pshell.device.Readable")
- start = to_array(start, 'd')
- end = to_array(end, 'd')
- steps = to_array(steps, steps[0].getClass()==java.lang.Integer ? 'i' : 'd')
-
- def scan = new AreaScan(writables, readables, start, end, steps, relative, (int)latency_ms, passes, zigzag) {
- protected void onBeforeReadout(double[] pos) {
- if (before_read!=null) before_read(pos)
- }
- protected void onAfterReadout(ScanRecord record) {
- if (after_read!=null) after_read(record)
- }
- }
-
- scan.setPlotTitle(title)
- scan.start()
- return scan.getResult()
-}
-
-def rscan(writable, readables, regions, latency=0.0, relative=false, passes=1, zigzag=false, Closure before_read=null, Closure after_read=null, title=null){
- /*
- Region Scan: positioner scanned linearly, from start to end positions, in multiple regions.
-
- Args:
- writable(Writable): Positioner set on each step, for each region.
- readables(list of Readable): Sensors to be sampled on each step.
- regions (list of tuples (float,floar, int) or (float,floar, float)): each tuple define a scan region
- (start, stop, steps) or (start, stop, step_size)
- relative (bool, optional): if true, start and end positions are relative to
- current at start of the scan
- latency(float, optional): settling time for each step before readout, defaults to 0.0.
- passes(int, optional): number of passes
- zigzag(bool, optional): if true writable invert direction on each pass.
- before_read (function): callback on each step, before each readout. Callback may have as
- optional parameters list of positions.
- after_read (function): callback on each step, after each readout. Callback may have as
- optional parameters a ScanRecord object.
- title(str, optional): plotting window name.
-
- Returns:
- ScanResult object.
- */
-
- def int latency_ms = latency * 1000
- writable = string_to_obj(writable)
- readables = to_array(string_to_obj(readables), "ch.psi.pshell.device.Readable")
- start=[]
- end=[]
- steps=[]
- for (def region in regions) {
- start.add(region[0])
- end.add(region[1])
- steps.add(region[2])
- }
- start = to_array(start, 'd')
- end = to_array(end, 'd')
- steps = to_array(steps, steps[0].getClass()==java.lang.Integer ? 'i' : 'd')
-
- def scan = new RegionScan(writable, readables, start, end, steps, relative, (int)latency_ms, passes, zigzag) {
- protected void onBeforeReadout(double[] pos) {
- if (before_read!=null) before_read(pos)
- }
- protected void onAfterReadout(ScanRecord record) {
- if (after_read!=null) after_read(record)
- }
- }
- scan.setPlotTitle(title)
- scan.start()
- return scan.getResult()
- }
-
-
-def cscan(writables, readables, start, end, steps,latency=0.0, time=null, relative=false, passes=1, zigzag=false, Closure before_read=null, Closure after_read=null, title=null) {
- /*
- Continuous Scan: positioner change continuously from start to end position and readables are sampled on the fly.
-
- Args:
- writablse(Speedable or list of Motor): A positioner with a getSpeed method or
- a list of motors.
- readables(list of Readable): Sensors to be sampled on each step.
- start(float or list of float): start positions of writables.
- end(float or list of float): final positions of writabless.
- steps(int or float or list of float): number of scan steps (int) or step size (float).
- time = null
- time (float, seconds): if not null then writables is Motor array and speeds are
- set according to time.
- relative (bool, optional): if true, start and end positions are relative to
- current at start of the scan
- latency(float, optional): sleep time in each step before readout, defaults to 0.0.
- before_read (function): callback on each step, before each readout.
- Callback may have as optional parameters list of positions.
- after_read (function): callback on each step, after each readout.
- Callback may have as optional parameters a ScanRecord object.
- title(str, optional): plotting window name.
-
- Returns:
- ScanResult object.
-
- */
- def int latency_ms = latency * 1000
- writables = to_array(string_to_obj(writables), "ch.psi.pshell.device.Writable")
- readables = to_array(string_to_obj(readables), "ch.psi.pshell.device.Readable")
- start = to_array(start, 'd')
- end = to_array(end, 'd')
- if (get_rank(steps)>0){
- steps = to_array(steps, steps[0].getClass()==java.lang.Integer ? 'i' : 'd')
- } else {
- steps = to_array(steps, steps.getClass()==java.lang.Integer ? 'i' : 'd')
- }
- //A single Writable with fixed speed
- def scan
- if (time == null) {
- scan = new ContinuousScan(writables[0], readables, start[0], end[0], steps[0], relative, (int)latency_ms, passes, zigzag) {
- protected void onBeforeReadout(double[] pos) {
- if (before_read!=null) before_read(pos)
- }
- protected void onAfterReadout(ScanRecord record) {
- if (after_read!=null) after_read(record)
- }
- }
- }
- else {
- //A set of Writables with speed configurable
- scan = new ContinuousScan(writables, readables, start, end, steps, time, relative, (int)latency_ms, passes, zigzag) {
- protected void onBeforeReadout(double[] pos) {
- if (before_read!=null) before_read(pos)
- }
- protected void onAfterReadout(ScanRecord record) {
- if (after_read!=null) after_read(record)
- }
- }
- }
- scan.setPlotTitle(title)
- scan.start()
- return scan.getResult()
-}
-
-def hscan(config, writable, readables, start, end, steps, passes=1, zigzag=False, before_stream=None, after_stream=None, after_read=None, title=None) {
- /*
- Hardware Scan: values sampled by external hardware and received asynchronously.
-
- Args:
- config(dict): Configuration of the hardware scan. The "class" key provides the implementation class.
- Other keys are implementation specific.
- writable(Writable): A positioner appropriated to the hardware scan type.
- readables(list of Readable): Sensors appropriated to the hardware scan type.
- start(float): start positions of writable.
- end(float): final positions of writables.
- steps(int or float): number of scan steps (int) or step size (float).
- before_stream (function): callback before just before starting positioner move.
- after_stream (function): callback before just after stopping positioner move.
- after_read (function): callback on each readout.
- Callback may have as optional parameters a ScanRecord object.
- title(str, optional): plotting window name.
-
- Returns:
- ScanResult object.
-
- */
- writable = string_to_obj(writable)
- readables = to_array(string_to_obj(readables), "ch.psi.pshell.device.Readable")
- start = to_array(start, 'd')
- end = to_array(end, 'd')
- steps = to_array(steps, steps[0].getClass()==java.lang.Integer ? 'i' : 'd')
- scan = HardwareScan.newScan(config, writable,readables, start, end , steps, passes, zigzag);
- scan.setPlotTitle(title)
- scan.start()
- return scan.getResult()
-}
-
-def bscan(stream, records,Closure before_read=null, Closure after_read=null, title=null) {
- /*
- BS Scan: records all values in a beam synchronous stream.
-
- Args:
- stream(Stream): stream object
- records(int): number of records to store
- before_read (function): callback on each step, before each readout.
- Callback may have as optional parameters list of positions.
- after_read (function): callback on each step, after each readout.
- Callback may have as optional parameters a ScanRecord object.
- title(str, optional): plotting window name.
-
- Returns:
- ScanResult object.
-
- */
- stream = string_to_obj(stream)
- def scan = new BsScan(stream, (int)records) {
- protected void onBeforeReadout(double[] pos) {
- if (before_read!=null) before_read(pos)
- }
- protected void onAfterReadout(ScanRecord record) {
- if (after_read!=null) after_read(record)
- }
- }
- scan.setPlotTitle(title)
- scan.start()
- return scan.getResult()
-}
-
-def tscan(readables, points, interval, Closure before_read=null, Closure after_read=null, title=null) {
- /*
- Time Scan: sensors are sampled in fixed time intervals.
-
- Args:
- readables(list of Readable): Sensors to be sampled on each step.
- points(int): number of samples.
- interval(float): time interval between readouts.
- before_read (function): callback on each step, before each readout.
- after_read (function): callback on each step, after each readout.
- title(str, optional): plotting window name.
-
- Returns:
- ScanResult object.
- */
- if (interval>0){
- interval= Math.max(interval, 0.001) //Minimum temporization is 1ms
- }
- def int latency_ms = interval * 1000
- readables = to_array(string_to_obj(readables), "ch.psi.pshell.device.Readable")
- def scan = new TimeScan(readables, points, latency_ms) {
- protected void onBeforeReadout(double[] pos) {
- if (before_read!=null) before_read(pos)
- }
- protected void onAfterReadout(ScanRecord record) {
- if (after_read!=null) after_read(record)
- }
- }
- scan.setPlotTitle(title)
- scan.start()
- return scan.getResult()
-
-}
-
-def escan(name, title=null) {
- /*
- Epics Scan: execute an Epics Scan Record.
- Args:
- name(str): Name of scan record.
- title(str, optional): plotting window name.
-
- Returns:
- ScanResult object.
- */
- def scan = new EpicsScan(name)
- scan.setPlotTitle(title)
- scan.start()
- return scan.getResult()
-}
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// Data Plotting
-///////////////////////////////////////////////////////////////////////////////////////////////////
-def plot(data, name= null, xdata= null, ydata= null, title=null) {
- /*Request one or multiple plots of user data (1d, 2d or 3d)
-
- Args:
- data: array or list of values. For multiple plots, array of arrays or lists of values.
- name(str or list of str, optional): Plot name or list of names (if multiple plots).
- xdata: array or list of values. For multiple plots, array of arrays or lists of values.
- ydata: array or list of values. For multiple plots, array of arrays or lists of values.
- title(str, optional): plotting window name.
-
- Returns:
- ArrayList of Plot objects.
-
- */
-
- if (name != null) {
- if (get_length(name) == 0) {
- name = null
- } else {
- if (data==null) {
- data = []
- for (def n in name) data.add([])
- }
- }
- def plots = new PlotDescriptor[get_length(data)]
- for (def i = 0; i < get_length(data); i++) {
- def plotName = name ? name[i] : null
- def x = xdata
- if (get_length(x)>0) {
- x = x[i]
- }
- def y = ydata
- if (get_length(y)>0) {
- y = y[i];
- }
- plots[i] = new PlotDescriptor(plotName, to_array(data[i], 'd'), to_array(x, 'd'), to_array(y, 'd'));
- }
- return get_context().plot(plots, title);
- } else {
- def plot = new PlotDescriptor(name, to_array(data, 'd'), to_array(xdata, 'd'), to_array(ydata, 'd'));
- return get_context().plot(plot, title);
- }
-}
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// Data file access
-///////////////////////////////////////////////////////////////////////////////////////////////////
-def load_data(path, page=0) {
- /*
- Read data from the current persistence context or from data files.
-
- Args:
- path(str): Path to group or dataset relative to the persistence context root.
- If in the format 'root|path' then read from path given by 'root'.
- page(int, optional): Data page (used for 3D datasets)
- Returns:
- Data array
-
- */
- def slice = get_context().dataManager.getData(path, page)
- return slice.sliceData
-}
-
-def get_attributes(path) {
- /*
- Get the attributes from the current persistence context or from data files.
-
- Args:
- path(str): Path to group or dataset relative to the current persistence context root.
- If in the format 'root|path' then read from path given by 'root'.
- Returns:
- Dictionary
-
- */
- return get_context().dataManager.getAttributes(path)
-}
-
-def save_dataset(path, data) {
- /*
- Save data into a dataset within the current persistence context.
-
- Args:
- path(str): Path to dataset relative to the current persistence context root.
- data (array or list): data to be saved
- Returns:
- Dictionary
-
- */
- get_context().dataManager.setDataset(path, to_array(data, 'd'))
-}
-
-def create_dataset(path, type, unsigned=false, dimensions=null) {
- /*
- Create an empty dataset within the current persistence context.
-
- Args:
- path(str): Path to dataset relative to the current persistence context root.
- type(str): array type 'b' = byte, 'h' = short, 'i' = int, 'l' = long, 'f' = float,
- 'd' = double, 'c' = char, 's' = String, 'o' = Object
- unsigned(boolean, optional): create a dataset of unsigned type.
- dimensions(tuple of int, optional): a 0 value means variable length in that dimension.
- Returns:
- null
-
- */
- get_context().dataManager.createDataset(path, ScriptUtils.getType(type), unsigned, dimensions)
-}
-
-def create_table(path, names, types=null, lengths=null) {
- /*
- Create an empty table (dataset of compound type) within the current persistence context.
-
- Args:
- path(str): Path to dataset relative to the current persistence context root.
- names(list of strings): name of each column
- types(array of str): 'b' = byte, 'h' = short, 'i' = int, 'l' = long, 'f' = float,
- 'd' = double, 'c' = char, 's' = String, 'o' = Object
- Note:A '[' prefix on type name indicates an array type.
- lengths(list of int): the array length for each columns(0 for scalar types).
- Returns:
- null
-
- */
- if (types != null) {
- for (i = 0; i < types.length; i++)
- types[i] = ScriptUtils.getType(types[i])
- }
- get_context().dataManager.createDataset(path, names, types, lengths)
-}
-
-def append_dataset(path, data, index=null) {
- /*
- Append data to dataset.
-
- Args:
- path(str): Path to dataset relative to the current persistence context root.
- data(number or array or list): name of each column.
- index(int, optional): if set then add the data in a specific position in the dataset.
- Returns:
- null
-
- */
- data = to_array(data, 'd')
- if (index == null)
- get_context().dataManager.appendItem(path, data);
- else
- get_context().dataManager.setItem(path, data, index);
-}
-
-def append_table(path, data) {
- /*
- Append data to a table (dataset of compound type)
-
- Args:
- path(str): Path to dataset relative to the current persistence context root.
- data(list): List of valus for each column of the table. Array types can be expressed as lists.
- Returns:
- null
-
- */
- get_context().dataManager.appendItem(path, data)
-}
-
-def flush_data() {
- /*
- Flush all data files immediately.
- Args:
- null
- Returns:
- null
- */
- get_context().dataManager.flush()
-}
-
-def set_attribute(path, name, value, unsigned=false) {
- /*
- Set an attribute to a group or dataset.
-
- Args:
- path(str): Path to dataset relative to the current persistence context root.
- name(str): name of the atttribute
- value(Object): the attribute value
- unsigned(bool, optional): if applies, indicate if value is unsigned.
- Returns:
- null
- */
- if (value.getClass()==java.math.BigDecimal){
- value = value.toDouble();
- }
- get_context().dataManager.setAttribute(path, name, value, unsigned)
-}
-
-def log(log){
- /*
- Writes a log to the automatic data saving context - only if there is an ongoing scan or
- script execution.
-
- Args:
- log(str): Log string.
-
- Returns:
- None
- */
- get_context().scriptingLog(String.valueOf(log))
- get_context().dataManager.appendLog(String.valueOf(log))
-}
-
-def set_exec_pars(Map args){
- /*
- Configures the script execution parameters, overriding the system configuration.
-
- Args:
- args(dictionary). Keys:
- name(str, optional): value of the {name} tag. Default is the running script name
- (or "scan" in the case of a command line scan command.)
- type(str, optional): value of the {type} tag. Default is empty.
- This field can be used to store data in sub-folders of standard location.
- path(str, optional): If defined provides the full path name for data output root (overriding config))
- The tag {data} can be used to enter a path relative to the standard data folder.
- layout(str, optional): Overrides default data layout.
- depth_dim(int, optional): dimension of the depth for 2d-matrixes in 3d datasets.
- persist(bool, optional): Overrides the configuration option to auto save scan data.
- flush(bool, optional): Overrides the configuration option to flush file on each record.
- accumulate(bool, optional): Overrides the configuration option to release scan records.
- If false disable accumulation of scan records to scan result.
- preserve(bool, optional): Overrides the configuration option to preserve device types.
- If false all values are converted to double.
- open(bool, optional): If true opens data output root (instead of only doing in the first data access call)
- If false closes output root, if open.
- reset(bool, optional): If true reset the scan counter - the {count} tag and set the timestamp to now.
- group(str, optional): Overrides default layout group name for scans
- tag(str, optional): Overrides default tag for scan names (affecting group or dataset name, according to layout)
- defaults(bool, optional): If true restore the original execution parameters.
-
- Graphical preferences can also be set. Keys are equal to lowercase of Preference enum:
- "plot_disabled", "table_disabled", "enabled_plots", "plot_types", "print_scan", "auto_range",
- "manual_range","domain_axis", "status".
- See set_preference for more information.
-
- Shortcut entries: "line_plots": list of devices with enforced line plots.
- */
- get_context().setExecutionPars(args)
-}
-
-def get_exec_pars(){
- /*
- Returns script execution parameters.
-
- Returns:
- ExecutionContext object. Fields:
- name (str): execution name - {name} tag.
- type (str): execution type - {type} tag.
- path (str): output data root.
- open (bool): true if the output data root has been opened.
- layout (str): data output layout. If None then using the configuration.
- persist (bool): auto save scan data option.
- flush (bool): flush file on each record.
- index (int): current scan index.
- group (str): data group currently used for scan data storage.
- if no ongoing scan return "/" if within a script, or else None if a console command.
- scanPath (str): dataset or group corresponding to current scan.
- scan (Scan): reference to current scan, if any
- source (CommandSource): return the source of the script or command.
- args (obj): return the arguments for the script.
- background (bool): return False if executing in main interpreter thread .
- */
- return get_context().getExecutionPars()
-}
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// Epics Channels access
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-def caget(name, type=null, size = null) {
- /*
- Reads an Epics PV.
-
- Args:
- name(str): PV name
- type(str, optional): type of PV. By default gets the PV standard field type.
- Scalar values: 'b', 'i', 'l', 'd', 's'.
- Array: values: '[b', '[i,', '[l', '[d', '[s'.
- size (int, optional): for arrays, number of elements to be read. Default read all.
-
- Returns:
- PV value
-
- */
- return Epics.get(name, Epics.getChannelType(type), size)
-}
-
-def cawait(name, value, timeout=null, comparator = null, type=null, size = null) {
- /*
- Wait for a PV to have a given value.
-
- Args:
- name(str): PV name
- value (obj): value to compare to
- timeout(float, optional): time in seconds to wait. If None, waits forever.
- comparator(java.util.Comparator or float, optional): if None waits for equality.
- If a numeric value is provided, waits for channel to be in range.
- type(str, optional): type of PV. By default gets the PV standard field type.
- Scalar values: 'b', 'i', 'l', 'd', 's'.
- Array: values: '[b', '[i,', '[l', '[d', '[s'.
- size (int, optional): for arrays, number of elements to be read. Default read all.
-
- Returns:
- None
- */
- if (timeout!=null)
- timeout = timeout * 1000
- return Epics.waitValue(name, value, comparator, (int)timeout, Epics.getChannelType(type), size)
-}
-
-def caput(name, value, timeout=null) {
- /*
- Writes to an Epics PV.
-
- Args:
- name(str): PV name
- value(scalar, string or array): new PV value.
- timeout(int, optional): timeout in seconds to the write. If None waits forever to completion.
-
- Returns:
- None
- */
- if (timeout!=null)
- timeout = timeout * 1000
- return Epics.put(name, value, (int)timeout)
-}
-
-def caputq(name, value) {
- /*
- Writes to an Epics PV and does not wait.
-
- Args:
- name(str): PV name
- value(scalar, string or array): new PV value.
-
- Returns:
- None
- */
- return Epics.putq(name, value)
-}
-
-
-def create_channel(name, type = null, size = null) {
- if (type == null) type = null;
- return Epics.newChannel(name, Epics.getChannelType(type), size)
-}
-
-class Channel implements java.beans.PropertyChangeListener, Writable, Readable{
- final channel
- final callback
- Channel(name, type = null, size = null, Closure callback=null){
- /*
- Create an object that encapsulates an Epics PV connection.
- Args:
- name(str): value to be written
- type(str, optional): type of PV. By default gets the PV standard field type.
- Scalar values: 'b', 'i', 'l', 'd', 's'.
- Array: values: '[b', '[i,', '[l', '[d', '[s'.
- size(int, optional): the size of the channel
- callback(function, optional): The monitor callback.
- */
- this.channel = Epics.newChannel(name, Epics.getChannelType(type), size)
- this.callback = callback
- }
-
- def get_name(){
- /*
- Return the name of the channel.
- */
- return channel.name
- }
-
- def get_size(){
- /*
- Return the size of the channel.
- */
- return channel.size
- }
-
- def set_size(size){
- /*
- Set the size of the channel.
- */
- channel.size = size
- }
-
- def is_connected(){
- /*
- Return True if channel is connected.
- */
- return channel.connected
- }
-
- def is_monitored(){
- /*
- Return True if channel is monitored
- */
- return channel.monitored
- }
- def set_monitored(boolean value){
- /*
- Set a channel monitor to trigger the callback function defined in the constructor.
- */
- channel.monitored = value
- if (value)
- channel.addPropertyChangeListener(this);
- else
- channel.removePropertyChangeListener(this);
- }
- def void propertyChange(java.beans.PropertyChangeEvent pce){
- if ((callback != null) && (pce.getPropertyName() == "value")){
- callback(pce.getNewValue())
- }
- }
- def put(value, timeout=None){
- /*
- Write to channel and wait value change. In the case of a timeout throws a TimeoutException.
- Args:
- value(obj): value to be written
- timeout(float, optional): timeout in seconds. If none waits forever.
- */
- if (timeout==None)
- channel.setValue(value);
- else
- channel.setValueAsync(value).get((int)(timeout*1000), java.util.concurrent.TimeUnit.MILLISECONDS);
- }
-
- def putq(value){
- /*
- Write to channel and don't wait.
- */
- channel.setValueNoWait(value)
- }
-
- def get(){
- /*
- Get channel value.
- */
- return channel.getValue()
- }
-
- def wait_for_value(value, timeout=None, comparator=None){
- /*
- Wait channel to reach a value, using a given comparator. In the case of a timeout throws a TimeoutException.
- Args:
- value(obj): value to be verified.
- timeout(float, optional): timeout in seconds. If None waits forever.
- comparator (java.util.Comparator, optional). If None, uses Object.equals.
- */
- if (comparator == null){
- if (timeout == null)
- channel.waitForValue(value);
- else
- channel.waitForValue(value, (int)(timeout*1000));
- } else{
- if (timeout == null)
- channel.waitForValue(value, comparator);
- else
- channel.waitForValue(value, comparator, (int)(timeout*1000));
- }
- }
-
- def close(){
- /*
- Close the channel.
- */
- channel.destroy()
- }
- //Writable interface
- def void write(value){
- putq(value)
- }
- //Readable interface
- def read() {
- return get()
- }
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// Concurrent execution
-///////////////////////////////////////////////////////////////////////////////////////////////////
-def fork(Closure[] closures){
- """Start execution of functions in parallel.
-
- Args:
- *functions(function references)
-
- Returns:
- List of callable objects
- """
- //callables = []
- //for m in functions:
- // if is_list(m):
- // callables.append(Callable(m[0],*m[1]))
- // else:
- // callables.append(Callable(m))
- return Threading.fork(closures)
-}
-
-def join(futures){
- """Wait parallel execution of functions.
-
- Args:
- futures(list of Future) : as returned from fork
-
- Returns:
- None
- """
- try{
- return Threading.join(futures)
- } catch (java.util.concurrent.ExecutionException ex){
- throw ex.getCause()
- }
-}
-
-def parallelize(Closure[] closures){
- """Equivalent to fork + join
-
- Args:
- *functions(function references)
-
- Returns:
- None
- """
- futures = fork(closures)
- return join(futures)
-}
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// Script evaluation and Background task control.
-///////////////////////////////////////////////////////////////////////////////////////////////////
-Object run(script_name, args = null, locals = null) {
- /*
- Run script: can be absolute path, relative, or short name to be search in the path.
- Args:
- args(Dict ot List): Sets Sys.argv (if list) or gobal variables(if dict) to the script.
- locals(Dict): If not null sets the locals()for the runing script.
- If locals is used then script definitions will not go to global namespace.
-
- Returns:
- The script return value (if set with set_return)
- */
- get_context().scriptManager.evalFile(script_name)
-}
-
-def abort() {
- /*
- Abort the execution of ongoing task. It can be called from the script to quit.
-
- Args:
- None
-
- Returns:
- None
- */
- //Cannot be on script execution thread
- def task = {
- get_context().abort()
- }
-
- fork(task)
- return null
-}
-
-def start_task(script, delay = 0.0, interval = -1){
- /*
- Start a background task
-
- Args:
- script(str): Name of the script implementing the task
- delay(float, optional): time in seconds for the first execution.
- Default starts immediately.
- interval(float, optional): time in seconds for between execution.
- If negative (default), single-execution.
-
- Returns:
- None
- */
- def delay_ms = delay * 1000
- def interval_ms = (interval>=0) ? interval * 1000 : interval
- get_context().taskManager.create(script, (int)delay_ms, (int)interval_ms)
- get_context().taskManager.start(script)
-}
-
-def stop_task(script, force=false){
- /*
- Stop a background task
-
- Args:
- script(str): Name of the script implementing the task
- force(boolean, optional): interrupt current execution, if running
-
- Returns:
- None
- */
- get_context().taskManager.remove(script, force)
-}
-
-def set_return(value){
- /*
- Sets the script return value. This value is returned by the "run" function.
-
- Args:
- value(Object): script return value.
-
- Returns:
- None
- */
- if (is_interpreter_thread()){
- _=value
- }
- __THREAD_EXEC_RESULT__[Thread.currentThread()]=value //Used when running file
- return value //Used when parsing file
-}
-
-
-def is_interpreter_thread(){
- return Thread.currentThread().name == "Interpreter Thread"
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-//UI interaction
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-def set_status(status){
- /*
- Set the application status.
-
- Args:
- status(str): new status.
-
- Returns:
- None
- */
- set_preference(Preference.STATUS, status)
-}
-
-def set_preference(preference, value){
- /*
- Hints to graphical layer:
-
- Args:
- preference(Preference): Preference name
- Preference.SCAN_PLOT_DISABLED #enable/disable scan plot (True/False)
- Preference.SCAN_TABLE_DISABLED #enable/disable scan table (True/False)
- Preference.ENABLED_PLOTS #select Readables to be plotted (list of Readable or
- String (Readable names))
- Preference.PLOT_TYPES #Dictionary or (Readable or String):(String or int) pairs
- where the key is a plot name and the value is the desired plot type
- Preference.PRINT_SCAN #Print scan records to console
- Preference.AUTO_RANGE # Automatic range scan plots x-axis
- Preference.MANUAL_RANGE # Manually set scan plots x-axis
- Preference.DOMAIN_AXIS #Set the domain axis source: "Time", "Index", or a readable name.
- Default(None): first positioner
- Preference.STATUS # set application status
- value(object): preference value
-
- Returns:
- None
- */
- if (get_rank(value)>0){
- value = to_array(value, 'o')
- }
- get_context().setPreference(preference, value)
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// Versioning tools
-///////////////////////////////////////////////////////////////////////////////////////////////////
-def commit(message){
- /*
- Commit the changes to the repository. If manual commit is not configured then there is no need to call this function: commits are made as needed.
-
- Args:
- message(str): commit message
-
- Returns:
- None
- */
- get_context().commit(message)
-}
-
-def add_repository(path){
- /*
- Add file or folder to repository
-
- Args:
- path(str): relative path to the home folder.
-
- Returns:
- None
- */
- get_context().addRepository(path)
-}
-
-def diff(){
- /*
- Return list of changes in the repository
-
- Args:
- None
-
- Returns:
- None
- */
- return get_context().diff()
-}
-
-
-def checkout_tag(tag){
- /*
- Checkout a tag name.
-
- Args:
- tag(str): tag name.
-
- Returns:
- None
- */
- get_context().checkoutTag(tag)
-}
-
-def checkout_branch(tag){
- /*
- Checkout a local branch name.
-
- Args:
- tag(str): branch name.
-
- Returns:
- None
- */
- get_context().checkoutLocalBranch(tag)
-}
-
-def pull_repository(){
- /*
- Push to remote repository.
-
- Args:
- all_branches(boolean, optional): all branches or just current.
- force(boolean, optional): force flag.
-
- Returns:
- None
- */
- get_context().pullFromUpstream()
-}
-
-def push_repository(all_branches=true, force=false){
- /*
- Push to remote repository.
-
- Args:
- all_branches(boolean, optional): all branches or just current.
- force(boolean, optional): force flag.
-
- Returns:
- None
- */
- get_context().pushToUpstream(all_branches, force)
-}
-
-def cleanup_repository(){
- /*
- Performs a repository cleanup.
-
- Args:
- None
-
- Returns:
- None
- */
- get_context().cleanupRepository()
-}
-
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// Device Pool & Imaging setup
-///////////////////////////////////////////////////////////////////////////////////////////////////
-def get_device(device_name){
- /*
- Returns a configured device (or imaging source) by its name.
-
- Args:
- device_name(str): name of the device.
-
- Returns:
- device
- */
- return get_context().devicePool.getByName(device_name)
-}
-
-def add_device(device, force = false){
- /*
- Add a device (or imaging source) to the device pool.
-
- Args:
- device(Device or Source): device object.
- force(boolean, optional): if true then dispose existing device with same name.
- Otherwise will fail in case of name clash.
-
- Returns:
- True if device was added, false if was already in the pool, or exception in case of name clash.
- */
- if (get_context().devicePool.contains(device)){
- return false
- }
- if (force){
- dev = get_context().devicePool.getByName(device.getName())
- if (dev != null)
- remove_device(dev)
- }
- return get_context().devicePool.addDevice(device)
-}
-
-def remove_device(device){
- /*
- Remove a device (or imaging source) from the device pool.
-
- Args:
- device(Device or Source): device object.
-
- Returns:
- bool: true if device was removed.
-
- */
- return get_context().devicePool.removeDevice(device)
-}
-
-
-def set_device_alias(device, alias){
- /*
- Set a device alias to be used in scans (datasets and plots).
-
- Args:
- device(Device): device object.
- alias(str): replace device name in scans.
-
- Returns:
- None
- */
- get_context().dataManager.setAlias(device, alias)
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// Utilities
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-def string_to_obj(obj) {
- if (obj instanceof String) {
- return evaluate(obj)
- } else if (obj instanceof Array) {
- ret = []
- for (i = 0; i < o.length; i++)
- ret[i] = string_to_obj(obj[i]);
- return ret
- }
- return obj
-}
-
-def stop(){
- /*
- Stop all devices implementing the Stoppable interface.
-
- Args:
- None
-
- Returns:
- None
- */
- get_context().stopAll()
-}
-
-def update(){
- /*
- Update all devices.
-
- Args:
- None
-
- Returns:
- None
- */
- get_context().updateAll()
-}
-
-def inject(){
- /*
- Restore initial globals: re-inject devices and startup variables to the interpreter.
-
- Args:
- None
-
- Returns:
- None
-
- */
- get_context().injectVars()
-}
-
-
-def sleep(seconds){
- Thread.sleep(millis * 1000);
-}
-
-_ = true
\ No newline at end of file
diff --git a/script/_Lib/startup.js b/script/_Lib/startup.js
deleted file mode 100644
index cf5f8c0..0000000
--- a/script/_Lib/startup.js
+++ /dev/null
@@ -1,2263 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// Global definitions and built-in functions
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-load("nashorn:mozilla_compat.js");
-
-importClass(Packages.jdk.nashorn.api.scripting.ScriptUtils);
-importClass(java.beans.PropertyChangeListener)
-importClass(java.lang.Thread)
-importClass(java.awt.image.BufferedImage)
-importClass(java.awt.Color)
-importClass(java.io.File)
-
-CommandSource = Java.type('ch.psi.pshell.core.CommandSource')
-ContextListener = Java.type('ch.psi.pshell.core.ContextAdapter')
-Context = Java.type('ch.psi.pshell.core.Context')
-UrlDevice = Java.type('ch.psi.pshell.core.UrlDevice')
-PlotDescriptor = Java.type('ch.psi.pshell.data.PlotDescriptor')
-Table = Java.type('ch.psi.pshell.data.Table')
-Device = Java.type('ch.psi.pshell.device.Device')
-DeviceBase = Java.type('ch.psi.pshell.device.DeviceBase')
-RegisterBase = Java.type('ch.psi.pshell.device.RegisterBase')
-ProcessVariableBase = Java.type('ch.psi.pshell.device.ProcessVariableBase')
-ControlledVariableBase = Java.type('ch.psi.pshell.device.ControlledVariableBase')
-PositionerBase = Java.type('ch.psi.pshell.device.PositionerBase')
-MotorBase = Java.type('ch.psi.pshell.device.MotorBase')
-DiscretePositionerBase = Java.type('ch.psi.pshell.device.DiscretePositionerBase')
-MotorGroupBase= Java.type('ch.psi.pshell.device.MotorGroupBase')
-MotorGroupDiscretePositioner = Java.type('ch.psi.pshell.device.MotorGroupDiscretePositioner')
-ReadonlyRegisterBase = Java.type('ch.psi.pshell.device.ReadonlyRegisterBase')
-ReadonlyAsyncRegisterBase = Java.type('ch.psi.pshell.device.ReadonlyAsyncRegisterBase')
-RegisterCache = Java.type('ch.psi.pshell.device.RegisterCache')
-ReadonlyRegisterArray = Java.type('ch.psi.pshell.device.ReadonlyRegister.ReadonlyRegisterArray')
-ReadonlyRegisterMatrix = Java.type('ch.psi.pshell.device.ReadonlyRegister.ReadonlyRegisterMatrix')
-DummyPositioner = Java.type('ch.psi.pshell.device.DummyPositioner')
-DummyMotor = Java.type('ch.psi.pshell.device.DummyMotor')
-DummyRegister = Java.type('ch.psi.pshell.device.DummyRegister')
-Timestamp = Java.type('ch.psi.pshell.device.Timestamp')
-Interlock = Java.type('ch.psi.pshell.device.Interlock')
-Readable = Java.type('ch.psi.pshell.device.Readable')
-ReadableArray = Java.type('ch.psi.pshell.device.Readable.ReadableArray')
-ReadableMatrix = Java.type('ch.psi.pshell.device.Readable.ReadableMatrix')
-ReadableCalibratedArray = Java.type('ch.psi.pshell.device.Readable.ReadableCalibratedArray')
-ReadableCalibratedMatrix = Java.type('ch.psi.pshell.device.Readable.ReadableCalibratedMatrix')
-ArrayCalibration = Java.type('ch.psi.pshell.device.ArrayCalibration')
-MatrixCalibration = Java.type('ch.psi.pshell.device.MatrixCalibration')
-Writable = Java.type('ch.psi.pshell.device.Writable')
-WritableArray = Java.type('ch.psi.pshell.device.Writable.WritableArray')
-Stoppable = Java.type('ch.psi.pshell.device.Stoppable')
-Averager = Java.type('ch.psi.pshell.device.Averager')
-Delta = Java.type('ch.psi.pshell.device.Delta')
-DeviceListener = Java.type('ch.psi.pshell.device.DeviceAdapter')
-ReadbackDeviceListener = Java.type('ch.psi.pshell.device.ReadbackDeviceAdapter')
-MotorListener = Java.type('ch.psi.pshell.device.MotorAdapter')
-MoveMode = Java.type('ch.psi.pshell.device.MoveMode')
-Epics = Java.type('ch.psi.pshell.epics.Epics')
-EpicsScan = Java.type('ch.psi.pshell.epics.EpicsScan')
-Source = Java.type('ch.psi.pshell.imaging.Source')
-SourceBase = Java.type('ch.psi.pshell.imaging.SourceBase')
-DirectSource = Java.type('ch.psi.pshell.imaging.DirectSource')
-RegisterMatrixSource = Java.type('ch.psi.pshell.imaging.RegisterMatrixSource')
-LinePlotSeries = Java.type('ch.psi.pshell.plot.LinePlotSeries')
-LinePlotErrorSeries = Java.type('ch.psi.pshell.plot.LinePlotErrorSeries')
-MatrixPlotSeries = Java.type('ch.psi.pshell.plot.MatrixPlotSeries')
-AxisId = Java.type('ch.psi.pshell.plot.Plot.AxisId')
-LinePlotStyle = Java.type('ch.psi.pshell.plot.LinePlot.Style')
-LineScan = Java.type('ch.psi.pshell.scan.LineScan')
-ContinuousScan = Java.type('ch.psi.pshell.scan.ContinuousScan')
-AreaScan = Java.type('ch.psi.pshell.scan.AreaScan')
-VectorScan = Java.type('ch.psi.pshell.scan.VectorScan')
-ManualScan = Java.type('ch.psi.pshell.scan.ManualScan')
-RegionScan = Java.type('ch.psi.pshell.scan.RegionScan')
-HardwareScan = Java.type('ch.psi.pshell.scan.HardwareScan')
-TimeScan = Java.type('ch.psi.pshell.scan.TimeScan')
-MonitorScan = Java.type('ch.psi.pshell.scan.MonitorScan')
-BinarySearch = Java.type('ch.psi.pshell.scan.BinarySearch')
-HillClimbingSearch = Java.type('ch.psi.pshell.scan.HillClimbingSearch')
-ScanResult = Java.type('ch.psi.pshell.scan.ScanResult')
-BsScan = Java.type('ch.psi.pshell.bs.BsScan')
-Stream = Java.type('ch.psi.pshell.bs.Stream')
-Preference = Java.type('ch.psi.pshell.scripting.ViewPreference')
-Threading = Java.type('ch.psi.utils.Threading')
-Convert = Java.type('ch.psi.utils.Convert')
-Arr = Java.type('ch.psi.utils.Arr')
-Chrono = Java.type('ch.psi.utils.Chrono')
-State = Java.type('ch.psi.utils.State')
-ScriptingUtils = Java.type('ch.psi.pshell.scripting.ScriptUtils')
-
-
-function get_context() {
- return Context.getInstance()
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// Type conversion and checking
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-function is_defined(obj) {
- return (typeof obj != 'undefined')
-}
-
-function get_rank(obj) {
- if (typeof obj == 'string') return 0
- var rank = 0;
- while ((obj != null) && (typeof obj != 'string') &&(obj[0] != null)) {
- rank++;
- obj = obj[0];
- }
- return rank;
-}
-
-function assert(condition, message) {
- if (!condition) {
- throw message || "Assertion failed";
- }
-}
-
-//TODO: this is wrong: returns false for 1.0
-function is_float(n) {
- if (n == null){
- return false;
- }
- if (get_rank(n) == 1) {
- for (var i = 0; i < n.length; i++) {
- if (is_float(n[i])) {
- return true;
- }
- }
- return false;
- }
- //return n === Number(n) && n % 1 !== 0;
- return (n.class.simpleName == "Float" || n.class.simpleName == "Double")
-}
-
-function is_array(obj) {
- //return get_rank(obj) == 0
- //return !(obj.length == undefined)
- //return obj.constructor === Array
- return Array.isArray(obj)
-}
-
-
-function is_java_array(obj){
- return !Array.isArray(obj) && obj.class.isArray()
-}
-
-function is_java_list(obj){
- return obj instanceof java.util.List
-}
-
-function to_array(obj, type) {
- //var javaObjectArray = Java.to(obj);
-
- if (obj == null) {
- return null;
- }
- if (!is_defined(type)) {
- //If undefined type, convert to a JavaScript array
- if (is_array(obj)){
- return obj
- }
- return Java.from(obj);
- }
-
- if (obj instanceof java.util.List){
- obj = to_array(obj)
- }
-
- var rank = get_rank(obj);
- if (rank == 0) {
- rank = 1;
- obj = [obj]
- }
-
- //Custom class
- if (!ScriptingUtils.isStandardType(type)) {
- var ret = java.lang.reflect.Array.newInstance(java.lang.Class.forName(type), obj.length)
- for (var i = 0; i < obj.length; i++) {
- ret[i] = obj[i]
- }
- return ret;
- }
-
- if (is_array(obj) && (type=='o')){
- for (var i = 0; i < obj.length; i++) {
- if (is_array(obj[i])){
- obj[i] = to_array(obj[i], type)
-
- }
- }
- }
-
- var name = ScriptingUtils.getType(type).getName()
- if (type[0] != "[") {
- type = "[" + type;
- name = ScriptingUtils.getType(type).getName();
- //Type 'o' always create a 1d array
- if (type!='[o'){
- for (var i = 1; i < rank; i++) {
- name = "[" + name;
- }
- }
- }
-
- return ScriptUtils.convert(obj, java.lang.Class.forName(name))
-}
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// Standard scan commands
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-function lscan(writables, readables, start, end, steps, latency, relative, passes, zigzag, before_read, after_read, title) {
- /*
- Line Scan: positioners change together, linearly from start to end positions.
-
- Args:
- writables(list of Writable): Positioners set on each step.
- readables(list of Readable): Sensors to be sampled on each step.
- start(list of float): start positions of writables.
- end(list of float): final positions of writables.
- steps(int or float or list of float): number of scan steps (int) or step size (float).
- relative (bool, optional): if true, start and end positions are relative to
- current at start of the scan
- latency(float, optional): sleep time in each step before readout, defaults to 0.0.
- passes(int, optional): number of passes
- zigzag(bool, optional): if true writables invert direction on each pass.
- before_read (function, optional): callback on each step, before each readout. Callback may have as
- optional parameters list of positions.
- after_read (function, optional): callback on each step, after each readout. Callback may have as
- optional parameters a ScanRecord object.
- title(str, optional): plotting window name.
-
- Returns:
- ScanResult object.
- */
- if (!is_defined(latency)) latency = 0.0;
- if (!is_defined(passes)) passes = 1;
- if (!is_defined(zigzag)) zigzag = false;
- if (!is_defined(relative)) relative = false;
- if (!is_defined(title)) title = null;
-
- var latency_ms = latency * 1000
- var writables = to_array(string_to_obj(writables), "ch.psi.pshell.device.Writable")
- var readables = to_array(string_to_obj(readables), "ch.psi.pshell.device.Readable")
- var start = to_array(start, 'd')
- var end = to_array(end, 'd')
- var steps = is_float(steps) ? to_array(steps, 'd') : steps
- //var scan = new LineScan(writables, readables, start, end, steps, relative, latency_ms)
- var scanClass = Java.extend(LineScan)
- var scan = new scanClass(writables, readables, start, end, steps, relative, latency_ms, passes, zigzag) {
- onBeforeReadout: function (pos) {
- if (is_defined(before_read))
- before_read(pos , scan)
- },
- onAfterReadout: function (record) {
- if (is_defined(after_read))
- after_read(record , scan)
- }
- }
- scan.setPlotTitle(title)
- scan.start()
- return scan.getResult()
-}
-
-
-function vscan(writables, readables, vector, line, latency, relative, passes, zigzag, before_read, after_read, title) {
- /*
- Vector Scan: positioners change following values provided in a vector.
-
- Args:
- writables(list of Writable): Positioners set on each step.
- readables(list of Readable): Sensors to be sampled on each step.
- vector(list of list of float): table of positioner values.
- line (bool, optional): if true, processs as line scan (1d)
- relative (bool, optional): if true, start and end positions are relative to current at
- start of the scan
- latency(float, optional): sleep time in each step before readout, defaults to 0.0.
- passes(int, optional): number of passes
- zigzag(bool, optional): if true writables invert direction on each pass.
- before_read (function, optional): callback on each step, before each readout.
- after_read (function, optional): callback on each step, after each readout.
- title(str, optional): plotting window name.
-
- Returns:
- ScanResult object.
- */
- if (!is_defined(line)) line = false;
- if (!is_defined(latency)) latency = 0.0;
- if (!is_defined(passes)) passes = 1;
- if (!is_defined(zigzag)) zigzag = false;
- if (!is_defined(relative)) relative = false;
- if (!is_defined(title)) title = null;
- var latency_ms = latency * 1000
- var writables = to_array(string_to_obj(writables), "ch.psi.pshell.device.Writable")
- var readables = to_array(string_to_obj(readables), "ch.psi.pshell.device.Readable")
-
-
- if (vector.length == 0)
- vector.push([]);
- else if (!is_array(vector[0])) {
- var aux = []
- for (var i = 0; i < vector.length; i++)
- aux.push([vector[i]]);
- var vector = aux
- }
-
- vector = to_array(vector, 'd')
- var scanClass = Java.extend(VectorScan)
-
- var scan = new scanClass(writables, readables, vector, line, relative, latency_ms, passes, zigzag) {
- onBeforeReadout: function (pos) {
- if (is_defined(before_read))
- before_read(pos , scan)
- },
- onAfterReadout: function (record) {
- if (is_defined(after_read))
- after_read(record, scan)
- }
- }
- scan.setPlotTitle(title)
- scan.start()
- return scan.getResult()
-}
-
-function ascan(writables, readables, start, end, steps, latency, relative, passes, zigzag, before_read, after_read, title) {
- /*
- Area Scan: multi-dimentional scan, each positioner is a dimention.
-
- Args:
- writables(list of Writable): Positioners set on each step.
- readables(list of Readable): Sensors to be sampled on each step.
- start(list of float): start positions of writables.
- end(list of float): final positions of writables.
- steps(list of int or list of float): number of scan steps (int) or step size (float).
- relative (bool, optional): if true, start and end positions are relative to current at
- start of the scan
- latency(float, optional): sleep time in each step before readout, defaults to 0.0.
- passes(int, optional): number of passes
- zigzag (bool, optional): if true writables invert direction on each row.
- before_read (function, optional): callback on each step, before each readout.
- after_read (function, optional): callback on each step, after each readout.
- title(str, optional): plotting window name.
-
- Returns:
- ScanResult object.
- */
- if (!is_defined(latency)) latency = 0.0;
- if (!is_defined(relative)) relative = false;
- if (!is_defined(passes)) passes = 1;
- if (!is_defined(zigzag)) zigzag = false;
- if (!is_defined(title)) title = null;
-
- var latency_ms = latency * 1000
- var writables = to_array(string_to_obj(writables), "ch.psi.pshell.device.Writable")
- var readables = to_array(string_to_obj(readables), "ch.psi.pshell.device.Readable")
- var start = to_array(start, 'd')
- var end = to_array(end, 'd')
- var steps = is_float(steps) ? to_array(steps, 'd') : to_array(steps, 'i')
- var scanClass = Java.extend(AreaScan)
- var scan = new scanClass(writables, readables, start, end, steps, relative, latency_ms, passes, zigzag) {
- onBeforeReadout: function (pos) {
- if (is_defined(before_read))
- before_read(pos , scan)
- },
- onAfterReadout: function (record) {
- if (is_defined(after_read))
- after_read(record, scan)
- }
- }
- scan.setPlotTitle(title)
- scan.start()
- return scan.getResult()
-}
-
-function rscan(writable, readables, regions, latency, relative, passes, zigzag, before_read, after_read, title) {
- /*
- Region Scan: positioner scanned linearly, from start to end positions, in multiple regions.
-
- Args:
- writable(Writable): Positioner set on each step, for each region.
- readables(list of Readable): Sensors to be sampled on each step.
- regions (list of tuples (float,float, int) or (float,float, float)): each tuple define a scan region
- (start, stop, steps) or (start, stop, step_size)
- relative (bool, optional): if true, start and end positions are relative to
- current at start of the scan
- latency(float, optional): settling time for each step before readout, defaults to 0.0.
- passes(int, optional): number of passes
- zigzag(bool, optional): if true writable invert direction on each pass.
- before_read (function, optional): callback on each step, before each readout. Callback may have as
- optional parameters list of positions.
- after_read (function, optional): callback on each step, after each readout. Callback may have as
- optional parameters a ScanRecord object.
- title(str, optional): plotting window name.
-
- Returns:
- ScanResult object.
- */
-
- if (!is_defined(latency)) latency = 0.0;
- if (!is_defined(passes)) passes = 1;
- if (!is_defined(zigzag)) zigzag = false;
- if (!is_defined(relative)) relative = false;
- if (!is_defined(title)) title = null;
-
- var latency_ms = latency * 1000
- var writable = string_to_obj(writable)
- var readables = to_array(string_to_obj(readables), "ch.psi.pshell.device.Readable")
-
- var start = []
- var end = []
- var steps = []
-
- for (var region in regions) {
- start.push(regions[region][0])
- end.push(regions[region][1])
- steps.push(regions[region][2])
- }
-
- var start = to_array(start, 'd')
- var end = to_array(end, 'd')
- var steps = is_float(steps) ? to_array(steps, 'd') : to_array(steps, 'i')
-
-
- var scanClass = Java.extend(RegionScan)
- var scan = new scanClass(writable, readables, start, end, steps, relative, latency_ms, passes, zigzag) {
- onBeforeReadout: function (pos) {
- if (is_defined(before_read))
- before_read(pos , scan)
- },
- onAfterReadout: function (record) {
- if (is_defined(after_read))
- after_read(record, scan)
- }
- }
- scan.setPlotTitle(title)
- scan.start()
- return scan.getResult()
- }
-
-
-function cscan(writables, readables, start, end, steps, latency, time, relative, passes, zigzag, before_read, after_read, title) {
- /*
- Continuous Scan: positioner change continuously from start to end position and readables are sampled on the fly.
-
- Args:
- writable(Speedable or list of Motor): A positioner with a getSpeed method or
- a list of motors.
- readables(list of Readable): Sensors to be sampled on each step.
- start(float or list of float): start positions of writables.
- end(float or list of float): final positions of writabless.
- steps(int or float or list of float): number of scan steps (int) or step size (float).
- time = null
- time (float, seconds): if not null then writables is Motor array and speeds are
- set according to time.
- relative (bool, optional): if true, start and end positions are relative to
- current at start of the scan
- latency(float, optional): sleep time in each step before readout, defaults to 0.0.
- before_read (function, optional): callback on each step, before each readout.
- Callback may have as optional parameters list of positions.
- after_read (function, optional): callback on each step, after each readout.
- Callback may have as optional parameters a ScanRecord object.
- title(str, optional): plotting window name.
-
- Returns:
- ScanResult object.
-
- */
- if (!is_defined(latency)) latency = 0.0;
- if (!is_defined(time)) time = null;
- if (!is_defined(relative)) relative = false;
- if (!is_defined(passes)) passes = 1;
- if (!is_defined(zigzag)) zigzag = false;
- if (!is_defined(title)) title = null;
-
- var latency_ms = latency * 1000
- var readables = to_array(string_to_obj(readables), "ch.psi.pshell.device.Readable")
- var scanClass = Java.extend(ContinuousScan)
- //A single Writable with fixed speed
- if (time == null) {
- var scan = new scanClass(writables, readables, start, end, steps, relative, latency_ms, passes, zigzag){
- onBeforeReadout: function (pos) {
- if (is_defined(before_read))
- before_read(pos , scan)
- },
- onAfterReadout: function (record) {
- if (is_defined(after_read))
- after_read(record, scan)
- }
-
- }
- }
- else {
- var writables = to_array(string_to_obj(writables), "ch.psi.pshell.device.ControlledSpeedable")
- //A set of Writables with speed configurable
- var start = to_array(start, 'd')
- var end = to_array(end, 'd')
- if ((steps.length!=null) && is_float(steps)){
- steps = to_array(steps, 'd')
- }
- var scan = new ContinuousScan(writables, readables, start, end, steps, time, relative, latency_ms, passes, zigzag){
- onBeforeReadout: function (pos) {
- if (is_defined(before_read))
- before_read(pos , scan)
- },
- onAfterReadout: function (record) {
- if (is_defined(after_read))
- after_read(record, scan)
- }
- }
- }
- scan.setPlotTitle(title)
- scan.start()
- return scan.getResult()
-}
-
-function hscan(config, writable, readables, start, end, steps, passes, zigzag, before_stream, after_stream, after_read, title) {
- /*
- Hardware Scan: values sampled by external hardware and received asynchronously.
-
- Args:
- config(dict): Configuration of the hardware scan. The "class" key provides the implementation class.
- Other keys are implementation specific.
- writable(Writable): A positioner appropriated to the hardware scan type.
- readables(list of Readable): Sensors appropriated to the hardware scan type.
- start(float): start positions of writable.
- end(float): final positions of writables.
- steps(int or float): number of scan steps (int) or step size (float).
- before_stream (function, optional): callback before just before starting positioner move.
- after_stream (function, optional): callback before just after stopping positioner move.
- after_read (function, optional): callback on each readout.
- Callback may have as optional parameters a ScanRecord object.
- title(str, optional): plotting window name.
-
- Returns:
- ScanResult object.
-
- */
- if (!is_defined(passes)) passes = 1;
- if (!is_defined(zigzag)) zigzag = false;
- if (!is_defined(title)) title = null;
- //var scan = HardwareScan.newScan(config, writable,readables, start, end , steps, passes, zigzag);
- var scanClass = Java.extend(HardwareScan)
- var scan = new scanClass(config, writable, readables, start, end, steps, passes, zigzag) {
- onAfterReadout: function (record) {
- if (is_defined(after_read))
- after_read(record, scan)
- },
- onBeforeStream: function (current_pass) {
- if (is_defined(before_stream))
- before_stream(current_pass)
- },
- onAfterStream: function (current_pass) {
- if (is_defined(after_stream))
- after_stream(current_pass)
- },
- }
- scan.setPlotTitle(title)
- scan.start()
- return scan.getResult()
-}
-
-function bscan(stream, records, before_read, after_read, title) {
- /*
- BS Scan: records all values in a beam synchronous stream.
-
- Args:
- stream(Stream): stream object
- records(int): number of records to store
- before_read (function, optional): callback on each step, before each readout.
- Callback may have as optional parameters list of positions.
- after_read (function, optional): callback on each step, after each readout.
- Callback may have as optional parameters a ScanRecord object.
- title(str, optional): plotting window name.
-
- Returns:
- ScanResult object.
-
- */
- if (!is_defined(title)) title = null;
- var stream = string_to_obj(stream)
- var scanClass = Java.extend(BsScan)
- var scan = new scanClass(stream,records) {
- onBeforeReadout: function (pos) {
- if (is_defined(before_read))
- before_read(pos , scan)
- },
- onAfterReadout: function (record) {
- if (is_defined(after_read))
- after_read(record, scan)
- }
- }
- scan.setPlotTitle(title)
- scan.start()
- return scan.getResult()
-}
-
-function tscan(readables, points, interval, title, before_read, after_read) {
- /*
- Time Scan: sensors are sampled in fixed time intervals.
-
- Args:
- readables(list of Readable): Sensors to be sampled on each step.
- points(int): number of samples.
- interval(float): time interval between readouts.
- before_read (function, optional): callback on each step, before each readout.
- after_read (function, optional): callback on each step, after each readout.
- title(str, optional): plotting window name.
-
- Returns:
- ScanResult object.
- */
- if (!is_defined(title)) title = null;
-
-
- var interval_ms = interval * 1000
- var readables = to_array(string_to_obj(readables), "ch.psi.pshell.device.Readable")
- var scanClass = Java.extend(TimeScan)
- var scan = new scanClass(readables, points, interval_ms) {
- onBeforeReadout: function (pos) {
- if (is_defined(before_read))
- before_read(pos, scan)
- },
- onAfterReadout: function (record) {
- if (is_defined(after_read))
- after_read(record, scan)
- }
- }
- scan.setPlotTitle(title)
- scan.start()
- return scan.getResult()
-}
-
-function mscan(trigger, readables, points, timeout, async, take_initial, before_read, after_read, title) {
- /*
- Monitor Scan: sensors are sampled in timestamp change event of the trigger.
-
- Args:
- trigger(Device): Source of the sampling triggering.
- readables(list of Readable): Sensors to be sampled on each step.
- If trigger has cache and is included in readables, it is not read
- for each step, but the change event value is used.
- points(int): number of samples.
- timeout(float, optional): maximum scan time in seconds.
- async(bool, optional): if True then records are sampled and stored on event change callback. Enforce
- reading only cached values of sensors.
- If False, the scan execution loop waits for trigger cache update. Do not make
- cache only access, but may loose change events.
- take_initial(bool, optional): if True include current values as first record (before first trigger).
- before_read (function, optional): callback on each step, before each readout.
- after_read (function, optional): callback on each step, after each readout.
- title(str, optional): plotting window name.
-
- Returns:
- ScanResult object.
- */
- if (!is_defined(timeout)) timeout = -1;
- if (!is_defined(async)) async = true;
- if (!is_defined(take_initial)) take_initial = false;
- if (!is_defined(title)) title = null;
-
- var timeout_ms = timeout * 1000
- var trigger = string_to_obj(trigger)
- var readables = to_array(string_to_obj(readables), "ch.psi.pshell.device.Readable")
- var scanClass = Java.extend(MonitorScan)
- var scan = new scanClass(trigger, readables, points, timeout_ms, async, take_initial) {
- onBeforeReadout: function (pos) {
- if (is_defined(before_read))
- before_read(pos, scan)
- },
- onAfterReadout: function (record) {
- if (is_defined(after_read))
- after_read(record, scan)
- }
- }
- scan.setPlotTitle(title)
- scan.start()
- return scan.getResult()
-}
-
-function escan(name, title) {
- /*
- Epics Scan: execute an Epics Scan Record.
- Args:
- name(str): Name of scan record.
- title(str, optional): plotting window name.
-
- Returns:
- ScanResult object.
- */
-
- if (!is_defined(title)) title = null;
- var scan = new EpicsScan(name)
- scan.setPlotTitle(title)
- scan.start()
- return scan.getResult()
-}
-
-function bsearch(writables, readable, start, end, steps, maximum, strategy, latency, relative, before_read, after_read, title){
- /*
- Binary search: searches writables in a binary search fashion to find a local maximum for the readable.
-
- Args:
- writables(list of Writable): Positioners set on each step.
- readable(Readable): Sensor to be sampled.
- start(list of float): start positions of writables.
- end(list of float): final positions of writables.
- steps(float or list of float): resolution of search for each writable.
- maximum (bool , optional): if True (default) search maximum, otherwise minimum.
- strategy (str , optional): "Normal": starts search midway to scan range and advance in the best direction.
- Uses orthogonal neighborhood (4-neighborhood for 2d)
- "Boundary": starts search on scan range.
- "FullNeighborhood": Uses complete neighborhood (8-neighborhood for 2d)
-
- latency(float, optional): settling time for each step before readout, defaults to 0.0.
- relative (bool, optional): if true, start and end positions are relative to current at
- start of the scan
- before_read (function, optional): callback on each step, before each readout.
- after_read (function, optional): callback on each step, after each readout.
- title(str, optional): plotting window name.
-
- Returns:
- SearchResult object.
-
- */
- if (!is_defined(maximum)) maximum = true;
- if (!is_defined(strategy)) strategy = "Normal";
- if (!is_defined(latency)) latency = 0.0;
- if (!is_defined(relative)) relative = false;
- if (!is_defined(title)) title = null;
-
- var latency_ms = latency * 1000
- var writables = to_array(string_to_obj(writables), "ch.psi.pshell.device.Writable")
- var readable = string_to_obj(readable)
- var start = to_array(start, 'd')
- var end = to_array(end, 'd')
- var steps = to_array(steps, 'd')
- strategy = BinarySearch.Strategy.valueOf(strategy)
- var scanClass = Java.extend(BinarySearch)
- var scan = new scanClass(writables,readable, start, end , steps, maximum, strategy, relative, latency_ms) {
- onBeforeReadout: function (pos) {
- if (is_defined(before_read))
- before_read(pos , scan)
- },
- onAfterReadout: function (record) {
- if (is_defined(after_read))
- after_read(record, scan)
- }
- }
- scan.setPlotTitle(title)
- scan.start()
- return scan.getResult()
-}
-
-function hsearch(writables, readable, range_min, range_max, initial_step, resolution, noise_filtering_steps, maximum, latency, relative, before_read, after_read, title){
- /*
- Hill Climbing search: searches writables in decreasing steps to find a local maximum for the readable.
- Args:
- writables(list of Writable): Positioners set on each step.
- readable(Readable): Sensor to be sampled.
- range_min(list of float): minimum positions of writables.
- range_max(list of float): maximum positions of writables.
- initial_step(float or list of float):initial step size for for each writable.
- resolution(float or list of float): resolution of search for each writable (minimum step size).
- noise_filtering_steps(int): number of aditional steps to filter noise
- maximum (bool , optional): if True (default) search maximum, otherwise minimum.
- latency(float, optional): settling time for each step before readout, defaults to 0.0.
- relative (bool, optional): if true, range_min and range_max positions are relative to current at
- start of the scan
- before_read (function, optional): callback on each step, before each readout.
- after_read (function, optional): callback on each step, after each readout.
- title(str, optional): plotting window name.
-
- Returns:
- SearchResult object.
-
- */
- if (!is_defined(maximum)) maximum = true;
- if (!is_defined(noise_filtering_steps)) noise_filtering_steps = 1;
- if (!is_defined(latency)) latency = 0.0;
- if (!is_defined(relative)) relative = false;
- if (!is_defined(title)) title = null;
-
- var latency_ms = latency * 1000
- var latency_ms = latency * 1000
- var readable = string_to_obj(readable)
- var range_min = to_array(range_min, 'd')
- var range_max = to_array(range_max, 'd')
- var initial_step = to_array(initial_step, 'd')
- var resolution = to_array(resolution, 'd')
- var scanClass = Java.extend(HillClimbingSearch)
- var scan = new scanClass(writables,readable, range_min, range_max , initial_step, resolution, noise_filtering_steps, maximum, relative, latency_ms) {
- onBeforeReadout: function (pos) {
- if (is_defined(before_read))
- before_read(pos , scan)
- },
- onAfterReadout: function (record) {
- if (is_defined(after_read))
- after_read(record, scan)
- }
- }
- scan.setPlotTitle(title)
- scan.start()
- return scan.getResult()
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// Data Plotting
-///////////////////////////////////////////////////////////////////////////////////////////////////
-function plot(data, name, xdata, ydata, title) {
- /*Request one or multiple plots of user data (1d, 2d or 3d)
-
- Args:
- data: array or list of values. For multiple plots, array of arrays or lists of values.
- name(str or list of str, optional): Plot name or list of names (if multiple plots).
- xdata: array or list of values. For multiple plots, array of arrays or lists of values.
- ydata: array or list of values. For multiple plots, array of arrays or lists of values.
- title(str, optional): plotting window name.
-
- Returns:
- ArrayList of Plot objects.
-
- */
- if (!is_defined(name)) name = null;
- if (!is_defined(xdata)) xdata = null;
- if (!is_defined(ydata)) ydata = null;
- if (!is_defined(title)) title = null;
-
- if (name != null) {
- if( typeof name === 'string' ) {
- name = [name]
- data = [data]
- }
- if (name.length == 0) {
- name = null;
- } else {
- if (!data) {
- data = []
- for (var n in name) {
- data.push([]);
- }
- }
- }
- var plots = java.lang.reflect.Array.newInstance(java.lang.Class.forName("ch.psi.pshell.data.PlotDescriptor"), data.length)
- for (var i = 0; i < data.length; i++) {
- var plotName = name ? name[i] : null;
- var x = xdata;
- if (x && x.length && x[0].length) {
- x = x[i];
- }
- var y = ydata
- if (y && y.length && x[0].length) {
- y = y[i];
- }
- plots[i] = new PlotDescriptor(plotName, to_array(data[i], 'd'), to_array(x, 'd'), to_array(y, 'd'));
- }
- return get_context().plot(plots, title);
- } else {
- var plot = new PlotDescriptor(name, to_array(data, 'd'), to_array(xdata, 'd'), to_array(ydata, 'd'));
-
- return get_context().plot(plot, title);
- }
-
-}
-
-function get_plots(title){
- /*
- Return all current plots in the plotting window given by 'title'.
-
- Args:
- title(str, optional): plotting window name.
-
- Returns:
- ArrayList of Plot objects.
-
- */
- if (!is_defined(title))
- title = null;
- return get_context().getPlots(title)
-}
-
-function get_plot_snapshots(title, file_type, temp_path){
- /*
- Returns list with file names of plots snapshots from a plotting context.
-
- Args:
- title(str, optional): plotting window name.
- file_type(str, optional): "png", "jpg", "bmp" or "gif"
- temp_path(str, optional): path where the files will be generated.
-
- Returns:
- list of strings
-
- */
- if (!is_defined(title)) title = null;
- if (!is_defined(file_type)) file_type = "png";
- if (!is_defined(temp_path)) temp_path = get_context().setup.getContextPath();
- sleep(0.1) //Give some time to plot to be finished - it is not sync with acquisition
- var ret = []
- var plots = get_plots(title)
- for (p in plots){
- var file_name = new File(temp_path + "/" + plots[p].getTitle() + "." + file_type).getCanonicalPath()
- plots[p].saveSnapshot(file_name , file_type)
- ret.push(file_name)
- }
- return ret
-}
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// Data file access
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-function load_data(path, index, shape) {
- /*
- Read data from the current persistence context or from data files.
-
- Args:
- path(str): Path to group or dataset relative to the persistence context root.
- If in the format 'root|path' then read from path given by 'root'.
- index(int or listr, optional):
- if integer, data depth (used for 3D datasets returning a 2d matrix)
- If a list, specifies the full coordinate for multidimensional datasets.
- Returns:
- Data array
-
- */
- if (!is_defined(index))
- index = 0;
- if (!is_defined(shape))
- shape = null;
-
- if ((shape!=null) && (is_array(index)))
- var slice = get_context().dataManager.getData(path, index, shape)
- else
- var slice = get_context().dataManager.getData(path, index)
- return slice.sliceData
-}
-
-function get_attributes(path) {
- /*
- Get the attributes from the current persistence context or from data files.
-
- Args:
- path(str): Path to group or dataset relative to the current persistence context root.
- If in the format 'root|path' then read from path given by 'root'.
- Returns:
- Dictionary
-
- */
- return get_context().dataManager.getAttributes(path)
-}
-
-function save_dataset(path, data, type) {
- /*
- Save data into a dataset within the current persistence context.
-
- Args:
- path(str): Path to dataset relative to the current persistence context root.
- type(str, optional): array type 'b' = byte, 'h' = short, 'i' = int, 'l' = long, 'f' = float,
- 'd' = double, 'c' = char, 's' = String, 'o' = Object
- default: 'd' (convert data to array of doubles)
- data (array or list): data to be saved
- Returns:
- Dictionary
-
- */
- if (!is_defined(type))
- type = 'd';
- if (is_array(data)){
- data = to_array(data, type)
- }
- get_context().dataManager.setDataset(path, data)
-}
-
-function create_group(path) {
- /*
- Create an empty dataset within the current persistence context.
-
- Args:
- path(str): Path to group relative to the current persistence context root.
- Returns:
- null
-
- */
- get_context().dataManager.createGroup(path)
-}
-
-
-function create_dataset(path, type, unsigned, dimensions) {
- /*
- Create an empty dataset within the current persistence context.
-
- Args:
- path(str): Path to dataset relative to the current persistence context root.
- type(str): array type 'b' = byte, 'h' = short, 'i' = int, 'l' = long, 'f' = float,
- 'd' = double, 'c' = char, 's' = String, 'o' = Object
- unsigned(boolean, optional): create a dataset of unsigned type.
- dimensions(tuple of int, optional): a 0 value means variable length in that dimension.
- Returns:
- null
-
- */
- if (!is_defined(unsigned))
- unsigned = false;
- if (!is_defined(dimensions))
- dimensions = null;
- if (!is_defined(type))
- type = null;
- get_context().dataManager.createDataset(path, ScriptingUtils.getType(type), unsigned, dimensions)
-}
-
-function create_table(path, names, types, lengths) {
- /*
- Create an empty table (dataset of compound type) within the current persistence context.
-
- Args:
- path(str): Path to dataset relative to the current persistence context root.
- names(list of strings): name of each column
- types(array of str): 'b' = byte, 'h' = short, 'i' = int, 'l' = long, 'f' = float,
- 'd' = double, 'c' = char, 's' = String, 'o' = Object
- Note:A '[' prefix on type name indicates an array type.
- lengths(list of int): the array length for each columns(0 for scalar types).
- Returns:
- null
-
- */
- if (!is_defined(types))
- types = null;
- if (!is_defined(lengths))
- lengths = null;
- var new_types = null
- if (types != null) {
- new_types = []
- for (var i = 0; i < types.length; i++){
- new_types.push(ScriptingUtils.getType(types[i]))
- }
- }
- get_context().dataManager.createDataset(path, names, new_types, lengths)
-}
-
-function append_dataset(path, data, index, type, shape) {
- /*
- Append data to dataset.
-
- Args:
- path(str): Path to dataset relative to the current persistence context root.
- data(number or array or list): name of each column.
- index(int or list, optional): if set then add the data in a specific position in the dataset.
- If integer is the index in an array (data must be 1 order lower than dataset)
- If a list, specifies the full coordinate for multidimensional datasets.
- type(str, optional): array type 'b' = byte, 'h' = short, 'i' = int, 'l' = long, 'f' = float,
- 'd' = double, 'c' = char, 's' = String, 'o' = Object
- default: 'd' (convert data to array of doubles)
- shape(list, optional): only valid if index is a list, provides the shape of the data array.
- In this case data must be a one-dimensional array.
- Returns:
- null
-
- */
- if (!is_defined(index))
- index = null;
- if (!is_defined(type))
- type = 'd';
- if (!is_defined(shape))
- shape = null;
- if (is_array(data)){
- data = to_array(data, type)
- }
- if (index == null)
- get_context().dataManager.appendItem(path, data);
- else {
- if (is_array(index))
- get_context().dataManager.setItem(path, data, index, shape);
- else
- get_context().dataManager.setItem(path, data, index);
- }
-}
-
-function append_table(path, data) {
- /*
- Append data to a table (dataset of compound type)
-
- Args:
- path(str): Path to dataset relative to the current persistence context root.
- data(list): List of valus for each column of the table. Array types can be expressed as lists.
- Returns:
- null
-
- */
-
- if (is_array(data)){
- for (var i=0; i< data.length; i++){
- if (is_array(data[i])){
- data[i] = to_array(data[i], 'd')
- }
- }
- data = to_array(data, 'o')
- }
- get_context().dataManager.appendItem(path, data)
-}
-
-function flush_data() {
- /*
- Flush all data files immediately.
-
- Args:
- null
- Returns:
- null
- */
- get_context().dataManager.flush()
-}
-
-function set_attribute(path, name, value, unsigned) {
- /*
- Set an attribute to a group or dataset.
-
- Args:
- path(str): Path to dataset relative to the current persistence context root.
- name(str): name of the atttribute
- value(Object): the attribute value
- unsigned(bool, optional): if applies, indicate if value is unsigned.
- Returns:
- null
- */
- if (!is_defined(unsigned))
- unsigned = false;
- get_context().dataManager.setAttribute(path, name, value, unsigned)
-}
-
-function log(log){
- /*
- Writes a log to the automatic data saving context - only if there is an ongoing scan or
- script execution.
-
- Args:
- log(str): Log string.
-
- Returns:
- None
- */
- get_context().scriptingLog(String(log))
- get_context().dataManager.appendLog(String(log))
-}
-
-function set_exec_pars(args){
- /*
- Configures the script execution parameters, overriding the system configuration.
-
- Args:
- args(dictionary). Keys:
- name(str, optional): value of the {name} tag. Default is the running script name
- (or "scan" in the case of a command line scan command.)
- type(str, optional): value of the {type} tag. Default is empty.
- This field can be used to store data in sub-folders of standard location.
- path(str, optional): If defined provides the full path name for data output root (overriding config))
- The tag {data} can be used to enter a path relative to the standard data folder.
- layout(str, optional): Overrides default data layout.
- depth_dim(int, optional): dimension of the depth for 2d-matrixes in 3d datasets.
- persist(bool, optional): Overrides the configuration option to auto save scan data.
- flush(bool, optional): Overrides the configuration option to flush file on each record.
- accumulate(bool, optional): Overrides the configuration option to release scan records.
- If false disable accumulation of scan records to scan result.
- preserve(bool, optional): Overrides the configuration option to preserve device types.
- If false all values are converted to double.
- open(bool, optional): If true opens data output root (instead of only doing in the first data access call)
- If false closes output root, if open.
- reset(bool, optional): If true reset the scan counter - the {count} tag and set the timestamp to now.
- group(str, optional): Overrides default layout group name for scans
- tag(str, optional): Overrides default tag for scan names (affecting group or dataset name, according to layout)
- defaults(bool, optional): If true restore the original execution parameters.
-
- Graphical preferences can also be set. Keys are equal to lowercase of Preference enum:
- "plot_disabled", "table_disabled", "enabled_plots", "plot_types", "print_scan", "auto_range",
- "manual_range","domain_axis", "status".
- See set_preference for more information.
-
- Shortcut entries: "line_plots": list of devices with enforced line plots.
- */
- get_context().setExecutionPars(args)
-}
-
-function get_exec_pars(){
- /*
- Returns script execution parameters.
-
- Returns:
- ExecutionContext object. Fields:
- name (str): execution name - {name} tag.
- type (str): execution type - {type} tag.
- path (str): output data root.
- open (bool): true if the output data root has been opened.
- layout (str): data output layout. If null then using the configuration.
- persist (bool): auto save scan data option.
- flush (bool): flush file on each record.
- index (int): current scan index.
- group (str): data group currently used for scan data storage.
- if no ongoing scan return "/" if within a script, or else null if a console command.
- scanPath (str): dataset or group corresponding to current scan.
- scan (Scan): reference to current scan, if any
- source (CommandSource): return the source of the script or command.
- args (obj): return the arguments for the script.
- background (bool): return False if executing in main interpreter thread .
- */
- return get_context().getExecutionPars()
-}
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// Epics Channels access
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-function caget(name, type, size) {
- /*
- Reads an Epics PV.
-
- Args:
- name(str): PV name
- type(str, optional): type of PV. By default gets the PV standard field type.
- Scalar values: 'b', 'i', 'l', 'd', 's'.
- Array: values: '[b', '[i,', '[l', '[d', '[s'.
- size (int, optional): for arrays, number of elements to be read. Default read all.
-
- Returns:
- PV value
-
- */
- if (!is_defined(type))
- type = null;
- if (!is_defined(size))
- size = null;
- return Epics.get(name, Epics.getChannelType(type), size)
-}
-
-function cawait(name, value, timeout, comparator, type, size) {
- /*
- Wait for a PV to have a given value.
-
- Args:
- name(str): PV name
- value (obj): value to compare to
- timeout(float, optional): time in seconds to wait. If null, waits forever.
- comparator(java.util.Comparator or float, optional): if None waits for equality.
- If a numeric value is provided, waits for channel to be in range.
- type(str, optional): type of PV. By default gets the PV standard field type.
- Scalar values: 'b', 'i', 'l', 'd', 's'.
- Array: values: '[b', '[i,', '[l', '[d', '[s'.
- size (int, optional): for arrays, number of elements to be read. Default read all.
-
- Returns:
- None
- */
- if (!is_defined(type)) type = null;
- if (!is_defined(size)) size = null;
- if (!is_defined(comparator)) comparator = null;
- if (is_defined(timeout))
- timeout = timeout * 1000
- else
- timeout = null
- return Epics.waitValue(name, value, comparator, timeout, Epics.getChannelType(type), size)
-}
-
-function caput(name, value, timeout) {
- /*
- Writes to an Epics PV.
-
- Args:
- name(str): PV name
- value(scalar, string or array): new PV value.
- timeout(int, optional): timeout in seconds to the write. If null waits forever to completion.
-
- Returns:
- None
- */
- if (is_defined(timeout))
- timeout = timeout * 1000
- else
- timeout = null
- return Epics.put(name, value, timeout)
-}
-
-function caputq(name, value) {
- /*
- Writes to an Epics PV and does not wait.
-
- Args:
- name(str): PV name
- value(scalar, string or array): new PV value.
-
- Returns:
- None
- */
- return Epics.putq(name, value)
-}
-
-
-function create_channel(name, type, size) {
- if (!is_defined(type))
- type = null;
- if (!is_defined(size))
- size = null;
- return Epics.newChannel(name, Epics.getChannelType(type), size)
-}
-
-
-function create_channel_device(channelName, type, size, deviceName){
- if (!is_defined(type))
- type = null;
- if (!is_defined(size))
- size = null;
- if (!is_defined(deviceName))
- deviceName = null;
- dev = Epics.newChannelDevice(deviceName, channelName,Epics.getChannelType(type))
- if (get_context().isSimulation()){
- dev.setSimulated()
- }
- dev.initialize()
- if (size != null){
- dev.setSize(size)
- }
- return dev
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// Concurrent execution
-///////////////////////////////////////////////////////////////////////////////////////////////////
-function _getCallable(func, args) {
- var callable = new java.util.concurrent.Callable() {
- call: function () {
- //return func(args)
- return func.apply( this, args );
- }
- }
- return callable
-}
-
-function fork() {
- /*
- Start execution of methods in parallel.
-
- Args:
- *functions(functions references)
-
- Returns:
- List of callable objects
- */
- var callables = []
- for( var i =0; i0){
- callables.push(_getCallable(m[0], m[1]))
- }
- else{
- callables.push(_getCallable(m))
- }
-
- }
- return Threading.fork(callables)
-}
-
-function join(futures) {
- /*
- Wait parallel execution of methods.
-
- Args:
- callables(list of Callables) : as returned from fork
-
- Returns:
- None
- */
- try{
- return Threading.join(futures)
- } catch(err){
- throw err.getCause()
- }
-}
-
-function parallelize() {
- /*
- Equivalent to fork + join
-
- Args:
- *methods(method references)
-
- Returns:
- None
- */
- futures = fork.apply(this, arguments)
- return join(futures)
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// Script evaluation and Background task control.
-///////////////////////////////////////////////////////////////////////////////////////////////////
-function run(script_name, args) {
- /*
- Run script: can be absolute path, relative, or short name to be search in the path.
- Args:
- args(Dict ot Array): gobal variables set to the script(if dict), or argv varialble (if array).
-
- Returns:
- The script return value
- */
- var script = get_context().scriptManager.library.resolveFile(script_name)
- var file = script!=null ? new File(script) : null
- if ((file == null) || ( ! file.exists())) throw "Invalid script: " + script_name
- get_context().startScriptExecution(args)
-
- if (is_defined(args) && (args!=null)){
- if (is_array(args)){
- argv = args
- } else {
- for (var key in args) {
- eval(key+"="+args[key])
- }
- }
- }
- //eval(new String(Files.readAllBytes(file.toPath())))
- //get_context().scriptManager.interpreter.evalFile(script);
- load(script)
-}
-
-
-function _abort() {
- get_context().abort()
-}
-
-function abort() {
- /*
- Abort the execution of ongoing task. It can be called from the script to quit.
-
- Args:
- None
-
- Returns:
- None
- */
- //Cannot be on script execution thread
- fork(_abort)
-}
-
-function start_task(script, delay, interval){
- /*
- Start a background task
-
- Args:
- script(str): Name of the script implementing the task
- delay(float, optional): time in seconds for the first execution.
- Default starts immediately.
- interval(float, optional): time in seconds for between execution.
- If negative (default), single-execution.
-
- Returns:
- None
- */
- if (!is_defined(delay)) delay = 0.0;
- if (!is_defined(interval)) interval = -1;
- var delay_ms = delay_ms * 1000
- var interval_ms = (interval>=0) ? interval_ms * 1000 : interval
- get_context().taskManager.create(script, delay_ms, interval_ms)
- get_context().taskManager.start(script)
-}
-
-function stop_task(script, force){
- /*
- Stop a background task
-
- Args:
- script(str): Name of the script implementing the task
- force(boolean, optional): interrupt current execution, if running
-
- Returns:
- None
- */
- if (!is_defined(force)) force = false;
- get_context().taskManager.remove(script, force)
-}
-
-function set_return(value){
- /*
- Sets the script return value. This value is returned by the "run" function.
-
- Args:
- value(Object): script return value.
-
- Returns:
- None
- */
- if (is_interpreter_thread()){
- _=value
- }
- __THREAD_EXEC_RESULT__.put(java.lang.Thread.currentThread(),value) //Used when running file
- return value //Used when parsing file
-}
-
-function is_interpreter_thread(){
- return java.lang.Thread.currentThread().name == "Interpreter Thread"
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// Versioning tools
-///////////////////////////////////////////////////////////////////////////////////////////////////
-function commit(message, force){
- /*
- Commit the changes to the repository. If manual commit is not configured then there is no need to call this function: commits are made as needed.
-
- Args:
- message(str): commit message
- force(bool, optional): if False, raises exception if no change detected in repo
- Returns:
- None
- */
- if (!is_defined(force)) force = false;
- get_context().commit(message, force)
-}
-
-function diff(){
- /*
- Return list of changes in the repository
-
- Args:
- None
-
- Returns:
- None
- */
- return get_context().diff()
-}
-
-function checkout_tag(tag){
- /*
- Checkout a tag name.
-
- Args:
- tag(str): tag name.
-
- Returns:
- None
- */
- get_context().checkoutTag(tag)
-}
-
-function checkout_branch(tag){
- /*
- Checkout a local branch name.
-
- Args:
- tag(str): branch name.
-
- Returns:
- None
- */
- get_context().checkoutLocalBranch(tag)
-}
-
-function pull_repository(){
- /*
- Push to remote repository.
-
- Args:
- all_branches(boolean, optional): all branches or just current.
- force(boolean, optional): force flag.
-
- Returns:
- None
- */
- get_context().pullFromUpstream()
-}
-
-function push_repository(all_branches, force){
- /*
- Push to remote repository.
-
- Args:
- all_branches(boolean, optional): all branches or just current.
- force(boolean, optional): force flag.
-
- Returns:
- None
- */
- if (!is_defined(all_branches)) all_branches = True;
- if (!is_defined(force)) force = false;
-
- get_context().pushToUpstream(all_branches, force)
-}
-
-function cleanup_repository(){
- /*
- Performs a repository cleanup.
-
- Args:
- None
-
- Returns:
- None
- */
- get_context().cleanupRepository()
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// Device Pool & Imaging setup
-///////////////////////////////////////////////////////////////////////////////////////////////////
-function get_device(device_name){
- /*
- Returns a configured device (or imaging source) by its name.
-
- Args:
- device_name(str): name of the device.
-
- Returns:
- device
- */
- return get_context().devicePool.getByName(device_name)
-}
-
-function add_device(device, force){
- /*
- Add a device (or imaging source) to the device pool.
-
- Args:
- device(Device or Source): device object.
- force(boolean, optional): if true then dispose existing device with same name.
- Otherwise will fail in case of name clash.
-
- Returns:
- True if device was added, false if was already in the pool, or exception in case of name clash.
- */
- if (!is_defined(force)) force = false;
- if (get_context().devicePool.contains(device)){
- return false
- }
- if (force){
- dev = get_context().devicePool.getByName(device.getName())
- if (dev!=null)
- remove_device(dev)
- }
- return get_context().devicePool.addDevice(device)
-}
-
-function remove_device(device){
- /*
- Remove a device (or imaging source) from the device pool.
-
- Args:
- device(Device or Source): device object.
-
- Returns:
- bool: true if device was removed.
-
- */
- return get_context().devicePool.removeDevice(device)
-}
-
-function set_device_alias(device, alias){
- /*
- Set a device alias to be used in scans (datasets and plots).
-
- Args:
- device(Device): device object.
- alias(str): replace device name in scans.
-
- Returns:
- None
- */
- get_context().dataManager.setAlias(device, alias)
-}
-
-function stop(){
- /*
- Stop all devices implementing the Stoppable interface.
-
- Args:
- None
-
- Returns:
- None
- */
- get_context().stopAll()
-}
-
-function update(){
- /*
- Update all devices.
-
- Args:
- None
-
- Returns:
- None
- */
- get_context().updateAll()
-}
-
-function reinit(dev){
- /*
- Re-initialize devices.
-
- Args:
- dev(Device, optional): the device to be re-initialized.
- If null re-initialize all devices not yet initialized.
-
- Returns:
- List with devices not initialized.
- */
- if (!is_defined(dev)) dev = null;
- return to_array(get_context().reinit())
-}
-
-function create_averager(dev, count, interval, name){
- /*
- Creates and initializes and averager for dev.
-
- Args:
- dev(Device): the source device
- count(int): number of samples
- interval(float, optional): sampling interval in seconds.
- If less than zero, sampling is made on data change event.
-
- Returns:
- Averager device
- */
- if (!is_defined(interval)) interval = 0.0;
- if (!is_defined(name)) name = null;
- dev = string_to_obj(dev)
- var averager = (name == null) ? new Averager(dev, count, interval*1000) : new Averager(name, dev, count, interval*1000)
- averager.initialize()
- return averager
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-//Mathematical functions
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-function mean(data){
- /*
- Calculate the mean of a sequence.
-
- Args:
- data(list, tuple, array ...): subscriptable object containing numbers
-
- Returns:
- Mean of the elements in the object.
-
- */
- if (!is_array(data)){
- data = to_array(data)
- }
- return data.reduce(function(sum, value){return sum + value;}, 0) / data.length;
-}
-
-function variance(data){
- /*
- Calculate the variance of a sequence.
-
- Args:
- data(list, tuple, array ...): subscriptable object containing numbers
-
- Returns:
- Variance of the elements in the object.
-
- */
- var c = mean(data)
- return mean(data.map(function(value){return Math.pow((value - c),2);}));
-}
-
-function stdev(data){
- /*
- Calculate the standard deviation of a sequence.
-
- Args:
- data(list, tuple, array ...): subscriptable object containing numbers
-
- Returns:
- Standard deviation of the elements in the object.
-
- */
- return Math.sqrt(variance(data))
-}
-
-function poly(val, coefs){
- /*
- Evaluates a polinomial: (coefs[0] + coefs[1]*val + coefs[2]*val^2...
-
- Args:
- val(float): value
- coefs (list of loats): polinomial coefficients
- Returns:
- Evaluated function for val
-
- */
- var r = 0
- var p = 0
- for (c in coefs){
- r = r + coefs[c] * Math.pow(val, p)
- p = p + 1
- }
- return r
-}
-
-function histogram(data, range_min, range_max, bin){
- /*
- Creates histogram on data.
-
- Args:
- data (tuple, array, ArrayList or Array): input data can be multi-dimensional or nested.
- range_min (int, optional): minimum histogram value. Default is floor(min(data))
- range_max (int, optional): maximul histogram value. Default is ceil(max(data))
- bin(int or float, optional): if int means number of bins. If float means bin size. Default = 1.0.
- Returns:
- tuple: (ydata, xdata)
-
- */
- flat = flatten(data)
- if (!is_defined(range_min)) range_max = null
- if (!is_defined(range_max)) range_max = null
- if (!is_defined(bin)) bin = 1.0
- if (range_min == null) range_min = Math.floor(Math.min.apply(null,flat))
- if (range_max == null) range_max = Math.ceil(Math.max.apply(null,flat))
-
- if (is_float(bin)){
- bin_size = bin
- n_bin = Math.ceil((range_max - range_min)/bin_size)
- }
- else{
- n_bin = bin
- bin_size = (range_max - range_min)/bin
- }
- var result = []; var size=n_bin; while(size--) result.push(0)
- for (var d in flat){
- b = Math.floor( (flat[d] - range_min) / bin_size)
- if ((b >=0) && (b < n_bin)){
- result[b] = result[b] + 1
- }
- }
- var result_x = []; var size=result.length; var p=range_min; while(size--) {result_x.push(p); p+=bin_size }
- return [result,result_x]
-}
-
-function cmp(a, b){
- if (a>b) return 1
- if (a= 2 && cross(lower[lower.length - 2], lower[lower.length - 1], points[i]) <= 0) {
- lower.pop();
- }
- lower.push(points[i]);
- }
-
- var upper = [];
- for (var i = points.length - 1; i >= 0; i--) {
- while (upper.length >= 2 && cross(upper[upper.length - 2], upper[upper.length - 1], points[i]) <= 0) {
- upper.pop();
- }
- upper.push(points[i]);
- }
-
- upper.pop();
- lower.pop();
- var hull = lower.concat(upper);
- if (!is_point_list){
- var px=[]
- var py=[]
- for (var i=0; i0){
- var ByteArray = Java.type("byte[]");
- var arr = new ByteArray(bytes);
- proc.getErrorStream().read(arr, 0, bytes)
- throw new java.lang.String(arr)
- }
-
- bytes = proc.getInputStream().available()
- if (bytes>0){
- var ByteArray = Java.type("byte[]");
- var arr = new ByteArray(bytes);
- proc.getInputStream().read(arr, 0, bytes)
- return new java.lang.String(arr)
- }
- return null
-}
-
-function exec_cpython(script_name, args, python_name){
- /*Executes an external cpython process.
-
- Args:
- script_name (str): name of the script (can be absolute or relative to script folder).
- args(list, optional): arguments to python process (or parameters to method, if not null)
- python_name (str, optional): name of executable
- Returns:
- Return of python process.
- */
- if (!is_defined(args)) args = []
- if (!is_defined(python_name)) python_name = "python"
-
- if (!script_name.toLowerCase().endsWith(".py")){
- script_name += ".py"
- }
- script = get_context().scriptManager.library.resolveFile(script_name)
- if (script == null){
- script= os.path.abspath(script_name)
- }
- c = python_name + " " + script + " "
- if ( args ){
- for (var arg in args){
- c = c + args[arg] + " "
- }
- }
- return exec_cmd(c)
-}
-
-function string_to_obj(o) {
- if (typeof o === 'string') {
- if (o.contains("://")){
- return new UrlDevice(o)
- }
- return eval(o)
- } else if (o instanceof Array) {
- ret = []
- for (var i = 0; i < o.length; i++)
- ret.push(string_to_obj(o[i]));
- return ret
- }
- return o
-}
-
-function bsget(channel){
- /* Reads an values a bsread stream, using the default provider.
-
- Args:
- channel(str or list of str): channel name(s)
- Returns:
- BS value or list of values
-
- */
- var channels = (typeof channel === 'string')? [channel]: channel
- var ret = Stream.readChannels(channels)
- if (typeof channel === 'string') {
- return ret[0]
- }
- return ret
-}
-
-function flatten(arr) {
- var ret = [];
- if (is_java_list(arr)){
- arr = to_array(arr)
- } else if (is_java_array(arr)) {
- arr = Java.from(arr);
- }
-
- for(var i = 0; i < arr.length; i++) {
- if((is_java_list(arr[i])) || (is_java_array(arr[i])) || (is_array(arr[i]))) {
- ret = ret.concat(flatten(arr[i]));
- } else {
- ret.push(arr[i]);
- }
- }
- return ret;
-}
-function range(start, stop, step, add_last) {
- if (!is_defined(add_last)) add_last = false
- var ret = []
- var cur = start;
- if (((start>stop) && (step>0)) ||((start= 0.0) && (cur < stop)) || ((step < 0.0) && (cur > start))){
- ret.push(cur)
- cur += step;
- }
- if (add_last) ret.push(stop)
- return ret;
-}
-
-function inject(){
- /*
- Restore initial globals: re-inject devices and startup variables to the interpreter.
-
- Args:
- None
-
- Returns:
- None
-
- */
- get_context().injectVars()
-}
-
-function notify(subject, text, attachments, to){
- /*Send email message.
-
- Args:
- subject(str): Message subject.
- text(str): Message body.
- attachments(list of str, optional): list of files to be attached (expansion tokens are allowed).
- to (list ofd str, optional): recipients. If None uses the recipients defined in mail.properties.
- Returns:
- None
-
- */
- if (!is_defined(attachments)) attachments = null
- if (!is_defined(to)) to = null
- get_context().notify(subject, text, attachments, to)
-}
-
-function sleep(seconds){
- java.lang.Thread.sleep(seconds * 1000);
-}
-
-
-function sort_indexes(arr, decreasing) {
- arr = to_array(arr)
- var sort = arr.slice(0)
- for (var i = 0; i < sort.length; i++) {
- sort[i] = [sort[i], i];
- }
- sort.sort(function(left, right) {
- return left[0] < right[0] ? -1 : 1;
- });
- var sort_indices = [];
- for (var i = 0; i < sort.length; i++) {
- sort_indices.push(sort[i][1]);
- sort[i] = sort[i][0];
- }
- if (decreasing){
- sort_indices.reverse()
- }
- return sort_indices;
-}
-
-function _getBuiltinFunctionNames(){
- ret = []
- for (var obj in this) {
- if (typeof this[obj] == "function" &&
- this.hasOwnProperty(obj) &&
- !(/[A-Z]/.test(obj)) && //TODO: This checking is not good, it is to filter all classes names seen as function
- !(obj.startsWith("_"))
- ) {
- var str = this[obj].toString()
- if (str.contains("\*\/") && str.contains("\/\*") && str.contains("{")){
- ret.push(obj.toString())
- }
- }
- }
- return ret
-}
-
-function _getFunctionDoc(f){
- if (typeof f == "function"){
- f = f.name
- }
- var str = this[f].toString()
-
- str = str.trim()
- if (str.startsWith("function ")){
- str = str.substring(9).trim()
- }
- if (str.contains("\*\/")){
- str = str.substring(0, str.indexOf("\*\/")+2)
- if (str.contains("{")){
- var index = str.indexOf("{")
- return (str.substring(0, index) + str.substring(index+1)).trim()
- }
- }
- return null
-}
-
-function help(object){
- /* Print help message for function or object (if available).
-
- Args:
- object (any, optional): function or object to get help.
- If null prints a list of the builtin functions.
-
- Returns:
- None
-
- */
- if (!is_defined(object)){
- print ("Built-in functions:")
- var names = _getBuiltinFunctionNames()
- for (var f in names){
- print ("\t" + names[f])
- }
- } else {
- //if (typeof object == "function"){
- // print this[f.name].toString()
- //} else {
- print(object)
- //}
- }
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-//UI interaction
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-function set_status(status){
- /*
- Set the application status.
-
- Args:
- status(str): new status.
-
- Returns:
- None
- */
- set_preference(ViewPreference.STATUS, status)
-}
-
-function set_preference(preference, value){
- /*
- Hints to graphical layer:
-
- Args:
- preference(ViewPreference): Preference name
- Preference.SCAN_PLOT_DISABLED #enable/disable scan plot (True/False)
- Preference.SCAN_TABLE_DISABLED #enable/disable scan table (True/False)
- Preference.ENABLED_PLOTS #select Readables to be plotted (list of Readable or
- String (Readable names))
- Preference.PLOT_TYPES #Dictionary or (Readable or String):(String or int) pairs
- where the key is a plot name and the value is the desired plot type
- Preference.PRINT_SCAN #Print scan records to console
- Preference.AUTO_RANGE # Automatic range scan plots x-axis
- Preference.MANUAL_RANGE # Manually set scan plots x-axis
- Preference.DOMAIN_AXIS #Set the domain axis source: "Time", "Index", or a readable name.
- Default(None): first positioner
- Preference.STATUS # set application status
- value(object): preference value
-
- Returns:
- None
- */
- if (get_rank(value)>0){
- value = to_array(value, 'o')
- }
- get_context().setPreference(preference, value)
-}
-
-function get_string(msg, default_value, alternatives, password){
- /*
- Reads a string from UI
- Args:
- msg(str): display message.
- default_value(str, optional): value displayed when window is shown.
- alternatives(list of str, optional): if provided presents a combo box instead of an editing field.
- password(boolean, optional): if True hides entered characters.
-
- Returns:
- String entered of null if canceled
- */
- if (!is_defined(default_value)) default_value = null;
- if (!is_defined(alternatives)) alternatives = null;
- if (!is_defined(password)) password = false;
- if (password){
- return get_context().getPassword(msg, null)
- }
- return get_context().getString(msg, (default_value==null) ? null: default_value.toString(), alternatives)
-}
-
-function get_option(msg, type ){
- /*
- Gets an option from UI
- Args:
- msg(str): display message.
- type(str, optional): 'YesNo','YesNoCancel' or 'OkCancel'
-
- Returns:
- 'Yes', 'No', 'Cancel'
-
- */
- if (!is_defined(type)) type = "YesNoCancel";
- return get_context().getOption(msg, type)
-}
-
-function show_message(msg, title, blocking){
- /*
- Pops a blocking message to UI
-
- Args:
- msg(str): display message.
- title(str, optional): dialog title
- */
- if (!is_defined(title)) title = null;
- if (!is_defined(blocking)) title = true;
- get_context().showMessage(msg, title, blocking)
-}
-
-function show_panel(device, title){
- /*
- Show, if exists, the panel relative to this device.
-
- Args:
- device(Device or str or BufferedImage): device
- title only apply to BufferedImage objects. For devices the title is the device name.
- */
- if (!is_defined(title)) title = null;
- if (device.class == BufferedImage.class){
- device = new DirectSource(title, device)
- device.initialize()
- }
- if (typeof device == 'string'){
- device = get_device(device)
- }
- return get_context().showPanel(device)
-}
-
diff --git a/script/_Lib/startup.py b/script/_Lib/startup.py
deleted file mode 100644
index 2b78f51..0000000
--- a/script/_Lib/startup.py
+++ /dev/null
@@ -1,2434 +0,0 @@
-###################################################################################################
-# Global definitions and built-in functions
-###################################################################################################
-
-import sys
-import time
-import math
-import types
-import inspect
-import os.path
-from operator import add, mul, sub, truediv
-from time import sleep
-
-from array import array
-import jarrayRegisterRegister
-
-import java.lang.Class as Class
-import java.lang.Object as Object
-import java.beans.PropertyChangeListener
-import java.util.concurrent.Callable
-import java.util.List
-import java.lang.reflect.Array
-import java.awt.image.BufferedImage as BufferedImage
-import java.awt.Color as Color
-import java.awt.Dimension as Dimension
-import java.awt.Font as Font
-
-import org.python.core.PyArray as PyArray
-
-import ch.psi.utils.Threading as Threading
-import ch.psi.utils.State as State
-import ch.psi.utils.Convert as Convert
-import ch.psi.utils.Arr as Arr
-import ch.psi.utils.Chrono as Chrono
-import ch.psi.pshell.core.CommandSource as CommandSource
-import ch.psi.pshell.core.ContextAdapter as ContextListener
-import ch.psi.pshell.core.Context
-import ch.psi.pshell.core.UrlDevice as UrlDevice
-import ch.psi.pshell.data.PlotDescriptor as PlotDescriptor
-import ch.psi.pshell.data.Table as Table
-import ch.psi.pshell.device.Device as Device
-import ch.psi.pshell.device.DeviceBase as DeviceBase
-import ch.psi.pshell.device.RegisterBase as RegisterBase
-import ch.psi.pshell.device.ProcessVariableBase as ProcessVariableBase
-import ch.psi.pshell.device.ControlledVariableBase as ControlledVariableBase
-import ch.psi.pshell.device.PositionerBase as PositionerBase
-import ch.psi.pshell.device.MotorBase as MotorBase
-import ch.psi.pshell.device.DiscretePositionerBase as DiscretePositionerBase
-import ch.psi.pshell.device.MotorGroupBase as MotorGroupBase
-import ch.psi.pshell.device.MotorGroupDiscretePositioner as MotorGroupDiscretePositioner
-import ch.psi.pshell.device.ReadonlyRegisterBase as ReadonlyRegisterBase
-import ch.psi.pshell.device.ReadonlyAsyncRegisterBase as ReadonlyAsyncRegisterBase
-import ch.psi.pshell.device.RegisterCache as RegisterCache
-import ch.psi.pshell.device.ReadonlyRegister.ReadonlyRegisterArray as ReadonlyRegisterArray
-import ch.psi.pshell.device.ReadonlyRegister.ReadonlyRegisterMatrix as ReadonlyRegisterMatrix
-import ch.psi.pshell.device.DummyPositioner as DummyPositioner
-import ch.psi.pshell.device.DummyMotor as DummyMotor
-import ch.psi.pshell.device.DummyRegister as DummyRegister
-import ch.psi.pshell.device.Timestamp as Timestamp
-import ch.psi.pshell.device.Interlock as Interlock
-import ch.psi.pshell.device.Readable as Readable
-import ch.psi.pshell.device.Readable.ReadableArray as ReadableArray
-import ch.psi.pshell.device.Readable.ReadableMatrix as ReadableMatrix
-import ch.psi.pshell.device.Readable.ReadableCalibratedArray as ReadableCalibratedArray
-import ch.psi.pshell.device.Readable.ReadableCalibratedMatrix as ReadableCalibratedMatrix
-import ch.psi.pshell.device.ArrayCalibration as ArrayCalibration
-import ch.psi.pshell.device.MatrixCalibration as MatrixCalibration
-import ch.psi.pshell.device.Writable as Writable
-import ch.psi.pshell.device.Writable.WritableArray as WritableArray
-import ch.psi.pshell.device.Stoppable as Stoppable
-import ch.psi.pshell.device.Averager as Averager
-import ch.psi.pshell.device.ArrayAverager as ArrayAverager
-import ch.psi.pshell.device.Delta as Delta
-import ch.psi.pshell.device.DeviceAdapter as DeviceListener
-import ch.psi.pshell.device.ReadbackDeviceAdapter as ReadbackDeviceListener
-import ch.psi.pshell.device.MotorAdapter as MotorListener
-import ch.psi.pshell.device.MoveMode as MoveMode
-import ch.psi.pshell.device.SettlingCondition as SettlingCondition
-import ch.psi.pshell.epics.Epics as Epics
-import ch.psi.pshell.epics.EpicsScan as EpicsScan
-import ch.psi.pshell.epics.ChannelSettlingCondition as ChannelSettlingCondition
-import ch.psi.pshell.imaging.Source as Source
-import ch.psi.pshell.imaging.SourceBase as SourceBase
-import ch.psi.pshell.imaging.DirectSource as DirectSource
-import ch.psi.pshell.imaging.RegisterMatrixSource as RegisterMatrixSource
-import ch.psi.pshell.imaging.ImageListener as ImageListener
-import ch.psi.pshell.plot.LinePlotSeries as LinePlotSeries
-import ch.psi.pshell.plot.LinePlotErrorSeries as LinePlotErrorSeries
-import ch.psi.pshell.plot.MatrixPlotSeries as MatrixPlotSeries
-import ch.psi.pshell.scan.LineScan
-import ch.psi.pshell.scan.ContinuousScan
-import ch.psi.pshell.scan.AreaScan
-import ch.psi.pshell.scan.VectorScan
-import ch.psi.pshell.scan.ManualScan
-import ch.psi.pshell.scan.HardwareScan
-import ch.psi.pshell.scan.RegionScan
-import ch.psi.pshell.scan.TimeScan
-import ch.psi.pshell.scan.MonitorScan
-import ch.psi.pshell.scan.BinarySearch
-import ch.psi.pshell.scan.HillClimbingSearch
-import ch.psi.pshell.scan.ScanResult
-import ch.psi.pshell.bs.BsScan
-import ch.psi.pshell.bs.Stream as Stream
-import ch.psi.pshell.scripting.ViewPreference as Preference
-import ch.psi.pshell.scripting.ScriptUtils as ScriptUtils
-
-
-def get_context():
- return ch.psi.pshell.core.Context.getInstance()
-
-###################################################################################################
-#Type conversion and checking
-###################################################################################################
-
-
-def to_array(obj, type = 'o'):
- """Convert Python list to Java array.
-
- Args:
- obj(list): Original data.
- type(str): array type 'b' = byte, 'h' = short, 'i' = int, 'l' = long, 'f' = float, 'd' = double,
- 'c' = char, 'z' = boolean, 's' = String, 'o' = Object
- Returns:
- Java array.
-
- """
- if type[0] == '[':
- type = type[1:]
- arrayType = ScriptUtils.getType("["+type)
-
- if obj is None:
- return None
- if isinstance(obj,java.util.List):
- obj = obj.toArray()
- if type != 'o':
- obj = Convert.toPrimitiveArray(obj, ScriptUtils.getType(type))
- if isinstance(obj,PyArray):
- if type != 'o':
- if (Arr.getRank(obj)== 1) and (obj.typecode != type):
- ret = java.lang.reflect.Array.newInstance(ScriptUtils.getType(type), len(obj))
- if type == 's':
- for i in range(len(obj)): ret[i] = str(obj[i])
- elif type == 'c':
- for i in range(len(obj)): ret[i] = chr(obj[i])
- else:
- for i in range(len(obj)): ret[i] = obj[i]
- obj = ret
- if type not in ['o', 's']:
- obj = Convert.toPrimitiveArray(obj)
- return obj
- if is_list(obj):
- if type=='o' or type== 's':
- ret = java.lang.reflect.Array.newInstance(ScriptUtils.getType(type), len(obj))
- for i in range (len(obj)):
- if is_list(obj[i]):
- ret[i] = to_array(obj[i],type)
- elif type == 's':
- ret[i] = str(obj[i])
- else:
- ret[i] = obj[i]
- return ret
-
- if len(obj)>0 and is_list(obj[0]):
- if len(obj[0])>0 and is_list(obj[0][0]):
- ret = java.lang.reflect.Array.newInstance(arrayType,len(obj),len(obj[0]))
- for i in range(len(obj)):
- ret[i]=to_array(obj[i], type)
- return ret
- else:
- ret = java.lang.reflect.Array.newInstance(arrayType,len(obj))
- for i in range(len(obj)):
- ret[i]=to_array(obj[i], type)
- return ret
- return jarray.array(obj,type)
- return obj
-
-def to_list(obj):
- """Convert an object into a Python List.
-
- Args:
- obj(tuple or array or ArrayList): Original data.
- Returns:
- List.
-
- """
- if obj is None:
- return None
- if isinstance(obj,tuple) or isinstance(obj,java.util.ArrayList) :
- return list(obj)
- #if isinstance(obj,PyArray):
- # return obj.tolist()
- if not isinstance(obj,list):
- return [obj,]
- return obj
-
-def is_list(obj):
- return isinstance(obj,tuple) or isinstance(obj,list) or isinstance (obj, java.util.ArrayList)
-
-def is_string(obj):
- return (type(obj) is str) or (type(obj) is unicode)
-
-###################################################################################################
-#Standard scan commands
-###################################################################################################
-def on_before_scan_readout(scan, pos):
- try:
- if scan.before_read != None:
- arguments = scan.before_read.func_code.co_argcount
- if arguments == 0:
- scan.before_read()
- elif arguments==1:
- scan.before_read(pos.tolist())
- elif arguments==2:
- scan.before_read(pos.tolist(), scan)
- except AttributeError:
- pass
-
-def on_after_scan_readout(scan, record):
- try:
- if scan.after_read != None:
- arguments = scan.after_read.func_code.co_argcount
- if arguments == 0:
- scan.after_read()
- elif arguments==1:
- scan.after_read(record)
- elif arguments==2:
- scan.after_read(record, scan)
- except AttributeError:
- pass
-
-def on_before_scan_pass(scan, num_pass):
- try:
- if scan.before_pass != None:
- arguments = scan.before_pass.func_code.co_argcount
- if arguments == 0:
- scan.before_pass()
- elif arguments==1:
- scan.before_pass(num_pass)
- elif arguments==2:
- scan.before_pass(num_pass, scan)
- except AttributeError:
- pass
-
-def on_after_scan_pass(scan, num_pass):
- try:
- if scan.after_pass != None:
- arguments = scan.after_pass.func_code.co_argcount
- if arguments == 0:
- scan.after_pass()
- elif arguments==1:
- scan.after_pass(num_pass)
- elif arguments==2:
- scan.after_pass(num_pass, scan)
- except AttributeError:
- pass
-
-class LineScan(ch.psi.pshell.scan.LineScan):
- def onBeforeReadout(self, pos):
- on_before_scan_readout(self, pos)
-
- def onAfterReadout(self, record):
- on_after_scan_readout(self, record)
-
- def onBeforePass(self, num_pass):
- on_before_scan_pass(self, num_pass)
-
- def onAfterPass(self, num_pass):
- on_after_scan_pass(self, num_pass)
-
-class ContinuousScan(ch.psi.pshell.scan.ContinuousScan):
- def onBeforeReadout(self, pos):
- on_before_scan_readout(self, pos)
-
- def onAfterReadout(self, record):
- on_after_scan_readout(self, record)
-
- def onBeforePass(self, num_pass):
- on_before_scan_pass(self, num_pass)
-
- def onAfterPass(self, num_pass):
- on_after_scan_pass(self, num_pass)
-
-class AreaScan(ch.psi.pshell.scan.AreaScan):
- def onBeforeReadout(self, pos):
- on_before_scan_readout(self, pos)
-
- def onAfterReadout(self, record):
- on_after_scan_readout(self, record)
-
- def onBeforePass(self, num_pass):
- on_before_scan_pass(self, num_pass)
-
- def onAfterPass(self, num_pass):
- on_after_scan_pass(self, num_pass)
-
-class RegionScan(ch.psi.pshell.scan.RegionScan):
- def onBeforeReadout(self, pos):
- on_before_scan_readout(self, pos)
-
- def onAfterReadout(self, record):
- on_after_scan_readout(self, record)
-
- def onBeforePass(self, num_pass):
- on_before_scan_pass(self, num_pass)
-
- def onAfterPass(self, num_pass):
- on_after_scan_pass(self, num_pass)
-
-class VectorScan(ch.psi.pshell.scan.VectorScan):
- def onBeforeReadout(self, pos):
- on_before_scan_readout(self, pos)
-
- def onAfterReadout(self, record):
- on_after_scan_readout(self, record)
-
- def onBeforePass(self, num_pass):
- on_before_scan_pass(self, num_pass)
-
- def onAfterPass(self, num_pass):
- on_after_scan_pass(self, num_pass)
-
-class ContinuousScan(ch.psi.pshell.scan.ContinuousScan):
- def onBeforeReadout(self, pos):
- on_before_scan_readout(self, pos)
-
- def onAfterReadout(self, record):
- on_after_scan_readout(self, record)
-
- def onBeforePass(self, num_pass):
- on_before_scan_pass(self, num_pass)
-
- def onAfterPass(self, num_pass):
- on_after_scan_pass(self, num_pass)
-
-class TimeScan(ch.psi.pshell.scan.TimeScan):
- def onBeforeReadout(self, pos):
- on_before_scan_readout(self, pos)
-
- def onAfterReadout(self, record):
- on_after_scan_readout(self, record)
-
- def onBeforePass(self, num_pass):
- on_before_scan_pass(self, num_pass)
-
- def onAfterPass(self, num_pass):
- on_after_scan_pass(self, num_pass)
-
-class MonitorScan(ch.psi.pshell.scan.MonitorScan):
- def onBeforeReadout(self, pos):
- on_before_scan_readout(self, pos)
-
- def onAfterReadout(self, record):
- on_after_scan_readout(self, record)
-
- def onBeforePass(self, num_pass):
- on_before_scan_pass(self, num_pass)
-
- def onAfterPass(self, num_pass):
- on_after_scan_pass(self, num_pass)
-
-class BsScan(ch.psi.pshell.bs.BsScan):
- def onBeforeReadout(self, pos):
- on_before_scan_readout(self, pos)
-
- def onAfterReadout(self, record):
- on_after_scan_readout(self, record)
-
- def onBeforePass(self, num_pass):
- on_before_scan_pass(self, num_pass)
-
- def onAfterPass(self, num_pass):
- on_after_scan_pass(self, num_pass)
-
-class ManualScan (ch.psi.pshell.scan.ManualScan):
- def __init__(self, writables, readables, start = None, end = None, steps = None, relative = False):
- ch.psi.pshell.scan.ManualScan.__init__(self, writables, readables, start, end, steps, relative)
-
- def append(self,setpoints, positions, values, timestamps=None):
- ch.psi.pshell.scan.ManualScan.append(self, to_array(setpoints), to_array(positions), to_array(values), None if (timestamps is None) else to_array(timestamps))
-
-class BinarySearch(ch.psi.pshell.scan.BinarySearch):
- def onBeforeReadout(self, pos):
- on_before_scan_readout(self, pos)
-
- def onAfterReadout(self, record):
- on_after_scan_readout(self, record)
-
-class HillClimbingSearch(ch.psi.pshell.scan.HillClimbingSearch):
- def onBeforeReadout(self, pos):
- on_before_scan_readout(self, pos)
-
- def onAfterReadout(self, record):
- on_after_scan_readout(self, record)
-
-def processScanPars(scan, pars):
- scan.before_read = pars.pop("before_read",None)
- scan.after_read = pars.pop("after_read",None)
- scan.before_pass = pars.pop("before_pass",None)
- scan.after_pass = pars.pop("after_pass",None)
- scan.setPlotTitle(pars.pop("title",None))
- get_context().setCommandPars(scan, pars)
-
-def lscan(writables, readables, start, end, steps, latency=0.0, relative=False, passes=1, zigzag=False, **pars):
- """Line Scan: positioners change together, linearly from start to end positions.
-
- Args:
- writables(list of Writable): Positioners set on each step.
- readables(list of Readable): Sensors to be sampled on each step.
- start(list of float): start positions of writables.
- end(list of float): final positions of writables.
- steps(int or float or list of float): number of scan steps (int) or step size (float).
- relative (bool, optional): if true, start and end positions are relative to
- current at start of the scan
- latency(float, optional): settling time for each step before readout, defaults to 0.0.
- passes(int, optional): number of passes
- zigzag(bool, optional): if true writables invert direction on each pass.
- pars(keyworded variable length arguments, optional): scan optional named arguments:
- - title(str, optional): plotting window name.
- - before_read (function, optional): callback on each step, before sampling. Arguments: positions, scan
- - after_read (function, optional): callback on each step, after sampling. Arguments: record, scan.
- - before_pass (function, optional): callback before each scan pass execution. Arguments: pass_num, scan.
- - after_pass (function, optional): callback after each scan pass execution. Arguments: pass_num, scan.
- - Aditional arguments defined by set_exec_pars.
-
- Returns:
- ScanResult object.
-
- """
- latency_ms=int(latency*1000)
- writables=to_list(string_to_obj(writables))
- readables=to_list(string_to_obj(readables))
- start=to_list(start)
- end=to_list(end)
- if type(steps) is float or is_list(steps):
- steps = to_list(steps)
- scan = LineScan(writables,readables, start, end , steps, relative, latency_ms, int(passes), zigzag)
- processScanPars(scan, pars)
- scan.start()
- return scan.getResult()
-
-def vscan(writables, readables, vector, line = False, latency=0.0, relative=False, passes=1, zigzag=False, **pars):
- """Vector Scan: positioners change following values provided in a vector.
-
- Args:
- writables(list of Writable): Positioners set on each step.
- readables(list of Readable): Sensors to be sampled on each step.
- vector(list of list of float): table of positioner values.
- line (bool, optional): if true, processs as line scan (1d)
- relative (bool, optional): if true, start and end positions are relative to current at
- start of the scan
- latency(float, optional): settling time for each step before readout, defaults to 0.0.
- passes(int, optional): number of passes
- zigzag(bool, optional): if true writables invert direction on each pass.
- pars(keyworded variable length arguments, optional): scan optional named arguments:
- - title(str, optional): plotting window name.
- - before_read (function, optional): callback on each step, before sampling. Arguments: positions, scan
- - after_read (function, optional): callback on each step, after sampling. Arguments: record, scan.
- - before_pass (function, optional): callback before each scan pass execution. Arguments: pass_num, scan.
- - after_pass (function, optional): callback after each scan pass execution. Arguments: pass_num, scan.
- - Aditional arguments defined by set_exec_pars.
-
- Returns:
- ScanResult object.
-
- """
- latency_ms=int(latency*1000)
- writables=to_list(string_to_obj(writables))
- readables=to_list(string_to_obj(readables))
- if len(vector) == 0:
- vector.append([])
- elif (not is_list(vector[0])) and (not isinstance(vector[0],PyArray)):
- vector = [[x,] for x in vector]
- vector = to_array(vector, 'd')
- scan = VectorScan(writables,readables, vector, line, relative, latency_ms, int(passes), zigzag)
- processScanPars(scan, pars)
- scan.start()
- return scan.getResult()
-
-def ascan(writables, readables, start, end, steps, latency=0.0, relative=False, passes=1, zigzag=False, **pars):
- """Area Scan: multi-dimentional scan, each positioner is a dimention.
-
- Args:
- writables(list of Writable): Positioners set on each step.
- readables(list of Readable): Sensors to be sampled on each step.
- start(list of float): start positions of writables.
- end(list of float): final positions of writables.
- steps(list of int or list of float): number of scan steps (int) or step size (float).
- latency(float, optional): settling time for each step before readout, defaults to 0.0.
- relative (bool, optional): if true, start and end positions are relative to current at
- start of the scan
- passes(int, optional): number of passes
- zigzag (bool, optional): if true writables invert direction on each row.
- pars(keyworded variable length arguments, optional): scan optional named arguments:
- - title(str, optional): plotting window name.
- - before_read (function, optional): callback on each step, before sampling. Arguments: positions, scan
- - after_read (function, optional): callback on each step, after sampling. Arguments: record, scan.
- - before_pass (function, optional): callback before each scan pass execution. Arguments: pass_num, scan.
- - after_pass (function, optional): callback after each scan pass execution. Arguments: pass_num, scan.
- - Aditional arguments defined by set_exec_pars.
-
- Returns:
- ScanResult object.
-
- """
- latency_ms=int(latency*1000)
- writables=to_list(string_to_obj(writables))
- readables=to_list(string_to_obj(readables))
- start=to_list(start)
- end=to_list(end)
- if is_list(steps):
- steps = to_list(steps)
- scan = AreaScan(writables,readables, start, end , steps, relative, latency_ms, int(passes), zigzag)
- processScanPars(scan, pars)
- scan.start()
- return scan.getResult()
-
-
-def rscan(writable, readables, regions, latency=0.0, relative=False, passes=1, zigzag=False, **pars):
- """Region Scan: positioner scanned linearly, from start to end positions, in multiple regions.
-
- Args:
- writable(Writable): Positioner set on each step, for each region.
- readables(list of Readable): Sensors to be sampled on each step.
- regions (list of tuples (float,float, int) or (float,float, float)): each tuple define a scan region
- (start, stop, steps) or (start, stop, step_size)
- relative (bool, optional): if true, start and end positions are relative to
- current at start of the scan
- latency(float, optional): settling time for each step before readout, defaults to 0.0.
- passes(int, optional): number of passes
- zigzag(bool, optional): if true writable invert direction on each pass.
- pars(keyworded variable length arguments, optional): scan optional named arguments:
- - title(str, optional): plotting window name.
- - before_read (function, optional): callback on each step, before sampling. Arguments: positions, scan
- - after_read (function, optional): callback on each step, after sampling. Arguments: record, scan.
- - before_pass (function, optional): callback before each scan pass execution. Arguments: pass_num, scan.
- - after_pass (function, optional): callback after each scan pass execution. Arguments: pass_num, scan.
- - Aditional arguments defined by set_exec_pars.
-
- Returns:
- ScanResult object.
-
- """
- start=[]
- end=[]
- steps=[]
- for region in regions:
- start.append(region[0])
- end.append(region[1])
- steps.append(region[2])
- latency_ms=int(latency*1000)
- writable=string_to_obj(writable)
- readables=to_list(string_to_obj(readables))
- start=to_list(start)
- end=to_list(end)
- steps = to_list(steps)
- scan = RegionScan(writable,readables, start, end , steps, relative, latency_ms, int(passes), zigzag)
- processScanPars(scan, pars)
- scan.start()
- return scan.getResult()
-
-def cscan(writables, readables, start, end, steps, latency=0.0, time=None, relative=False, passes=1, zigzag=False, **pars):
- """Continuous Scan: positioner change continuously from start to end position and readables are sampled on the fly.
-
- Args:
- writable(Speedable or list of Motor): A positioner with a getSpeed method or
- a list of motors.
- readables(list of Readable): Sensors to be sampled on each step.
- start(float or list of float): start positions of writables.
- end(float or list of float): final positions of writabless.
- steps(int or float or list of float): number of scan steps (int) or step size (float).
- latency(float, optional): sleep time in each step before readout, defaults to 0.0.
- time (float, seconds): if not None then writables is Motor array and speeds are
- set according to time.
- relative (bool, optional): if true, start and end positions are relative to
- current at start of the scan
- passes(int, optional): number of passes
- pars(keyworded variable length arguments, optional): scan optional named arguments:
- - title(str, optional): plotting window name.
- - before_read (function, optional): callback on each step, before sampling. Arguments: positions, scan
- - after_read (function, optional): callback on each step, after sampling. Arguments: record, scan.
- - before_pass (function, optional): callback before each scan pass execution. Arguments: pass_num, scan.
- - after_pass (function, optional): callback after each scan pass execution. Arguments: pass_num, scan.
- - Aditional arguments defined by set_exec_pars.
-
- Returns:
- ScanResult object.
-
- """
- latency_ms=int(latency*1000)
- readables=to_list(string_to_obj(readables))
- writables=to_list(string_to_obj(writables))
- #A single Writable with fixed speed
- if time is None:
- scan = ContinuousScan(writables[0],readables, start, end , steps, relative, latency_ms, int(passes), zigzag)
- #A set of Writables with speed configurable
- else:
- start=to_list(start)
- end=to_list(end)
- if type(steps) is float or is_list(steps):
- steps = to_list(steps)
- scan = ContinuousScan(writables,readables, start, end , steps, time, relative, latency_ms, int(passes), zigzag)
-
- processScanPars(scan, pars)
- scan.start()
- return scan.getResult()
-
-def hscan(config, writable, readables, start, end, steps, passes=1, zigzag=False, **pars):
- """Hardware Scan: values sampled by external hardware and received asynchronously.
-
- Args:
- config(dict): Configuration of the hardware scan. The "class" key provides the implementation class.
- Other keys are implementation specific.
- writable(Writable): A positioner appropriated to the hardware scan type.
- readables(list of Readable): Sensors appropriated to the hardware scan type.
- start(float): start positions of writable.
- end(float): final positions of writables.
- steps(int or float): number of scan steps (int) or step size (float).
- passes(int, optional): number of passes
- pars(keyworded variable length arguments, optional): scan optional named arguments:
- - title(str, optional): plotting window name.
- - after_read (function, optional): callback on each step, after sampling. Arguments: record, scan.
- - before_pass (function, optional): callback before each scan pass execution. Arguments: pass_num, scan.
- - after_pass (function, optional): callback after each scan pass execution. Arguments: pass_num, scan.
- - Aditional arguments defined by set_exec_pars.
-
- Returns:
- ScanResult object.
-
- """
- cls = Class.forName(config["class"])
- class HardwareScan(cls):
- def __init__(self, config, writable, readables, start, end, stepSize, passes, zigzag):
- cls.__init__(self, config, writable, readables, start, end, stepSize, passes, zigzag)
- def onAfterReadout(self, record):
- on_after_scan_readout(self, record)
- def onBeforePass(self, num_pass):
- on_before_scan_pass(self, num_pass)
- def onAfterPass(self, num_pass):
- on_after_scan_pass(self, num_pass)
-
- readables=to_list(string_to_obj(readables))
- #TODO: Calling through abstract would enForce the constructor signature, but is not working
- #scan = ch.psi.pshell.scan.HardwareScan.newScan(HardwareScan, config, writable,readables, start, end , steps, passes, zigzag)
- scan = HardwareScan(config, writable,readables, start, end , steps, int(passes), zigzag)
- processScanPars(scan, pars)
- scan.start()
- return scan.getResult()
-
-def bscan(stream, records, timeout = None, passes=1, **pars):
- """BS Scan: records all values in a beam synchronous stream.
-
- Args:
- stream(Stream): stream object or list of chanel names to build stream from
- records(int): number of records to store
- timeout(float, optional): maximum scan time in seconds.
- passes(int, optional): number of passes
- pars(keyworded variable length arguments, optional): scan optional named arguments:
- - title(str, optional): plotting window name.
- - before_read (function, optional): callback on each step, before sampling. Arguments: positions, scan
- - after_read (function, optional): callback on each step, after sampling. Arguments: record, scan.
- - before_pass (function, optional): callback before each scan pass execution. Arguments: pass_num, scan.
- - after_pass (function, optional): callback after each scan pass execution. Arguments: pass_num, scan.
- - Aditional arguments defined by set_exec_pars.
-
- Returns:
- ScanResult object.
-
- """
- timeout_ms=int(timeout*1000) if ((timeout is not None) and (timeout>=0)) else -1
- if not is_list(stream):
- stream=string_to_obj(stream)
- scan = BsScan(stream,int(records), timeout_ms, int(passes))
- processScanPars(scan, pars)
- scan.start()
- return scan.getResult()
-
-def tscan(readables, points, interval, passes=1, **pars):
- """Time Scan: sensors are sampled in fixed time intervals.
-
- Args:
- readables(list of Readable): Sensors to be sampled on each step.
- points(int): number of samples.
- interval(float): time interval between readouts. Minimum temporization is 0.001s
- passes(int, optional): number of passes
- pars(keyworded variable length arguments, optional): scan optional named arguments:
- - title(str, optional): plotting window name.
- - before_read (function, optional): callback on each step, before sampling. Arguments: positions, scan
- - after_read (function, optional): callback on each step, after sampling. Arguments: record, scan.
- - before_pass (function, optional): callback before each scan pass execution. Arguments: pass_num, scan.
- - after_pass (function, optional): callback after each scan pass execution. Arguments: pass_num, scan.
- - Aditional arguments defined by set_exec_pars.
-
- Returns:
- ScanResult object.
-
- """
- interval= max(interval, 0.001) #Minimum temporization is 1ms
- interval_ms=int(interval*1000)
- readables=to_list(string_to_obj(readables))
- scan = TimeScan(readables, points, interval_ms, int(passes))
- processScanPars(scan, pars)
- scan.start()
- return scan.getResult()
-
-def mscan(trigger, readables, points, timeout = None, async=True, take_initial=False, passes=1, **pars):
- """Monitor Scan: sensors are sampled when received change event of the trigger device.
-
- Args:
- trigger(Device or list of Device): Source of the sampling triggering.
- readables(list of Readable): Sensors to be sampled on each step.
- If trigger has cache and is included in readables, it is not read
- for each step, but the change event value is used.
- points(int): number of samples.
- timeout(float, optional): maximum scan time in seconds.
- async(bool, optional): if True then records are sampled and stored on event change callback. Enforce
- reading only cached values of sensors.
- If False, the scan execution loop waits for trigger cache update. Do not make
- cache only access, but may loose change events.
- take_initial(bool, optional): if True include current values as first record (before first trigger).
- passes(int, optional): number of passes
- pars(keyworded variable length arguments, optional): scan optional named arguments:
- - title(str, optional): plotting window name.
- - before_read (function, optional): callback on each step, before sampling. Arguments: positions, scan
- - after_read (function, optional): callback on each step, after sampling. Arguments: record, scan.
- - before_pass (function, optional): callback before each scan pass execution. Arguments: pass_num, scan.
- - after_pass (function, optional): callback after each scan pass execution. Arguments: pass_num, scan.
- - Aditional arguments defined by set_exec_pars.
-
- Returns:
- ScanResult object.
-
- """
- timeout_ms=int(timeout*1000) if ((timeout is not None) and (timeout>=0)) else -1
- trigger = string_to_obj(trigger)
- readables=to_list(string_to_obj(readables))
- scan = MonitorScan(trigger, readables, points, timeout_ms, async, take_initial, int(passes))
- processScanPars(scan, pars)
- scan.start()
- return scan.getResult()
-
-def escan(name, **pars):
- """Epics Scan: execute an Epics Scan Record.
-
- Args:
- name(str): Name of scan record.
- title(str, optional): plotting window name.
- pars(keyworded variable length arguments, optional): scan optional named arguments:
- - title(str, optional): plotting window name.
- - Aditional arguments defined by set_exec_pars.
-
- Returns:
- ScanResult object.
-
- """
- scan = EpicsScan(name)
- processScanPars(scan, pars)
- scan.start()
- return scan.getResult()
-
-
-def bsearch(writables, readable, start, end, steps, maximum = True, strategy = "Normal", latency=0.0, relative=False, **pars):
- """Binary search: searches writables in a binary search fashion to find a local maximum for the readable.
-
- Args:
- writables(list of Writable): Positioners set on each step.
- readable(Readable): Sensor to be sampled.
- start(list of float): start positions of writables.
- end(list of float): final positions of writables.
- steps(float or list of float): resolution of search for each writable.
- maximum (bool , optional): if True (default) search maximum, otherwise minimum.
- strategy (str , optional): "Normal": starts search midway to scan range and advance in the best direction.
- Uses orthogonal neighborhood (4-neighborhood for 2d)
- "Boundary": starts search on scan range.
- "FullNeighborhood": Uses complete neighborhood (8-neighborhood for 2d)
-
- latency(float, optional): settling time for each step before readout, defaults to 0.0.
- relative (bool, optional): if true, start and end positions are relative to current at
- start of the scan
- pars(keyworded variable length arguments, optional): scan optional named arguments:
- - title(str, optional): plotting window name.
- - before_read (function, optional): callback on each step, before sampling. Arguments: positions, scan
- - after_read (function, optional): callback on each step, after sampling. Arguments: record, scan.
- - Aditional arguments defined by set_exec_pars.
-
- Returns:
- SearchResult object.
-
- """
- latency_ms=int(latency*1000)
- writables=to_list(string_to_obj(writables))
- readable=string_to_obj(readable)
- start=to_list(start)
- end=to_list(end)
- steps = to_list(steps)
- strategy = BinarySearch.Strategy.valueOf(strategy)
- scan = BinarySearch(writables,readable, start, end , steps, maximum, strategy, relative, latency_ms)
- processScanPars(scan, pars)
- scan.start()
- return scan.getResult()
-
-def hsearch(writables, readable, range_min, range_max, initial_step, resolution, filter=1, maximum=True, latency=0.0, relative=False, **pars):
- """Hill Climbing search: searches writables in decreasing steps to find a local maximum for the readable.
- Args:
- writables(list of Writable): Positioners set on each step.
- readable(Readable): Sensor to be sampled.
- range_min(list of float): minimum positions of writables.
- range_max(list of float): maximum positions of writables.
- initial_step(float or list of float):initial step size for for each writable.
- resolution(float or list of float): resolution of search for each writable (minimum step size).
- filter(int): number of aditional steps to filter noise
- maximum (bool , optional): if True (default) search maximum, otherwise minimum.
- latency(float, optional): settling time for each step before readout, defaults to 0.0.
- relative (bool, optional): if true, range_min and range_max positions are relative to current at
- start of the scan
- pars(keyworded variable length arguments, optional): scan optional named arguments:
- - title(str, optional): plotting window name.
- - before_read (function, optional): callback on each step, before sampling. Arguments: positions, scan
- - after_read (function, optional): callback on each step, after sampling. Arguments: record, scan.
- - Aditional arguments defined by set_exec_pars.
-
- Returns:
- SearchResult object.
-
- """
- latency_ms=int(latency*1000)
- writables=to_list(string_to_obj(writables))
- readable=string_to_obj(readable)
- range_min=to_list(range_min)
- range_max=to_list(range_max)
- initial_step = to_list(initial_step)
- resolution = to_list(resolution)
- scan = HillClimbingSearch(writables,readable, range_min, range_max , initial_step, resolution, filter, maximum, relative, latency_ms)
- processScanPars(scan, pars)
- scan.start()
- return scan.getResult()
-
-###################################################################################################
-#Data plotting
-###################################################################################################
-
-def plot(data, name = None, xdata = None, ydata=None, title=None):
- """Request one or multiple plots of user data (1d, 2d or 3d).
-
- Args:
- data: array or list of values. For multiple plots, array of arrays or lists of values.
- name(str or list of str, optional): plot name or list of names (if multiple plots).
- xdata: array or list of values. For multiple plots, array of arrays or lists of values.
- ydata: array or list of values. For multiple plots, array of arrays or lists of values.
- title(str, optional): plotting window name.
-
- Returns:
- ArrayList of Plot objects.
-
- """
- if isinstance(data, ch.psi.pshell.data.Table):
- if is_list(xdata):
- xdata = to_array(xdata, 'd')
- return get_context().plot(data,xdata,name,title)
-
- if isinstance(data, ch.psi.pshell.scan.ScanResult):
- return get_context().plot(data,title)
-
- if (name is not None) and is_list(name):
- if len(name)==0:
- name=None;
- else:
- if (data==None):
- data = []
- for n in name:
- data.append([])
- plots = java.lang.reflect.Array.newInstance(Class.forName("ch.psi.pshell.data.PlotDescriptor"), len(data))
- for i in range (len(data)):
- plotName = None if (name is None) else name[i]
- x = xdata
- if is_list(x) and len(x)>0 and (is_list(x[i]) or isinstance(x[i] , java.util.List) or isinstance(x[i],PyArray)):
- x = x[i]
- y = ydata
- if is_list(y) and len(y)>0 and (is_list(y[i]) or isinstance(y[i] , java.util.List) or isinstance(y[i],PyArray)):
- y = y[i]
- plots[i] = PlotDescriptor(plotName , to_array(data[i], 'd'), to_array(x, 'd'), to_array(y, 'd'))
- return get_context().plot(plots,title)
- else:
- plot = PlotDescriptor(name, to_array(data, 'd'), to_array(xdata, 'd'), to_array(ydata, 'd'))
- return get_context().plot(plot,title)
-
-def get_plots(title=None):
- """Return all current plots in the plotting window given by 'title'.
-
- Args:
- title(str, optional): plotting window name.
-
- Returns:
- ArrayList of Plot objects.
-
- """
-
- return get_context().getPlots(title)
-
-def get_plot_snapshots(title = None, file_type = "png", size = None, temp_path = get_context().setup.getContextPath()):
- """Returns list with file names of plots snapshots from a plotting context.
-
- Args:
- title(str, optional): plotting window name.
- file_type(str, optional): "png", "jpg", "bmp" or "gif"
- size(array, optional): [width, height]
- temp_path(str, optional): path where the files will be generated.
-
- Returns:
- list of strings
-
- """
- time.sleep(0.1) #Give some time to plot to be finished - it is not sync with acquisition
- ret = []
- if size != None:
- size = Dimension(size[0], size[1])
- plots = get_plots(title)
- for i in range(len(plots)):
- p = plots[i]
- name = p.getTitle()
- if name is None or name == "":
- name = str(i)
- file_name = os.path.abspath(temp_path + "/" + name + "." + file_type)
- p.saveSnapshot(file_name , file_type, size)
- ret.append(file_name)
- return ret
-
-###################################################################################################
-#Data access functions
-###################################################################################################
-
-def load_data(path, index=0, shape=None):
- """Read data from the current persistence context or from data files.
-
- Args:
- path(str): Path to group or dataset relative to the persistence context root.
- If in the format 'root|path' then read from path given by 'root'.
- index(int or listr, optional):
- if integer, data depth (used for 3D datasets returning a 2d matrix)
- If a list, specifies the full coordinate for multidimensional datasets.
- shape(list, optional): only valid if index is a list, provides the shape of the data array.
- In this case return a flattened a one-dimensional array.
-
- Returns:
- Data array
-
- """
- if index is not None and is_list(index):
- slice = get_context().dataManager.getData(path, index, shape)
- else:
- slice = get_context().dataManager.getData(path, index)
- return slice.sliceData
-
-def get_attributes(path):
- """Get the attributes from the current persistence context or from data files.
-
- Args:
- path(str): Path to group or dataset relative to the current persistence context root.
- If in the format 'root|path' then read from path given by 'root'.
- Returns:
- Dictionary
-
- """
- return get_context().dataManager.getAttributes(path)
-
-def save_dataset(path, data, type='d'):
- """Save data into a dataset within the current persistence context.
-
- Args:
- path(str): Path to dataset relative to the current persistence context root.
- type(str, optional): array type 'b' = byte, 'h' = short, 'i' = int, 'l' = long, 'f' = float,
- 'd' = double, 'c' = char, 's' = String, 'o' = Object
- default: 'd' (convert data to array of doubles)
- data (array or list): data to be saved
- Returns:
- Dictionary
-
- """
- data = to_array(data, type)
- get_context().dataManager.setDataset(path,data)
-
-def create_group(path):
- """Create an empty dataset within the current persistence context.
-
- Args:
- path(str): Path to group relative to the current persistence context root.
- Returns:
- None
-
- """
- get_context().dataManager.createGroup(path)
-
-def create_dataset(path, type, unsigned=False, dimensions=None):
- """Create an empty dataset within the current persistence context.
-
- Args:
- path(str): Path to dataset relative to the current persistence context root.
- type(str): array type 'b' = byte, 'h' = short, 'i' = int, 'l' = long, 'f' = float,
- 'd' = double, 'c' = char, 's' = String, 'o' = Object
- unsigned(boolean, optional): create a dataset of unsigned type.
- dimensions(tuple of int, optional): a 0 value means variable length in that dimension.
- Returns:
- None
-
- """
- get_context().dataManager.createDataset(path, ScriptUtils.getType(type), unsigned, dimensions)
-
-def create_table(path, names, types=None, lengths=None):
- """Create an empty table (dataset of compound type) within the current persistence context.
-
- Args:
- path(str): Path to dataset relative to the current persistence context root.
- names(list of strings): name of each column
- types(array of str): 'b' = byte, 'h' = short, 'i' = int, 'l' = long, 'f' = float,
- 'd' = double, 'c' = char, 's' = String, 'o' = Object
- Note:A '[' prefix on type name indicates an array type.
- lengths(list of int): the array length for each columns(0 for scalar types).
- Returns:
- None
-
- """
- type_classes = []
- if (types is not None):
- for i in range (len(types)):
- type_classes.append(ScriptUtils.getType(types[i]))
- get_context().dataManager.createDataset(path, names, type_classes, lengths)
-
-def append_dataset(path, data, index=None, type='d', shape=None):
- """Append data to dataset.
-
- Args:
- path(str): Path to dataset relative to the current persistence context root.
- data(number or array or list): name of each column.
- index(int or list, optional): if set then add the data in a specific position in the dataset.
- If integer is the index in an array (data must be 1 order lower than dataset)
- If a list, specifies the full coordinate for multidimensional datasets.
- type(str, optional): array type 'b' = byte, 'h' = short, 'i' = int, 'l' = long, 'f' = float,
- 'd' = double, 'c' = char, 's' = String, 'o' = Object
- default: 'd' (convert data to array of doubles)
- shape(list, optional): only valid if index is a list, provides the shape of the data array.
- In this case data must be a flattened one-dimensional array.
- Returns:
- None
-
- """
- data = to_array(data, type)
- if index is None:
- get_context().dataManager.appendItem(path, data)
- else:
- if is_list(index):
- if shape is None:
- shape = [len(index)]
- get_context().dataManager.setItem(path, data, index, shape)
- else:
- get_context().dataManager.setItem(path, data, index)
-
-def append_table(path, data):
- """Append data to a table (dataset of compound type)
-
- Args:
- path(str): Path to dataset relative to the current persistence context root.
- data(list): List of valus for each column of the table. Array types can be expressed as lists.
- Returns:
- None
-
- """
- #data = to_array(data)
- if is_list(data):
- arr = java.lang.reflect.Array.newInstance(Class.forName("java.lang.Object"),len(data))
- for i in range (len(data)):
- if is_list(data[i]):
- arr[i] = to_array(data[i], 'd')
- else:
- arr[i] = data[i]
- data=arr
- get_context().dataManager.appendItem(path, data)
-
-def flush_data():
- """Flush all data files immediately.
-
- Args:
- None
- Returns:
- None
- """
- get_context().dataManager.flush()
-
-def set_attribute(path, name, value, unsigned = False):
- """Set an attribute to a group or dataset.
-
- Args:
- path(str): Path to dataset relative to the current persistence context root.
- name(str): name of the atttribute
- value(Object): the attribute value
- unsigned(bool, optional): if applies, indicate if value is unsigned.
- Returns:
- None
- """
- if is_list(value):
- value = Convert.toStringArray(to_array(value))
- get_context().dataManager.setAttribute(path, name, value, unsigned)
-
-def log(log, data_file=True):
- """Writes a log to the system log and data context - if there is an ongoing scan or script execution.
-
- Args:
- log(str): Log string.
- data_file(bool, optional): if true logs to the data file, in addiction to the system logger
-
- Returns:
- None
- """
- get_context().scriptingLog(str(log))
- if data_file:
- try:
- get_context().dataManager.appendLog(str(log))
- except:
- #Do not generate exception if cannot write to data file
- pass
-
-def set_exec_pars(**args):
- """ Configures the script execution parameters, overriding the system configuration.
-
- Args:
- args(dictionary). Keys:
- name(str, optional): value of the {name} tag. Default is the running script name
- (or "scan" in the case of a command line scan command.)
- type(str, optional): value of the {type} tag. Default is empty.
- This field can be used to store data in sub-folders of standard location.
- path(str, optional): If defined provides the full path name for data output root (overriding config))
- The tag {data} can be used to enter a path relative to the standard data folder.
- layout(str, optional): Overrides default data layout.
- depth_dim(int, optional): dimension of 2d-matrixes in 3d datasets.
- persist(bool, optional): Overrides the configuration option to auto save scan data.
- flush(bool, optional): Overrides the configuration option to flush file on each record.
- accumulate(bool, optional): Overrides the configuration option to release scan records.
- If false disable accumulation of scan records to scan result.
- preserve(bool, optional): Overrides the configuration option to preserve device types.
- If false all values are converted to double.
- open(bool, optional): If true opens data output root (instead of only doing in the first data access call)
- If false closes output root, if open.
- reset(bool, optional): If true reset the scan counter - the {count} tag and set the timestamp to now.
- group(str, optional): Overrides default layout group name for scans
- tag(str, optional): Overrides default tag for scan names (affecting group or dataset name, according to layout)
- defaults(bool, optional): If true restore the original execution parameters.
-
- Graphical preferences can also be set. Keys are equal to lowercase of Preference enum:
- "plot_disabled", "table_disabled", "enabled_plots", "plot_types", "print_scan", "auto_range",
- "manual_range","domain_axis", "status".
- See set_preference for more information.
-
- Shortcut entries: "line_plots": list of devices with enforced line plots.
- """
- get_context().setExecutionPars(args)
-
-#TODO: Change return to dictionary
-def get_exec_pars():
- """ Returns script execution parameters.
-
- Returns:
- ExecutionContext object. Fields:
- name (str): execution name - {name} tag.
- type (str): execution type - {type} tag.
- path (str): output data root.
- open (bool): true if the output data root has been opened.
- layout (str): data output layout. If None then using the configuration.
- persist (bool): auto save scan data option.
- flush (bool): flush file on each record.
- index (int): current scan index.
- group (str): data group currently used for scan data storage.
- if no ongoing scan return "/" if within a script, or else None if a console command.
- scanPath (str): dataset or group corresponding to current scan.
- scan (Scan): reference to current scan, if any
- source (CommandSource): return the source of the script or command.
- background (bool): return False if executing in main interpreter thread .
- aborted (bool): True if execution has been aborted
- """
- return get_context().getExecutionPars()
-
-###################################################################################################
-#EPICS channel access
-###################################################################################################
-
-def _adjust_channel_value(value, var_type=None):
- if (value is None):
- return value
- if (var_type is not None):
- if is_list(value):
- var_type = var_type.replace(',','').replace('[','')
- ret = []
- for item in value:
- ret.append(_adjust_channel_value(item), var_type)
- value = ret
- else:
- var_type = var_type.lower()
- if var_type=='b':
- value = byte(value)
- elif var_type=='i':
- value = short(value)
- elif var_type=='l':
- value = int(value)
- elif var_type=='f':
- value = float(value)
- elif var_type=='d':
- value = float(value)
- elif var_type=='s':
- value = str(value)
-
- if isinstance(value,tuple):
- value = list(value)
- if isinstance(value,list):
- list_type = type(value[0])
- array_types = {
- int: "i",
- long: "l",
- float:"d",
- str:Class.forName("java.lang.String"),
- }
- array_type = array_types.get(type(value[0]),'d')
- array = PyArray(array_type)
- array.fromlist(value)
- value=array
- return value
-
-def caget(name, type=None, size=None):
- """Reads an Epics PV.
-
- Args:
- name(str): PV name
- type(str, optional): type of PV. By default gets the PV standard field type.
- Scalar values: 'b', 'i', 'l', 'd', 's'.
- Array: values: '[b', '[i,', '[l', '[d', '[s'.
- size (int, optional): for arrays, number of elements to be read. Default read all.
-
- Returns:
- PV value
-
- """
- return Epics.get(name, Epics.getChannelType(type), size)
-
-def cawait(name, value, timeout=None, comparator=None, type=None, size=None):
- """Wait for a PV to have a given value.
-
- Args:
- name(str): PV name
- value (obj): value to compare to
- timeout(float, optional): time in seconds to wait. If None, waits forever.
- comparator(java.util.Comparator or float, optional): if None waits for equality.
- If a numeric value is provided, waits for channel to be in range.
- type(str, optional): type of PV. By default gets the PV standard field type.
- Scalar values: 'b', 'i', 'l', 'd', 's'.
- Array: values: '[b', '[i,', '[l', '[d', '[s'.
- size (int, optional): for arrays, number of elements to be read. Default read all.
-
- Returns:
- None
- """
- if (timeout is not None):
- timeout = int(timeout*1000)
- value = _adjust_channel_value(value)
- Epics.waitValue(name, value, comparator, timeout, Epics.getChannelType(type), size)
-
-def caput(name, value, timeout = None):
- """Writes to an Epics PV.
-
- Args:
- name(str): PV name
- value(scalar, string or array): new PV value.
- timeout(int, optional): timeout in seconds to the write. If None waits forever to completion.
-
- Returns:
- None
- """
- value=_adjust_channel_value(value)
- if (timeout is not None):
- timeout = int(timeout*1000)
- return Epics.put(name, value, timeout)
-
-def caputq(name, value):
- """Writes to an Epics PV and does not wait.
-
- Args:
- name(str): PV name
- value(scalar, string or array): new PV value.
-
- Returns:
- None
- """
- value=_adjust_channel_value(value)
- return Epics.putq(name, value)
-
-def camon(name, type=None, size=None, wait = sys.maxint):
- """Install a monitor to an Epics PV and print value changes.
-
- Args:
- name(str): PV name
- type(str, optional): type of PV. By default gets the PV standard field type.
- Scalar values: 'b', 'i', 'l', 'd', 's'.
- Array: values: '[b', '[i,', '[l', '[d', '[s'.
- size (int, optional): for arrays, number of elements to be read. Default read all.
- wait (int, optional): blocking time for this function. By default blocks forever.
- Returns:
- None
-
- """
- val = lambda x: x.tolist() if isinstance(x,PyArray) else x
-
- class MonitorListener(java.beans.PropertyChangeListener):
- def propertyChange(self, pce):
- print val(pce.getNewValue())
-
- channel = create_channel(name, type, size)
- print val(channel.getValue())
- channel.setMonitored(True)
- channel.addPropertyChangeListener(MonitorListener())
-
- try:
- time.sleep(wait)
- finally:
- Epics.closeChannel(channel)
-
-def create_channel_device(channel_name, type=None, size=None, device_name=None):
- """Create a device from an EPICS PV.
-
- Args:
- channel_name(str): PV name
- type(str, optional): type of PV. By default gets the PV standard field type.
- Scalar values: 'b', 'i', 'l', 'd', 's'.
- Array: values: '[b', '[i,', '[l', '[d', '[s'.
- size (int, optional): for arrays, number of elements to be read. Default read all.
- device_name (str, optional): device name (if different from hannel_name.
- Returns:
- None
-
- """
- dev = Epics.newChannelDevice(channel_name if (device_name is None) else device_name , channel_name, Epics.getChannelType(type))
- if get_context().isSimulation():
- dev.setSimulated()
- dev.initialize()
- if (size is not None):
- dev.setSize(size)
- return dev
-
-def create_channel(name, type=None, size=None):
- return Epics.newChannel(name, Epics.getChannelType(type), size)
-
-class Channel(java.beans.PropertyChangeListener, Writable, Readable):
- def __init__(self, channel_name, type = None, size = None, callback=None, alias = None):
- """ Create an object that encapsulates an Epics PV connection.
- Args:
- channel_name(str):name of the channel
- type(str, optional): type of PV. By default gets the PV standard field type.
- Scalar values: 'b', 'i', 'l', 'd', 's'.
- Array: values: '[b', '[i,', '[l', '[d', '[s'.
- size(int, optional): the size of the channel
- callback(function, optional): The monitor callback.
- alias(str): name to be used on scans.
- """
- self.channel = create_channel(channel_name, type, size)
- self.callback = callback
- if alias is not None:
- set_device_alias(self, alias)
- else:
- set_device_alias(self, channel_name)
-
- def get_name(self):
- """Return the name of the channel.
- """
- return self.channel.name
-
- def get_size(self):
- """Return the size of the channel.
- """
- return self.channel.size
-
- def set_size(self, size):
- """Set the size of the channel.
- """
- self.channel.size = size
-
- def is_connected(self):
- """Return True if channel is connected.
- """
- return self.channel.connected
-
- def is_monitored(self):
- """Return True if channel is monitored
- """
- return self.channel.monitored
-
- def set_monitored(self, value):
- """Set a channel monitor to trigger the callback function defined in the constructor.
- """
- self.channel.monitored = value
- if (value):
- self.channel.addPropertyChangeListener(self)
- else:
- self.channel.removePropertyChangeListener(self)
-
- def propertyChange(self, pce):
- if pce.getPropertyName() == "value":
- if self.callback is not None:
- self.callback(pce.getNewValue())
-
- def put(self, value, timeout=None):
- """Write to channel and wait value change. In the case of a timeout throws a TimeoutException.
- Args:
- value(obj): value to be written
- timeout(float, optional): timeout in seconds. If none waits forever.
- """
- if (timeout==None):
- self.channel.setValue(value)
- else:
- self.channel.setValueAsync(value).get(int(timeout*1000), java.util.concurrent.TimeUnit.MILLISECONDS);
-
- def putq(self, value):
- """Write to channel and don't wait.
- """
- self.channel.setValueNoWait(value)
-
- def get(self, force = False):
- """Get channel value.
- """
- return self.channel.getValue(force)
-
- def wait_for_value(self, value, timeout=None, comparator=None):
- """Wait channel to reach a value, using a given comparator. In the case of a timeout throws a TimeoutException.
- Args:
- value(obj): value to be verified.
- timeout(float, optional): timeout in seconds. If None waits forever.
- comparator (java.util.Comparator, optional). If None, uses Object.equals.
- """
- if comparator is None:
- if timeout is None:
- self.channel.waitForValue(value)
- else:
- self.channel.waitForValue(value, int(timeout*1000))
- else:
- if timeout is None:
- self.channel.waitForValue(value, comparator)
- else:
- self.channel.waitForValue(value, comparator, int(timeout*1000))
-
- def close(self):
- """Close the channel.
- """
- self.channel.destroy()
-
- #Writable interface
- def write(self, value):
- self.put(value)
-
- #Readable interface
- def read(self):
- return self.get()
-
-###################################################################################################
-#Concurrent execution
-###################################################################################################
-import java.lang.Thread
-class Callable(java.util.concurrent.Callable):
- def __init__(self, method, *args):
- self.method = method
- self.args = args
- self.thread = java.lang.Thread.currentThread()
- def call(self):
- try:
- get_context().startedChildThread(self.thread)
- return self.method(*self.args)
- #except:
- # traceback.print_exc(file=sys.stderr)
- finally:
- get_context().finishedChildThread(self.thread)
-
-
-
-def fork(*functions):
- """Start execution of functions in parallel.
-
- Args:
- *functions(function references)
-
- Returns:
- List of callable objects
- """
- callables = []
- for m in functions:
- if is_list(m):
- callables.append(Callable(m[0],*m[1]))
- else:
- callables.append(Callable(m))
- return Threading.fork(callables)
-
-def join(futures):
- """Wait parallel execution of functions.
-
- Args:
- futures(list of Future) : as returned from fork
-
- Returns:
- None
-"""
- try:
- return Threading.join(futures)
- except java.util.concurrent.ExecutionException, ex:
- raise ex.getCause()
-
-def parallelize(*functions):
- """Equivalent to fork + join
-
- Args:
- *functions(function references)
-
- Returns:
- None
- """
- futures = fork(*functions)
- return join(futures)
-
-
-###################################################################################################
-#Script evaluation and background task control.
-###################################################################################################
-def run(script_name, args = None, locals = None):
- """Run script: can be absolute path, relative, or short name to be search in the path.
- Args:
- args(Dict ot List): Sets Sys.argv (if list) or gobal variables(if dict) to the script.
- locals(Dict): If not none sets the locals()for the runing script.
- If locals is used then script definitions will not go to global namespace.
-
- Returns:
- The script return value (if set with set_return)
- """
- global _
- script = get_context().scriptManager.library.resolveFile(script_name)
- if script is not None and os.path.isfile(script):
- get_context().startScriptExecution(args)
- _ = None
- if args is None:
- pass
- elif isinstance(args,tuple):
- sys.argv = list(args)
- elif isinstance(args,list):
- sys.argv = args
- else:
- for arg in args.keys():
- globals()[arg] = args[arg]
- if (locals is None):
- execfile(script, globals())
- else:
- execfile(script, globals(), locals)
- return _
- #print >> sys.stderr, "Invalid script: " + str(script_name)
- raise IOError("Invalid script: " + str(script_name))
-
-
-def abort():
- """Abort the execution of ongoing task. It can be called from the script to quit.
-
- Args:
- None
-
- Returns:
- None
- """
- #Cannot be on script execution thread
- fork(get_context().abort)
-
-
-def start_task(script, delay = 0.0, interval = -1):
- """Start a background task
-
- Args:
- script(str): Name of the script implementing the task
- delay(float, optional): time in seconds for the first execution.
- Default starts immediately.
- interval(float, optional): time in seconds for between execution.
- If negative (default), single-execution.
-
- Returns:
- None
- """
- delay_ms=int(delay*1000)
- interval_ms=int(interval*1000) if (interval>=0) else int(interval)
- get_context().taskManager.create(script, delay_ms, interval_ms)
- get_context().taskManager.start(script)
-
-
-def stop_task(script, force = False):
- """Stop a background task
-
- Args:
- script(str): Name of the script implementing the task
- force(boolean, optional): interrupt current execution, if running
-
- Returns:
- None
- """
- get_context().taskManager.remove(script, force)
-
-
-def set_return(value):
- """Sets the script return value. This value is returned by the "run" function.
-
- Args:
- value(Object): script return value.
-
- Returns:
- None
- """
- import java.lang.Thread
- global __THREAD_EXEC_RESULT__
- #In Jython, the output of last statement is not returned when running a file so we have to use a return variable
- if __name__ == "__builtin__":
- if is_interpreter_thread():
- _=value
- __THREAD_EXEC_RESULT__[java.lang.Thread.currentThread()]=value #Used when running file
- else:
- #if startup is imported, cannot set global
- caller = inspect.currentframe().f_back
- if is_interpreter_thread():
- caller.f_globals["_"]=value
- caller.f_globals["__THREAD_EXEC_RESULT__"][java.lang.Thread.currentThread()]=value
- return value #Used when parsing file
-
-def is_interpreter_thread():
- import java.lang.Thread
- return java.lang.Thread.currentThread().name == "Interpreter Thread"
-
-
-###################################################################################################
-#Versioning tools
-###################################################################################################
-
-def commit(message, force = False):
- """Commit the changes to the repository. If manual commit is not configured then there is no need to call this function: commits are made as needed.
-
- Args:
- message(str): commit message
- force(bool, optional): if False, raises exception if no change detected in repo
-
- Returns:
- None
- """
- get_context().commit(message, force)
-
-def diff():
- """Return list of changes in the repository
-
- Args:
- None
-
- Returns:
- None
- """
- return get_context().diff()
-
-def checkout_tag(tag):
- """Checkout a tag name.
-
- Args:
- tag(str): tag name.
-
- Returns:
- None
- """
- get_context().checkoutTag(tag)
-
-def checkout_branch(tag):
- """Checkout a local branch name.
-
- Args:
- tag(str): branch name.
-
- Returns:
- None
- """
- get_context().checkoutLocalBranch(tag)
-
-def pull_repository():
- """Pull from remote repository.
-
- """
- get_context().pullFromUpstream()
-
-def push_repository(all_branches=True, force=False):
- """Push to remote repository.
-
- Args:
- all_branches(boolean, optional): all branches or just current.
- force(boolean, optional): force flag.
-
- Returns:
- None
- """
- get_context().pushToUpstream(all_branches, force)
-
-def cleanup_repository():
- """Performs a repository cleanup.
-
- Args:
- None
-
- Returns:
- None
- """
- get_context().cleanupRepository()
-
-
-###################################################################################################
-#Device Pool functions
-###################################################################################################
-def get_device(device_name):
- """Returns a configured device (or imaging source) by its name.
-
- Args:
- device_name(str): name of the device.
-
- Returns:
- device
- """
- return get_context().devicePool.getByName(device_name)
-
-def add_device(device, force = False):
- """Add a device (or imaging source) to the device pool.
-
- Args:
- device(Device or Source): device object.
- force(boolean, optional): if true then dispose existing device with same name.
- Otherwise will fail in case of name clash.
-
- Returns:
- True if device was added, false if was already in the pool, or exception in case of name clash.
- """
- if get_context().devicePool.contains(device):
- return False
- if force:
- dev = get_context().devicePool.getByName(device.getName())
- if dev is not None:
- remove_device(dev)
- return get_context().devicePool.addDevice(device)
-
-def remove_device(device):
- """Remove a device (or imaging source) from the device pool.
-
- Args:
- device(Device or Source): device object.
-
- Returns:
- bool: true if device was removed.
-
- """
- return get_context().devicePool.removeDevice(device)
-
-def set_device_alias(device, alias):
- """Set a device alias to be used in scans (datasets and plots).
-
- Args:
- device(Device): device object.
- alias(str): replace device name in scans.
-
- Returns:
- None
- """
- get_context().dataManager.setAlias(device, alias)
-
-def stop():
- """Stop all devices implementing the Stoppable interface.
-
- Args:
- None
-
- Returns:
- None
- """
- get_context().stopAll()
-
-def update():
- """Update all devices.
-
- Args:
- None
-
- Returns:
- None
- """
- get_context().updateAll()
-
-def reinit(dev = None):
- """Re-initialize devices.
-
- Args:
- dev(Device, optional): the device to be re-initialized.
- If None re-initialize all devices not yet initialized.
-
- Returns:
- List with devices not initialized.
- """
- return to_list(get_context().reinit())
-
-def create_device(url, parent=None):
- """Create a device form a definition string(see URLDevice)
-
- Args:
- url(str or list of string): the device definition string (or list of strings)
- parent(bool, optional): parent device
-
- Returns:
- The created device (or list of devices)
- """
- return UrlDevice.create(url, parent)
-
-
-def create_averager(dev, count, interval=0.0, name = None, monitored = False):
- """Creates and initializes and averager for dev.
-
- Args:
- dev(Device): the source device
- count(int): number of samples
- interval(float, optional): sampling interval in seconds.
- If less than zero, sampling is made on data change event.
- name(str, optional): sets the name of the device (default is: averager)
- monitored (bool, optional): if true then averager processes asynchronously.
-
- Returns:
- Averager device
- """
- dev = string_to_obj(dev)
- if isinstance(dev, ReadableArray):
- av = ArrayAverager(dev, count, int(interval*1000)) if (name is None) else ArrayAverager(name, dev, count, int(interval*1000))
- else:
- av = Averager(dev, count, int(interval*1000)) if (name is None) else Averager(name, dev, count, int(interval*1000))
- av.initialize()
- if (monitored):
- av.monitored = True
- return av
-
-###################################################################################################
-#Standard libraries management
-###################################################################################################
-if __name__ == "__builtin__":
- ca_channel_path=os.path.join(get_context().setup.getStandardLibraryPath(), "epics")
- sys.path.append(ca_channel_path)
- #This is to destroy previous context of _ca (it is not shared with PShell)
- if run_count > 0:
- if sys.modules.has_key("_ca"):
- import _ca
- _ca.initialize()
-
-###################################################################################################
-#Mathematical functions
-###################################################################################################
-
-def arrmul(a, b):
- """Multiply 2 series of the same size.
-
- Args:
-
- a(list, tuple, array ...): subscriptable object containing numbers
- b(list, tuple, array ...): subscriptable object containing numbers
-
- Returns:
- List
-
- """
- return map(mul, a, b)
-
-def arrdiv(a, b):
- """Divide 2 series of the same size.
-
- Args:
-
- a(list, tuple, array ...): subscriptable object containing numbers
- b(list, tuple, array ...): subscriptable object containing numbers
-
- Returns:
- List
-
- """
- return map(truediv, a, b)
-
-def arradd(a, b):
- """Add 2 series of the same size.
-
- Args:
-
- a(list, tuple, array ...): subscriptable object containing numbers
- b(list, tuple, array ...): subscriptable object containing numbers
-
- Returns:
- List
-
- """
- return map(add, a, b)
-
-def arrsub(a, b):
- """Subtract 2 series of the same size.
-
- Args:
-
- a(list, tuple, array ...): subscriptable object containing numbers
- b(list, tuple, array ...): subscriptable object containing numbers
-
- Returns:
- List
-
- """
- return map(sub, a, b)
-
-def arrabs(a):
- """Returns the absolute of all elements in series.
-
- Args:
-
- a(list, tuple, array ...): subscriptable object containing numbers
-
- Returns:
- List
-
- """
- return map(abs, a)
-
-def arroff(a, value = "mean"):
- """Subtract offset to all elemets in series.
-
- Args:
-
- a(list, tuple, array ...): subscriptable object containing numbers
- type(int or str, optional): value to subtract from the array, or "mean" or "min".
-
- Returns:
- List
-
- """
- if value=="mean":
- value = mean(a)
- elif value=="min":
- value = min(a)
- return [x-value for x in a]
-
-def mean(data):
- """Calculate the mean of a sequence.
-
- Args:
- data(list, tuple, array ...): subscriptable object containing numbers
-
- Returns:
- Mean of the elements in the object.
-
- """
- return reduce(lambda x, y: x + y, data) / len(data)
-
-def variance(data):
- """Calculate the variance of a sequence.
-
- Args:
- data(list, tuple, array ...): subscriptable object containing numbers
-
- Returns:
- Variance of the elements in the object.
-
- """
- c = mean(data)
- ss = sum((x-c)**2 for x in data)
- return ss/len(data)
-
-def stdev(data):
- """Calculate the standard deviation of a sequence.
-
- Args:
- data(list, tuple, array ...): subscriptable object containing numbers
-
- Returns:
- Standard deviation of the elements in the object.
-
- """
- return variance(data)**0.5
-
-
-def center_of_mass(data, x = None):
- """Calculate the center of mass of a series, and its rms.
-
- Args:
-
- data(list, tuple, array ...): subscriptable object containing numbers
- x(list, tuple, array ..., optional): x coordinates
-
- Returns:
- Tuple (com, rms)
-
- """
- if x is None:
- x = Arr.indexesDouble(len(data))
- data_sum = sum(data)
- if (data_sum==0):
- return float('nan')
- xmd = arrmul( x, data)
- com = sum(xmd) / data_sum
- xmd2 = arrmul( x, xmd)
- com2 = sum(xmd2) / data_sum
- rms = math.sqrt(abs(com2 - com * com))
- return (com, rms)
-
-def poly(val, coefs):
- """Evaluates a polinomial: (coefs[0] + coefs[1]*val + coefs[2]*val^2...
-
- Args:
- val(float): value
- coefs (list of loats): polinomial coefficients
- Returns:
- Evaluated function for val
-
- """
- r = 0
- p = 0
- for c in coefs:
- r = r + c * math.pow(val, p)
- p = p + 1
- return r
-
-def histogram(data, range_min = None, range_max = None, bin = 1.0):
- """Creates histogram on data.
-
- Args:
- data (tuple, array, ArrayList or Array): input data can be multi-dimensional or nested.
- range_min (int, optional): minimum histogram value. Default is floor(min(data))
- range_max (int, optional): maximul histogram value. Default is ceil(max(data))
- bin(int or float, optional): if int means number of bins. If float means bin size. Default = 1.0.
- Returns:
- tuple: (ydata, xdata)
-
- """
- if range_min is None: range_min = math.floor(min(flatten(data)))
- if range_max is None: range_max = math.ceil(max(flatten(data)))
- if type(bin) is float:
- bin_size = bin
- n_bin = int(math.ceil(float(range_max - range_min)/bin_size))
- else:
- n_bin = bin
- bin_size = float(range_max - range_min)/bin
-
- result = [0] * n_bin
- for d in flatten(data):
- b = int( float(d - range_min) / bin_size)
- if (b >=0) and (b < n_bin):
- result[b] = result[b] + 1
- return (result, frange(range_min, range_max, bin_size))
-
-def _turn(p, q, r):
- return cmp((q[0] - p[0])*(r[1] - p[1]) - (r[0] - p[0])*(q[1] - p[1]), 0)
-
-def _keep(hull, r):
- while len(hull) > 1 and _turn(hull[-2], hull[-1], r) != 1:
- hull.pop()
- return (not len(hull) or hull[-1] != r) and hull.append(r) or hull
-
-def convex_hull(point_list=None, x=None, y=None):
- """Returns the convex hull from a list of points. Either point_list or x,y is provided.
- (Alhorithm taken from http://tomswitzer.net/2010/03/graham-scan/)
- Args:
- point_list (array of tuples, optional): arrays of the points
- x (array of float, optional): array with x coords of points
- y (array of float, optional): array with y coords of points
- Returns:
- Array of points or (x,y)
-
- """
- is_point_list = point_list is not None
- if not point_list:
- point_list=[]
- for i in range(len(x)):
- if((x[i] is not None) and (y[i] is not None)): point_list.append((x[i], y[i]))
- point_list.sort()
- lh,uh = reduce(_keep, point_list, []), reduce(_keep, reversed(point_list), [])
- ret = lh.extend(uh[i] for i in xrange(1, len(uh) - 1)) or lh
- if not is_point_list:
- x, y = [], []
- for i in range(len(ret)):
- x.append(ret[i][0])
- y.append(ret[i][1])
- return (x,y)
- return ret
-
-###################################################################################################
-#Utilities
-###################################################################################################
-
-def exec_cmd(cmd):
- """Executes a shell command. If errors happens raises an exception.
-
- Args:
- cmd (str): command process input.
- Returns:
- Output of command process.
- """
- import subprocess
- proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
- (ret, err) = proc.communicate()
- if (err is not None) and err!="":
- raise Exception(err)
- return ret
-
-def exec_cpython(script_name, args = [], method_name = None, python_name = "python"):
- """Executes an external cpython process.
-
- Args:
- script_name (str): name of the script (can be absolute or relative to script folder).
- args(list, optional): arguments to python process (or parameters to method, if not None)
- method_name (str, optional): if defined indicates a method to be called.
- python_name (str, optional): name of executable
- Returns:
- Return of python process.
- """
- if method_name is None:
- script = get_context().scriptManager.library.resolveFile(script_name)
- if script is None :
- script= os.path.abspath(script_name)
- c = python_name + " " + script + " "
- if args is not None and (len(args)>0):
- for arg in args:
- c = c + str(arg) + " "
- return exec_cmd(c)
- else:
- #Calling a method
- import json
- import tempfile
- import java.lang.Thread
- script = os.path.abspath(get_context().scriptManager.library.resolveFile(script_name))
- with open(get_context().setup.getContextPath()+ "/Temp" + str(java.lang.Thread.currentThread().getId())+".py", "wb") as f:
- f.write(("script = '" +script +"'\n").replace('\\', '\\\\'))
- f.write("function = '" +method_name +"'\n")
- f.write("jsonargs = '" + json.dumps(args) +"'\n")
- f.write("""import sys
-import json
-import os
-args =json.loads(jsonargs)
-i = script.rfind(os.sep)
-module = script[i+1:-3]
-sys.path.insert(1,script[:i+1])
-exec ('from ' + module + ' import ' + function + ' as function')
-print (json.dumps(function(*args)))
-""")
- f.close()
- ret = exec_cpython(os.path.abspath(f.name), python_name = python_name)
- os.remove(f.name)
- ret = '\n'+ret[0:-len(os.linesep)]
- jsonret = ret[ret.rfind('\n')+1:].strip()
- return json.loads(jsonret)
-
-def bsget(channel):
- """Reads an values a bsread stream, using the default provider.
-
- Args:
- channel(str or list of str): channel name(s)
- Returns:
- BS value or list of values
-
- """
- channels = to_list(channel)
- ret = Stream.readChannels(channels)
- if type(channel) is str:
- return ret[0]
- return ret
-
-def flatten(data):
- """Flattens multi-dimentional or nested data.
-
- Args:
- data (tuple, array, ArrayList or Array): input data
- Returns:
- Iterator on the flattened data.
-
- """
- if isinstance(data,PyArray):
- if not data.typecode.startswith('['):
- return data
-
- import itertools
- return itertools.chain(*data)
-
-#Float range -> Useful for scanning is a range
-def frange_gen(start, finish, step):
- while ((step >= 0.0) and (start <= finish)) or ((step < 0.0) and (start >= finish)):
- yield start
- start += step
-
-def frange(start, finish, step, enforce_finish = False, inclusive_finish = False):
- """Create a list with a range of float values (a float equivalent to "range").
-
- Args:
- start(float): start of range.
- finish(float): end of range.
- step(float): step size.
- enforce_finish(boolean, optional): adds the final element even if range was not exact.
- inclusive_finish(boolean, optional): if false finish is exclusive (like in "range").
-
- Returns:
- list
-
- """
- step = float(step)
- ret = list(frange_gen(start, finish, step))
- if len(ret) > 0:
- if inclusive_finish == False:
- if ret[-1]==finish:
- del ret[-1]
- if enforce_finish and ret[-1]!=finish:
- ret.append(finish)
- return ret
-
-def inject():
- """Restore initial globals: re-inject devices and startup variables to the interpreter.
-
- Args:
- None
-
- Returns:
- None
-
- """
- if __name__ == "__builtin__":
- get_context().injectVars()
- else:
- caller = inspect.currentframe().f_back
- caller.f_globals.update(get_context().scriptManager.injections)
-
-def notify(subject, text, attachments = None, to=None):
- """Send email message.
-
- Args:
- subject(str): Message subject.
- text(str): Message body.
- attachments(list of str, optional): list of files to be attached (expansion tokens are allowed).
- to (list ofd str, optional): recipients. If None uses the recipients defined in mail.properties.
- Returns:
- None
-
- """
- get_context().notify(subject, text, to_list(attachments), to_list(to))
-
-def string_to_obj(o):
- if is_string(o):
- if "://" in o:
- return UrlDevice(o)
- return eval(o)
- elif is_list(o):
- ret = []
- for i in o:
- ret.append(string_to_obj(i))
- return ret
- return o
-
-def _getBuiltinFunctions(filter = None):
- ret = []
- for name in globals().keys():
- val = globals()[name]
- if type(val) is types.FunctionType:
- if filter is None or filter in name:
- #Only "public" documented functions
- if not name.startswith('_') and (val.__doc__ is not None):
- ret.append(val)
- return to_array(ret)
-
-
-def _getBuiltinFunctionNames(filter = None):
- ret = []
- for function in _getBuiltinFunctions(filter):
- ret.append(function.__name__)
- return to_array(ret)
-
-def _getFunctionDoc(function):
- if type(function) is str:
- if function not in globals():
- return
- function = globals()[function]
- if type(function) is types.FunctionType and '__doc__' in dir(function):
- spec = inspect.getargspec(function)
- (args,defs) = (spec[0], spec[3])
- if defs is not None:
- for i in range (len(defs)):
- index = len(args) - len(defs) + i
- args[index] = args[index] + " = " + str(defs[i])
- #varargs
- if spec[1] is not None:
- args.append('*' + spec[1])
- #keywords
- if spec[2] is not None:
- args.append('**' + spec[2])
-
- return function.__name__ + "(" + ", ".join(args) + ")" + "\n\n" + function.__doc__
-
-def help(object = None):
- """
- Print help message for function or object (if available).
-
- Args:
- object (any, optional): function or object to get help.
- If null prints a list of the builtin functions.
-
- Returns:
- None
-
- """
- if object is None:
- print "Built-in functions:"
- for f in _getBuiltinFunctionNames():
- print "\t" + f
- else:
- if type(object) is types.FunctionType:
- print _getFunctionDoc(object)
- elif '__doc__' in dir(object):
- #The default doc is now shown
- import org.python.core.BuiltinDocs.object_doc
- if object.__doc__ != org.python.core.BuiltinDocs.object_doc:
- print object.__doc__
-
-
-###################################################################################################
-#UI interaction
-###################################################################################################
-
-def set_status(status):
- """Set the application status.
-
- Args:
- status(str): new status.
-
- Returns:
- None
- """
- set_preference(Preference.STATUS, status)
-
-def setup_plotting( enable_plots=None, enable_table=None,plot_list = None, line_plots = None, range = None, domain=None, defaults=None):
- if defaults == True: set_preference(Preference.DEFAULTS, True)
- if enable_plots is not None: set_preference(Preference.PLOT_DISABLED, not enable_plots)
- if enable_table is not None: set_preference(Preference.TABLE_DISABLED, not enable_table)
- if plot_list is not None: set_preference(Preference.ENABLED_PLOTS, None if plot_list == "all" else plot_list)
- if line_plots is not None:
- plots = None
- if line_plots != "none":
- plots = {}
- for plot in line_plots:
- plots[plot]=1
- set_preference(Preference.PLOT_TYPES, plots)
- if range is not None:
- if range == "none":
- set_preference(Preference.AUTO_RANGE, None)
- elif range == "auto":
- set_preference(Preference.AUTO_RANGE, True)
- else:
- set_preference(Preference.MANUAL_RANGE, range)
- if domain is not None:
- set_preference(Preference.DOMAIN_AXIS, domain)
-
-
-def set_preference(preference, value):
- """Hints to graphical layer:
-
- Args:
- preference(Preference): Preference name
- Preference.PLOT_DISABLED #enable/disable scan plot (True/False)
- Preference.TABLE_DISABLED #enable/disable scan table (True/False)
- Preference.ENABLED_PLOTS #select Readables to be plotted (list of Readable or
- String (Readable names))
- Preference.PLOT_TYPES #Dictionary or (Readable or String):(String or int) pairs
- where the key is a plot name and the value is the desired plot type
- Preference.PRINT_SCAN #Print scan records to console
- Preference.AUTO_RANGE # Automatic range scan plots x-axis
- Preference.MANUAL_RANGE # Manually set scan plots x-axis
- Preference.DOMAIN_AXIS #Set the domain axis source: "Time", "Index", or a readable name.
- Default(None): first positioner
- Preference.STATUS # set application status
-
- value(object): preference value
-
- Returns:
- None
- """
- value = to_array(value, 'o') #If list then convert to Object array
- get_context().setPreference(preference, value)
-
-def get_string(msg, default = None, alternatives = None, password = False):
- """
- Reads a string from UI
- Args:
- msg(str): display message.
- default(str, optional): value displayed when window is shown.
- alternatives(list of str, optional): if provided presents a combo box instead of an editing field.
- password(boolean, optional): if True hides entered characters.
-
- Returns:
- String entered of null if canceled
- """
- if password :
- return get_context().getPassword(msg, None)
- return get_context().getString(msg, str(default) if (default is not None) else None, alternatives)
-
-def get_option(msg, type = "YesNoCancel"):
- """
- Gets an option from UI
- Args:
- msg(str): display message.
- type(str, optional): 'YesNo','YesNoCancel' or 'OkCancel'
-
- Returns:
- 'Yes', 'No', 'Cancel'
-
- """
- return get_context().getOption(msg, type)
-
-def show_message(msg, title=None, blocking = True):
- """
- Pops a blocking message to UI
-
- Args:
- msg(str): display message.
- title(str, optional): dialog title
- """
- get_context().showMessage(msg, title, blocking)
-
-def show_panel(device, title=None):
- """
- Show, if exists, the panel relative to this device.
-
- Args:
- device(Device or str or BufferedImage): device
- title only apply to BufferedImage objects. For devices the title is the device name.
- """
- if type(device) is BufferedImage:
- device = DirectSource(title, device)
- device.initialize()
- if type(device) is str:
- device = get_device(device)
- return get_context().showPanel(device)
-
diff --git a/script/__Lib/_startup.py b/script/__Lib/_startup.py
deleted file mode 100644
index 1feb5f0..0000000
--- a/script/__Lib/_startup.py
+++ /dev/null
@@ -1,2529 +0,0 @@
-###################################################################################################
-# Global definitions and built-in functions
-###################################################################################################
-
-import sys
-import time
-import math
-import os.path
-from operator import add, mul, sub, truediv
-from time import sleep
-from array import array
-import jarray
-
-import java.lang.Class as Class
-import java.lang.Object as Object
-import java.beans.PropertyChangeListener
-import java.util.concurrent.Callable
-import java.util.List
-import java.lang.reflect.Array
-import java.lang.Thread
-import java.awt.image.BufferedImage as BufferedImage
-import java.awt.Color as Color
-import java.awt.Dimension as Dimension
-import java.awt.Font as Font
-import org.python.core.PyArray as PyArray
-import org.python.core.PyFunction as PyFunction
-
-import ch.psi.utils.Threading as Threading
-import ch.psi.utils.State as State
-import ch.psi.utils.Convert as Convert
-import ch.psi.utils.Arr as Arr
-import ch.psi.utils.Chrono as Chrono
-import ch.psi.pshell.core.CommandSource as CommandSource
-import ch.psi.pshell.core.ContextAdapter as ContextListener
-import ch.psi.pshell.core.Context
-import ch.psi.pshell.core.InlineDevice as InlineDevice
-import ch.psi.pshell.data.PlotDescriptor as PlotDescriptor
-import ch.psi.pshell.data.Table as Table
-import ch.psi.pshell.device.Device as Device
-import ch.psi.pshell.device.DeviceBase as DeviceBase
-import ch.psi.pshell.device.RegisterBase as RegisterBase
-import ch.psi.pshell.device.ProcessVariableBase as ProcessVariableBase
-import ch.psi.pshell.device.ControlledVariableBase as ControlledVariableBase
-import ch.psi.pshell.device.PositionerBase as PositionerBase
-import ch.psi.pshell.device.MotorBase as MotorBase
-import ch.psi.pshell.device.DiscretePositionerBase as DiscretePositionerBase
-import ch.psi.pshell.device.MotorGroupBase as MotorGroupBase
-import ch.psi.pshell.device.MotorGroupDiscretePositioner as MotorGroupDiscretePositioner
-import ch.psi.pshell.device.ReadonlyRegisterBase as ReadonlyRegisterBase
-import ch.psi.pshell.device.ReadonlyAsyncRegisterBase as ReadonlyAsyncRegisterBase
-import ch.psi.pshell.device.Register as Register
-import ch.psi.pshell.device.RegisterCache as RegisterCache
-import ch.psi.pshell.device.ReadonlyRegister.ReadonlyRegisterArray as ReadonlyRegisterArray
-import ch.psi.pshell.device.ReadonlyRegister.ReadonlyRegisterMatrix as ReadonlyRegisterMatrix
-import ch.psi.pshell.device.DummyPositioner as DummyPositioner
-import ch.psi.pshell.device.DummyMotor as DummyMotor
-import ch.psi.pshell.device.DummyRegister as DummyRegister
-import ch.psi.pshell.device.Timestamp as Timestamp
-import ch.psi.pshell.device.Interlock as Interlock
-import ch.psi.pshell.device.Readable as Readable
-import ch.psi.pshell.device.Readable.ReadableArray as ReadableArray
-import ch.psi.pshell.device.Readable.ReadableMatrix as ReadableMatrix
-import ch.psi.pshell.device.Readable.ReadableCalibratedArray as ReadableCalibratedArray
-import ch.psi.pshell.device.Readable.ReadableCalibratedMatrix as ReadableCalibratedMatrix
-import ch.psi.pshell.device.ArrayCalibration as ArrayCalibration
-import ch.psi.pshell.device.MatrixCalibration as MatrixCalibration
-import ch.psi.pshell.device.Writable as Writable
-import ch.psi.pshell.device.Writable.WritableArray as WritableArray
-import ch.psi.pshell.device.Stoppable as Stoppable
-import ch.psi.pshell.device.Averager as Averager
-import ch.psi.pshell.device.ArrayAverager as ArrayAverager
-import ch.psi.pshell.device.Delta as Delta
-import ch.psi.pshell.device.DeviceAdapter as DeviceListener
-import ch.psi.pshell.device.ReadbackDeviceAdapter as ReadbackDeviceListener
-import ch.psi.pshell.device.MotorAdapter as MotorListener
-import ch.psi.pshell.device.MoveMode as MoveMode
-import ch.psi.pshell.device.SettlingCondition as SettlingCondition
-import ch.psi.pshell.epics.Epics as Epics
-import ch.psi.pshell.epics.EpicsScan as EpicsScan
-import ch.psi.pshell.epics.ChannelSettlingCondition as ChannelSettlingCondition
-import ch.psi.pshell.imaging.Source as Source
-import ch.psi.pshell.imaging.SourceBase as SourceBase
-import ch.psi.pshell.imaging.DirectSource as DirectSource
-import ch.psi.pshell.imaging.RegisterMatrixSource as RegisterMatrixSource
-import ch.psi.pshell.imaging.ImageListener as ImageListener
-import ch.psi.pshell.plot.LinePlotSeries as LinePlotSeries
-import ch.psi.pshell.plot.LinePlotErrorSeries as LinePlotErrorSeries
-import ch.psi.pshell.plot.MatrixPlotSeries as MatrixPlotSeries
-import ch.psi.pshell.scan.ScanBase as ScanBase
-import ch.psi.pshell.scan.LineScan
-import ch.psi.pshell.scan.ContinuousScan
-import ch.psi.pshell.scan.AreaScan
-import ch.psi.pshell.scan.VectorScan
-import ch.psi.pshell.scan.ManualScan
-import ch.psi.pshell.scan.HardwareScan
-import ch.psi.pshell.scan.RegionScan
-import ch.psi.pshell.scan.TimeScan
-import ch.psi.pshell.scan.MonitorScan
-import ch.psi.pshell.scan.BinarySearch
-import ch.psi.pshell.scan.HillClimbingSearch
-import ch.psi.pshell.scan.ScanResult
-import ch.psi.pshell.bs.BsScan
-import ch.psi.pshell.bs.Stream as Stream
-import ch.psi.pshell.scripting.ViewPreference as Preference
-import ch.psi.pshell.scripting.ScriptUtils as ScriptUtils
-
-def get_context():
- return ch.psi.pshell.core.Context.getInstance()
-
-###################################################################################################
-#Type conversion and checking
-###################################################################################################
-
-def to_array(obj, type = 'o'):
- """Convert Python list to Java array.
-
- Args:
- obj(list): Original data.
- type(str): array type 'b' = byte, 'h' = short, 'i' = int, 'l' = long, 'f' = float, 'd' = double,
- 'c' = char, 'z' = boolean, 's' = String, 'o' = Object
- Returns:
- Java array.
-
- """
- if type[0] == '[':
- type = type[1:]
- arrayType = ScriptUtils.getType("["+type)
-
- if obj is None:
- return None
- if isinstance(obj,java.util.List):
- obj = obj.toArray()
- if type != 'o':
- obj = Convert.toPrimitiveArray(obj, ScriptUtils.getType(type))
- if isinstance(obj,PyArray):
- if type != 'o':
- if (Arr.getRank(obj)== 1) and (obj.typecode != type):
- ret = java.lang.reflect.Array.newInstance(ScriptUtils.getType(type), len(obj))
- if type == 's':
- for i in range(len(obj)): ret[i] = str(obj[i])
- elif type == 'c':
- for i in range(len(obj)): ret[i] = chr(obj[i])
- else:
- for i in range(len(obj)): ret[i] = obj[i]
- obj = ret
- if type not in ['o', 's']:
- obj = Convert.toPrimitiveArray(obj)
- return obj
- if is_list(obj):
- if type=='o' or type== 's':
- ret = java.lang.reflect.Array.newInstance(ScriptUtils.getType(type), len(obj))
- for i in range (len(obj)):
- if is_list(obj[i]):
- ret[i] = to_array(obj[i],type)
- elif type == 's':
- ret[i] = str(obj[i])
- else:
- ret[i] = obj[i]
- return ret
-
- if len(obj)>0 and is_list(obj[0]):
- if len(obj[0])>0 and is_list(obj[0][0]):
- ret = java.lang.reflect.Array.newInstance(arrayType,len(obj),len(obj[0]))
- for i in range(len(obj)):
- ret[i]=to_array(obj[i], type)
- return ret
- else:
- ret = java.lang.reflect.Array.newInstance(arrayType,len(obj))
- for i in range(len(obj)):
- ret[i]=to_array(obj[i], type)
- return ret
- return jarray.array(obj,type)
- return obj
-
-def to_list(obj):
- """Convert an object into a Python List.
-
- Args:
- obj(tuple or array or ArrayList): Original data.
- Returns:
- List.
-
- """
- if obj is None:
- return None
- if isinstance(obj,tuple) or isinstance(obj,java.util.ArrayList) :
- return list(obj)
- #if isinstance(obj,PyArray):
- # return obj.tolist()
- if not isinstance(obj,list):
- return [obj,]
- return obj
-
-def is_list(obj):
- return isinstance(obj,tuple) or isinstance(obj,list) or isinstance (obj, java.util.ArrayList)
-
-def is_string(obj):
- return (type(obj) is str) or (type(obj) is unicode)
-
-
-###################################################################################################
-#Standard scan commands
-###################################################################################################
-
-def on_before_scan_readout(scan, pos):
- try:
- if scan.before_read != None:
- arguments = scan.before_read.func_code.co_argcount
- if arguments == 0:
- scan.before_read()
- elif arguments==1:
- scan.before_read(pos.tolist())
- elif arguments==2:
- scan.before_read(pos.tolist(), scan)
- except AttributeError:
- pass
-
-def on_after_scan_readout(scan, record):
- try:
- if scan.after_read != None:
- arguments = scan.after_read.func_code.co_argcount
- if arguments == 0:
- scan.after_read()
- elif arguments==1:
- scan.after_read(record)
- elif arguments==2:
- scan.after_read(record, scan)
- except AttributeError:
- pass
-
-def on_before_scan_pass(scan, num_pass):
- try:
- if scan.before_pass != None:
- arguments = scan.before_pass.func_code.co_argcount
- if arguments == 0:
- scan.before_pass()
- elif arguments==1:
- scan.before_pass(num_pass)
- elif arguments==2:
- scan.before_pass(num_pass, scan)
- except AttributeError:
- pass
-
-def on_after_scan_pass(scan, num_pass):
- try:
- if scan.after_pass != None:
- arguments = scan.after_pass.func_code.co_argcount
- if arguments == 0:
- scan.after_pass()
- elif arguments==1:
- scan.after_pass(num_pass)
- elif arguments==2:
- scan.after_pass(num_pass, scan)
- except AttributeError:
- pass
-
-class LineScan(ch.psi.pshell.scan.LineScan):
- def onBeforeReadout(self, pos):
- on_before_scan_readout(self, pos)
-
- def onAfterReadout(self, record):
- on_after_scan_readout(self, record)
-
- def onBeforePass(self, num_pass):
- on_before_scan_pass(self, num_pass)
-
- def onAfterPass(self, num_pass):
- on_after_scan_pass(self, num_pass)
-
-class ContinuousScan(ch.psi.pshell.scan.ContinuousScan):
- def onBeforeReadout(self, pos):
- on_before_scan_readout(self, pos)
-
- def onAfterReadout(self, record):
- on_after_scan_readout(self, record)
-
- def onBeforePass(self, num_pass):
- on_before_scan_pass(self, num_pass)
-
- def onAfterPass(self, num_pass):
- on_after_scan_pass(self, num_pass)
-
-class AreaScan(ch.psi.pshell.scan.AreaScan):
- def onBeforeReadout(self, pos):
- on_before_scan_readout(self, pos)
-
- def onAfterReadout(self, record):
- on_after_scan_readout(self, record)
-
- def onBeforePass(self, num_pass):
- on_before_scan_pass(self, num_pass)
-
- def onAfterPass(self, num_pass):
- on_after_scan_pass(self, num_pass)
-
-class RegionScan(ch.psi.pshell.scan.RegionScan):
- def onBeforeReadout(self, pos):
- on_before_scan_readout(self, pos)
-
- def onAfterReadout(self, record):
- on_after_scan_readout(self, record)
-
- def onBeforePass(self, num_pass):
- on_before_scan_pass(self, num_pass)
-
- def onAfterPass(self, num_pass):
- on_after_scan_pass(self, num_pass)
-
-class VectorScan(ch.psi.pshell.scan.VectorScan):
- def onBeforeReadout(self, pos):
- on_before_scan_readout(self, pos)
-
- def onAfterReadout(self, record):
- on_after_scan_readout(self, record)
-
- def onBeforePass(self, num_pass):
- on_before_scan_pass(self, num_pass)
-
- def onAfterPass(self, num_pass):
- on_after_scan_pass(self, num_pass)
-
-class ContinuousScan(ch.psi.pshell.scan.ContinuousScan):
- def onBeforeReadout(self, pos):
- on_before_scan_readout(self, pos)
-
- def onAfterReadout(self, record):
- on_after_scan_readout(self, record)
-
- def onBeforePass(self, num_pass):
- on_before_scan_pass(self, num_pass)
-
- def onAfterPass(self, num_pass):
- on_after_scan_pass(self, num_pass)
-
-class TimeScan(ch.psi.pshell.scan.TimeScan):
- def onBeforeReadout(self, pos):
- on_before_scan_readout(self, pos)
-
- def onAfterReadout(self, record):
- on_after_scan_readout(self, record)
-
- def onBeforePass(self, num_pass):
- on_before_scan_pass(self, num_pass)
-
- def onAfterPass(self, num_pass):
- on_after_scan_pass(self, num_pass)
-
-class MonitorScan(ch.psi.pshell.scan.MonitorScan):
- def onBeforeReadout(self, pos):
- on_before_scan_readout(self, pos)
-
- def onAfterReadout(self, record):
- on_after_scan_readout(self, record)
-
- def onBeforePass(self, num_pass):
- on_before_scan_pass(self, num_pass)
-
- def onAfterPass(self, num_pass):
- on_after_scan_pass(self, num_pass)
-
-class BsScan(ch.psi.pshell.bs.BsScan):
- def onBeforeReadout(self, pos):
- on_before_scan_readout(self, pos)
-
- def onAfterReadout(self, record):
- on_after_scan_readout(self, record)
-
- def onBeforePass(self, num_pass):
- on_before_scan_pass(self, num_pass)
-
- def onAfterPass(self, num_pass):
- on_after_scan_pass(self, num_pass)
-
-class ManualScan (ch.psi.pshell.scan.ManualScan):
- def __init__(self, writables, readables, start = None, end = None, steps = None, relative = False, dimensions = None):
- ch.psi.pshell.scan.ManualScan.__init__(self, writables, readables, start, end, steps, relative)
- self._dimensions = dimensions
-
- def append(self,setpoints, positions, values, timestamps=None):
- ch.psi.pshell.scan.ManualScan.append(self, to_array(setpoints), to_array(positions), to_array(values), None if (timestamps is None) else to_array(timestamps))
-
- def getDimensions(self):
- if self._dimensions == None:
- return ch.psi.pshell.scan.ManualScan.getDimensions(self)
- else:
- return self._dimensions
-
-class BinarySearch(ch.psi.pshell.scan.BinarySearch):
- def onBeforeReadout(self, pos):
- on_before_scan_readout(self, pos)
-
- def onAfterReadout(self, record):
- on_after_scan_readout(self, record)
-
-class HillClimbingSearch(ch.psi.pshell.scan.HillClimbingSearch):
- def onBeforeReadout(self, pos):
- on_before_scan_readout(self, pos)
-
- def onAfterReadout(self, record):
- on_after_scan_readout(self, record)
-
-def processScanPars(scan, pars):
- scan.before_read = pars.pop("before_read",None)
- scan.after_read = pars.pop("after_read",None)
- scan.before_pass = pars.pop("before_pass",None)
- scan.after_pass = pars.pop("after_pass",None)
- scan.setPlotTitle(pars.pop("title",None))
- scan.setHidden(pars.pop("hidden",False))
- scan.setSettleTimeout (pars.pop("settle_timeout",ScanBase.getScansSettleTimeout()))
- scan.setUseWritableReadback (pars.pop("use_readback",ScanBase.getScansUseWritableReadback()))
- scan.setInitialMove(pars.pop("initial_move",ScanBase.getScansTriggerInitialMove()))
- scan.setParallelPositioning(pars.pop("parallel_positioning",ScanBase.getScansParallelPositioning()))
- scan.setAbortOnReadableError(pars.pop("abort_on_error",ScanBase.getAbortScansOnReadableError()))
- scan.setRestorePosition (pars.pop("restore_position",ScanBase.getRestorePositionOnRelativeScans()))
- scan.setCheckPositions(pars.pop("check_positions",ScanBase.getScansCheckPositions()))
-
-
- get_context().setCommandPars(scan, pars)
-
-def lscan(writables, readables, start, end, steps, latency=0.0, relative=False, passes=1, zigzag=False, **pars):
- """Line Scan: positioners change together, linearly from start to end positions.
-
- Args:
- writables(list of Writable): Positioners set on each step.
- readables(list of Readable): Sensors to be sampled on each step.
- start(list of float): start positions of writables.
- end(list of float): final positions of writables.
- steps(int or float or list of float): number of scan steps (int) or step size (float).
- relative (bool, optional): if true, start and end positions are relative to
- current at start of the scan
- latency(float, optional): settling time for each step before readout, defaults to 0.0.
- passes(int, optional): number of passes
- zigzag(bool, optional): if true writables invert direction on each pass.
- pars(keyworded variable length arguments, optional): scan optional named arguments:
- - title(str, optional): plotting window name.
- - hidden(bool, optional): if true generates no effects on user interface.
- - before_read (function, optional): callback on each step, before sampling. Arguments: positions, scan
- - after_read (function, optional): callback on each step, after sampling. Arguments: record, scan.
- - before_pass (function, optional): callback before each scan pass execution. Arguments: pass_num, scan.
- - after_pass (function, optional): callback after each scan pass execution. Arguments: pass_num, scan.
- - settle_timeout(int, optional): timeout for each positioner get to position. Default (-1) waits forever.
- - initial_move (bool, optional): if true (default) perform move to initial position prior to scan start.
- - parallel_positioning (bool, optional): if true (default) all positioners are set in parallel.
- - abort_on_error (bool, optional): if true then aborts scan in sensor failures. Default is false.
- - restore_position (bool, optional): if true (default) then restore initial position after relative scans.
- - check_positions (bool, optional): if true (default) verifies if in correct positions after move finishes.
- - Aditional arguments defined by set_exec_pars.
-
- Returns:
- ScanResult object.
-
- """
- latency_ms=int(latency*1000)
- writables=to_list(string_to_obj(writables))
- readables=to_list(string_to_obj(readables))
- start=to_list(start)
- end=to_list(end)
- if type(steps) is float or is_list(steps):
- steps = to_list(steps)
- scan = LineScan(writables,readables, start, end , steps, relative, latency_ms, int(passes), zigzag)
- processScanPars(scan, pars)
- scan.start()
- return scan.getResult()
-
-def vscan(writables, readables, vector, line = False, latency=0.0, relative=False, passes=1, zigzag=False, **pars):
- """Vector Scan: positioners change following values provided in a vector.
-
- Args:
- writables(list of Writable): Positioners set on each step.
- readables(list of Readable): Sensors to be sampled on each step.
- vector(list of list of float): table of positioner values.
- line (bool, optional): if true, processs as line scan (1d)
- relative (bool, optional): if true, start and end positions are relative to current at
- start of the scan
- latency(float, optional): settling time for each step before readout, defaults to 0.0.
- passes(int, optional): number of passes
- zigzag(bool, optional): if true writables invert direction on each pass.
- pars(keyworded variable length arguments, optional): scan optional named arguments:
- - title(str, optional): plotting window name.
- - before_read (function, optional): callback on each step, before sampling. Arguments: positions, scan
- - after_read (function, optional): callback on each step, after sampling. Arguments: record, scan.
- - before_pass (function, optional): callback before each scan pass execution. Arguments: pass_num, scan.
- - after_pass (function, optional): callback after each scan pass execution. Arguments: pass_num, scan.
- - settle_timeout(int, optional): timeout for each positioner get to position. Default (-1) waits forever.
- - initial_move (bool, optional): if true (default) perform move to initial position prior to scan start.
- - parallel_positioning (bool, optional): if true (default) all positioners are set in parallel.
- - abort_on_error (bool, optional): if true then aborts scan in sensor failures. Default is false.
- - restore_position (bool, optional): if true (default) then restore initial position after relative scans.
- - check_positions (bool, optional): if true (default) verifies if in correct positions after move finishes.
- - Aditional arguments defined by set_exec_pars.
-
- Returns:
- ScanResult object.
-
- """
- latency_ms=int(latency*1000)
- writables=to_list(string_to_obj(writables))
- readables=to_list(string_to_obj(readables))
- if len(vector) == 0:
- vector.append([])
- elif (not is_list(vector[0])) and (not isinstance(vector[0],PyArray)):
- vector = [[x,] for x in vector]
- vector = to_array(vector, 'd')
- scan = VectorScan(writables,readables, vector, line, relative, latency_ms, int(passes), zigzag)
- processScanPars(scan, pars)
- scan.start()
- return scan.getResult()
-
-def ascan(writables, readables, start, end, steps, latency=0.0, relative=False, passes=1, zigzag=False, **pars):
- """Area Scan: multi-dimentional scan, each positioner is a dimention.
-
- Args:
- writables(list of Writable): Positioners set on each step.
- readables(list of Readable): Sensors to be sampled on each step.
- start(list of float): start positions of writables.
- end(list of float): final positions of writables.
- steps(list of int or list of float): number of scan steps (int) or step size (float).
- latency(float, optional): settling time for each step before readout, defaults to 0.0.
- relative (bool, optional): if true, start and end positions are relative to current at
- start of the scan
- passes(int, optional): number of passes
- zigzag (bool, optional): if true writables invert direction on each row.
- pars(keyworded variable length arguments, optional): scan optional named arguments:
- - title(str, optional): plotting window name.
- - before_read (function, optional): callback on each step, before sampling. Arguments: positions, scan
- - after_read (function, optional): callback on each step, after sampling. Arguments: record, scan.
- - before_pass (function, optional): callback before each scan pass execution. Arguments: pass_num, scan.
- - after_pass (function, optional): callback after each scan pass execution. Arguments: pass_num, scan.
- - settle_timeout(int, optional): timeout for each positioner get to position. Default (-1) waits forever.
- - initial_move (bool, optional): if true (default) perform move to initial position prior to scan start.
- - parallel_positioning (bool, optional): if true (default) all positioners are set in parallel.
- - abort_on_error (bool, optional): if true then aborts scan in sensor failures. Default is false.
- - restore_position (bool, optional): if true (default) then restore initial position after relative scans.
- - check_positions (bool, optional): if true (default) verifies if in correct positions after move finishes.
- - Aditional arguments defined by set_exec_pars.
-
- Returns:
- ScanResult object.
-
- """
- latency_ms=int(latency*1000)
- writables=to_list(string_to_obj(writables))
- readables=to_list(string_to_obj(readables))
- start=to_list(start)
- end=to_list(end)
- if is_list(steps):
- steps = to_list(steps)
- scan = AreaScan(writables,readables, start, end , steps, relative, latency_ms, int(passes), zigzag)
- processScanPars(scan, pars)
- scan.start()
- return scan.getResult()
-
-
-def rscan(writable, readables, regions, latency=0.0, relative=False, passes=1, zigzag=False, **pars):
- """Region Scan: positioner scanned linearly, from start to end positions, in multiple regions.
-
- Args:
- writable(Writable): Positioner set on each step, for each region.
- readables(list of Readable): Sensors to be sampled on each step.
- regions (list of tuples (float,float, int) or (float,float, float)): each tuple define a scan region
- (start, stop, steps) or (start, stop, step_size)
- relative (bool, optional): if true, start and end positions are relative to
- current at start of the scan
- latency(float, optional): settling time for each step before readout, defaults to 0.0.
- passes(int, optional): number of passes
- zigzag(bool, optional): if true writable invert direction on each pass.
- pars(keyworded variable length arguments, optional): scan optional named arguments:
- - title(str, optional): plotting window name.
- - before_read (function, optional): callback on each step, before sampling. Arguments: positions, scan
- - after_read (function, optional): callback on each step, after sampling. Arguments: record, scan.
- - before_pass (function, optional): callback before each scan pass execution. Arguments: pass_num, scan.
- - after_pass (function, optional): callback after each scan pass execution. Arguments: pass_num, scan.
- - settle_timeout(int, optional): timeout for each positioner get to position. Default (-1) waits forever.
- - initial_move (bool, optional): if true (default) perform move to initial position prior to scan start.
- - parallel_positioning (bool, optional): if true (default) all positioners are set in parallel.
- - abort_on_error (bool, optional): if true then aborts scan in sensor failures. Default is false.
- - restore_position (bool, optional): if true (default) then restore initial position after relative scans.
- - check_positions (bool, optional): if true (default) verifies if in correct positions after move finishes.
- - Aditional arguments defined by set_exec_pars.
-
- Returns:
- ScanResult object.
-
- """
- start=[]
- end=[]
- steps=[]
- for region in regions:
- start.append(region[0])
- end.append(region[1])
- steps.append(region[2])
- latency_ms=int(latency*1000)
- writable=string_to_obj(writable)
- readables=to_list(string_to_obj(readables))
- start=to_list(start)
- end=to_list(end)
- steps = to_list(steps)
- scan = RegionScan(writable,readables, start, end , steps, relative, latency_ms, int(passes), zigzag)
- processScanPars(scan, pars)
- scan.start()
- return scan.getResult()
-
-def cscan(writables, readables, start, end, steps, latency=0.0, time=None, relative=False, passes=1, zigzag=False, **pars):
- """Continuous Scan: positioner change continuously from start to end position and readables are sampled on the fly.
-
- Args:
- writable(Speedable or list of Motor): A positioner with a getSpeed method or
- a list of motors.
- readables(list of Readable): Sensors to be sampled on each step.
- start(float or list of float): start positions of writables.
- end(float or list of float): final positions of writabless.
- steps(int or float or list of float): number of scan steps (int) or step size (float).
- latency(float, optional): sleep time in each step before readout, defaults to 0.0.
- time (float, seconds): if not None then writables is Motor array and speeds are
- set according to time.
- relative (bool, optional): if true, start and end positions are relative to
- current at start of the scan
- passes(int, optional): number of passes
- pars(keyworded variable length arguments, optional): scan optional named arguments:
- - title(str, optional): plotting window name.
- - before_read (function, optional): callback on each step, before sampling. Arguments: positions, scan
- - after_read (function, optional): callback on each step, after sampling. Arguments: record, scan.
- - before_pass (function, optional): callback before each scan pass execution. Arguments: pass_num, scan.
- - after_pass (function, optional): callback after each scan pass execution. Arguments: pass_num, scan.
- - abort_on_error (bool, optional): if true then aborts scan in sensor failures. Default is false.
- - restore_position (bool, optional): if true (default) then restore initial position after relative scans.
- - Aditional arguments defined by set_exec_pars.
-
- Returns:
- ScanResult object.
-
- """
- latency_ms=int(latency*1000)
- readables=to_list(string_to_obj(readables))
- writables=to_list(string_to_obj(writables))
- start=to_list(start)
- end=to_list(end)
- #A single Writable with fixed speed
- if time is None:
- if is_list(steps): steps=steps[0]
- scan = ContinuousScan(writables[0],readables, start[0], end[0] , steps, relative, latency_ms, int(passes), zigzag)
- #A set of Writables with speed configurable
- else:
- if type(steps) is float or is_list(steps):
- steps = to_list(steps)
- scan = ContinuousScan(writables,readables, start, end , steps, time, relative, latency_ms, int(passes), zigzag)
-
- processScanPars(scan, pars)
- scan.start()
- return scan.getResult()
-
-def hscan(config, writable, readables, start, end, steps, passes=1, zigzag=False, **pars):
- """Hardware Scan: values sampled by external hardware and received asynchronously.
-
- Args:
- config(dict): Configuration of the hardware scan. The "class" key provides the implementation class.
- Other keys are implementation specific.
- writable(Writable): A positioner appropriated to the hardware scan type.
- readables(list of Readable): Sensors appropriated to the hardware scan type.
- start(float): start positions of writable.
- end(float): final positions of writables.
- steps(int or float): number of scan steps (int) or step size (float).
- passes(int, optional): number of passes
- pars(keyworded variable length arguments, optional): scan optional named arguments:
- - title(str, optional): plotting window name.
- - after_read (function, optional): callback on each step, after sampling. Arguments: record, scan.
- - before_pass (function, optional): callback before each scan pass execution. Arguments: pass_num, scan.
- - after_pass (function, optional): callback after each scan pass execution. Arguments: pass_num, scan.
- - abort_on_error (bool, optional): if true then aborts scan in sensor failures. Default is false.
- - Aditional arguments defined by set_exec_pars.
-
- Returns:
- ScanResult object.
-
- """
- cls = Class.forName(config["class"])
- class HardwareScan(cls):
- def __init__(self, config, writable, readables, start, end, stepSize, passes, zigzag):
- cls.__init__(self, config, writable, readables, start, end, stepSize, passes, zigzag)
- def onAfterReadout(self, record):
- on_after_scan_readout(self, record)
- def onBeforePass(self, num_pass):
- on_before_scan_pass(self, num_pass)
- def onAfterPass(self, num_pass):
- on_after_scan_pass(self, num_pass)
-
- readables=to_list(string_to_obj(readables))
- scan = HardwareScan(config, writable,readables, start, end , steps, int(passes), zigzag)
- processScanPars(scan, pars)
- scan.start()
- return scan.getResult()
-
-def bscan(stream, records, timeout = None, passes=1, **pars):
- """BS Scan: records all values in a beam synchronous stream.
-
- Args:
- stream(Stream): stream object or list of chanel names to build stream from
- records(int): number of records to store
- timeout(float, optional): maximum scan time in seconds.
- passes(int, optional): number of passes
- pars(keyworded variable length arguments, optional): scan optional named arguments:
- - title(str, optional): plotting window name.
- - before_read (function, optional): callback on each step, before sampling. Arguments: positions, scan
- - after_read (function, optional): callback on each step, after sampling. Arguments: record, scan.
- - before_pass (function, optional): callback before each scan pass execution. Arguments: pass_num, scan.
- - after_pass (function, optional): callback after each scan pass execution. Arguments: pass_num, scan.
- - Aditional arguments defined by set_exec_pars.
-
- Returns:
- ScanResult object.
-
- """
- timeout_ms=int(timeout*1000) if ((timeout is not None) and (timeout>=0)) else -1
- if not is_list(stream):
- stream=string_to_obj(stream)
- scan = BsScan(stream,int(records), timeout_ms, int(passes))
- processScanPars(scan, pars)
- scan.start()
- return scan.getResult()
-
-def tscan(readables, points, interval, passes=1, **pars):
- """Time Scan: sensors are sampled in fixed time intervals.
-
- Args:
- readables(list of Readable): Sensors to be sampled on each step.
- points(int): number of samples.
- interval(float): time interval between readouts. Minimum temporization is 0.001s
- passes(int, optional): number of passes
- pars(keyworded variable length arguments, optional): scan optional named arguments:
- - title(str, optional): plotting window name.
- - before_read (function, optional): callback on each step, before sampling. Arguments: positions, scan
- - after_read (function, optional): callback on each step, after sampling. Arguments: record, scan.
- - before_pass (function, optional): callback before each scan pass execution. Arguments: pass_num, scan.
- - after_pass (function, optional): callback after each scan pass execution. Arguments: pass_num, scan.
- - abort_on_error (bool, optional): if true then aborts scan in sensor failures. Default is false.
- - Aditional arguments defined by set_exec_pars.
-
- Returns:
- ScanResult object.
-
- """
- interval= max(interval, 0.001) #Minimum temporization is 1ms
- interval_ms=int(interval*1000)
- readables=to_list(string_to_obj(readables))
- scan = TimeScan(readables, points, interval_ms, int(passes))
- processScanPars(scan, pars)
- scan.start()
- return scan.getResult()
-
-def mscan(trigger, readables, points, timeout = None, async=True, take_initial=False, passes=1, **pars):
- """Monitor Scan: sensors are sampled when received change event of the trigger device.
-
- Args:
- trigger(Device or list of Device): Source of the sampling triggering.
- readables(list of Readable): Sensors to be sampled on each step.
- If trigger has cache and is included in readables, it is not read
- for each step, but the change event value is used.
- points(int): number of samples.
- timeout(float, optional): maximum scan time in seconds.
- async(bool, optional): if True then records are sampled and stored on event change callback. Enforce
- reading only cached values of sensors.
- If False, the scan execution loop waits for trigger cache update. Do not make
- cache only access, but may loose change events.
- take_initial(bool, optional): if True include current values as first record (before first trigger).
- passes(int, optional): number of passes
- pars(keyworded variable length arguments, optional): scan optional named arguments:
- - title(str, optional): plotting window name.
- - before_read (function, optional): callback on each step, before sampling. Arguments: positions, scan
- - after_read (function, optional): callback on each step, after sampling. Arguments: record, scan.
- - before_pass (function, optional): callback before each scan pass execution. Arguments: pass_num, scan.
- - after_pass (function, optional): callback after each scan pass execution. Arguments: pass_num, scan.
- - abort_on_error (bool, optional): if true then aborts scan in sensor failures. Default is false.
- - Aditional arguments defined by set_exec_pars.
-
- Returns:
- ScanResult object.
-
- """
- timeout_ms=int(timeout*1000) if ((timeout is not None) and (timeout>=0)) else -1
- trigger = string_to_obj(trigger)
- readables=to_list(string_to_obj(readables))
- scan = MonitorScan(trigger, readables, points, timeout_ms, async, take_initial, int(passes))
- processScanPars(scan, pars)
- scan.start()
- return scan.getResult()
-
-def escan(name, **pars):
- """Epics Scan: execute an Epics Scan Record.
-
- Args:
- name(str): Name of scan record.
- title(str, optional): plotting window name.
- pars(keyworded variable length arguments, optional): scan optional named arguments:
- - title(str, optional): plotting window name.
- - Aditional arguments defined by set_exec_pars.
-
- Returns:
- ScanResult object.
-
- """
- scan = EpicsScan(name)
- processScanPars(scan, pars)
- scan.start()
- return scan.getResult()
-
-
-def bsearch(writables, readable, start, end, steps, maximum = True, strategy = "Normal", latency=0.0, relative=False, **pars):
- """Binary search: searches writables in a binary search fashion to find a local maximum for the readable.
-
- Args:
- writables(list of Writable): Positioners set on each step.
- readable(Readable): Sensor to be sampled.
- start(list of float): start positions of writables.
- end(list of float): final positions of writables.
- steps(float or list of float): resolution of search for each writable.
- maximum (bool , optional): if True (default) search maximum, otherwise minimum.
- strategy (str , optional): "Normal": starts search midway to scan range and advance in the best direction.
- Uses orthogonal neighborhood (4-neighborhood for 2d)
- "Boundary": starts search on scan range.
- "FullNeighborhood": Uses complete neighborhood (8-neighborhood for 2d)
-
- latency(float, optional): settling time for each step before readout, defaults to 0.0.
- relative (bool, optional): if true, start and end positions are relative to current at
- start of the scan
- pars(keyworded variable length arguments, optional): scan optional named arguments:
- - title(str, optional): plotting window name.
- - before_read (function, optional): callback on each step, before sampling. Arguments: positions, scan
- - after_read (function, optional): callback on each step, after sampling. Arguments: record, scan.
- - settle_timeout(int, optional): timeout for each positioner get to position. Default (-1) waits forever.
- - parallel_positioning (bool, optional): if true (default) all positioners are set in parallel.
- - abort_on_error (bool, optional): if true then aborts scan in sensor failures. Default is false.
- - restore_position (bool, optional): if true (default) then restore initial position after relative scans.
- - check_positions (bool, optional): if true (default) verifies if in correct positions after move finishes.
- - Aditional arguments defined by set_exec_pars.
-
- Returns:
- SearchResult object.
-
- """
- latency_ms=int(latency*1000)
- writables=to_list(string_to_obj(writables))
- readable=string_to_obj(readable)
- start=to_list(start)
- end=to_list(end)
- steps = to_list(steps)
- strategy = BinarySearch.Strategy.valueOf(strategy)
- scan = BinarySearch(writables,readable, start, end , steps, maximum, strategy, relative, latency_ms)
- processScanPars(scan, pars)
- scan.start()
- return scan.getResult()
-
-def hsearch(writables, readable, range_min, range_max, initial_step, resolution, filter=1, maximum=True, latency=0.0, relative=False, **pars):
- """Hill Climbing search: searches writables in decreasing steps to find a local maximum for the readable.
- Args:
- writables(list of Writable): Positioners set on each step.
- readable(Readable): Sensor to be sampled.
- range_min(list of float): minimum positions of writables.
- range_max(list of float): maximum positions of writables.
- initial_step(float or list of float):initial step size for for each writable.
- resolution(float or list of float): resolution of search for each writable (minimum step size).
- filter(int): number of aditional steps to filter noise
- maximum (bool , optional): if True (default) search maximum, otherwise minimum.
- latency(float, optional): settling time for each step before readout, defaults to 0.0.
- relative (bool, optional): if true, range_min and range_max positions are relative to current at
- start of the scan
- pars(keyworded variable length arguments, optional): scan optional named arguments:
- - title(str, optional): plotting window name.
- - before_read (function, optional): callback on each step, before sampling. Arguments: positions, scan
- - after_read (function, optional): callback on each step, after sampling. Arguments: record, scan.
- - settle_timeout(int, optional): timeout for each positioner get to position. Default (-1) waits forever.
- - parallel_positioning (bool, optional): if true (default) all positioners are set in parallel.
- - abort_on_error (bool, optional): if true then aborts scan in sensor failures. Default is false.
- - restore_position (bool, optional): if true (default) then restore initial position after relative scans.
- - check_positions (bool, optional): if true (default) verifies if in correct positions after move finishes.
- - Aditional arguments defined by set_exec_pars.
-
- Returns:
- SearchResult object.
-
- """
- latency_ms=int(latency*1000)
- writables=to_list(string_to_obj(writables))
- readable=string_to_obj(readable)
- range_min=to_list(range_min)
- range_max=to_list(range_max)
- initial_step = to_list(initial_step)
- resolution = to_list(resolution)
- scan = HillClimbingSearch(writables,readable, range_min, range_max , initial_step, resolution, filter, maximum, relative, latency_ms)
- processScanPars(scan, pars)
- scan.start()
- return scan.getResult()
-
-
-###################################################################################################
-#Data plotting
-###################################################################################################
-
-def plot(data, name = None, xdata = None, ydata=None, title=None):
- """Request one or multiple plots of user data (1d, 2d or 3d).
-
- Args:
- data: array or list of values. For multiple plots, array of arrays or lists of values.
- name(str or list of str, optional): plot name or list of names (if multiple plots).
- xdata: array or list of values. For multiple plots, array of arrays or lists of values.
- ydata: array or list of values. For multiple plots, array of arrays or lists of values.
- title(str, optional): plotting window name.
-
- Returns:
- ArrayList of Plot objects.
-
- """
- if isinstance(data, ch.psi.pshell.data.Table):
- if is_list(xdata):
- xdata = to_array(xdata, 'd')
- return get_context().plot(data,xdata,name,title)
-
- if isinstance(data, ch.psi.pshell.scan.ScanResult):
- return get_context().plot(data,title)
-
- if (name is not None) and is_list(name):
- if len(name)==0:
- name=None;
- else:
- if (data==None):
- data = []
- for n in name:
- data.append([])
- plots = java.lang.reflect.Array.newInstance(Class.forName("ch.psi.pshell.data.PlotDescriptor"), len(data))
- for i in range (len(data)):
- plotName = None if (name is None) else name[i]
- x = xdata
- if is_list(x) and len(x)>0 and (is_list(x[i]) or isinstance(x[i] , java.util.List) or isinstance(x[i],PyArray)):
- x = x[i]
- y = ydata
- if is_list(y) and len(y)>0 and (is_list(y[i]) or isinstance(y[i] , java.util.List) or isinstance(y[i],PyArray)):
- y = y[i]
- plots[i] = PlotDescriptor(plotName , to_array(data[i], 'd'), to_array(x, 'd'), to_array(y, 'd'))
- return get_context().plot(plots,title)
- else:
- plot = PlotDescriptor(name, to_array(data, 'd'), to_array(xdata, 'd'), to_array(ydata, 'd'))
- return get_context().plot(plot,title)
-
-def get_plots(title=None):
- """Return all current plots in the plotting window given by 'title'.
-
- Args:
- title(str, optional): plotting window name.
-
- Returns:
- ArrayList of Plot objects.
-
- """
- return get_context().getPlots(title)
-
-def get_plot_snapshots(title = None, file_type = "png", size = None, temp_path = get_context().setup.getContextPath()):
- """Returns list with file names of plots snapshots from a plotting context.
-
- Args:
- title(str, optional): plotting window name.
- file_type(str, optional): "png", "jpg", "bmp" or "gif"
- size(array, optional): [width, height]
- temp_path(str, optional): path where the files will be generated.
-
- Returns:
- list of strings
-
- """
- time.sleep(0.1) #Give some time to plot to be finished - it is not sync with acquisition
- ret = []
- if size != None:
- size = Dimension(size[0], size[1])
- plots = get_plots(title)
- for i in range(len(plots)):
- p = plots[i]
- name = p.getTitle()
- if name is None or name == "":
- name = str(i)
- file_name = os.path.abspath(temp_path + "/" + name + "." + file_type)
- p.saveSnapshot(file_name , file_type, size)
- ret.append(file_name)
- return ret
-
-
-###################################################################################################
-#Data access functions
-###################################################################################################
-
-def load_data(path, index=0, shape=None):
- """Read data from the current persistence context or from data files.
-
- Args:
- path(str): Path to group or dataset relative to the persistence context root.
- If in the format 'root|path' then read from path given by 'root'.
- index(int or listr, optional):
- if integer, data depth (used for 3D datasets returning a 2d matrix)
- If a list, specifies the full coordinate for multidimensional datasets.
- shape(list, optional): only valid if index is a list, provides the shape of the data array.
- In this case return a flattened a one-dimensional array.
-
- Returns:
- Data array
-
- """
- if index is not None and is_list(index):
- slice = get_context().dataManager.getData(path, index, shape)
- else:
- slice = get_context().dataManager.getData(path, index)
- return slice.sliceData
-
-def get_attributes(path):
- """Get the attributes from the current persistence context or from data files.
-
- Args:
- path(str): Path to group or dataset relative to the current persistence context root.
- If in the format 'root|path' then read from path given by 'root'.
- Returns:
- Dictionary
-
- """
- return get_context().dataManager.getAttributes(path)
-
-def save_dataset(path, data, type='d'):
- """Save data into a dataset within the current persistence context.
-
- Args:
- path(str): Path to dataset relative to the current persistence context root.
- type(str, optional): array type 'b' = byte, 'h' = short, 'i' = int, 'l' = long, 'f' = float,
- 'd' = double, 'c' = char, 's' = String, 'o' = Object
- default: 'd' (convert data to array of doubles)
- data (array or list): data to be saved
- Returns:
- Dictionary
-
- """
- data = to_array(data, type)
- get_context().dataManager.setDataset(path,data)
-
-def create_group(path):
- """Create an empty dataset within the current persistence context.
-
- Args:
- path(str): Path to group relative to the current persistence context root.
- Returns:
- None
-
- """
- get_context().dataManager.createGroup(path)
-
-def create_dataset(path, type, unsigned=False, dimensions=None):
- """Create an empty dataset within the current persistence context.
-
- Args:
- path(str): Path to dataset relative to the current persistence context root.
- type(str): array type 'b' = byte, 'h' = short, 'i' = int, 'l' = long, 'f' = float,
- 'd' = double, 'c' = char, 's' = String, 'o' = Object
- unsigned(boolean, optional): create a dataset of unsigned type.
- dimensions(tuple of int, optional): a 0 value means variable length in that dimension.
- Returns:
- None
-
- """
- get_context().dataManager.createDataset(path, ScriptUtils.getType(type), unsigned, dimensions)
-
-def create_table(path, names, types=None, lengths=None):
- """Create an empty table (dataset of compound type) within the current persistence context.
-
- Args:
- path(str): Path to dataset relative to the current persistence context root.
- names(list of strings): name of each column
- types(array of str): 'b' = byte, 'h' = short, 'i' = int, 'l' = long, 'f' = float,
- 'd' = double, 'c' = char, 's' = String, 'o' = Object
- Note:A '[' prefix on type name indicates an array type.
- lengths(list of int): the array length for each columns(0 for scalar types).
- Returns:
- None
-
- """
- type_classes = []
- if (types is not None):
- for i in range (len(types)):
- type_classes.append(ScriptUtils.getType(types[i]))
- get_context().dataManager.createDataset(path, names, type_classes, lengths)
-
-def append_dataset(path, data, index=None, type='d', shape=None):
- """Append data to dataset.
-
- Args:
- path(str): Path to dataset relative to the current persistence context root.
- data(number or array or list): name of each column.
- index(int or list, optional): if set then add the data in a specific position in the dataset.
- If integer is the index in an array (data must be 1 order lower than dataset)
- If a list, specifies the full coordinate for multidimensional datasets.
- type(str, optional): array type 'b' = byte, 'h' = short, 'i' = int, 'l' = long, 'f' = float,
- 'd' = double, 'c' = char, 's' = String, 'o' = Object
- default: 'd' (convert data to array of doubles)
- shape(list, optional): only valid if index is a list, provides the shape of the data array.
- In this case data must be a flattened one-dimensional array.
- Returns:
- None
-
- """
- data = to_array(data, type)
- if index is None:
- get_context().dataManager.appendItem(path, data)
- else:
- if is_list(index):
- if shape is None:
- shape = [len(index)]
- get_context().dataManager.setItem(path, data, index, shape)
- else:
- get_context().dataManager.setItem(path, data, index)
-
-def append_table(path, data):
- """Append data to a table (dataset of compound type)
-
- Args:
- path(str): Path to dataset relative to the current persistence context root.
- data(list): List of valus for each column of the table. Array types can be expressed as lists.
- Returns:
- None
-
- """
- if is_list(data):
- arr = java.lang.reflect.Array.newInstance(Class.forName("java.lang.Object"),len(data))
- for i in range (len(data)):
- if is_list(data[i]):
- arr[i] = to_array(data[i], 'd')
- else:
- arr[i] = data[i]
- data=arr
- get_context().dataManager.appendItem(path, data)
-
-def flush_data():
- """Flush all data files immediately.
-
- Args:
- None
- Returns:
- None
- """
- get_context().dataManager.flush()
-
-def set_attribute(path, name, value, unsigned = False):
- """Set an attribute to a group or dataset.
-
- Args:
- path(str): Path to dataset relative to the current persistence context root.
- name(str): name of the atttribute
- value(Object): the attribute value
- unsigned(bool, optional): if applies, indicate if value is unsigned.
- Returns:
- None
- """
- if is_list(value):
- value = Convert.toStringArray(to_array(value))
- get_context().dataManager.setAttribute(path, name, value, unsigned)
-
-def log(log, data_file=True):
- """Writes a log to the system log and data context - if there is an ongoing scan or script execution.
-
- Args:
- log(str): Log string.
- data_file(bool, optional): if true logs to the data file, in addiction to the system logger
-
- Returns:
- None
- """
- get_context().scriptingLog(str(log))
- if data_file:
- try:
- get_context().dataManager.appendLog(str(log))
- except:
- #Do not generate exception if cannot write to data file
- pass
-
-def set_exec_pars(**args):
- """ Configures the script execution parameters, overriding the system configuration.
-
- Args:
- args(dictionary). Keys:
- name(str, optional): value of the {name} tag. Default is the running script name
- (or "scan" in the case of a command line scan command.)
- type(str, optional): value of the {type} tag. Default is empty.
- This field can be used to store data in sub-folders of standard location.
- path(str, optional): If defined provides the full path name for data output root (overriding config))
- The tag {data} can be used to enter a path relative to the standard data folder.
- layout(str, optional): Overrides default data layout.
- provider(str, optional): Overrides default data provider.
- depth_dim(int, optional): dimension of 2d-matrixes in 3d datasets.
- save(bool, optional): Overrides the configuration option to auto save scan data.
- flush(bool, optional): Overrides the configuration option to flush file on each record.
- keep(bool, optional): Overrides the configuration option to release scan records.
- If false disable accumulation of scan records to scan result.
- preserve(bool, optional): Overrides the configuration option to preserve device types.
- If false all values are converted to double.
- open(bool, optional): If true opens data output root (instead of only doing in the first data access call)
- If false closes output root, if open.
- reset(bool, optional): If true reset the scan counter - the {count} tag and set the timestamp to now.
- group(str, optional): Overrides default layout group name for scans
- tag(str, optional): Overrides default tag for scan names (affecting group or dataset name, according to layout)
- defaults(bool, optional): If true restore the original execution parameters.
-
- Graphical preferences can also be set. Keys are equal to lowercase of Preference enum:
- "plot_disabled", "table_disabled", "enabled_plots", "plot_types", "print_scan", "auto_range",
- "manual_range","domain_axis", "status".
- See set_preference for more information.
-
- Shortcut entries: "line_plots": list of devices with enforced line plots.
- "range": "none", "auto", or [min, max]
- "display": if false disables scan data plotting and printing.
- """
- get_context().setExecutionPars(args)
-
-def get_exec_pars():
- """ Returns script execution parameters.
-
- Returns:
- ExecutionParameters object. Fields:
- name (str): execution name - {name} tag.
- type (str): execution type - {type} tag.
- path (str): output data root.
- open (bool): true if the output data root has been opened.
- layout (str): data output layout. If None then using the configuration.
- save (bool): auto save scan data option.
- flush (bool): flush file on each record.
- index (int): current scan index.
- group (str): data group currently used for scan data storage.
- if no ongoing scan return "/" if within a script, or else None if a console command.
- scanPath (str): dataset or group corresponding to current scan.
- scan (Scan): reference to current scan, if any
- source (CommandSource): return the source of the script or command.
- background (bool): return False if executing in main interpreter thread .
- aborted (bool): True if execution has been aborted
- """
- return get_context().getExecutionPars()
-
-
-###################################################################################################
-#EPICS channel access
-###################################################################################################
-
-def _adjust_channel_value(value, var_type=None):
- if (value is None):
- return value
- if (var_type is not None):
- if is_list(value):
- var_type = var_type.replace(',','').replace('[','')
- ret = []
- for item in value:
- ret.append(_adjust_channel_value(item), var_type)
- value = ret
- else:
- var_type = var_type.lower()
- if var_type=='b':
- value = byte(value)
- elif var_type=='i':
- value = short(value)
- elif var_type=='l':
- value = int(value)
- elif var_type=='f':
- value = float(value)
- elif var_type=='d':
- value = float(value)
- elif var_type=='s':
- value = str(value)
-
- if isinstance(value,tuple):
- value = list(value)
- if isinstance(value,list):
- list_type = type(value[0])
- array_types = {
- int: "i",
- long: "l",
- float:"d",
- str:Class.forName("java.lang.String"),
- }
- array_type = array_types.get(type(value[0]),'d')
- array = PyArray(array_type)
- array.fromlist(value)
- value=array
- return value
-
-def caget(name, type=None, size=None, meta = False ):
- """Reads an Epics PV.
-
- Args:
- name(str): PV name
- type(str, optional): type of PV. By default gets the PV standard field type.
- Scalar values: 'b', 'i', 'l', 'd', 's'.
- Array: values: '[b', '[i,', '[l', '[d', '[s'.
- size (int, optional): for arrays, number of elements to be read. Default read all.
- meta (bool, optional): if true gets channel value and metadata (timestamp, severity).
-
- Returns:
- PV value if meta is false, otherwise a dictionary containing PV value and metadata
-
- """
- if meta:
- return Epics.getMeta(name, Epics.getChannelType(type), size)
- return Epics.get(name, Epics.getChannelType(type), size)
-
-def cawait(name, value, timeout=None, comparator=None, type=None, size=None):
- """Wait for a PV to have a given value.
-
- Args:
- name(str): PV name
- value (obj): value to compare to
- timeout(float, optional): time in seconds to wait. If None, waits forever.
- comparator(java.util.Comparator or float, optional): if None waits for equality.
- If a numeric value is provided, waits for channel to be in range.
- type(str, optional): type of PV. By default gets the PV standard field type.
- Scalar values: 'b', 'i', 'l', 'd', 's'.
- Array: values: '[b', '[i,', '[l', '[d', '[s'.
- size (int, optional): for arrays, number of elements to be read. Default read all.
-
- Returns:
- None
- """
- if (timeout is not None):
- timeout = int(timeout*1000)
- value = _adjust_channel_value(value)
- Epics.waitValue(name, value, comparator, timeout, Epics.getChannelType(type), size)
-
-def caput(name, value, timeout = None):
- """Writes to an Epics PV.
-
- Args:
- name(str): PV name
- value(scalar, string or array): new PV value.
- timeout(int, optional): timeout in seconds to the write. If None waits forever to completion.
-
- Returns:
- None
- """
- value=_adjust_channel_value(value)
- if (timeout is not None):
- timeout = int(timeout*1000)
- return Epics.put(name, value, timeout)
-
-def caputq(name, value):
- """Writes to an Epics PV and does not wait.
-
- Args:
- name(str): PV name
- value(scalar, string or array): new PV value.
-
- Returns:
- None
- """
- value=_adjust_channel_value(value)
- return Epics.putq(name, value)
-
-def camon(name, type=None, size=None, wait = sys.maxint):
- """Install a monitor to an Epics PV and print value changes.
-
- Args:
- name(str): PV name
- type(str, optional): type of PV. By default gets the PV standard field type.
- Scalar values: 'b', 'i', 'l', 'd', 's'.
- Array: values: '[b', '[i,', '[l', '[d', '[s'.
- size (int, optional): for arrays, number of elements to be read. Default read all.
- wait (int, optional): blocking time for this function. By default blocks forever.
- Returns:
- None
-
- """
- val = lambda x: x.tolist() if isinstance(x,PyArray) else x
-
- class MonitorListener(java.beans.PropertyChangeListener):
- def propertyChange(self, pce):
- print val(pce.getNewValue())
-
- channel = create_channel(name, type, size)
- print val(channel.getValue())
- channel.setMonitored(True)
- channel.addPropertyChangeListener(MonitorListener())
-
- try:
- time.sleep(wait)
- finally:
- Epics.closeChannel(channel)
-
-def create_channel_device(channel_name, type=None, size=None, device_name=None):
- """Create a device from an EPICS PV.
-
- Args:
- channel_name(str): PV name
- type(str, optional): type of PV. By default gets the PV standard field type.
- Scalar values: 'b', 'i', 'l', 'd', 's'.
- Array: values: '[b', '[i,', '[l', '[d', '[s'.
- size (int, optional): for arrays, number of elements to be read. Default read all.
- device_name (str, optional): device name (if different from hannel_name.
- Returns:
- None
-
- """
- dev = Epics.newChannelDevice(channel_name if (device_name is None) else device_name , channel_name, Epics.getChannelType(type))
- if get_context().isSimulation():
- dev.setSimulated()
- dev.initialize()
- if (size is not None):
- dev.setSize(size)
- return dev
-
-def create_channel(name, type=None, size=None):
- return Epics.newChannel(name, Epics.getChannelType(type), size)
-
-class Channel(java.beans.PropertyChangeListener, Writable, Readable):
- def __init__(self, channel_name, type = None, size = None, callback=None, alias = None):
- """ Create an object that encapsulates an Epics PV connection.
- Args:
- channel_name(str):name of the channel
- type(str, optional): type of PV. By default gets the PV standard field type.
- Scalar values: 'b', 'i', 'l', 'd', 's'.
- Array: values: '[b', '[i,', '[l', '[d', '[s'.
- size(int, optional): the size of the channel
- callback(function, optional): The monitor callback.
- alias(str): name to be used on scans.
- """
- self.channel = create_channel(channel_name, type, size)
- self.callback = callback
- if alias is not None:
- set_device_alias(self, alias)
- else:
- set_device_alias(self, channel_name)
-
- def get_name(self):
- """Return the name of the channel.
- """
- return self.channel.name
-
- def get_size(self):
- """Return the size of the channel.
- """
- return self.channel.size
-
- def set_size(self, size):
- """Set the size of the channel.
- """
- self.channel.size = size
-
- def is_connected(self):
- """Return True if channel is connected.
- """
- return self.channel.connected
-
- def is_monitored(self):
- """Return True if channel is monitored
- """
- return self.channel.monitored
-
- def set_monitored(self, value):
- """Set a channel monitor to trigger the callback function defined in the constructor.
- """
- self.channel.monitored = value
- if (value):
- self.channel.addPropertyChangeListener(self)
- else:
- self.channel.removePropertyChangeListener(self)
-
- def propertyChange(self, pce):
- if pce.getPropertyName() == "value":
- if self.callback is not None:
- self.callback(pce.getNewValue())
-
- def put(self, value, timeout=None):
- """Write to channel and wait value change. In the case of a timeout throws a TimeoutException.
- Args:
- value(obj): value to be written
- timeout(float, optional): timeout in seconds. If none waits forever.
- """
- if (timeout==None):
- self.channel.setValue(value)
- else:
- self.channel.setValueAsync(value).get(int(timeout*1000), java.util.concurrent.TimeUnit.MILLISECONDS);
-
- def putq(self, value):
- """Write to channel and don't wait.
- """
- self.channel.setValueNoWait(value)
-
- def get(self, force = False):
- """Get channel value.
- """
- return self.channel.getValue(force)
-
- def wait_for_value(self, value, timeout=None, comparator=None):
- """Wait channel to reach a value, using a given comparator. In the case of a timeout throws a TimeoutException.
- Args:
- value(obj): value to be verified.
- timeout(float, optional): timeout in seconds. If None waits forever.
- comparator (java.util.Comparator, optional). If None, uses Object.equals.
- """
- if comparator is None:
- if timeout is None:
- self.channel.waitForValue(value)
- else:
- self.channel.waitForValue(value, int(timeout*1000))
- else:
- if timeout is None:
- self.channel.waitForValue(value, comparator)
- else:
- self.channel.waitForValue(value, comparator, int(timeout*1000))
-
- def close(self):
- """Close the channel.
- """
- self.channel.destroy()
-
- #Writable interface
- def write(self, value):
- self.put(value)
-
- #Readable interface
- def read(self):
- return self.get()
-
-
-###################################################################################################
-#Concurrent execution
-###################################################################################################
-
-class Callable(java.util.concurrent.Callable):
- def __init__(self, method, *args):
- self.method = method
- self.args = args
- self.thread = java.lang.Thread.currentThread()
- def call(self):
- try:
- get_context().startedChildThread(self.thread)
- return self.method(*self.args)
- #except:
- # traceback.print_exc(file=sys.stderr)
- finally:
- get_context().finishedChildThread(self.thread)
-
-def fork(*functions):
- """Start execution of functions in parallel.
-
- Args:
- *functions(function references)
-
- Returns:
- List of callable objects
- """
- callables = []
- for m in functions:
- if is_list(m):
- callables.append(Callable(m[0],*m[1]))
- else:
- callables.append(Callable(m))
- return Threading.fork(callables)
-
-def join(futures):
- """Wait parallel execution of functions.
-
- Args:
- futures(list of Future) : as returned from fork
-
- Returns:
- None
-"""
- try:
- return Threading.join(futures)
- except java.util.concurrent.ExecutionException, ex:
- raise ex.getCause()
-
-def parallelize(*functions):
- """Equivalent to fork + join
-
- Args:
- *functions(function references)
-
- Returns:
- None
- """
- futures = fork(*functions)
- return join(futures)
-
-
-###################################################################################################
-#Script evaluation and background task control.
-###################################################################################################
-
-def run(script_name, args = None, locals = None):
- """Run script: can be absolute path, relative, or short name to be search in the path.
- Args:
- args(Dict ot List): Sets Sys.argv (if list) or gobal variables(if dict) to the script.
- locals(Dict): If not none sets the locals()for the runing script.
- If locals is used then script definitions will not go to global namespace.
-
- Returns:
- The script return value (if set with set_return)
- """
- global _
- script = get_context().scriptManager.library.resolveFile(script_name)
- if script is not None and os.path.isfile(script):
- get_context().startScriptExecution(args)
- _ = None
- if args is None:
- pass
- elif isinstance(args,tuple):
- sys.argv = list(args)
- elif isinstance(args,list):
- sys.argv = args
- else:
- for arg in args.keys():
- globals()[arg] = args[arg]
- if (locals is None):
- execfile(script, globals())
- else:
- execfile(script, globals(), locals)
- return _
- raise IOError("Invalid script: " + str(script_name))
-
-def abort():
- """Abort the execution of ongoing task. It can be called from the script to quit.
-
- Args:
- None
-
- Returns:
- None
- """
- #Cannot be on script execution thread
- fork(get_context().abort)
-
-def start_task(script, delay = 0.0, interval = -1):
- """Start a background task
-
- Args:
- script(str): Name of the script implementing the task
- delay(float, optional): time in seconds for the first execution.
- Default starts immediately.
- interval(float, optional): time in seconds for between execution.
- If negative (default), single-execution.
-
- Returns:
- None
- """
- delay_ms=int(delay*1000)
- interval_ms=int(interval*1000) if (interval>=0) else int(interval)
- get_context().taskManager.create(script, delay_ms, interval_ms)
- get_context().taskManager.start(script)
-
-def stop_task(script, force = False):
- """Stop a background task
-
- Args:
- script(str): Name of the script implementing the task
- force(boolean, optional): interrupt current execution, if running
-
- Returns:
- None
- """
- get_context().taskManager.remove(script, force)
-
-def set_return(value):
- """Sets the script return value. This value is returned by the "run" function.
-
- Args:
- value(Object): script return value.
-
- Returns:
- None
- """
- #In Jython, the output of last statement is not returned when running a file
- if __name__ == "__builtin__":
- global __THREAD_EXEC_RESULT__
- if is_interpreter_thread():
- global _
- _=value
- __THREAD_EXEC_RESULT__[java.lang.Thread.currentThread()]=value #Used when running file
- else:
- #if startup is imported, cannot set global
- caller = _get_caller()
- if is_interpreter_thread():
- caller.f_globals["_"]=value
- if not "__THREAD_EXEC_RESULT__" in caller.f_globals.keys():
- caller.f_globals["__THREAD_EXEC_RESULT__"] = {}
- caller.f_globals["__THREAD_EXEC_RESULT__"][java.lang.Thread.currentThread()]=value
- return value #Used when parsing file
-
-def get_return():
- if __name__ == "__builtin__":
- global __THREAD_EXEC_RESULT__
- return __THREAD_EXEC_RESULT__[java.lang.Thread.currentThread()]
- else:
- return _get_caller().f_globals["__THREAD_EXEC_RESULT__"][java.lang.Thread.currentThread()]
-
-def is_interpreter_thread():
- return java.lang.Thread.currentThread().name == "Interpreter Thread"
-
-
-###################################################################################################
-#Versioning tools
-###################################################################################################
-
-def commit(message, force = False):
- """Commit the changes to the repository. If manual commit is not configured then there is no need to call this function: commits are made as needed.
-
- Args:
- message(str): commit message
- force(bool, optional): if False, raises exception if no change detected in repo
-
- Returns:
- None
- """
- get_context().commit(message, force)
-
-def diff():
- """Return list of changes in the repository
-
- Args:
- None
-
- Returns:
- None
- """
- return get_context().diff()
-
-def checkout_tag(tag):
- """Checkout a tag name.
-
- Args:
- tag(str): tag name.
-
- Returns:
- None
- """
- get_context().checkoutTag(tag)
-
-def checkout_branch(tag):
- """Checkout a local branch name.
-
- Args:
- tag(str): branch name.
-
- Returns:
- None
- """
- get_context().checkoutLocalBranch(tag)
-
-def pull_repository():
- """Pull from remote repository.
-
- """
- get_context().pullFromUpstream()
-
-def push_repository(all_branches=True, force=False):
- """Push to remote repository.
-
- Args:
- all_branches(boolean, optional): all branches or just current.
- force(boolean, optional): force flag.
-
- Returns:
- None
- """
- get_context().pushToUpstream(all_branches, force)
-
-def cleanup_repository():
- """Performs a repository cleanup.
-
- Args:
- None
-
- Returns:
- None
- """
- get_context().cleanupRepository()
-
-
-###################################################################################################
-#Device Pool functions
-###################################################################################################
-
-def get_device(device_name):
- """Returns a configured device (or imaging source) by its name.
-
- Args:
- device_name(str): name of the device.
-
- Returns:
- device
- """
- return get_context().devicePool.getByName(device_name)
-
-def add_device(device, force = False):
- """Add a device (or imaging source) to the device pool.
-
- Args:
- device(Device or Source): device object.
- force(boolean, optional): if true then dispose existing device with same name.
- Otherwise will fail in case of name clash.
-
- Returns:
- True if device was added, false if was already in the pool, or exception in case of name clash.
- """
- if get_context().devicePool.contains(device):
- return False
- if force:
- dev = get_context().devicePool.getByName(device.getName())
- if dev is not None:
- remove_device(dev)
- return get_context().devicePool.addDevice(device)
-
-def remove_device(device):
- """Remove a device (or imaging source) from the device pool.
-
- Args:
- device(Device or Source): device object.
-
- Returns:
- bool: true if device was removed.
-
- """
- return get_context().devicePool.removeDevice(device)
-
-def set_device_alias(device, alias):
- """Set a device alias to be used in scans (datasets and plots).
-
- Args:
- device(Device): device object.
- alias(str): replace device name in scans.
-
- Returns:
- None
- """
- get_context().dataManager.setAlias(device, alias)
-
-def stop():
- """Stop all devices implementing the Stoppable interface.
-
- Args:
- None
-
- Returns:
- None
- """
- get_context().stopAll()
-
-def update():
- """Update all devices.
-
- Args:
- None
-
- Returns:
- None
- """
- get_context().updateAll()
-
-def reinit(dev = None):
- """Re-initialize devices.
-
- Args:
- dev(Device, optional): the device to be re-initialized.
- If None re-initialize all devices not yet initialized.
-
- Returns:
- List with devices not initialized.
- """
- return to_list(get_context().reinit())
-
-def create_device(url, parent=None):
- """Create a device form a definition string(see InlineDevice)
-
- Args:
- url(str or list of string): the device definition string (or list of strings)
- parent(bool, optional): parent device
-
- Returns:
- The created device (or list of devices)
- """
- return InlineDevice.create(url, parent)
-
-
-def create_averager(dev, count, interval=0.0, name = None, monitored = False):
- """Creates and initializes and averager for dev.
-
- Args:
- dev(Device): the source device
- count(int): number of samples
- interval(float, optional): sampling interval in seconds.
- If less than zero, sampling is made on data change event.
- name(str, optional): sets the name of the device (default is: averager)
- monitored (bool, optional): if true then averager processes asynchronously.
-
- Returns:
- Averager device
- """
- dev = string_to_obj(dev)
- if isinstance(dev, ReadableArray):
- av = ArrayAverager(dev, count, int(interval*1000)) if (name is None) else ArrayAverager(name, dev, count, int(interval*1000))
- else:
- av = Averager(dev, count, int(interval*1000)) if (name is None) else Averager(name, dev, count, int(interval*1000))
- av.initialize()
- if (monitored):
- av.monitored = True
- return av
-
-
-###################################################################################################
-#Standard libraries management
-###################################################################################################
-
-if __name__ == "__builtin__":
- ca_channel_path=os.path.join(get_context().setup.getStandardLibraryPath(), "epics")
- sys.path.append(ca_channel_path)
- #This is to destroy previous context of _ca (it is not shared with PShell)
- if run_count > 0:
- if sys.modules.has_key("_ca"):
- import _ca
- _ca.initialize()
-
-
-###################################################################################################
-#Mathematical functions
-###################################################################################################
-
-def arrmul(a, b):
- """Multiply 2 series of the same size.
-
- Args:
-
- a(list, tuple, array ...): subscriptable object containing numbers
- b(list, tuple, array ...): subscriptable object containing numbers
-
- Returns:
- List
-
- """
- return map(mul, a, b)
-
-def arrdiv(a, b):
- """Divide 2 series of the same size.
-
- Args:
-
- a(list, tuple, array ...): subscriptable object containing numbers
- b(list, tuple, array ...): subscriptable object containing numbers
-
- Returns:
- List
-
- """
- return map(truediv, a, b)
-
-def arradd(a, b):
- """Add 2 series of the same size.
-
- Args:
-
- a(list, tuple, array ...): subscriptable object containing numbers
- b(list, tuple, array ...): subscriptable object containing numbers
-
- Returns:
- List
-
- """
- return map(add, a, b)
-
-def arrsub(a, b):
- """Subtract 2 series of the same size.
-
- Args:
-
- a(list, tuple, array ...): subscriptable object containing numbers
- b(list, tuple, array ...): subscriptable object containing numbers
-
- Returns:
- List
-
- """
- return map(sub, a, b)
-
-def arrabs(a):
- """Returns the absolute of all elements in series.
-
- Args:
-
- a(list, tuple, array ...): subscriptable object containing numbers
-
- Returns:
- List
-
- """
- return map(abs, a)
-
-def arroff(a, value = "mean"):
- """Subtract offset to all elemets in series.
-
- Args:
-
- a(list, tuple, array ...): subscriptable object containing numbers
- type(int or str, optional): value to subtract from the array, or "mean" or "min".
-
- Returns:
- List
-
- """
- if value=="mean":
- value = mean(a)
- elif value=="min":
- value = min(a)
- return [x-value for x in a]
-
-def mean(data):
- """Calculate the mean of a sequence.
-
- Args:
- data(list, tuple, array ...): subscriptable object containing numbers
-
- Returns:
- Mean of the elements in the object.
-
- """
- return reduce(lambda x, y: x + y, data) / len(data)
-
-def variance(data):
- """Calculate the variance of a sequence.
-
- Args:
- data(list, tuple, array ...): subscriptable object containing numbers
-
- Returns:
- Variance of the elements in the object.
-
- """
- c = mean(data)
- ss = sum((x-c)**2 for x in data)
- return ss/len(data)
-
-def stdev(data):
- """Calculate the standard deviation of a sequence.
-
- Args:
- data(list, tuple, array ...): subscriptable object containing numbers
-
- Returns:
- Standard deviation of the elements in the object.
-
- """
- return variance(data)**0.5
-
-
-def center_of_mass(data, x = None):
- """Calculate the center of mass of a series, and its rms.
-
- Args:
-
- data(list, tuple, array ...): subscriptable object containing numbers
- x(list, tuple, array ..., optional): x coordinates
-
- Returns:
- Tuple (com, rms)
-
- """
- if x is None:
- x = Arr.indexesDouble(len(data))
- data_sum = sum(data)
- if (data_sum==0):
- return float('nan')
- xmd = arrmul( x, data)
- com = sum(xmd) / data_sum
- xmd2 = arrmul( x, xmd)
- com2 = sum(xmd2) / data_sum
- rms = math.sqrt(abs(com2 - com * com))
- return (com, rms)
-
-def poly(val, coefs):
- """Evaluates a polinomial: (coefs[0] + coefs[1]*val + coefs[2]*val^2...
-
- Args:
- val(float): value
- coefs (list of loats): polinomial coefficients
- Returns:
- Evaluated function for val
-
- """
- r = 0
- p = 0
- for c in coefs:
- r = r + c * math.pow(val, p)
- p = p + 1
- return r
-
-def histogram(data, range_min = None, range_max = None, bin = 1.0):
- """Creates histogram on data.
-
- Args:
- data (tuple, array, ArrayList or Array): input data can be multi-dimensional or nested.
- range_min (int, optional): minimum histogram value. Default is floor(min(data))
- range_max (int, optional): maximul histogram value. Default is ceil(max(data))
- bin(int or float, optional): if int means number of bins. If float means bin size. Default = 1.0.
- Returns:
- tuple: (ydata, xdata)
-
- """
- if range_min is None: range_min = math.floor(min(flatten(data)))
- if range_max is None: range_max = math.ceil(max(flatten(data)))
- if type(bin) is float:
- bin_size = bin
- n_bin = int(math.ceil(float(range_max - range_min)/bin_size))
- else:
- n_bin = bin
- bin_size = float(range_max - range_min)/bin
-
- result = [0] * n_bin
- for d in flatten(data):
- b = int( float(d - range_min) / bin_size)
- if (b >=0) and (b < n_bin):
- result[b] = result[b] + 1
- return (result, frange(range_min, range_max, bin_size))
-
-def _turn(p, q, r):
- return cmp((q[0] - p[0])*(r[1] - p[1]) - (r[0] - p[0])*(q[1] - p[1]), 0)
-
-def _keep(hull, r):
- while len(hull) > 1 and _turn(hull[-2], hull[-1], r) != 1:
- hull.pop()
- return (not len(hull) or hull[-1] != r) and hull.append(r) or hull
-
-def convex_hull(point_list=None, x=None, y=None):
- """Returns the convex hull from a list of points. Either point_list or x,y is provided.
- (Alhorithm taken from http://tomswitzer.net/2010/03/graham-scan/)
- Args:
- point_list (array of tuples, optional): arrays of the points
- x (array of float, optional): array with x coords of points
- y (array of float, optional): array with y coords of points
- Returns:
- Array of points or (x,y)
-
- """
- is_point_list = point_list is not None
- if not point_list:
- point_list=[]
- for i in range(len(x)):
- if((x[i] is not None) and (y[i] is not None)): point_list.append((x[i], y[i]))
- point_list.sort()
- lh,uh = reduce(_keep, point_list, []), reduce(_keep, reversed(point_list), [])
- ret = lh.extend(uh[i] for i in xrange(1, len(uh) - 1)) or lh
- if not is_point_list:
- x, y = [], []
- for i in range(len(ret)):
- x.append(ret[i][0])
- y.append(ret[i][1])
- return (x,y)
- return ret
-
-###################################################################################################
-#Utilities
-###################################################################################################
-
-def get_setting(name=None):
- """Get a persisted script setting value.
-
- Args:
- name (str): name of the setting.
- Returns:
- String with setting value or None if setting is undefined.
- If name is None then returns map with all settings.
- """
- return get_context().getSettings() if (name is None) else get_context().getSetting(name)
-
-def set_setting(name, value):
- """Set a persisted script setting value.
-
- Args:
- name (str): name of the setting.
- value (obj): value for the setting, converted to string (if None then remove the setting).
- Returns:
- None.
- """
- get_context().setSetting(name, value)
-
-def exec_cmd(cmd):
- """Executes a shell command. If errors happens raises an exception.
-
- Args:
- cmd (str): command process input.
- Returns:
- Output of command process.
- """
- import subprocess
- proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
- (ret, err) = proc.communicate()
- if (err is not None) and err!="":
- raise Exception(err)
- return ret
-
-def exec_cpython(script_name, args = [], method_name = None, python_name = "python"):
- """Executes an external cpython process.
-
- Args:
- script_name (str): name of the script (can be absolute or relative to script folder).
- args(list, optional): arguments to python process (or parameters to method, if not None)
- method_name (str, optional): if defined indicates a method to be called.
- python_name (str, optional): name of executable
- Returns:
- Return of python process.
- """
- if method_name is None:
- script = get_context().scriptManager.library.resolveFile(script_name)
- if script is None :
- script= os.path.abspath(script_name)
- c = python_name + " " + script + " "
- if args is not None and (len(args)>0):
- for arg in args:
- c = c + str(arg) + " "
- return exec_cmd(c)
- else:
- #Calling a method
- import json
- import tempfile
- script = os.path.abspath(get_context().scriptManager.library.resolveFile(script_name))
- with open(get_context().setup.getContextPath()+ "/Temp" + str(java.lang.Thread.currentThread().getId())+".py", "wb") as f:
- f.write(("script = '" +script +"'\n").replace('\\', '\\\\'))
- f.write("function = '" +method_name +"'\n")
- f.write("jsonargs = '" + json.dumps(args) +"'\n")
- f.write("""import sys
-import json
-import os
-args =json.loads(jsonargs)
-i = script.rfind(os.sep)
-module = script[i+1:-3]
-sys.path.insert(1,script[:i+1])
-exec ('from ' + module + ' import ' + function + ' as function')
-print (json.dumps(function(*args)))
-""")
- f.close()
- ret = exec_cpython(os.path.abspath(f.name), python_name = python_name)
- os.remove(f.name)
- ret = '\n'+ret[0:-len(os.linesep)]
- jsonret = ret[ret.rfind('\n')+1:].strip()
- return json.loads(jsonret)
-
-def bsget(channel, modulo=1, offset=0, timeout = 5.0):
- """Reads an values a bsread stream, using the default provider.
-
- Args:
- channel(str or list of str): channel name(s)
- module(int, optional): stream modulo
- offset(int, optional): stream offset
- timeout(float, optional): stream timeout in secs
- Returns:
- BS value or list of values
-
- """
- channels = to_list(channel)
- ret = Stream.readChannels(channels, modulo, offset, int(timeout * 1000))
- if is_string(channel):
- return ret[0]
- return ret
-
-def flatten(data):
- """Flattens multi-dimentional or nested data.
-
- Args:
- data (tuple, array, ArrayList or Array): input data
- Returns:
- Iterator on the flattened data.
-
- """
- if isinstance(data,PyArray):
- if not data.typecode.startswith('['):
- return data
-
- import itertools
- return itertools.chain(*data)
-
-def frange_gen(start, finish, step):
- while ((step >= 0.0) and (start <= finish)) or ((step < 0.0) and (start >= finish)):
- yield start
- start += step
-
-def frange(start, finish, step, enforce_finish = False, inclusive_finish = False):
- """Create a list with a range of float values (a float equivalent to "range").
-
- Args:
- start(float): start of range.
- finish(float): end of range.
- step(float): step size.
- enforce_finish(boolean, optional): adds the final element even if range was not exact.
- inclusive_finish(boolean, optional): if false finish is exclusive (like in "range").
-
- Returns:
- list
-
- """
- step = float(step)
- ret = list(frange_gen(start, finish, step))
- if len(ret) > 0:
- if inclusive_finish == False:
- if ret[-1]==finish:
- del ret[-1]
- if enforce_finish and ret[-1]!=finish:
- ret.append(finish)
- return ret
-
-def _get_caller():
- #Not doing inspect.currentframe().f_back because inspect is slow to load
- return sys._getframe(1).f_back if hasattr(sys, "_getframe") else None
-
-def inject():
- """Restore initial globals: re-inject devices and startup variables to the interpreter.
-
- Args:
- None
-
- Returns:
- None
-
- """
- if __name__ == "__builtin__":
- get_context().injectVars()
- else:
- _get_caller().f_globals.update(get_context().scriptManager.injections)
-
-def notify(subject, text, attachments = None, to=None):
- """Send email message.
-
- Args:
- subject(str): Message subject.
- text(str): Message body.
- attachments(list of str, optional): list of files to be attached (expansion tokens are allowed).
- to (list ofd str, optional): recipients. If None uses the recipients defined in mail.properties.
- Returns:
- None
-
- """
- get_context().notify(subject, text, to_list(attachments), to_list(to))
-
-def string_to_obj(o):
- if is_string(o):
- if "://" in o:
- return InlineDevice(o)
- return eval(o)
- elif is_list(o):
- ret = []
- for i in o:
- ret.append(string_to_obj(i))
- return ret
- return o
-
-def _getBuiltinFunctions(filter = None):
- ret = []
- for name in globals().keys():
- val = globals()[name]
- if type(val) is PyFunction:
- if filter is None or filter in name:
- #Only "public" documented functions
- if not name.startswith('_') and (val.__doc__ is not None):
- ret.append(val)
- return to_array(ret)
-
-
-def getBuiltinFunctionNames(filter = None):
- ret = []
- for function in _getBuiltinFunctions(filter):
- ret.append(function.func_name)
- return to_array(ret)
-
-def getFunctionDoc(function):
- if is_string(function):
- if function not in globals():
- return
- function = globals()[function]
- if type(function) is PyFunction and '__doc__' in dir(function):
- ac = function.func_code.co_argcount
- var = function.func_code.co_varnames
- args = list(var)[:ac]
- defs = function.func_defaults
- if defs is not None:
- for i in range (len(defs)):
- index = len(args) - len(defs) + i
- args[index] = args[index] + " = " + str(defs[i])
- flags = function.func_code.co_flags
- if flags & 4 > 0:
- args.append('*' + var[ac])
- ac=ac+1
- if flags & 8 > 0:
- args.append('**' + var[ac])
- d = function.func_doc
- return function.func_name+ "(" + ", ".join(args) + ")" + "\n\n" + (d if (d is not None) else "")
-
-def help(object = None):
- """
- Print help message for function or object (if available).
-
- Args:
- object (any, optional): function or object to get help.
- If null prints a list of the builtin functions.
-
- Returns:
- None
-
- """
- if object is None:
- print "Built-in functions:"
- for f in getBuiltinFunctionNames():
- print "\t" + f
- else:
- if type(object) is PyFunction:
- print getFunctionDoc(object)
- elif '__doc__' in dir(object):
- #The default doc is now shown
- import org.python.core.BuiltinDocs.object_doc
- if object.__doc__ != org.python.core.BuiltinDocs.object_doc:
- print object.__doc__
-
-###################################################################################################
-#UI interaction
-###################################################################################################
-
-def set_status(status):
- """Set the application status.
-
- Args:
- status(str): new status.
-
- Returns:
- None
- """
- set_preference(Preference.STATUS, status)
-
-def setup_plotting( enable_plots=None, enable_table=None,plot_list = None, line_plots = None, range = None, domain=None, defaults=None):
- if defaults == True: set_preference(Preference.DEFAULTS, True)
- if enable_plots is not None: set_preference(Preference.PLOT_DISABLED, not enable_plots)
- if enable_table is not None: set_preference(Preference.TABLE_DISABLED, not enable_table)
- if plot_list is not None: set_preference(Preference.ENABLED_PLOTS, None if plot_list == "all" else plot_list)
- if line_plots is not None:
- plots = None
- if line_plots != "none":
- plots = {}
- for plot in line_plots:
- plots[plot]=1
- set_preference(Preference.PLOT_TYPES, plots)
- if range is not None:
- if range == "none":
- set_preference(Preference.AUTO_RANGE, None)
- elif range == "auto":
- set_preference(Preference.AUTO_RANGE, True)
- else:
- set_preference(Preference.MANUAL_RANGE, range)
- if domain is not None:
- set_preference(Preference.DOMAIN_AXIS, domain)
-
-
-def set_preference(preference, value):
- """Hints to graphical layer:
-
- Args:
- preference(Preference): Preference name
- Preference.PLOT_DISABLED #enable/disable scan plot (True/False)
- Preference.TABLE_DISABLED #enable/disable scan table (True/False)
- Preference.ENABLED_PLOTS #select Readables to be plotted (list of Readable or
- String (Readable names))
- Preference.PLOT_TYPES #Dictionary or (Readable or String):(String or int) pairs
- where the key is a plot name and the value is the desired plot type
- Preference.PRINT_SCAN #Print scan records to console
- Preference.AUTO_RANGE # Automatic range scan plots x-axis
- Preference.MANUAL_RANGE # Manually set scan plots x-axis
- Preference.DOMAIN_AXIS #Set the domain axis source: "Time", "Index", or a readable name.
- Default(None): first positioner
- Preference.STATUS # set application status
-
- value(object): preference value
-
- Returns:
- None
- """
- value = to_array(value, 'o') #If list then convert to Object array
- get_context().setPreference(preference, value)
-
-def get_string(msg, default = None, alternatives = None, password = False):
- """
- Reads a string from UI
- Args:
- msg(str): display message.
- default(str, optional): value displayed when window is shown.
- alternatives(list of str, optional): if provided presents a combo box instead of an editing field.
- password(boolean, optional): if True hides entered characters.
-
- Returns:
- String entered of null if canceled
- """
- if password :
- return get_context().getPassword(msg, None)
- return get_context().getString(msg, str(default) if (default is not None) else None, alternatives)
-
-def get_option(msg, type = "YesNoCancel"):
- """
- Gets an option from UI
- Args:
- msg(str): display message.
- type(str, optional): 'YesNo','YesNoCancel' or 'OkCancel'
-
- Returns:
- 'Yes', 'No', 'Cancel'
-
- """
- return get_context().getOption(msg, type)
-
-def show_message(msg, title=None, blocking = True):
- """
- Pops a blocking message to UI
-
- Args:
- msg(str): display message.
- title(str, optional): dialog title
- """
- get_context().showMessage(msg, title, blocking)
-
-def show_panel(device, title=None):
- """
- Show, if exists, the panel relative to this device.
-
- Args:
- device(Device or str or BufferedImage): device
- title only apply to BufferedImage objects. For devices the title is the device name.
- """
- if type(device) is BufferedImage:
- device = DirectSource(title, device)
- device.initialize()
- if is_string(device):
- device = get_device(device)
- return get_context().showPanel(device)
diff --git a/script/__Lib/diffcalc-2.1/.cache/v/cache/lastfailed b/script/__Lib/diffcalc-2.1/.cache/v/cache/lastfailed
deleted file mode 100755
index 9e26dfe..0000000
--- a/script/__Lib/diffcalc-2.1/.cache/v/cache/lastfailed
+++ /dev/null
@@ -1 +0,0 @@
-{}
\ No newline at end of file
diff --git a/script/__Lib/diffcalc-2.1/.gitignore b/script/__Lib/diffcalc-2.1/.gitignore
deleted file mode 100755
index edda307..0000000
--- a/script/__Lib/diffcalc-2.1/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-*.class
-*~
-*.pyc
-doc/build/
-.pydevproject
-.project
-.tox
-.DS_Store
-.idea
diff --git a/script/__Lib/diffcalc-2.1/.settings/com.wdev91.eclipse.copyright.xml b/script/__Lib/diffcalc-2.1/.settings/com.wdev91.eclipse.copyright.xml
deleted file mode 100755
index eb2e1ed..0000000
--- a/script/__Lib/diffcalc-2.1/.settings/com.wdev91.eclipse.copyright.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
- Diamond Light Source Ltd.
- .]]>
-
-
-
diff --git a/script/__Lib/diffcalc-2.1/.settings/org.eclipse.core.resources.prefs b/script/__Lib/diffcalc-2.1/.settings/org.eclipse.core.resources.prefs
deleted file mode 100755
index d0a9e4e..0000000
--- a/script/__Lib/diffcalc-2.1/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-encoding//doc/source/conf.py=utf-8
-encoding/=UTF-8
diff --git a/script/__Lib/diffcalc-2.1/.settings/org.eclipse.core.runtime.prefs b/script/__Lib/diffcalc-2.1/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100755
index 5a0ad22..0000000
--- a/script/__Lib/diffcalc-2.1/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-line.separator=\n
diff --git a/script/__Lib/diffcalc-2.1/.travis.yml b/script/__Lib/diffcalc-2.1/.travis.yml
deleted file mode 100755
index 2ee17ea..0000000
--- a/script/__Lib/diffcalc-2.1/.travis.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-# based on https://www.topbug.net/blog/2012/05/27/use-travis-ci-with-jython/
-
-language: python
-
-python:
- - "2.7"
-
-env:
- - JYTHON=false
- - JYTHON=true
-
-install:
- - if [ "$JYTHON" == "true" ]; then . install-jython-environment.sh; fi
- - if [ "$JYTHON" == "false" ]; then pip install --upgrade pytest; pip install pytest-xdist; fi
-
-before_script:
- - if [ "$JYTHON" == "true" ]; then export PYTEST=$HOME/jython/bin/pytest; else export PYTEST=pytest; fi
- - echo PYTEST:- $PYTEST
-
-script: $PYTEST
-
diff --git a/script/__Lib/diffcalc-2.1/COPYING b/script/__Lib/diffcalc-2.1/COPYING
deleted file mode 100755
index 20d40b6..0000000
--- a/script/__Lib/diffcalc-2.1/COPYING
+++ /dev/null
@@ -1,674 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc.
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
- The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works. By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users. We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors. You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
- To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights. Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received. You must make sure that they, too, receive
-or can get the source code. And you must show them these terms so they
-know their rights.
-
- Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
- For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software. For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
- Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so. This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software. The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable. Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products. If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
- Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary. To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- TERMS AND CONDITIONS
-
- 0. Definitions.
-
- "This License" refers to version 3 of the GNU General Public License.
-
- "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
- "The Program" refers to any copyrightable work licensed under this
-License. Each licensee is addressed as "you". "Licensees" and
-"recipients" may be individuals or organizations.
-
- To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy. The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
- A "covered work" means either the unmodified Program or a work based
-on the Program.
-
- To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy. Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
- To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies. Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
- An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License. If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
- 1. Source Code.
-
- The "source code" for a work means the preferred form of the work
-for making modifications to it. "Object code" means any non-source
-form of a work.
-
- A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
- The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form. A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
- The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities. However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work. For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
- The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
- The Corresponding Source for a work in source code form is that
-same work.
-
- 2. Basic Permissions.
-
- All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met. This License explicitly affirms your unlimited
-permission to run the unmodified Program. The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work. This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
- You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force. You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright. Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
- Conveying under any other circumstances is permitted solely under
-the conditions stated below. Sublicensing is not allowed; section 10
-makes it unnecessary.
-
- 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
- No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
- When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
- 4. Conveying Verbatim Copies.
-
- You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
- You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
- 5. Conveying Modified Source Versions.
-
- You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
- a) The work must carry prominent notices stating that you modified
- it, and giving a relevant date.
-
- b) The work must carry prominent notices stating that it is
- released under this License and any conditions added under section
- 7. This requirement modifies the requirement in section 4 to
- "keep intact all notices".
-
- c) You must license the entire work, as a whole, under this
- License to anyone who comes into possession of a copy. This
- License will therefore apply, along with any applicable section 7
- additional terms, to the whole of the work, and all its parts,
- regardless of how they are packaged. This License gives no
- permission to license the work in any other way, but it does not
- invalidate such permission if you have separately received it.
-
- d) If the work has interactive user interfaces, each must display
- Appropriate Legal Notices; however, if the Program has interactive
- interfaces that do not display Appropriate Legal Notices, your
- work need not make them do so.
-
- A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit. Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
- 6. Conveying Non-Source Forms.
-
- You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
- a) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by the
- Corresponding Source fixed on a durable physical medium
- customarily used for software interchange.
-
- b) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by a
- written offer, valid for at least three years and valid for as
- long as you offer spare parts or customer support for that product
- model, to give anyone who possesses the object code either (1) a
- copy of the Corresponding Source for all the software in the
- product that is covered by this License, on a durable physical
- medium customarily used for software interchange, for a price no
- more than your reasonable cost of physically performing this
- conveying of source, or (2) access to copy the
- Corresponding Source from a network server at no charge.
-
- c) Convey individual copies of the object code with a copy of the
- written offer to provide the Corresponding Source. This
- alternative is allowed only occasionally and noncommercially, and
- only if you received the object code with such an offer, in accord
- with subsection 6b.
-
- d) Convey the object code by offering access from a designated
- place (gratis or for a charge), and offer equivalent access to the
- Corresponding Source in the same way through the same place at no
- further charge. You need not require recipients to copy the
- Corresponding Source along with the object code. If the place to
- copy the object code is a network server, the Corresponding Source
- may be on a different server (operated by you or a third party)
- that supports equivalent copying facilities, provided you maintain
- clear directions next to the object code saying where to find the
- Corresponding Source. Regardless of what server hosts the
- Corresponding Source, you remain obligated to ensure that it is
- available for as long as needed to satisfy these requirements.
-
- e) Convey the object code using peer-to-peer transmission, provided
- you inform other peers where the object code and Corresponding
- Source of the work are being offered to the general public at no
- charge under subsection 6d.
-
- A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
- A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling. In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage. For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product. A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
- "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source. The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
- If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information. But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
- The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed. Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
- Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
- 7. Additional Terms.
-
- "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law. If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
- When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it. (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.) You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
- Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
- a) Disclaiming warranty or limiting liability differently from the
- terms of sections 15 and 16 of this License; or
-
- b) Requiring preservation of specified reasonable legal notices or
- author attributions in that material or in the Appropriate Legal
- Notices displayed by works containing it; or
-
- c) Prohibiting misrepresentation of the origin of that material, or
- requiring that modified versions of such material be marked in
- reasonable ways as different from the original version; or
-
- d) Limiting the use for publicity purposes of names of licensors or
- authors of the material; or
-
- e) Declining to grant rights under trademark law for use of some
- trade names, trademarks, or service marks; or
-
- f) Requiring indemnification of licensors and authors of that
- material by anyone who conveys the material (or modified versions of
- it) with contractual assumptions of liability to the recipient, for
- any liability that these contractual assumptions directly impose on
- those licensors and authors.
-
- All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10. If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term. If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
- If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
- Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
- 8. Termination.
-
- You may not propagate or modify a covered work except as expressly
-provided under this License. Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
- However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
- Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
- Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License. If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
- 9. Acceptance Not Required for Having Copies.
-
- You are not required to accept this License in order to receive or
-run a copy of the Program. Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance. However,
-nothing other than this License grants you permission to propagate or
-modify any covered work. These actions infringe copyright if you do
-not accept this License. Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
- 10. Automatic Licensing of Downstream Recipients.
-
- Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License. You are not responsible
-for enforcing compliance by third parties with this License.
-
- An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations. If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
- You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License. For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
- 11. Patents.
-
- A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based. The
-work thus licensed is called the contributor's "contributor version".
-
- A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version. For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
- Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
- In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement). To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
- If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients. "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
- If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
- A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License. You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
- Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
- 12. No Surrender of Others' Freedom.
-
- If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all. For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
- 13. Use with the GNU Affero General Public License.
-
- Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work. The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
- 14. Revised Versions of this License.
-
- The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation. If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
- If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
- Later license versions may give you additional or different
-permissions. However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
- 15. Disclaimer of Warranty.
-
- THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. Limitation of Liability.
-
- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
- 17. Interpretation of Sections 15 and 16.
-
- If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-
- Copyright (C)
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see .
-
-Also add information on how to contact you by electronic and paper mail.
-
- If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
- Copyright (C)
- This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
- You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-.
-
- The GNU General Public License does not permit incorporating your program
-into proprietary programs. If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License. But first, please read
-.
\ No newline at end of file
diff --git a/script/__Lib/diffcalc-2.1/Makefile b/script/__Lib/diffcalc-2.1/Makefile
deleted file mode 100755
index 221a775..0000000
--- a/script/__Lib/diffcalc-2.1/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-
-test-all: test-python test-jython test-integration test-launcher
-
-test-python:
- py.test
-
-test-jython:
- export CLASSPATH=$(HOME)/lib/Jama-1.0.3.jar:$(CLASSPATH); echo $$CLASSPATH; $(HOME)/jython/bin/py.test
-
-test-integration:
- py.test --boxed integration_checks.py
-
-test-launcher:
- ./diffcalc.py --help
- ./diffcalc.py --modules
- ./diffcalc.py --non-interactive --python sixcircle
-
-install-jython:
- ./install-jython-environment.sh
-
-doc-source:
- ./diffcalc.py --non-interactive --make-manuals-source
-
-doc-html:
- cd doc; make html
-
-doc-pdf:
- cd doc; make pdf
-
-doc-all:
- cd doc; make all
-
-doc-clean:
- cd doc; make clean
-
-help:
- @echo
- @echo "Please use \`make ' where is one of"
- @echo
- @echo " test-all"
- @echo " test-python"
- @echo " test-jython"
- @echo " test-integration"
- @echo " test-launcher"
- @echo " install-jython"
- @echo
- @echo " doc-source : to expand *_template.rst to *.rst"
- @echo " doc-html"
- @echo " doc-pdf"
- @echo " doc-all"
- @echo " doc-clean"
- @echo
diff --git a/script/__Lib/diffcalc-2.1/README.rst b/script/__Lib/diffcalc-2.1/README.rst
deleted file mode 100755
index 95f0ad3..0000000
--- a/script/__Lib/diffcalc-2.1/README.rst
+++ /dev/null
@@ -1,513 +0,0 @@
-Diffcalc - A Diffraction Condition Calculator for Diffractometer Control
-========================================================================
-
-Diffcalc is a python/jython based diffraction condition calculator used for
-controlling diffractometers within reciprocal lattice space. It performs the
-same task as the fourc, sixc, twoc, kappa, psic and surf macros from SPEC.
-
-There is a `user guide `_ and `developer guide `_, both at `diffcalc.readthedocs.io `_
-
-|Travis| |Read the docs|
-
-.. |Travis| image:: https://travis-ci.org/DiamondLightSource/diffcalc.svg?branch=master
- :target: https://travis-ci.org/DiamondLightSource/diffcalc
- :alt: Build Status
-
-.. |Read the docs| image:: https://readthedocs.org/projects/diffcalc/badge/?version=latest
- :target: http://diffcalc.readthedocs.io/en/latest/?badge=latest
- :alt: Documentation Status
-
-.. contents::
-
-.. section-numbering::
-
-Software compatibility
-----------------------
-
-- Written in Python using numpy
-- Works in Jython using Jama
-- Runs directly in `OpenGDA`
-- Runs in in Python or IPython using minimal OpenGda emulation (included)
-- Contact us for help running in your environment
-
-Diffractometer compatibility
-----------------------------
-
-Diffcalc’s standard calculation engine is an implementation of [You1999]_ and
-[Busing1967]_. Diffcalc works with any diffractometer which is a subset of:
-
- .. image:: https://raw.githubusercontent.com/DiamondLightSource/diffcalc/master/doc/source/youmanual_images/4s_2d_diffractometer.png
- :alt: 4s + 2d six-circle diffractometer, from H.You (1999)
- :width: 50%
- :align: center
-
-Diffcalc can be configured to work with any diffractometer geometry which is a
-subset of this. For example, a five-circle diffractometer might be missing the
-nu circle above.
-
-Note that the first versions of Diffcalc were based on [Vlieg1993]_ and
-[Vlieg1998]_ and a ‘Vlieg’ engine is still available. There is also an engine
-based on [Willmott2011]_. The ‘You’ engine is more generic and the plan is to
-remove the old ‘Vlieg’ engine once beamlines have been migrated.
-
-Installation
-------------
-
-Check it out::
-
- $ git clone https://github.com/DiamondLightSource/diffcalc.git
- Cloning into 'diffcalc'...
-
-At Diamond Diffcalc may be installed within an OpenGDA deployment and is
-available via the 'module' system from bash.
-
-Starting
---------
-
-Start diffcalc in ipython using a sixcircle dummy diffractometer::
-
- $ cd diffcalc
- $ ./diffcalc.py --help
- ...
-
- $ ./diffcalc.py sixcircle
-
- Running: "ipython --no-banner --HistoryManager.hist_file=/tmp/ipython_hist_zrb13439.sqlite -i -m diffcmd.start sixcircle False"
-
- ---------------------------------- DIFFCALC -----------------------------------
- Startup script: '/Users/zrb13439/git/diffcalc/startup/sixcircle.py'
- Loading ub calculation: 'test'
- ------------------------------------ Help -------------------------------------
- Quick: https://github.com/DiamondLightSource/diffcalc/blob/master/README.rst
- Manual: https://diffcalc.readthedocs.io
- Type: > help ub
- > help hkl
- -------------------------------------------------------------------------------
- In [1]:
-
-Within Diamond use::
-
- $ module load diffcalc
- $ diffcalc --help
- ...
- $ diffcalc sixcircle
-
-Trying it out
--------------
-
-Type ``demo.all()`` to see it working and then move try the following quick
-start guide::
-
- >>> demo.all()
- ...
-
-Getting help
-------------
-
-To view help with orientation and then moving in hkl space::
-
- >>> help ub
- ...
- >>> help hkl
- ...
-
-Configuring a UB calculation
-----------------------------
-See the full `user manual for many more
-options and an explanation of what this all means.
-
-To load the last used UB-calculation::
-
- >>> lastub
- Loading ub calculation: 'mono-Si'
-
-To load a previous UB-calculation::
-
- >>> listub
- UB calculations in: /Users/walton/.diffcalc/i16
-
- 0) mono-Si 15 Feb 2017 (22:32)
- 1) i16-32 13 Feb 2017 (18:32)
-
- >>> loadub 0
-
-To create a new UB-calculation::
-
- >>> newub 'example'
- >>> setlat '1Acube' 1 1 1 90 90 90
-
-Find U matrix from two reflections::
-
- >>> pos wl 1
- wl: 1.0000
- >>> c2th [0 0 1]
- 59.99999999999999
-
- >>> pos sixc [0 60 0 30 90 0]
- sixc: mu: 0.0000 delta: 60.0000 gam: 0.0000 eta: 30.0000 chi: 90.0000 phi: 0.0000
- >>> addref [0 0 1]
-
- >>> pos sixc [0 90 0 45 45 90]
- sixc: mu: 0.0000 delta: 90.0000 gam: 0.0000 eta: 45.0000 chi: 45.0000 phi: 90.0000
- >>> addref [0 1 1]
- Calculating UB matrix.
-
-
-Check that it looks good::
-
- >>> checkub
-
- ENERGY H K L H_COMP K_COMP L_COMP TAG
- 1 12.3984 0.00 0.00 1.00 0.0000 0.0000 1.0000
- 2 12.3984 0.00 1.00 1.00 0.0000 1.0000 1.0000
-
-To see the resulting UB-calculation::
-
- >>> ub
- UBCALC
-
- name: example
-
- n_phi: 0.00000 0.00000 1.00000 <- set
- n_hkl: -0.00000 0.00000 1.00000
- miscut: None
-
- CRYSTAL
-
- name: 1Acube
-
- a, b, c: 1.00000 1.00000 1.00000
- 90.00000 90.00000 90.00000
-
- B matrix: 6.28319 0.00000 0.00000
- 0.00000 6.28319 0.00000
- 0.00000 0.00000 6.28319
-
- UB MATRIX
-
- U matrix: 1.00000 0.00000 0.00000
- 0.00000 1.00000 0.00000
- 0.00000 0.00000 1.00000
-
- U angle: 0
-
- UB matrix: 6.28319 0.00000 0.00000
- 0.00000 6.28319 0.00000
- 0.00000 0.00000 6.28319
-
- REFLECTIONS
-
- ENERGY H K L MU DELTA GAM ETA CHI PHI TAG
- 1 12.398 0.00 0.00 1.00 0.0000 60.0000 0.0000 30.0000 90.0000 0.0000
- 2 12.398 0.00 1.00 1.00 0.0000 90.0000 0.0000 45.0000 45.0000 90.0000
-
-Setting the reference vector
-----------------------------
-See the full `user manual for many more
-options and an explanation of what this all means.
-
-By default the reference vector is set parallel to the phi axis. That is,
-along the z-axis of the phi coordinate frame.
-
-The `ub` command shows the current reference vector, along with any inferred
-miscut, at the top its report (or it can be shown by calling ``setnphi`` or
-``setnhkl'`` with no args)::
-
- >>> ub
- ...
- n_phi: 0.00000 0.00000 1.00000 <- set
- n_hkl: -0.00000 0.00000 1.00000
- miscut: None
- ...
-
-Constraining solutions for moving in hkl space
-----------------------------------------------
-See the full `user manual for many more
-options and an explanation of what this all means.
-
-To get help and see current constraints::
-
- >>> help con
- ...
-
- >>> con
- DET REF SAMP
- ------ ------ ------
- delta --> a_eq_b --> mu
- --> gam alpha eta
- qaz beta chi
- naz psi phi
- mu_is_gam
-
- gam : 0.0000
- a_eq_b
- mu : 0.0000
-
- Type 'help con' for instructions
-
-Three constraints can be given: zero or one from the DET and REF columns and the
-remainder from the SAMP column. Not all combinations are currently available.
-Use ``help con`` to see a summary if you run into troubles.
-
-To configure four-circle vertical scattering::
-
- >>> con gam 0 mu 0 a_eq_b
- gam : 0.0000
- a_eq_b
- mu : 0.0000
-
-Moving in hkl space
--------------------
-
-Simulate moving to a reflection::
-
- >>> sim hkl [0 1 1]
- sixc would move to:
- mu : 0.0000
- delta : 90.0000
- gam : 0.0000
- eta : 45.0000
- chi : 45.0000
- phi : 90.0000
-
- alpha : 30.0000
- beta : 30.0000
- naz : 35.2644
- psi : 90.0000
- qaz : 90.0000
- tau : 45.0000
- theta : 45.0000
-
-Move to reflection::
-
- >>> pos hkl [0 1 1]
- hkl: h: 0.00000 k: 1.00000 l: 1.00000
-
- >>> pos sixc
- sixc: mu: 0.0000 delta: 90.0000 gam: 0.0000 eta: 45.0000 chi: 45.0000 phi: 90.0000
-
-
-Scanning in hkl space
----------------------
-
-Scan an hkl axis (and read back settings)::
-
- >>> scan l 0 1 .2 sixc
- l mu delta gam eta chi phi
- ------- ------- -------- ------- -------- ------- --------
- 0.00000 0.0000 60.0000 0.0000 30.0000 0.0000 90.0000
- 0.20000 0.0000 61.3146 0.0000 30.6573 11.3099 90.0000
- 0.40000 0.0000 65.1654 0.0000 32.5827 21.8014 90.0000
- 0.60000 0.0000 71.3371 0.0000 35.6685 30.9638 90.0000
- 0.80000 0.0000 79.6302 0.0000 39.8151 38.6598 90.0000
- 1.00000 0.0000 90.0000 0.0000 45.0000 45.0000 90.0000
-
-Scan a constraint (and read back virtual angles and eta)::
-
- >>> con psi
- gam : 0.0000
- ! psi : ---
- mu : 0.0000
- >>> scan psi 70 110 10 hklverbose [0 1 1] eta
- psi eta h k l theta qaz alpha naz tau psi beta
- -------- -------- ------- ------- ------- -------- -------- -------- -------- -------- -------- --------
- 70.00000 26.1183 0.00000 1.00000 1.00000 45.00000 90.00000 19.20748 45.28089 45.00000 70.00000 42.14507
- 80.00000 35.1489 -0.00000 1.00000 1.00000 45.00000 90.00000 24.40450 40.12074 45.00000 80.00000 35.93196
- 90.00000 45.0000 0.00000 1.00000 1.00000 45.00000 90.00000 30.00000 35.26439 45.00000 90.00000 30.00000
- 100.00000 54.8511 -0.00000 1.00000 1.00000 45.00000 90.00000 35.93196 30.68206 45.00000 100.00000 24.40450
- 110.00000 63.8817 -0.00000 1.00000 1.00000 45.00000 90.00000 42.14507 26.34100 45.00000 110.00000 19.20748
-
-
-Orientation Commands
---------------------
-
-+-----------------------------+---------------------------------------------------+
-| **STATE** |
-+-----------------------------+---------------------------------------------------+
-| **-- newub** {'name'} | start a new ub calculation name |
-+-----------------------------+---------------------------------------------------+
-| **-- loadub** 'name' | num | load an existing ub calculation |
-+-----------------------------+---------------------------------------------------+
-| **-- lastub** | load the last used ub calculation |
-+-----------------------------+---------------------------------------------------+
-| **-- listub** | list the ub calculations available to load |
-+-----------------------------+---------------------------------------------------+
-| **-- rmub** 'name'|num | remove existing ub calculation |
-+-----------------------------+---------------------------------------------------+
-| **-- saveubas** 'name' | save the ub calculation with a new name |
-+-----------------------------+---------------------------------------------------+
-| **LATTICE** |
-+-----------------------------+---------------------------------------------------+
-| **-- setlat** | interactively enter lattice parameters (Angstroms |
-| | and Deg) |
-+-----------------------------+---------------------------------------------------+
-| **-- setlat** name a | assumes cubic |
-+-----------------------------+---------------------------------------------------+
-| **-- setlat** name a b | assumes tetragonal |
-+-----------------------------+---------------------------------------------------+
-| **-- setlat** name a b c | assumes ortho |
-+-----------------------------+---------------------------------------------------+
-| **-- setlat** name a b c | assumes mon/hex with gam not equal to 90 |
-| gamma | |
-+-----------------------------+---------------------------------------------------+
-| **-- setlat** name a b c | arbitrary |
-| alpha beta gamma | |
-+-----------------------------+---------------------------------------------------+
-| **-- c2th** [h k l] | calculate two-theta angle for reflection |
-+-----------------------------+---------------------------------------------------+
-| **-- hklangle** [h1 k1 l1] | calculate angle between [h1 k1 l1] and [h2 k2 l2] |
-| [h2 k2 l2] | crystal planes |
-+-----------------------------+---------------------------------------------------+
-| **REFERENCE (SURFACE)** |
-+-----------------------------+---------------------------------------------------+
-| **-- setnphi** {[x y z]} | sets or displays n_phi reference |
-+-----------------------------+---------------------------------------------------+
-| **-- setnhkl** {[h k l]} | sets or displays n_hkl reference |
-+-----------------------------+---------------------------------------------------+
-| **REFLECTIONS** |
-+-----------------------------+---------------------------------------------------+
-| **-- showref** | shows full reflection list |
-+-----------------------------+---------------------------------------------------+
-| **-- addref** | add reflection interactively |
-+-----------------------------+---------------------------------------------------+
-| **-- addref** [h k l] | add reflection with current position and energy |
-| {'tag'} | |
-+-----------------------------+---------------------------------------------------+
-| **-- addref** [h k l] (p1, | add arbitrary reflection |
-| .., pN) energy {'tag'} | |
-+-----------------------------+---------------------------------------------------+
-| **-- editref** num | interactively edit a reflection |
-+-----------------------------+---------------------------------------------------+
-| **-- delref** num | deletes a reflection (numbered from 1) |
-+-----------------------------+---------------------------------------------------+
-| **-- clearref** | deletes all the reflections |
-+-----------------------------+---------------------------------------------------+
-| **-- swapref** | swaps first two reflections used for calculating |
-| | U matrix |
-+-----------------------------+---------------------------------------------------+
-| **-- swapref** num1 num2 | swaps two reflections (numbered from 1) |
-+-----------------------------+---------------------------------------------------+
-| **CRYSTAL ORIENTATIONS** |
-+-----------------------------+---------------------------------------------------+
-| **-- showorient** | shows full list of crystal orientations |
-+-----------------------------+---------------------------------------------------+
-| **-- addorient** | add crystal orientation interactively |
-+-----------------------------+---------------------------------------------------+
-| **-- addorient** [h k l] | add crystal orientation in laboratory frame |
-| [x y z] {'tag'} | |
-+-----------------------------+---------------------------------------------------+
-| **-- editorient** num | interactively edit a crystal orientation |
-+-----------------------------+---------------------------------------------------+
-| **-- delorient** num | deletes a crystal orientation (numbered from 1) |
-+-----------------------------+---------------------------------------------------+
-| **-- clearorient** | deletes all the crystal orientations |
-+-----------------------------+---------------------------------------------------+
-| **-- swaporient** | swaps first two crystal orientations used for |
-| | calculating U matrix |
-+-----------------------------+---------------------------------------------------+
-| **-- swaporient** num1 num2 | swaps two crystal orientations (numbered from 1) |
-+-----------------------------+---------------------------------------------------+
-| **UB MATRIX** |
-+-----------------------------+---------------------------------------------------+
-| **-- checkub** | show calculated and entered hkl values for |
-| | reflections |
-+-----------------------------+---------------------------------------------------+
-| **-- setu** | manually set u matrix |
-| {[[..][..][..]]} | |
-+-----------------------------+---------------------------------------------------+
-| **-- setub** | manually set ub matrix |
-| {[[..][..][..]]} | |
-+-----------------------------+---------------------------------------------------+
-| **-- calcub** | (re)calculate u matrix from ref1 and ref2 |
-+-----------------------------+---------------------------------------------------+
-| **-- trialub** | (re)calculate u matrix from ref1 only (check |
-| | carefully) |
-+-----------------------------+---------------------------------------------------+
-| **-- refineub** {[h k l]} | refine unit cell dimensions and U matrix to match |
-| {pos} | diffractometer angles for a given hkl value |
-+-----------------------------+---------------------------------------------------+
-| **-- addmiscut** angle | apply miscut to U matrix using a specified miscut |
-| {[x y z]} | angle in degrees and a rotation axis |
-| | (default: [0 1 0]) |
-+-----------------------------+---------------------------------------------------+
-| **-- setmiscut** angle | manually set U matrix using a specified miscut |
-| {[x y z]} | angle in degrees and a rotation axis |
-| | (default: [0 1 0]) |
-+-----------------------------+---------------------------------------------------+
-
-Motion Commands
----------------
-
-+-----------------------------+---------------------------------------------------+
-| **CONSTRAINTS** |
-+-----------------------------+---------------------------------------------------+
-| **-- con** | list available constraints and values |
-+-----------------------------+---------------------------------------------------+
-| **-- con** {val} | constrains and optionally sets one constraint |
-+-----------------------------+---------------------------------------------------+
-| **-- con** {val} | clears and then fully constrains |
-| {val} {val} | |
-+-----------------------------+---------------------------------------------------+
-| **-- uncon** | remove constraint |
-+-----------------------------+---------------------------------------------------+
-| **HKL** |
-+-----------------------------+---------------------------------------------------+
-| **-- allhkl** [h k l] | print all hkl solutions ignoring limits |
-+-----------------------------+---------------------------------------------------+
-| **HARDWARE** |
-+-----------------------------+---------------------------------------------------+
-| **-- hardware** | show diffcalc limits and cuts |
-+-----------------------------+---------------------------------------------------+
-| **-- setcut** {name {val}} | sets cut angle |
-+-----------------------------+---------------------------------------------------+
-| **-- setmin** {axis {val}} | set lower limits used by auto sector code (None |
-| | to clear) |
-+-----------------------------+---------------------------------------------------+
-| **-- setmax** {name {val}} | sets upper limits used by auto sector code (None |
-| | to clear) |
-+-----------------------------+---------------------------------------------------+
-| **MOTION** |
-+-----------------------------+---------------------------------------------------+
-| **-- sim** hkl scn | simulates moving scannable (not all) |
-+-----------------------------+---------------------------------------------------+
-| **-- sixc** | show Eularian position |
-+-----------------------------+---------------------------------------------------+
-| **-- pos** sixc [mu, delta, | move to Eularian position(None holds an axis |
-| gam, eta, chi, phi] | still) |
-+-----------------------------+---------------------------------------------------+
-| **-- sim** sixc [mu, delta, | simulate move to Eulerian positionsixc |
-| gam, eta, chi, phi] | |
-+-----------------------------+---------------------------------------------------+
-| **-- hkl** | show hkl position |
-+-----------------------------+---------------------------------------------------+
-| **-- pos** hkl [h k l] | move to hkl position |
-+-----------------------------+---------------------------------------------------+
-| **-- pos** {h | k | l} val | move h, k or l to val |
-+-----------------------------+---------------------------------------------------+
-| **-- sim** hkl [h k l] | simulate move to hkl position |
-+-----------------------------+---------------------------------------------------+
-
-
-References
-----------
-
-.. [You1999] H. You. *Angle calculations for a '4S+2D' six-circle diffractometer.*
- J. Appl. Cryst. (1999). **32**, 614-623. `(pdf link)
- `__.
-
-.. [Busing1967] W. R. Busing and H. A. Levy. *Angle calculations for 3- and 4-circle X-ray
- and neutron diffractometers.* Acta Cryst. (1967). **22**, 457-464. `(pdf link)
- `__.
-
-.. [Vlieg1993] Martin Lohmeier and Elias Vlieg. *Angle calculations for a six-circle
- surface x-ray diffractometer.* J. Appl. Cryst. (1993). **26**, 706-716. `(pdf link)
- `__.
-
-.. [Vlieg1998] Elias Vlieg. *A (2+3)-type surface diffractometer: mergence of the z-axis and
- (2+2)-type geometries.* J. Appl. Cryst. (1998). **31**, 198-203. `(pdf link)
- `__.
-
-.. [Willmott2011] C. M. Schlepütz, S. O. Mariager, S. A. Pauli, R. Feidenhans'l and
- P. R. Willmott. *Angle calculations for a (2+3)-type diffractometer: focus
- on area detectors.* J. Appl. Cryst. (2011). **44**, 73-83. `(pdf link)
- `__.
diff --git a/script/__Lib/diffcalc-2.1/README_template.rst b/script/__Lib/diffcalc-2.1/README_template.rst
deleted file mode 100755
index f62cc5f..0000000
--- a/script/__Lib/diffcalc-2.1/README_template.rst
+++ /dev/null
@@ -1,267 +0,0 @@
-Diffcalc - A Diffraction Condition Calculator for Diffractometer Control
-========================================================================
-
-Diffcalc is a python/jython based diffraction condition calculator used for
-controlling diffractometers within reciprocal lattice space. It performs the
-same task as the fourc, sixc, twoc, kappa, psic and surf macros from SPEC.
-
-There is a `user guide `_ and `developer guide `_, both at `diffcalc.readthedocs.io `_
-
-|Travis| |Read the docs|
-
-.. |Travis| image:: https://travis-ci.org/DiamondLightSource/diffcalc.svg?branch=master
- :target: https://travis-ci.org/DiamondLightSource/diffcalc
- :alt: Build Status
-
-.. |Read the docs| image:: https://readthedocs.org/projects/diffcalc/badge/?version=latest
- :target: http://diffcalc.readthedocs.io/en/latest/?badge=latest
- :alt: Documentation Status
-
-.. contents::
-
-.. section-numbering::
-
-Software compatibility
-----------------------
-
-- Written in Python using numpy
-- Works in Jython using Jama
-- Runs directly in `OpenGDA`
-- Runs in in Python or IPython using minimal OpenGda emulation (included)
-- Contact us for help running in your environment
-
-Diffractometer compatibility
-----------------------------
-
-Diffcalc’s standard calculation engine is an implementation of [You1999]_ and
-[Busing1967]_. Diffcalc works with any diffractometer which is a subset of:
-
- .. image:: https://raw.githubusercontent.com/DiamondLightSource/diffcalc/master/doc/source/youmanual_images/4s_2d_diffractometer.png
- :alt: 4s + 2d six-circle diffractometer, from H.You (1999)
- :width: 50%
- :align: center
-
-Diffcalc can be configured to work with any diffractometer geometry which is a
-subset of this. For example, a five-circle diffractometer might be missing the
-nu circle above.
-
-Note that the first versions of Diffcalc were based on [Vlieg1993]_ and
-[Vlieg1998]_ and a ‘Vlieg’ engine is still available. There is also an engine
-based on [Willmott2011]_. The ‘You’ engine is more generic and the plan is to
-remove the old ‘Vlieg’ engine once beamlines have been migrated.
-
-If we choose the x axis parallel to b, the yaxis intheplaneofblandb2,andthezaxis perpendicular to that plane,
-
-Installation
-------------
-
-Check it out::
-
- $ git clone https://github.com/DiamondLightSource/diffcalc.git
- Cloning into 'diffcalc'...
-
-At Diamond Diffcalc may be installed within an OpenGDA deployment and is
-available via the 'module' system from bash.
-
-Starting
---------
-
-Start diffcalc in ipython using a sixcircle dummy diffractometer::
-
- $ cd diffcalc
- $ ./diffcalc.py --help
- ...
-
- $ ./diffcalc.py sixcircle
-
- Running: "ipython --no-banner --HistoryManager.hist_file=/tmp/ipython_hist_zrb13439.sqlite -i -m diffcmd.start sixcircle False"
-
- ---------------------------------- DIFFCALC -----------------------------------
- Startup script: '/Users/zrb13439/git/diffcalc/startup/sixcircle.py'
- Loading ub calculation: 'test'
- ------------------------------------ Help -------------------------------------
- Quick: https://github.com/DiamondLightSource/diffcalc/blob/master/README.rst
- Manual: https://diffcalc.readthedocs.io
- Type: > help ub
- > help hkl
- -------------------------------------------------------------------------------
- In [1]:
-
-Within Diamond use::
-
- $ module load diffcalc
- $ diffcalc --help
- ...
- $ diffcalc sixcircle
-
-Trying it out
--------------
-
-Type ``demo.all()`` to see it working and then move try the following quick
-start guide::
-
- >>> demo.all()
- ...
-
-Getting help
-------------
-
-To view help with orientation and then moving in hkl space::
-
- >>> help ub
- ...
- >>> help hkl
- ...
-
-Configuring a UB calculation
-----------------------------
-See the full `user manual for many more
-options and an explanation of what this all means.
-
-To load the last used UB-calculation::
-
- >>> lastub
- Loading ub calculation: 'mono-Si'
-
-To load a previous UB-calculation::
-
- >>> listub
- UB calculations in: /Users/walton/.diffcalc/i16
-
- 0) mono-Si 15 Feb 2017 (22:32)
- 1) i16-32 13 Feb 2017 (18:32)
-
- >>> loadub 0
-
-To create a new UB-calculation::
-
- ==> newub 'example'
- ==> setlat '1Acube' 1 1 1 90 90 90
-
-where the basis is defined by Busing & Levy:
-
- "...we choose the x axis parallel to b, the y axis in the plane of bl
- and b2, and the zaxis perpendicular to that plane."
-
-
-Find U matrix from two reflections::
-
- ==> pos wl 1
- ==> c2th [0 0 1]
- 59.99999999999999
-
- ==> pos sixc [0 60 0 30 90 0]
- ==> addref [0 0 1]
-
- ==> pos sixc [0 90 0 45 45 90]
- ==> addref [0 1 1]
-
-
-Check that it looks good::
-
- ==> checkub
-
-To see the resulting UB-calculation::
-
- ==> ub
-
-Setting the reference vector
-----------------------------
-See the full `user manual for many more
-options and an explanation of what this all means.
-
-By default the reference vector is set parallel to the phi axis. That is,
-along the z-axis of the phi coordinate frame.
-
-The `ub` command shows the current reference vector, along with any inferred
-miscut, at the top its report (or it can be shown by calling ``setnphi`` or
-``setnhkl'`` with no args)::
-
- >>> ub
- ...
- n_phi: 0.00000 0.00000 1.00000 <- set
- n_hkl: -0.00000 0.00000 1.00000
- miscut: None
- ...
-
-Constraining solutions for moving in hkl space
-----------------------------------------------
-See the full `user manual for many more
-options and an explanation of what this all means.
-
-To get help and see current constraints::
-
- >>> help con
- ...
-
- ==> con
-
-Three constraints can be given: zero or one from the DET and REF columns and the
-remainder from the SAMP column. Not all combinations are currently available.
-Use ``help con`` to see a summary if you run into troubles.
-
-To configure four-circle vertical scattering::
-
- ==> con gam 0 mu 0 a_eq_b
-
-Moving in hkl space
--------------------
-
-Simulate moving to a reflection::
-
- ==> sim hkl [0 1 1]
-
-Move to reflection::
-
- ==> pos hkl [0 1 1]
-
- ==> pos sixc
-
-
-Scanning in hkl space
----------------------
-
-Scan an hkl axis (and read back settings)::
-
- ==> scan l 0 1 .2 sixc
-
-Scan a constraint (and read back virtual angles and eta)::
-
- ==> con psi
- ==> scan psi 70 110 10 hklverbose [0 1 1] eta
-
-
-Orientation Commands
---------------------
-
-==> UB_HELP_TABLE
-
-Motion Commands
----------------
-
-==> HKL_HELP_TABLE
-
-
-References
-----------
-
-.. [You1999] H. You. *Angle calculations for a '4S+2D' six-circle diffractometer.*
- J. Appl. Cryst. (1999). **32**, 614-623. `(pdf link)
- `__.
-
-.. [Busing1967] W. R. Busing and H. A. Levy. *Angle calculations for 3- and 4-circle X-ray
- and neutron diffractometers.* Acta Cryst. (1967). **22**, 457-464. `(pdf link)
- `__.
-
-.. [Vlieg1993] Martin Lohmeier and Elias Vlieg. *Angle calculations for a six-circle
- surface x-ray diffractometer.* J. Appl. Cryst. (1993). **26**, 706-716. `(pdf link)
- `__.
-
-.. [Vlieg1998] Elias Vlieg. *A (2+3)-type surface diffractometer: mergence of the z-axis and
- (2+2)-type geometries.* J. Appl. Cryst. (1998). **31**, 198-203. `(pdf link)
- `__.
-
-.. [Willmott2011] C. M. Schlepütz, S. O. Mariager, S. A. Pauli, R. Feidenhans'l and
- P. R. Willmott. *Angle calculations for a (2+3)-type diffractometer: focus
- on area detectors.* J. Appl. Cryst. (2011). **44**, 73-83. `(pdf link)
- `__.
diff --git a/script/__Lib/diffcalc-2.1/buckminster.cspec b/script/__Lib/diffcalc-2.1/buckminster.cspec
deleted file mode 100755
index 745b4c3..0000000
--- a/script/__Lib/diffcalc-2.1/buckminster.cspec
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/script/__Lib/diffcalc-2.1/diffcalc.py b/script/__Lib/diffcalc-2.1/diffcalc.py
deleted file mode 100755
index 66be493..0000000
--- a/script/__Lib/diffcalc-2.1/diffcalc.py
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/python
-
-import sys
-
-from diffcmd.diffcalc_launcher import main
-
-
-if __name__ == '__main__':
- sys.exit(main())
\ No newline at end of file
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/__init__.py b/script/__Lib/diffcalc-2.1/diffcalc/__init__.py
deleted file mode 100755
index e69de29..0000000
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/dc/__init__.py b/script/__Lib/diffcalc-2.1/diffcalc/dc/__init__.py
deleted file mode 100755
index e69de29..0000000
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/dc/common.py b/script/__Lib/diffcalc-2.1/diffcalc/dc/common.py
deleted file mode 100755
index 9793f71..0000000
--- a/script/__Lib/diffcalc-2.1/diffcalc/dc/common.py
+++ /dev/null
@@ -1,24 +0,0 @@
-from diffcalc.util import allnum, command, DiffcalcException
-
-
-def sim(scn, hkl):
- """sim hkl scn -- simulates moving scannable (not all)
- """
- if not isinstance(hkl, (tuple, list)):
- raise TypeError()
-
- if not allnum(hkl):
- raise TypeError()
-
- try:
- print scn.simulateMoveTo(hkl)
- except AttributeError:
- raise TypeError(
- "The first argument does not support simulated moves")
-
-def energy_to_wavelength(energy):
- try:
- return 12.39842 / energy
- except ZeroDivisionError:
- raise DiffcalcException(
- "Cannot calculate hkl position as Energy is set to 0")
\ No newline at end of file
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/dc/dcvlieg.py b/script/__Lib/diffcalc-2.1/diffcalc/dc/dcvlieg.py
deleted file mode 100755
index b1fb5da..0000000
--- a/script/__Lib/diffcalc-2.1/diffcalc/dc/dcvlieg.py
+++ /dev/null
@@ -1,76 +0,0 @@
-from diffcalc.dc.common import energy_to_wavelength
-
-from diffcalc import settings
-from diffcalc.hkl.vlieg.transform import VliegTransformSelector,\
- TransformCommands, VliegPositionTransformer
-from diffcalc.dc.help import compile_extra_motion_commands_for_help
-import diffcalc.hkl.vlieg.calc
-
-
-# reload to aid testing only
-import diffcalc.ub.ub as _ub
-reload(_ub)
-from diffcalc import hardware as _hardware
-#reload(_hardware)
-import diffcalc.hkl.vlieg.hkl as _hkl
-reload(_hkl)
-
-from diffcalc.ub.ub import * # @UnusedWildImport
-from diffcalc.hardware import * # @UnusedWildImport
-from diffcalc.hkl.vlieg.hkl import * # @UnusedWildImport
-from diffcalc.gdasupport.scannable.sim import sim
-
-_transform_selector = VliegTransformSelector()
-_transform_commands = TransformCommands(_transform_selector)
-_transformer = VliegPositionTransformer(settings.geometry, settings.hardware,
- _transform_selector)
-
-transform = _transform_commands.transform
-transforma = _transform_commands.transforma
-transformb = _transform_commands.transformb
-transformc = _transform_commands.transformc
-
-
-on = 'on'
-off = 'off'
-auto = 'auto'
-manual = 'manual'
-
-def hkl_to_angles(h, k, l, energy=None):
- """Convert a given hkl vector to a set of diffractometer angles"""
- if energy is None:
- energy = settings.hardware.get_energy() # @UndefinedVariable
-
- position, params = hklcalc.hklToAngles(h, k, l, energy_to_wavelength(energy))
- position = _transformer.transform(position)
- angle_tuple = settings.geometry.internal_position_to_physical_angles(position) # @UndefinedVariable
- angle_tuple = settings.hardware.cut_angles(angle_tuple) # @UndefinedVariable
-
- return angle_tuple, params
-
-
-def angles_to_hkl(angleTuple, energy=None):
- """Converts a set of diffractometer angles to an hkl position
- ((h, k, l), paramDict)=angles_to_hkl(self, (a1, a2,aN), energy=None)"""
- if energy is None:
- energy = settings.hardware.get_energy() # @UndefinedVariable
-
- i_pos = settings.geometry.physical_angles_to_internal_position(angleTuple) # @UndefinedVariable
- return hklcalc.anglesToHkl(i_pos, energy_to_wavelength(energy))
-
-
-settings.ubcalc_strategy = diffcalc.hkl.vlieg.calc.VliegUbCalcStrategy()
-settings.angles_to_hkl_function = diffcalc.hkl.vlieg.calc.vliegAnglesToHkl
-settings.include_sigtau = True
-
-ub_commands_for_help = _ub.commands_for_help
-
-hkl_commands_for_help = (_hkl.commands_for_help +
- _hardware.commands_for_help +
- ['Transform',
- transform,
- transforma,
- transformb,
- transformc] +
- compile_extra_motion_commands_for_help())
-
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/dc/dcwillmot.py b/script/__Lib/diffcalc-2.1/diffcalc/dc/dcwillmot.py
deleted file mode 100755
index 7bd8a87..0000000
--- a/script/__Lib/diffcalc-2.1/diffcalc/dc/dcwillmot.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# This file differs from dcyou in only two places
-
-from diffcalc import settings
-from diffcalc.dc.common import energy_to_wavelength
-from diffcalc.dc.help import compile_extra_motion_commands_for_help
-import diffcalc.hkl.willmott.calc
-
-
-# reload to aid testing only
-from diffcalc.ub import ub as _ub
-reload(_ub)
-from diffcalc import hardware as _hardware
-#reload(_hardware)
-from diffcalc.hkl.you import hkl as _hkl
-reload(_hkl)
-
-from diffcalc.ub.ub import * # @UnusedWildImport
-from diffcalc.hardware import * # @UnusedWildImport
-from diffcalc.hkl.willmot.hkl import * # @UnusedWildImport
-from diffcalc.gdasupport.scannable.sim import sim
-
-def hkl_to_angles(h, k, l, energy=None):
- """Convert a given hkl vector to a set of diffractometer angles"""
- if energy is None:
- energy = settings.hardware.get_energy() # @UndefinedVariable
-
- (pos, params) = hklcalc.hklToAngles(h, k, l, energy_to_wavelength(energy))
- angle_tuple = settings.geometry.internal_position_to_physical_angles(pos) # @UndefinedVariable
- angle_tuple = settings.hardware.cut_angles(angle_tuple) # @UndefinedVariable
-
- return angle_tuple, params
-
-def angles_to_hkl(angleTuple, energy=None):
- """Converts a set of diffractometer angles to an hkl position
- ((h, k, l), paramDict)=angles_to_hkl(self, (a1, a2,aN), energy=None)"""
- if energy is None:
- energy = settings.hardware.get_energy() # @UndefinedVariable
- i_pos = settings.geometry.physical_angles_to_internal_position(angleTuple) # @UndefinedVariable
- return hklcalc.anglesToHkl(i_pos, energy_to_wavelength(energy))
-
-settings.ubcalc_strategy = diffcalc.hkl.willmott.calc.WillmottHorizontalUbCalcStrategy()
-settings.angles_to_hkl_function = diffcalc.hkl.willmott.calc.angles_to_hkl
-
-
-ub_commands_for_help = _ub.commands_for_help
-
-hkl_commands_for_help = _hkl.commands_for_help + _hardware.commands_for_help + compile_extra_motion_commands_for_help()
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/dc/dcyou.py b/script/__Lib/diffcalc-2.1/diffcalc/dc/dcyou.py
deleted file mode 100755
index 651c2fe..0000000
--- a/script/__Lib/diffcalc-2.1/diffcalc/dc/dcyou.py
+++ /dev/null
@@ -1,56 +0,0 @@
-from diffcalc import settings
-from diffcalc.dc.common import energy_to_wavelength
-from diffcalc.dc.help import compile_extra_motion_commands_for_help
-
-import diffcalc.hkl.you.calc
-settings.ubcalc_strategy = diffcalc.hkl.you.calc.YouUbCalcStrategy()
-settings.angles_to_hkl_function = diffcalc.hkl.you.calc.youAnglesToHkl
-settings.include_reference = True
-
-# reload to aid testing only
-from diffcalc.ub import ub as _ub
-
-reload(_ub)
-from diffcalc import hardware as _hardware
-#reload(_hardware)
-from diffcalc.hkl.you import hkl as _hkl
-reload(_hkl)
-
-from diffcalc.ub.ub import * # @UnusedWildImport
-from diffcalc.hardware import * # @UnusedWildImport
-from diffcalc.hkl.you.hkl import * # @UnusedWildImport
-
-
-def hkl_to_angles(h, k, l, energy=None):
- """Convert a given hkl vector to a set of diffractometer angles
-
- return angle tuple and params dictionary
-
- """
- if energy is None:
- energy = settings.hardware.get_energy() # @UndefinedVariable
-
- (pos, params) = hklcalc.hklToAngles(h, k, l, energy_to_wavelength(energy))
- angle_tuple = settings.geometry.internal_position_to_physical_angles(pos) # @UndefinedVariable
- angle_tuple = settings.hardware.cut_angles(angle_tuple) # @UndefinedVariable
-
- return angle_tuple, params
-
-
-def angles_to_hkl(angleTuple, energy=None):
- """Converts a set of diffractometer angles to an hkl position
-
- Return hkl tuple and params dictionary
-
- """
- if energy is None:
- energy = settings.hardware.get_energy() # @UndefinedVariable
- i_pos = settings.geometry.physical_angles_to_internal_position(angleTuple) # @UndefinedVariable
- return hklcalc.anglesToHkl(i_pos, energy_to_wavelength(energy))
-
-
-
-
-
-ub_commands_for_help = _ub.commands_for_help
-hkl_commands_for_help = _hkl.commands_for_help + _hardware.commands_for_help + compile_extra_motion_commands_for_help()
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/dc/help.py b/script/__Lib/diffcalc-2.1/diffcalc/dc/help.py
deleted file mode 100755
index 5d4afe6..0000000
--- a/script/__Lib/diffcalc-2.1/diffcalc/dc/help.py
+++ /dev/null
@@ -1,161 +0,0 @@
-'''
-Created on 6 May 2016
-
-@author: walton
-'''
-from diffcalc import settings
-from diffcalc.gdasupport.scannable.sim import sim
-import textwrap
-from diffcalc.util import bold
-
-
-class ExternalCommand(object):
- """Instances found in a command_list by format_command_help will
- result in documentation for a command without there actually being one.
- """
- def __init__(self, docstring):
- """Set the docstring that will be pulled off by format_command_help.
- """
- self.__doc__ = docstring
- self.__name__ = ''
-
-
-WIDTH = 27
-INDENT = 3
-
-
-def format_command_help(command_list):
-
- row_list = _command_list_to_table_cells(command_list)
- lines = []
- for row_cells in row_list:
- if len(row_cells) == 1:
- heading = row_cells[0]
- lines.append('')
- lines.append(bold(heading))
- lines.append('')
- elif len(row_cells) == 2:
- cell1, cell2 = row_cells
-
- cell1_lines = textwrap.wrap(cell1, WIDTH, subsequent_indent=' ')
- cell2_lines = textwrap.wrap(cell2, 79 - INDENT - 3 - WIDTH)
-
- first_line = True
- while cell1_lines or cell2_lines:
- line = ' ' * INDENT
- if cell1_lines:
- line += cell1_lines.pop(0).ljust(WIDTH)
- else:
- line += ' ' * (WIDTH)
- line += ' : ' if first_line else ' '
- if cell2_lines:
- line += cell2_lines.pop(0)
- lines.append(line)
- first_line = False
-
- return '\n'.join(lines)
-
-
-def format_commands_for_rst_table(title, command_list):
- W1 = WIDTH # internal width
- W2 = 79 - W1 - 3 # internal width
- HORIZ_LINE = '+-' + '-' * W1 + '-+-' + '-' * W2 + '-+'
-
- row_list = _command_list_to_table_cells(command_list)
-
- lines = []
-
- lines.append(HORIZ_LINE) # Top line
- for row_cells in row_list:
- if len(row_cells) == 1:
- lines.append('| ' + ('**' + row_cells[0] + '**').ljust(W1 + W2 + 3) + ' |')
-
- elif len(row_cells) == 2:
- cmd_and_args = row_cells[0].split(' ', 1)
- cmd = cmd_and_args[0]
- args = cmd_and_args[1] if len(cmd_and_args) == 2 else ''
- cell1 = '**-- %s** %s' % (cmd, args)
- cell1_lines = textwrap.wrap(cell1, W1) #, subsequent_indent=' ')
- cell2_lines = textwrap.wrap(row_cells[1], W2)
-
- while cell1_lines or cell2_lines:
- line = '| '
- line += (cell1_lines.pop(0) if cell1_lines else '').ljust(W1)
- line += ' | '
- line += (cell2_lines.pop(0) if cell2_lines else '').ljust(W2)
- line += ' |'
- lines.append(line)
-
- else:
- assert False
-
- lines.append(HORIZ_LINE)
- return lines
-
-
-
-
-
-def _command_list_to_table_cells(command_list):
- row_list = []
- for obj in command_list:
-
- if isinstance(obj, basestring): # group heading
- row_list.append([obj.upper()])
-
- else: # individual command
- doc_before_empty_line = obj.__doc__.split('\n\n')[0]
- doc_lines = [s.strip() for s in doc_before_empty_line.split('\n')]
- for doc_line in doc_lines:
- if doc_line == '':
- continue
- if obj.__name__ in ('ub', 'hkl'):
- continue
- name, args, desc = _split_doc_line(doc_line)
- desc = desc.strip()
- args = args.strip()
- if desc and desc[-1] == '.':
- desc = desc[:-1]
-
- row_list.append([name + (' ' if args else '') + args, desc])
-
- return row_list
-
-
-def _split_doc_line(docLine):
- name, _, right = docLine.partition(' ')
- args, _, desc = right.partition('-- ')
- return name, args, desc
-
-
-def compile_extra_motion_commands_for_help():
-
- _hwname = settings.hardware.name # @UndefinedVariable
- _angles = ', '.join(settings.hardware.get_axes_names()) # @UndefinedVariable
-
- commands = []
-
- commands.append('Motion')
- commands.append(sim)
- commands.append(ExternalCommand(
- '%(_hwname)s -- show Eularian position' % vars()))
- commands.append(ExternalCommand(
- 'pos %(_hwname)s [%(_angles)s] -- move to Eularian position'
- '(None holds an axis still)' % vars()))
- commands.append(ExternalCommand(
- 'sim %(_hwname)s [%(_angles)s] -- simulate move to Eulerian position'
- '%(_hwname)s' % vars()))
-
- commands.append(ExternalCommand(
- 'hkl -- show hkl position'))
- commands.append(ExternalCommand(
- 'pos hkl [h k l] -- move to hkl position'))
- commands.append(ExternalCommand(
- 'pos {h | k | l} val -- move h, k or l to val'))
- commands.append(ExternalCommand(
- 'sim hkl [h k l] -- simulate move to hkl position'))
-
-# if engine_name != 'vlieg':
-# pass
-# # TODO: remove sigtau command and 'Surface' string
- return commands
\ No newline at end of file
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/gdasupport/__init__.py b/script/__Lib/diffcalc-2.1/diffcalc/gdasupport/__init__.py
deleted file mode 100755
index e69de29..0000000
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/gdasupport/minigda/__init__.py b/script/__Lib/diffcalc-2.1/diffcalc/gdasupport/minigda/__init__.py
deleted file mode 100755
index e69de29..0000000
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/gdasupport/minigda/command.py b/script/__Lib/diffcalc-2.1/diffcalc/gdasupport/minigda/command.py
deleted file mode 100755
index d6e7fc5..0000000
--- a/script/__Lib/diffcalc-2.1/diffcalc/gdasupport/minigda/command.py
+++ /dev/null
@@ -1,322 +0,0 @@
-###
-# Copyright 2008-2011 Diamond Light Source Ltd.
-# This file is part of Diffcalc.
-#
-# Diffcalc is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Diffcalc is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Diffcalc. If not, see .
-###
-
-#try:
-# from gda.device import Scannable
-#except ImportError:
-# from diffcalc.gdasupport.minigda.scannable import Scannable
-from diffcalc.gdasupport.minigda.scannable import Scannable
-from diffcalc.util import getMessageFromException, allnum, bold
-import math
-
-
-ROOT_NAMESPACE_DICT = {}
-
-class Pos(object):
-
- def __init__(self):
- self.__name__ = 'pos'
-
- def __call__(self, *posargs):
- if len(posargs) == 0:
-
- keys = dict(ROOT_NAMESPACE_DICT).keys()
- keys.sort()
- for key in keys:
- val = ROOT_NAMESPACE_DICT[key]
- if isinstance(val, Scannable):
- print self.posReturningReport(val)
- else:
- print self.posReturningReport(*posargs)
-
- def posReturningReport(self, *posargs):
- # report position of this scannable
- if len(posargs) == 1:
- scannable = posargs[0]
- self._assert_scannable(scannable)
- return self._generatePositionReport(scannable)
-
- # Move the scannable and report
- elif len(posargs) == 2:
- scannable = posargs[0]
- self._assert_scannable(scannable)
- # Move it
- scannable.asynchronousMoveTo(posargs[1])
- # TODO: minigda assumes all moves complete instantly, so no need
- # yet to check the move is complete
- return self._generatePositionReport(scannable)
-
- else:
- raise ValueError(
- "Invlaid arguements: 'pos [ scannable [ value ] ]'")
-
- def _assert_scannable(self, obj):
- if not isinstance(obj, Scannable):
- raise TypeError(
- "The first argument to the pos command must be scannable. "
- "Not: " + str(type(obj)))
-
- def _generatePositionReport(self, scannable):
- fieldNames = (tuple(scannable.getInputNames()) +
- tuple(scannable.getExtraNames()))
- # All scannables
- result = "%s:" % scannable.getName()
- result = result.ljust(10)
- try:
- pos = scannable.getPosition()
- except Exception, e:
- return result + "Error: %s" % getMessageFromException(e)
- if pos is None:
- return result + "---"
- # Single field scannable:
- if len(fieldNames) == 1:
- try:
- result += "%s" % scannable.formatPositionFields(pos)[0]
- except AttributeError:
- result += str(scannable())
- # Multi field scannable:
- else:
- try:
- formatted = scannable.formatPositionFields(pos)
- for name, formattedValue in zip(fieldNames, formatted):
- result += "%s: %s " % (name, formattedValue)
- except AttributeError:
- result += str(scannable())
-
- return result
-
-
-class ScanDataHandler:
- def __init__(self):
- self.scannables = None
-
- def callAtScanStart(self, scannables):
- pass
-
- def callWithScanPoint(self, PositionDictIndexedByScannable):
- pass
-
- def callAtScanEnd(self):
- pass
-
-
-class ScanDataPrinter(ScanDataHandler):
-
- def __init__(self):
- self.first_point_printed = False
- self.widths = []
- self.scannables = []
-
- def callAtScanStart(self, scannables):
- self.first_point_printed = False
- self.scannables = scannables
-
- def print_first_point(self, position_dict):
- # also sets self.widths
- header_strings = []
- for scn in self.scannables:
- field_names = list(scn.getInputNames()) + list(scn.getExtraNames())
- if len(field_names) == 1:
- header_strings.append(scn.getName())
- else:
- for field_name in field_names:
- header_strings.append(field_name)
-
- first_row_strings = []
- for scn in self.scannables:
- pos = position_dict[scn]
- first_row_strings.extend(scn.formatPositionFields(pos))
-
- self.widths = []
- for header, pos_string in zip(header_strings, first_row_strings):
- self.widths.append(max(len(header), len(pos_string)))
-
- header_cells = []
- for heading, width in zip(header_strings, self.widths):
- header_cells.append(heading.rjust(width))
-
- underline_cells = ['-' * w for w in self.widths]
-
- first_row_cells = []
- for pos, width in zip(first_row_strings, self.widths):
- first_row_cells.append(pos.rjust(width))
-
- #table_width = sum(self.widths) + len(self.widths * 2) - 2
- lines = []
- #lines.append('=' * table_width)
- lines.append(bold(' '.join(header_cells)))
- lines.append(' '.join(underline_cells))
- lines.append(' '.join(first_row_cells))
- print '\n'.join(lines)
-
- def callWithScanPoint(self, position_dict):
- if not self.first_point_printed:
- self.print_first_point(position_dict)
- self.first_point_printed = True
- else:
- row_strings = []
- for scn in self.scannables:
- pos = position_dict[scn]
- row_strings.extend(scn.formatPositionFields(pos))
-
- row_cells = []
- for pos, width in zip(row_strings, self.widths):
- row_cells.append(pos.rjust(width))
-
- print ' '.join(row_cells)
-
- def callAtScanEnd(self):
- #table_width = sum(self.widths) + len(self.widths * 2) - 2
- #print '=' * table_width
- pass
-
-
-class Scan(object):
- class Group:
- def __init__(self, scannable):
- self.scannable = scannable
- self.args = []
-
- def __cmp__(self, other):
- return(self.scannable.getLevel() - other.scannable.getLevel())
-
- def __repr__(self):
- return "Group(%s, %s)" % (self.scannable.getName(), str(self.args))
-
- def shouldTriggerLoop(self):
- return len(self.args) == 3
-
- def __init__(self, scanDataHandlers):
- # scanDataHandlers should be list
- if type(scanDataHandlers) not in (tuple, list):
- scanDataHandlers = (scanDataHandlers,)
- self.dataHandlers = scanDataHandlers
-
- def __call__(self, *scanargs):
- groups = self._parseScanArgsIntoScannableArgGroups(scanargs)
- groups = self._reorderInnerGroupsAccordingToLevel(groups)
- # Configure data handlers for a new scan
- for handler in self.dataHandlers: handler.callAtScanStart(
- [grp.scannable for grp in groups])
- # Perform the scan
- self._performScan(groups, currentRecursionLevel=0)
- # Inform data handlers of scan completion
- for handler in self.dataHandlers: handler.callAtScanEnd()
-
- def _parseScanArgsIntoScannableArgGroups(self, scanargs):
- """
- -> [ Group(scnA, (a1, a2, a2)), Group((scnB), (b1)), ...
- ... Group((scnC),()), Group((scnD),(d1))]
- """
- result = []
- if not isinstance(scanargs[0], Scannable):
- raise TypeError("First scan argument must be a scannable")
-
- # Parse out scannables followed by non-scannable args
- for arg in scanargs:
- if isinstance(arg, Scannable):
- result.append(Scan.Group(arg))
- else:
- result[-1].args.append(arg)
- return result
-
- def _reorderInnerGroupsAccordingToLevel(self, groups):
- # Find the first group not to trigger a loop
- for idx, group in enumerate(groups):
- if not group.shouldTriggerLoop():
- break
- latter = groups[idx:]; latter.sort() # Horrible hack not needed in python 3!
- return groups[:idx] + latter
-
- def _performScan(self, groups, currentRecursionLevel):
- # groups[currentRecursionLevel:] will start with either:
- # a) A loop triggering group
- # b) A number (possibly 0) of non-loop triggering groups
- unprocessedGroups = groups[currentRecursionLevel:]
-
- # 1) If first remaining group should trigger a loop, perform this loop,
- # recursively calling this method on the remaining groups
- if len(unprocessedGroups) > 0:
- first = unprocessedGroups[0]
- # If groups starts with a request to loop:
- if first.shouldTriggerLoop():
- posList = self._frange(first.args[0], first.args[1], first.args[2])
- for pos in posList:
- first.scannable.asynchronousMoveTo(pos)
- # TODO: Should wait. minigda assumes all moves complete immediately
- self._performScan(groups, currentRecursionLevel + 1)
- return
-
- # 2) Move all non-loop triggering groups (may be zero)
- self._moveNonLoopTriggeringGroups(unprocessedGroups)
-
- # 3) Sample position of all scannables
- posDict = self._samplePositionsOfAllScannables(groups)
-
- # 4) Inform the data handlers that this point has been recorded
- for handler in self.dataHandlers: handler.callWithScanPoint(posDict)
-
- def _moveNonLoopTriggeringGroups(self, groups):
- # TODO: Should wait. minigda assumes all moves complete immediately. groups could be zero lengthed.
- for grp in groups:
- if len(grp.args) == 0:
- pass
- elif len(grp.args) == 1:
- grp.scannable.asynchronousMoveTo(grp.args[0])
- elif len(grp.args) == 2:
- raise Exception("Scannables followed by two args not supported by minigda's scan command ")
- else:
- raise Exception("Scannable: %s args%s" % (grp.scannable, str(grp.args)))
-
- def _samplePositionsOfAllScannables(self, groups):
- posDict = {}
- for grp in groups:
- posDict[grp.scannable] = grp.scannable.getPosition()
- return posDict
-
- def _frange(self, limit1, limit2, increment):
- """Range function that accepts floats (and integers).
- """
-# limit1 = float(limit1)
-# limit2 = float(limit2)
- try:
- increment = float(increment)
- except TypeError:
- raise TypeError(
- "Only scaler values are supported, not GDA format vectors.")
- count = int(math.ceil(((limit2 - limit1) + increment / 100.) / increment))
- result = []
- for n in range(count):
- result.append(limit1 + n * increment)
- return result
-
-
-def sim(scn, hkl):
- """sim hkl scn -- simulates moving scannable (not all)
- """
- if not isinstance(hkl, (tuple, list)):
- raise TypeError()
-
- if not allnum(hkl):
- raise TypeError()
-
- try:
- print scn.simulateMoveTo(hkl)
- except AttributeError:
- raise TypeError(
- "The first argument does not support simulated moves")
\ No newline at end of file
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/gdasupport/minigda/scannable.py b/script/__Lib/diffcalc-2.1/diffcalc/gdasupport/minigda/scannable.py
deleted file mode 100755
index f6f9926..0000000
--- a/script/__Lib/diffcalc-2.1/diffcalc/gdasupport/minigda/scannable.py
+++ /dev/null
@@ -1,511 +0,0 @@
-###
-# Copyright 2008-2011 Diamond Light Source Ltd.
-# This file is part of Diffcalc.
-#
-# Diffcalc is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Diffcalc is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Diffcalc. If not, see .
-###
-
-import time
-
-try:
- from gda.device.scannable import ScannableBase
-except ImportError:
- class Scannable(object):
- pass
-
- class ScannableBase(Scannable):
- """Implemtation of a subset of OpenGDA's Scannable interface
- """
-
- level = 5
- inputNames = []
- extraNames = []
- outputFormat = []
-
- def isBusy(self):
- raise NotImplementedError()
-
- def rawGetPosition(self):
- raise NotImplementedError()
-
- def rawAsynchronousMoveTo(self, newpos):
- raise NotImplementedError()
-
- def waitWhileBusy(self):
- while self.isBusy():
- time.sleep(.1)
-
- def getPosition(self):
- return self.rawGetPosition()
-
- def asynchronousMoveTo(self, newpos):
- self.rawAsynchronousMoveTo(newpos)
-
- def atScanStart(self):
- pass
-
- def atScanEnd(self):
- pass
-
- def atCommandFailure(self):
- pass
-
- ###
-
- def __repr__(self):
- pos = self.getPosition()
- formattedValues = self.formatPositionFields(pos)
- if len(tuple(self.getInputNames()) + tuple(self.getExtraNames())) > 1:
- result = self.getName() + ': '
- else:
- result = ''
-
- names = tuple(self.getInputNames()) + tuple(self.getExtraNames())
- for name, val in zip(names, formattedValues):
- result += ' ' + name + ': ' + val
- return result
- ###
-
- def formatPositionFields(self, pos):
- """Returns position as array of formatted strings"""
- # Make sure pos is a tuple or list
- if type(pos) not in (tuple, list):
- pos = tuple([pos])
-
- # Sanity check
- if len(pos) != len(self.getOutputFormat()):
- raise Exception(
- "In scannable '%s':number of position fields differs from "
- "number format strings specified" % self.getName())
-
- result = []
- for field, format in zip(pos, self.getOutputFormat()):
- if field is None:
- result.append('???')
- else:
- s = (format % field)
- ## if width!=None:
- ## s = s.ljust(width)
- result.append(s)
-
- return result
-
- def getName(self):
- return self.name
-
- def setName(self, value):
- self.name = value
-
- def getLevel(self):
- return self.level
-
- def setLevel(self, value):
- self.level = value
-
- def getInputNames(self):
- return self.inputNames
-
- def setInputNames(self, value):
- self.inputNames = value
-
- def getExtraNames(self):
- return self.extraNames
-
- def setExtraNames(self, value):
- self.extraNames = value
-
- def getOutputFormat(self):
- return self.outputFormat
-
- def setOutputFormat(self, value):
- if type(value) not in (tuple, list):
- raise TypeError(
- "%s.setOutputFormat() expects tuple or list; not %s" %
- (self.getName(), str(type(value))))
- self.outputFormat = value
-
- def __call__(self, newpos=None):
- if newpos is None:
- return self.getPosition()
- self.asynchronousMoveTo(newpos)
-
- class ScannableAdapter(Scannable):
- '''Wrap up a Scannable and give it a new name and optionally an offset
- (added to the delegate when reading up and subtracting when setting down
- '''
-
- def __init__(self, delegate_scn, name, offset=0):
- assert len(delegate_scn.getInputNames()) == 1
- assert len(delegate_scn.getExtraNames()) == 0
- self.delegate_scn = delegate_scn
- self.name = name
- self.offset = offset
-
- def __getattr__(self, name):
- return getattr(self.delegate_scn, name)
-
- def getName(self):
- return self.name
-
- def getInputNames(self):
- return [self.name]
-
- def getPosition(self):
- return self.delegate_scn.getPosition() + self.offset
-
- def asynchronousMoveTo(self, newpos):
- self.delegate_scn.asynchronousMoveTo(newpos - self.offset)
-
- def __repr__(self):
- pos = self.getPosition()
- formatted_values = self.delegate_scn.formatPositionFields(pos)
- return self.name + ': ' + formatted_values[0] + ' ' + self.get_hint()
-
- def get_hint(self):
- if self.offset:
- offset_hint = ' + ' if self.offset >= 0 else ' - '
- offset_hint += str(self.offset)
- else:
- offset_hint = ''
- return '(%s%s)' % (self.delegate_scn.name, offset_hint)
-
- def __call__(self, newpos=None):
- if newpos is None:
- return self.getPosition()
- self.asynchronousMoveTo(newpos)
-
-class SingleFieldDummyScannable(ScannableBase):
-
- def __init__(self, name, initial_position=0.):
- self.name = name
- self.inputNames = [name]
- self.outputFormat = ['% 6.4f']
- self.level = 3
- self._current_position = float(initial_position)
-
- def isBusy(self):
- return False
-
- def waitWhileBusy(self):
- return
-
- def asynchronousMoveTo(self, new_position):
- self._current_position = float(new_position)
-
- def getPosition(self):
- return self._current_position
-
-
-class DummyPD(SingleFieldDummyScannable):
- """For compatability with the gda's dummy_pd module"""
- pass
-
-
-class MultiInputExtraFieldsDummyScannable(ScannableBase):
- '''Multi input Dummy PD Class supporting input and extra fields'''
- def __init__(self, name, inputNames, extraNames):
- self.setName(name)
- self.setInputNames(inputNames)
- self.setExtraNames(extraNames)
- self.setOutputFormat(['%6.4f'] * (len(inputNames) + len(extraNames)))
- self.setLevel(3)
- self.currentposition = [0.0] * len(inputNames)
-
- def isBusy(self):
- return 0
-
- def asynchronousMoveTo(self, new_position):
- if type(new_position) == type(1) or type(new_position) == type(1.0):
- new_position = [new_position]
- msg = "Wrong new_position size"
- assert len(new_position) == len(self.currentposition), msg
- for i in range(len(new_position)):
- if new_position[i] != None:
- self.currentposition[i] = float(new_position[i])
-
- def getPosition(self):
- extraValues = range(100, 100 + (len(self.getExtraNames())))
- return self.currentposition + map(float, extraValues)
-
-
-class ZeroInputExtraFieldsDummyScannable(ScannableBase):
- '''Zero input/extra field dummy pd
- '''
- def __init__(self, name):
- self.setName(name)
- self.setInputNames([])
- self.setOutputFormat([])
-
- def isBusy(self):
- return 0
-
- def asynchronousMoveTo(self, new_position):
- pass
-
- def getPosition(self):
- pass
-
-
-class ScannableGroup(ScannableBase):
- """wraps up motors. Simulates motors if non given."""
-
- def __init__(self, name, motorList):
-
- self.setName(name)
- # Set input format
- motorNames = []
- for scn in motorList:
- motorNames.append(scn.getName())
- self.setInputNames(motorNames)
- # Set output format
- format = []
- for motor in motorList:
- format.append(motor.getOutputFormat()[0])
- self.setOutputFormat(format)
- self.__motors = motorList
-
- def asynchronousMoveTo(self, position):
- # if input has any Nones, then replace these with the current positions
- if None in position:
- position = list(position)
- current = self.getPosition()
- for idx, val in enumerate(position):
- if val is None:
- position[idx] = current[idx]
-
- for scn, pos in zip(self.__motors, position):
- scn.asynchronousMoveTo(pos)
-
- def getPosition(self):
- return [scn.getPosition() for scn in self.__motors]
-
- def isBusy(self):
- for scn in self.__motors:
- if scn.isBusy():
- return True
- return False
-
- def configure(self):
- pass
-
-
-class ScannableMotionWithScannableFieldsBase(ScannableBase):
- '''
- This extended version of ScannableMotionBase contains a
- completeInstantiation() method which adds a dictionary of
- MotionScannableParts to an instance. Each part allows one of the
- instances fields to be interacted with like it itself is a scannable.
- Fields are dynamically added to the instance linking to these parts
- allowing dotted access from Jython. They may also be accessed using
- Jython container access methods (via the __getitem__() method). To acess
- them from Jave use the getComponent(name) method.
-
- When moving a part (via either a pos or scan command), the part calls
- the parent to perform the actual task. The parts asynchronousMoveto
- command will call the parent with a list of None values except for the
- field it represents which will be passed the desired position value.
-
- The asynchronousMoveTo method in class that inherats from this base
- class then must handle these Nones. In some cases the method may
- actually be able to move the underlying system assoiciated with one
- field individually from others. If this is not possible the best
- behaviour may be to simply not support this beahviour and exception or
- alternatively to substitute the None values with actual current position
- of parent's scannables associated fields.
-
- ScannableMotionBaseWithMemory() inherats from this calss and provides a
- solution useful for some scenarious: it keeps track of the last position
- moved to, and replaces the Nones in an asynchronousMoveTo request with
- these values. There are a number of dangers associated with this which
- are addressed in that class's documentation, but it provides a way to
- move one axis within a group of non-orthogonal axis while keeping the
- others still.
- '''
- childrenDict = {}
- numInputFields = None
- numExtraFields = None
-
- def completeInstantiation(self):
- '''This method should be called at the end of all user defined
- consructors'''
- # self.validate()
- self.numInputFields = len(self.getInputNames())
- self.numExtraFields = len(self.getExtraNames())
- self.addScannableParts()
- self.autoCompletePartialMoveToTargets = False
- self.positionAtScanStart = None
-
- def setAutoCompletePartialMoveToTargets(self, b):
- self.autoCompletePartialMoveToTargets = b
-
- def atScanStart(self):
- self.positionAtScanStart = self.getPosition()
-
- def atCommandFailure(self):
- self.positionAtScanStart = None
-
- def atScanEnd(self):
- self.positionAtScanStart = None
-
-###
-
- def __repr__(self):
- pos = self.getPosition()
- formattedValues = self.formatPositionFields(pos)
- if len(tuple(self.getInputNames()) + tuple(self.getExtraNames())) > 1:
- result = self.getName() + ': '
- else:
- result = ''
-
- names = tuple(self.getInputNames()) + tuple(self.getExtraNames())
- for name, val in zip(names, formattedValues):
- result += ' ' + name + ': ' + val
- return result
-###
-
- def formatPositionFields(self, pos):
- """Returns position as array of formatted strings"""
- # Make sure pos is a tuple or list
- if type(pos) not in (tuple, list):
- pos = tuple([pos])
-
- # Sanity check
- if len(pos) != len(self.getOutputFormat()):
- raise Exception(
- "In scannable '%s':number of position fields differs from "
- "number format strings specified" % self.getName())
-
- result = []
- for field, format in zip(pos, self.getOutputFormat()):
- if field is None:
- result.append('???')
- else:
- s = (format % field)
-## if width!=None:
-## s = s.ljust(width)
- result.append(s)
-
- return result
-
-###
-
- def addScannableParts(self):
- '''
- Creates an array of MotionScannableParts each of which allows access to
- the scannable's fields. See this class's documentation for more info.
- '''
- self.childrenDict = {}
- # Add parts to access the input fields
- for index in range(len(self.getInputNames())):
- scannableName = self.getInputNames()[index]
- self.childrenDict[scannableName] = self.MotionScannablePart(
- scannableName, index, self, isInputField=1)
-
- # Add parts to access the extra fields
- for index in range(len(self.getExtraNames())):
- scannableName = self.getExtraNames()[index]
- self.childrenDict[scannableName] = self.MotionScannablePart(
- scannableName, index + len(self.getInputNames()),
- self, isInputField=0)
-
- def asynchronousMoveTo(self, newpos):
- if self.autoCompletePartialMoveToTargets:
- newpos = self.completePosition(newpos)
- ScannableBase.asynchronousMoveTo(self, newpos)
-
- def completePosition(self, position):
- '''
- If position contains any null or None values, these are replaced with
- the corresponding fields from the scannables current position and then
- returned.'''
- # Just return position if it does not need padding
- if None not in position:
- return position
- if self.positionAtScanStart is not None:
- basePosition = self.positionAtScanStart
- else:
- basePosition = self.getPosition()[:self.numInputFields]
- for i in range(self.numInputFields):
- if position[i] is None:
- position[i] = basePosition[i]
- return position
-
- def __getattr__(self, name):
- try:
- return self.childrenDict[name]
- except:
- raise AttributeError("No child named:" + name)
-
- def __getitem__(self, key):
- '''Provides container like access from Jython'''
- return self.childrenDict[key]
-
- def getPart(self, name):
- '''Returns the a compnent scannable'''
- return self.childrenDict[name]
-
- class MotionScannablePart(ScannableBase):
- '''
- A scannable to be placed in the parent's childrenDict that allows
- access to the parent's individual fields.'''
-
- def __init__(self, scannableName, index, parentScannable,
- isInputField):
- self.setName(scannableName)
- if isInputField:
- self.setInputNames([scannableName])
- else:
- self.setExtraNames([scannableName])
- self.index = index
- self.parentScannable = parentScannable
- self.setOutputFormat(
- [self.parentScannable.getOutputFormat()[index]])
-
- def isBusy(self):
- return self.parentScannable.isBusy()
-
- def asynchronousMoveTo(self, new_position):
- if self.parentScannable.isBusy():
- raise Exception(
- self.parentScannable.getName() + "." + self.getName() +
- " cannot be moved because " +
- self.parentScannable.getName() + " is already moving")
-
- toMoveTo = [None] * len(self.parentScannable.getInputNames())
- toMoveTo[self.index] = new_position
- self.parentScannable.asynchronousMoveTo(toMoveTo)
-
- def moveTo(self, new_position):
- self.asynchronousMoveTo(new_position)
- self.waitWhileBusy()
-
- def getPosition(self):
- return self.parentScannable.getPosition()[self.index]
-
- def __str__(self):
- return self.__repr__()
-
- def __repr__(self):
- # Get the name of this field
- # (assume its an input field first and correct if wrong)
- name = self.getInputNames()[0]
-
- if name == 'value':
- name = self.getExtraNames()[0]
- parentName = self.parentScannable.getName()
- return parentName + "." + name + " : " + str(self.getPosition())
-
-
-
-
\ No newline at end of file
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/gdasupport/scannable/__init__.py b/script/__Lib/diffcalc-2.1/diffcalc/gdasupport/scannable/__init__.py
deleted file mode 100755
index e69de29..0000000
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/gdasupport/scannable/base.py b/script/__Lib/diffcalc-2.1/diffcalc/gdasupport/scannable/base.py
deleted file mode 100755
index dfa3182..0000000
--- a/script/__Lib/diffcalc-2.1/diffcalc/gdasupport/scannable/base.py
+++ /dev/null
@@ -1,62 +0,0 @@
-###
-# Copyright 2008-2011 Diamond Light Source Ltd.
-# This file is part of Diffcalc.
-#
-# Diffcalc is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Diffcalc is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Diffcalc. If not, see .
-###
-
-try:
- from gda.device.scannable import PseudoDevice
-except ImportError:
- from diffcalc.gdasupport.minigda.scannable import \
- ScannableBase as PseudoDevice
-
-
-class ScannableGroup(PseudoDevice):
-
- def __init__(self, name, motorList):
-
- self.setName(name)
- # Set input format
- motorNames = []
- for scn in motorList:
- motorNames.append(scn.getName())
- self.setInputNames(motorNames)
- # Set output format
- format = []
- for motor in motorList:
- format.append(motor.getOutputFormat()[0])
- self.setOutputFormat(format)
- self.__motors = motorList
-
- def asynchronousMoveTo(self, position):
- # if input has any Nones, then replace these with the current positions
- if None in position:
- position = list(position)
- current = self.getPosition()
- for idx, val in enumerate(position):
- if val is None:
- position[idx] = current[idx]
-
- for scn, pos in zip(self.__motors, position):
- scn.asynchronousMoveTo(pos)
-
- def getPosition(self):
- return [scn.getPosition() for scn in self.__motors]
-
- def isBusy(self):
- for scn in self.__motors:
- if scn.isBusy():
- return True
- return False
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/gdasupport/scannable/diffractometer.py b/script/__Lib/diffcalc-2.1/diffcalc/gdasupport/scannable/diffractometer.py
deleted file mode 100755
index 1d1b993..0000000
--- a/script/__Lib/diffcalc-2.1/diffcalc/gdasupport/scannable/diffractometer.py
+++ /dev/null
@@ -1,126 +0,0 @@
-###
-# Copyright 2008-2011 Diamond Light Source Ltd.
-# This file is part of Diffcalc.
-#
-# Diffcalc is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Diffcalc is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Diffcalc. If not, see .
-###
-
-try:
- from gda.device.scannable import ScannableMotionBase
-except ImportError:
- from diffcalc.gdasupport.minigda.scannable import \
- ScannableBase as ScannableMotionBase
-
-from diffcalc.util import getMessageFromException
-
-# TODO: Split into a base class when making other scannables
-
-
-class DiffractometerScannableGroup(ScannableMotionBase):
- """"
- Wraps up a scannableGroup of axis to tweak the way the resulting
- object is displayed and to add a simulate move to method.
-
- The scannable group should have the same geometry as that expected
- by the diffractometer hardware geometry used in the diffraction
- calculator.
-
- The optional parameter slaveDriver can be used to provide a
- slave_driver. This is useful for triggering a move of an incidental
- axis whose position depends on that of the diffractometer, but whose
- position need not be included in the DiffractometerScannableGroup
- itself. This parameter is exposed as a field and can be set or
- cleared to null at will without effecting the core calculation code.
- """
-
- def __init__(self, name, diffcalc_module, scannableGroup,
- slave_driver=None, hint_generator=None):
- # if motorList is None, will create a dummy __group
- self.diffcalc_module = diffcalc_module
- self.__group = scannableGroup
- self.slave_driver = slave_driver
- self.setName(name)
- self.hint_generator = hint_generator
-
- def getInputNames(self):
- return self.__group.getInputNames()
-
- def getExtraNames(self):
- if self.slave_driver is None:
- return []
- else:
- return self.slave_driver.getScannableNames()
-
- def getOutputFormat(self):
- if self.slave_driver is None:
- slave_formats = []
- else:
- slave_formats = self.slave_driver.getScannableNames()
- return list(self.__group.getOutputFormat()) + slave_formats
-
- def asynchronousMoveTo(self, position):
- self.__group.asynchronousMoveTo(position)
- if self.slave_driver is not None:
- self.slave_driver.triggerAsynchronousMove(position)
-
- def getPosition(self):
- if self.slave_driver is None:
- slave_positions = []
- else:
- slave_positions = self.slave_driver.getPositions()
- return list(self.__group.getPosition()) + list(slave_positions)
-
- def isBusy(self):
- if self.slave_driver is None:
- return self.__group.isBusy()
- else:
- return self.__group.isBusy() or self.slave_driver.isBusy()
-
- def waitWhileBusy(self):
- self.__group.waitWhileBusy()
- if self.slave_driver is not None:
- self.slave_driver.waitWhileBusy()
-
- def simulateMoveTo(self, pos):
- if len(pos) != len(self.getInputNames()):
- raise ValueError('Wrong number of inputs')
- try:
- (hkl, params) = self.diffcalc_module.angles_to_hkl(pos)
- except Exception, e:
- return "Error: %s" % getMessageFromException(e)
- width = max(len(k) for k in params)
-
- lines = ([' ' + 'hkl'.rjust(width) + ' : % 9.4f %.4f %.4f' %
- (hkl[0], hkl[1], hkl[2])])
- lines[-1] = lines[-1] + '\n'
- fmt = ' %' + str(width) + 's : % 9.4f'
- for k in sorted(params):
- lines.append(fmt % (k, params[k]))
- return '\n'.join(lines)
-
- def __repr__(self):
- position = self.getPosition()
- names = list(self.getInputNames()) + list(self.getExtraNames())
- if self.hint_generator is None:
- hint_list = [''] * len(self.getInputNames())
- else:
- hint_list = self.hint_generator()
-
- lines = [self.name + ':']
- width = max(len(k) for k in names)
- fmt = ' %' + str(width) + 's : % 9.4f %s'
- for name, pos, hint in zip(names, position, hint_list):
- lines.append(fmt % (name, pos, hint))
- lines[len(self.getInputNames())] += '\n'
- return '\n'.join(lines)
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/gdasupport/scannable/hkl.py b/script/__Lib/diffcalc-2.1/diffcalc/gdasupport/scannable/hkl.py
deleted file mode 100755
index 12376d2..0000000
--- a/script/__Lib/diffcalc-2.1/diffcalc/gdasupport/scannable/hkl.py
+++ /dev/null
@@ -1,135 +0,0 @@
-###
-# Copyright 2008-2011 Diamond Light Source Ltd.
-# This file is part of Diffcalc.
-#
-# Diffcalc is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Diffcalc is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Diffcalc. If not, see .
-###
-import platform
-
-DEBUG = False
-
-try:
- from gda.device.scannable.scannablegroup import \
- ScannableMotionWithScannableFieldsBase
-except ImportError:
- from diffcalc.gdasupport.minigda.scannable import \
- ScannableMotionWithScannableFieldsBase
-
-from diffcalc.util import getMessageFromException, DiffcalcException
-
-
-class _DynamicDocstringMetaclass(type):
-
- def _get_doc(self):
- return Hkl.dynamic_docstring
-
- __doc__ = property(_get_doc) # @ReservedAssignment
-
-
-class Hkl(ScannableMotionWithScannableFieldsBase):
-
- if platform.system() != 'Java':
- __metaclass__ = _DynamicDocstringMetaclass # TODO: Removed to fix Jython
-
- dynamic_docstring = 'Hkl Scannable'
-
- def _get_doc(self):
- return Hkl.dynamic_docstring
-
- __doc__ = property(_get_doc) # @ReservedAssignment
-
- def __init__(self, name, diffractometerObject, diffcalcObject,
- virtualAnglesToReport=None):
- self.diffhw = diffractometerObject
- self._diffcalc = diffcalcObject
- if type(virtualAnglesToReport) is str:
- virtualAnglesToReport = (virtualAnglesToReport,)
- self.vAngleNames = virtualAnglesToReport
-
- self.setName(name)
- self.setInputNames(['h', 'k', 'l'])
- self.setOutputFormat(['%7.5f'] * 3)
- if self.vAngleNames:
- self.setExtraNames(self.vAngleNames)
- self.setOutputFormat(['%7.5f'] * (3 + len(self.vAngleNames)))
-
- self.completeInstantiation()
- self.setAutoCompletePartialMoveToTargets(True)
- self.dynamic_class_doc = 'Hkl Scannable xyz'
-
- def rawAsynchronousMoveTo(self, hkl):
- if len(hkl) != 3: raise ValueError('Hkl device expects three inputs')
- try:
- (pos, _) = self._diffcalc.hkl_to_angles(hkl[0], hkl[1], hkl[2])
- except DiffcalcException, e:
- if DEBUG:
- raise
- else:
- raise DiffcalcException(e.message)
- self.diffhw.asynchronousMoveTo(pos)
-
- def rawGetPosition(self):
- pos = self.diffhw.getPosition() # a tuple
- (hkl , params) = self._diffcalc.angles_to_hkl(pos)
- result = list(hkl)
- if self.vAngleNames:
- for vAngleName in self.vAngleNames:
- result.append(params[vAngleName])
- return result
-
- def getFieldPosition(self, i):
- return self.getPosition()[i]
-
- def isBusy(self):
- return self.diffhw.isBusy()
-
- def waitWhileBusy(self):
- return self.diffhw.waitWhileBusy()
-
- def simulateMoveTo(self, hkl):
- if type(hkl) not in (list, tuple):
- raise ValueError('Hkl device expects three inputs')
- if len(hkl) != 3:
- raise ValueError('Hkl device expects three inputs')
- (pos, params) = self._diffcalc.hkl_to_angles(hkl[0], hkl[1], hkl[2])
-
- width = max(len(k) for k in (params.keys() + list(self.diffhw.getInputNames())))
- fmt = ' %' + str(width) + 's : % 9.4f'
-
- lines = [self.diffhw.getName() + ' would move to:']
- for idx, name in enumerate(self.diffhw.getInputNames()):
- lines.append(fmt % (name, pos[idx]))
- lines[-1] = lines[-1] + '\n'
- for k in sorted(params):
- lines.append(fmt % (k, params[k]))
- return '\n'.join(lines)
-
- def __str__(self):
- return self.__repr__()
-
- def __repr__(self):
- lines = ['hkl:']
- pos = self.diffhw.getPosition()
- try:
- (hkl, params) = self._diffcalc.angles_to_hkl(pos)
- except Exception, e:
- return "" % getMessageFromException(e)
-
- width = max(len(k) for k in params)
- lines.append(' ' + 'hkl'.rjust(width) + ' : %9.4f %.4f %.4f' % (hkl[0], hkl[1], hkl[2]))
- lines[-1] = lines[-1] + '\n'
- fmt = ' %' + str(width) + 's : % 9.4f'
- for k in sorted(params):
- lines.append(fmt % (k, params[k]))
- return '\n'.join(lines)
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/gdasupport/scannable/mock.py b/script/__Lib/diffcalc-2.1/diffcalc/gdasupport/scannable/mock.py
deleted file mode 100755
index 13871da..0000000
--- a/script/__Lib/diffcalc-2.1/diffcalc/gdasupport/scannable/mock.py
+++ /dev/null
@@ -1,47 +0,0 @@
-###
-# Copyright 2008-2011 Diamond Light Source Ltd.
-# This file is part of Diffcalc.
-#
-# Diffcalc is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Diffcalc is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Diffcalc. If not, see .
-###
-
-try:
- from gda.device.scannable import ScannableMotionBase
-except ImportError:
- from diffcalc.gdasupport.minigda.scannable import \
- ScannableBase as ScannableMotionBase
-
-
-class MockMotor(ScannableMotionBase):
-
- def __init__(self, name='mock'):
- self.pos = 0.0
- self._busy = False
- self.name = name
-
- def asynchronousMoveTo(self, pos):
- self._busy = True
- self.pos = float(pos)
-
- def getPosition(self):
- return self.pos
-
- def isBusy(self):
- return self._busy
-
- def makeNotBusy(self):
- self._busy = False
-
- def getOutputFormat(self):
- return ['%f']
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/gdasupport/scannable/parameter.py b/script/__Lib/diffcalc-2.1/diffcalc/gdasupport/scannable/parameter.py
deleted file mode 100755
index a08e95c..0000000
--- a/script/__Lib/diffcalc-2.1/diffcalc/gdasupport/scannable/parameter.py
+++ /dev/null
@@ -1,45 +0,0 @@
-###
-# Copyright 2008-2011 Diamond Light Source Ltd.
-# This file is part of Diffcalc.
-#
-# Diffcalc is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Diffcalc is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Diffcalc. If not, see .
-###
-
-try:
- from gda.device.scannable import ScannableMotionBase
-except ImportError:
- from diffcalc.gdasupport.minigda.scannable import \
- ScannableBase as ScannableMotionBase
-
-
-class DiffractionCalculatorParameter(ScannableMotionBase):
-
- def __init__(self, name, parameterName, parameter_manager):
-
- self.parameter_manager = parameter_manager
- self.parameterName = parameterName
-
- self.setName(name)
- self.setInputNames([parameterName])
- self.setOutputFormat(['%5.5f'])
- self.setLevel(3)
-
- def asynchronousMoveTo(self, value):
- self.parameter_manager.set_constraint(self.parameterName, value)
-
- def getPosition(self):
- return self.parameter_manager.get_constraint(self.parameterName)
-
- def isBusy(self):
- return False
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/gdasupport/scannable/sim.py b/script/__Lib/diffcalc-2.1/diffcalc/gdasupport/scannable/sim.py
deleted file mode 100755
index 44b2108..0000000
--- a/script/__Lib/diffcalc-2.1/diffcalc/gdasupport/scannable/sim.py
+++ /dev/null
@@ -1,21 +0,0 @@
-'''
-Created on 7 May 2016
-
-@author: walton
-'''
-from diffcalc.util import allnum
-
-def sim(scn, hkl):
- """sim hkl scn -- simulates moving scannable (not all)
- """
- if not isinstance(hkl, (tuple, list)):
- raise TypeError
-
- if not allnum(hkl):
- raise TypeError()
-
- try:
- print scn.simulateMoveTo(hkl)
- except AttributeError:
- raise TypeError(
- "The first argument does not support simulated moves")
\ No newline at end of file
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/gdasupport/scannable/simulation.py b/script/__Lib/diffcalc-2.1/diffcalc/gdasupport/scannable/simulation.py
deleted file mode 100755
index 0255a5f..0000000
--- a/script/__Lib/diffcalc-2.1/diffcalc/gdasupport/scannable/simulation.py
+++ /dev/null
@@ -1,139 +0,0 @@
-###
-# Copyright 2008-2011 Diamond Light Source Ltd.
-# This file is part of Diffcalc.
-#
-# Diffcalc is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Diffcalc is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Diffcalc. If not, see .
-###
-
-import time
-from math import sqrt, pi, exp
-
-try:
- from gda.device.scannable import PseudoDevice
-except ImportError:
- from diffcalc.gdasupport.minigda.scannable import \
- ScannableBase as PseudoDevice
-
-from diffcalc.ub.crystal import CrystalUnderTest
-from diffcalc.hkl.you.calc import youAnglesToHkl
-from diffcalc.hkl.vlieg.calc import vliegAnglesToHkl
-from diffcalc.hkl.you.geometry import calcCHI, calcPHI
-
-TORAD = pi / 180
-TODEG = 180 / pi
-
-
-class Equation(object):
-
- def __call__(self, dh, dk, dl):
- raise Exception('Abstract')
-
- def __str__(self):
- "Abstract equation"
-
-
-class Gaussian(Equation):
-
- def __init__(self, variance):
- self.variance = float(variance)
-
- def __call__(self, dh, dk, dl):
- dr_squared = dh * dh + dk * dk + dl * dl
- return (1 / sqrt(2 * pi * self.variance) *
- exp(-dr_squared / (2 * self.variance)))
-
-
-class SimulatedCrystalCounter(PseudoDevice):
-
- def __init__(self, name, diffractometerScannable, geometryPlugin,
- wavelengthScannable, equation=Gaussian(.01), engine='you'):
- self.setName(name)
- self.setInputNames([name + '_count'])
- self.setOutputFormat(['%7.5f'])
- self.exposureTime = 1
- self.pause = True
- self.diffractometerScannable = diffractometerScannable
- self.geometry = geometryPlugin
- self.wavelengthScannable = wavelengthScannable
- self.equation = equation
- self.engine = engine
-
- self.cut = None
- self.UB = None
- self.chiMissmount = 0.
- self.phiMissmount = 0.
- self.setCrystal('cubic', 1, 1, 1, 90, 90, 90)
-
- def setCrystal(self, name, a, b, c, alpha, beta, gamma):
- self.cut = CrystalUnderTest(name, a, b, c, alpha, beta, gamma)
- self.calcUB()
-
- def setChiMissmount(self, chi):
- self.chiMissmount = chi
- self.calcUB()
-
- def setPhiMissmount(self, phi):
- self.phiMissmount = phi
- self.calcUB()
-
- def calcUB(self):
- CHI = calcCHI(self.chiMissmount * TORAD)
- PHI = calcPHI(self.phiMissmount * TORAD)
- self.UB = CHI * PHI * self.cut.B
-
- def asynchronousMoveTo(self, exposureTime):
- self.exposureTime = exposureTime
- if self.pause:
- time.sleep(exposureTime) # Should not technically block!
-
- def getPosition(self):
- h, k, l = self.getHkl()
- dh, dk, dl = h - round(h), k - round(k), l - round(l)
- count = self.equation(dh, dk, dl)
- #return self.exposureTime, count*self.exposureTime
- return count * self.exposureTime
-
- def getHkl(self):
- pos = self.geometry.physical_angles_to_internal_position(
- self.diffractometerScannable.getPosition())
- pos.changeToRadians()
- wavelength = self.wavelengthScannable.getPosition()
- if self.engine.lower() == 'vlieg':
- return vliegAnglesToHkl(pos, wavelength, self.UB)
- elif self.engine.lower() == 'you':
- return youAnglesToHkl(pos, wavelength, self.UB)
- else:
- raise ValueError(self.engine)
-
- def isBusy(self):
- return False
-
- def __str__(self):
- return self.__repr__()
-
- def __repr__(self):
- s = 'simulated crystal detector: %s\n' % self.getName()
- h, k, l = self.getHkl()
- s += ' h : %f\n' % h
- s += ' k : %f\n' % k
- s += ' l : %f\n' % l
- s += self.cut.__str__() + '\n'
- s += "chi orientation: %s\n" % self.chiMissmount
- s += "phi orientation: %s\n" % self.phiMissmount
- ub = self.UB.tolist()
- s += "UB:\n"
- s += " % 18.13f% 18.13f% 18.12f\n" % (ub[0][0], ub[0][1], ub[0][2])
- s += " % 18.13f% 18.13f% 18.12f\n" % (ub[1][0], ub[1][1], ub[1][2])
- s += " % 18.13f% 18.13f% 18.12f\n" % (ub[2][0], ub[2][1], ub[2][2])
- return s
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/gdasupport/scannable/slave_driver.py b/script/__Lib/diffcalc-2.1/diffcalc/gdasupport/scannable/slave_driver.py
deleted file mode 100755
index cd5ce24..0000000
--- a/script/__Lib/diffcalc-2.1/diffcalc/gdasupport/scannable/slave_driver.py
+++ /dev/null
@@ -1,109 +0,0 @@
-###
-# Copyright 2008-2011 Diamond Light Source Ltd.
-# This file is part of Diffcalc.
-#
-# Diffcalc is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Diffcalc is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Diffcalc. If not, see .
-###
-
-from math import pi, tan, sin, atan, cos, atan2
-
-TORAD = pi / 180
-TODEG = 180 / pi
-
-
-class SlaveScannableDriver(object):
-
- def __init__(self, scannables):
- self.scannables = scannables
-
- def isBusy(self):
- for scn in self.scannables:
- if scn.isBusy():
- return True
- return False
-
- def waitWhileBusy(self):
- for scn in self.scannables:
- scn.waitWhileBusy()
-
- def triggerAsynchronousMove(self, triggerPos):
- nu = self.slaveFromTriggerPos(triggerPos)
- for scn in self.scannables:
- scn.asynchronousMoveTo(nu)
-
- def getPosition(self):
- return self.scannables[0].getPosition()
-
- def slaveFromTriggerPos(self, triggerPos):
- raise Exception("Abstract")
-
- def getScannableNames(self):
- return [scn.name for scn in self.scannables]
-
- def getOutputFormat(self):
- return [list(scn.outputFormat)[0] for scn in self.scannables]
-
- def getPositions(self):
- return [float(scn.getPosition()) for scn in self.scannables]
-
-
-"""
-Based on: Elias Vlieg, "A (2+3)-Type Surface Diffractometer: Mergence of the
-z-axis and (2+2)-Type Geometries", J. Appl. Cryst. (1998). 31. 198-203
-"""
-
-
-class NuDriverForSixCirclePlugin(SlaveScannableDriver):
-
- def slaveFromTriggerPos(self, triggerPos):
-
- alpha, delta, gamma, _, _, _ = triggerPos
- alpha = alpha * TORAD
- delta = delta * TORAD
- gamma = gamma * TORAD
-
- ### Equation16 RHS ###
- rhs = -1 * tan(gamma - alpha) * sin(delta)
- nu = atan(rhs) # -pi/2 <= nu <= pi/2
- return nu * TODEG
-
-
-class NuDriverForWillmottHorizontalGeometry(SlaveScannableDriver):
-
- """
- Based on: Phillip Willmott, "Angle calculations for a (2+3)-type
- diffractometer: focus on area detectors", J. Appl. Cryst. (2011). 44.
- 73-83
- """
-
- def __init__(self, scannables, area_detector=False):
- SlaveScannableDriver.__init__(self, scannables)
- self.area_detector = area_detector
-
- def slaveFromTriggerPos(self, triggerPos):
-
- delta, gamma, omegah, _ = triggerPos
- delta *= TORAD
- gamma *= TORAD
- omegah *= TORAD
- if self.area_detector:
- nu = atan2(sin(delta - omegah), tan(gamma)) # (66)
- else:
- top = -sin(gamma) * sin(omegah)
- bot = (sin(omegah) * cos(gamma) * sin(delta) +
- cos(omegah) * cos(delta))
- nu = atan2(top, bot) # (61)
-
- print 'nu:', nu * TODEG
- return nu * TODEG
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/gdasupport/scannable/vrmlanimator.py b/script/__Lib/diffcalc-2.1/diffcalc/gdasupport/scannable/vrmlanimator.py
deleted file mode 100755
index 9f40441..0000000
--- a/script/__Lib/diffcalc-2.1/diffcalc/gdasupport/scannable/vrmlanimator.py
+++ /dev/null
@@ -1,184 +0,0 @@
-###
-# Copyright 2008-2011 Diamond Light Source Ltd.
-# This file is part of Diffcalc.
-#
-# Diffcalc is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Diffcalc is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Diffcalc. If not, see .
-###
-
-import time
-import threading
-import socket
-PORT = 4567
-
-from gda.device.scannable import ScannableMotionWithScannableFieldsBaseTest
-
-#import scannable.vrmlModelDriver
-#reload(scannable.vrmlModelDriver);from scannable.vrmlModelDriver import \
-# VrmlModelDriver, LinearProfile, MoveThread
-#fc=VrmlModelDriver(
-# 'fc',['alpha','delta','omega', 'chi','phi'], speed=30, host='diamrl5104')
-#alpha = fc.alpha
-#delta = fc.delta
-#omega = fc.omega
-#chi = fc.chi
-#phi = fc.phi
-
-
-def connect_to_socket(host, port):
- print "Connecting to %s on port %d" % (host, port)
- sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
- sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
- sock.connect((host, port))
- print "Connected"
- socketfile = sock.makefile('rw', 0)
- return socketfile
-
-
-class LinearProfile(object):
-
- def __init__(self, v, t_accel, startList, endList):
- assert len(startList) == len(endList)
- self.v = float(v)
- self.start = startList
- self.end = endList
- self.t_accel = t_accel
-
- distances = [e - s for e, s in zip(self.end, self.start)]
- max_distance = max([abs(d) for d in distances])
- if max_distance == 0:
- self.delta_time = 0
- else:
- self.delta_time = abs(max_distance / self.v)
- self.speeds = [d / self.delta_time for d in distances]
- self.start_time = time.time()
-
- def getPosition(self):
- if self.start_time is None:
- return self.start
- if not self.isMoving():
- return self.end
- t = abs(float(time.time() - self.start_time))
- if t > self.delta_time:
- # we are in the deceleration phase (i.e paused for now)
- return self.end
- return [s + v * t for s, v in zip(self.start, self.speeds)]
-
- def isMoving(self):
- return time.time() < self.start_time + self.delta_time + self.t_accel
-
-
-class MoveThread(threading.Thread):
-
- def __init__(self, profile, socketfile, axisNames):
- threading.Thread.__init__(self)
- self.profile = profile
- self.socketfile = socketfile
- self.axisNames = axisNames
-
- def run(self):
- while self.profile.isMoving():
- self.update()
- time.sleep(.1)
- self.update()
-
- def update(self):
- pos = self.profile.getPosition()
- d = dict(zip(map(str, self.axisNames), pos))
- if self.socketfile:
- self.socketfile.write(repr(d) + '\n')
-
-
-class VrmlModelDriver(ScannableMotionWithScannableFieldsBaseTest):
-
- def __init__(self, name, axes_names, host=None, speed=60, t_accel=.1,
- format='%.3f'):
- self.name = name
- self.inputNames = list(axes_names)
- self.extraNames = []
- self.outputFormat = [format] * len(self.inputNames)
- self.completeInstantiation()
- self.__last_target = [0.] * len(self.inputNames)
- self.verbose = False
- self.move_thread = None
- self.speed = speed
- self.host = host
- self.t_accel = t_accel
- self.socketfile = None
- if self.host:
- try:
- self.connect()
- except socket.error:
- print "Failed to connect to %s:%r" % (self.host, PORT)
- print "Connect with: %s.connect()" % self.name
-
- def connect(self):
- self.socketfile = connect_to_socket(self.host, PORT)
- self.rawAsynchronousMoveTo(self.__last_target)
-
- def isBusy(self):
- if self.move_thread is None:
- return False
- return self.move_thread.profile.isMoving()
-
- def rawGetPosition(self):
- if self.move_thread is None:
- return self.__last_target
- else:
- return self.move_thread.profile.getPosition()
-
- def rawAsynchronousMoveTo(self, targetList):
- if self.isBusy():
- raise Exception(self.name + ' is already moving')
- if self.verbose:
- print self.name + ".rawAsynchronousMoveTo(%r)" % targetList
-
- for i, target in enumerate(targetList):
- if target is None:
- targetList[i] = self.__last_target[i]
- profile = LinearProfile(
- self.speed, self.t_accel, self.__last_target, targetList)
- self.move_thread = MoveThread(
- profile, self.socketfile, self.inputNames)
- self.move_thread.start()
- self.__last_target = targetList
-
- def getFieldPosition(self, index):
- return self.getPosition()[index]
-
- def __del__(self):
- self.socketfile.close()
-
-#class TrapezoidProfile(object):
-#
-# def __init__(self, t_accel, v_max, delta_x):
-# self.t_a = t_accel
-# self.v_m = v_max
-# self.delta_x = delta_x
-#
-# self.t_c = (self.X - self.v_m*self.t_a) / self.v_m
-#
-# def x(self, t):
-# if self.t_c <=0:
-# return self.__xshort(t)
-# else:
-# return self.__xlong(t)
-#
-# def __xshort(self, t):
-# delta_t = 2 * sqrt(self.delta_x*self.t_a/self.v_m)
-# if t <= .5*delta_t:
-# return (.5*self.v_m/self.t_a) * t**2
-# else:
-# v_peak = (self.v_m/self.t_a) * .5*delta_t
-# return (t-.5*delta_t)*v_peak - (t-.5*delta_t)**2 ####HERE, bugged
-# self.delta_x/2
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/gdasupport/scannable/wavelength.py b/script/__Lib/diffcalc-2.1/diffcalc/gdasupport/scannable/wavelength.py
deleted file mode 100755
index 52fd925..0000000
--- a/script/__Lib/diffcalc-2.1/diffcalc/gdasupport/scannable/wavelength.py
+++ /dev/null
@@ -1,50 +0,0 @@
-###
-# Copyright 2008-2011 Diamond Light Source Ltd.
-# This file is part of Diffcalc.
-#
-# Diffcalc is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Diffcalc is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Diffcalc. If not, see .
-###
-
-try:
- from gdascripts.pd.dummy_pds import DummyPD
-except ImportError:
- from diffcalc.gdasupport.minigda.scannable import DummyPD
-
-
-class Wavelength(DummyPD):
-
- def __init__(self, name, energyScannable,
- energyScannableMultiplierToGetKeV=1):
- self.energyScannable = energyScannable
- self.energyScannableMultiplierToGetKeV = \
- energyScannableMultiplierToGetKeV
-
- DummyPD.__init__(self, name)
-
- def asynchronousMoveTo(self, pos):
- self.energyScannable.asynchronousMoveTo(
- (12.39842 / pos) / self.energyScannableMultiplierToGetKeV)
-
- def getPosition(self):
- energy = self.energyScannable.getPosition()
- if energy == 0:
- raise Exception(
- "The energy is 0, so no wavelength could be calculated.run_All()")
- return 12.39842 / (energy * self.energyScannableMultiplierToGetKeV)
-
- def isBusy(self):
- return self.energyScannable.isBusy()
-
- def waitWhileBusy(self):
- return self.energyScannable.waitWhileBusy()
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/gdasupport/you.py b/script/__Lib/diffcalc-2.1/diffcalc/gdasupport/you.py
deleted file mode 100755
index 609a344..0000000
--- a/script/__Lib/diffcalc-2.1/diffcalc/gdasupport/you.py
+++ /dev/null
@@ -1,113 +0,0 @@
-from diffcalc.gdasupport.scannable.diffractometer import DiffractometerScannableGroup
-from diffcalc.gdasupport.scannable.hkl import Hkl
-from diffcalc.gdasupport.scannable.simulation import SimulatedCrystalCounter
-from diffcalc.gdasupport.scannable.wavelength import Wavelength
-from diffcalc.gdasupport.scannable.parameter import DiffractionCalculatorParameter
-
-
-from diffcalc.dc import dcyou as _dc
-from diffcalc.dc.help import format_command_help
-reload(_dc)
-from diffcalc.dc.dcyou import * # @UnusedWildImport
-from diffcalc import settings
-
-try:
- import gda # @UnusedImport @UnresolvedImport
- GDA = True
-except:
- GDA = False
-
-if not GDA:
- from diffcalc.gdasupport.minigda import command
- _pos = command.Pos()
- _scan = command.Scan(command.ScanDataPrinter())
-
- def pos(*args):
- """
- pos show position of all Scannables
- pos scn show position of scn
- pos scn targetmove scn to target (a number)
- """
- return _pos(*args)
-
- def scan(*args):
- """
- scan scn start stop step {scn {target}} {det t}
- """
- return _scan(*args)
-
-
-from diffcalc.gdasupport.scannable.sim import sim # @UnusedImport
-
-_scn_group = settings.axes_scannable_group
-_diff_scn_name = settings.geometry.name # @UndefinedVariable
-_energy_scannable = settings.energy_scannable
-
-
-# Create diffractometer scannable
-_diff_scn = DiffractometerScannableGroup(_diff_scn_name, _dc, _scn_group)
-globals()[_diff_scn_name] = _diff_scn
-
-# Create hkl scannables
-hkl = Hkl('hkl', _scn_group, _dc)
-h = hkl.h
-k = hkl.k
-l = hkl.l
-
-Hkl.dynamic_docstring = format_command_help(hkl_commands_for_help) # must be on the class
-ub.__doc__ = format_command_help(ub_commands_for_help)
-
-_virtual_angles = ('theta', 'qaz', 'alpha', 'naz', 'tau', 'psi', 'beta')
-hklverbose = Hkl('hklverbose', _scn_group, _dc, _virtual_angles)
-
-
-# Create wavelength scannable
-wl = Wavelength(
- 'wl', _energy_scannable, settings.energy_scannable_multiplier_to_get_KeV)
-if not GDA:
- wl.asynchronousMoveTo(1) # Angstrom
-_energy_scannable.level = 3
-wl.level = 3
-
-
-# Create simulated counter timer
-ct = SimulatedCrystalCounter('ct', _scn_group, settings.geometry, wl)
-ct.level = 10
-
-
-# Create constraint scannables
-def _create_constraint_scannable(con_name, scn_name=None):
- if not scn_name:
- scn_name = con_name
- return DiffractionCalculatorParameter(
- scn_name, con_name, _dc.constraint_manager)
-
-# Detector constraints
-def isconstrainable(name):
- return not constraint_manager.is_constraint_fixed(name)
-
-if isconstrainable('delta'): delta_con = _create_constraint_scannable('delta', 'delta_con')
-if isconstrainable('gam'): gam_con = _create_constraint_scannable('gam', 'gam_con')
-if isconstrainable('qaz'): qaz = _create_constraint_scannable('qaz')
-if isconstrainable('naz'): naz = _create_constraint_scannable('naz')
-
-# Reference constraints
-alpha = _create_constraint_scannable('alpha')
-beta = _create_constraint_scannable('beta')
-psi = _create_constraint_scannable('psi')
-a_eq_b = 'a_eq_b'
-
-# Sample constraints
-if isconstrainable('mu'): mu_con = _create_constraint_scannable('mu', 'mu_con')
-if isconstrainable('eta'): eta_con = _create_constraint_scannable('eta', 'eta_con')
-if isconstrainable('chi'): chi_con = _create_constraint_scannable('chi', 'chi_con')
-if isconstrainable('phi'): phi_con = _create_constraint_scannable('phi', 'phi_con')
-if isconstrainable('mu') and isconstrainable('gam'): mu_is_gam = 'mu_is_gam'
-
-
-# Cleanup to allow "from gdasupport.you import *"
-del DiffractometerScannableGroup, Hkl, SimulatedCrystalCounter
-del Wavelength, DiffractionCalculatorParameter
-
-# Cleanup other cruft
-del format_command_help
\ No newline at end of file
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/hardware.py b/script/__Lib/diffcalc-2.1/diffcalc/hardware.py
deleted file mode 100755
index 274feaf..0000000
--- a/script/__Lib/diffcalc-2.1/diffcalc/hardware.py
+++ /dev/null
@@ -1,382 +0,0 @@
-###
-# Copyright 2008-2011 Diamond Light Source Ltd.
-# This file is part of Diffcalc.
-#
-# Diffcalc is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Diffcalc is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Diffcalc. If not, see .
-###
-
-from __future__ import absolute_import
-
-from diffcalc.util import DiffcalcException
-from diffcalc import settings
-
-SMALL = 1e-8
-
-from diffcalc.util import command
-
-__all__ = ['hardware', 'setcut', 'setmin', 'setmax']
-
-
-def getNameFromScannableOrString(o):
- try: # it may be a scannable
- return o.getName()
- except AttributeError:
- return str(o)
-
-
-
-@command
-def hardware():
- """hardware -- show diffcalc limits and cuts"""
- print settings.hardware.repr_sector_limits_and_cuts() # @UndefinedVariable
-
-@command
-def setcut(scannable_or_string=None, val=None):
- """setcut {name {val}} -- sets cut angle
- """
- if scannable_or_string is None and val is None:
- print settings.hardware.repr_sector_limits_and_cuts() # @UndefinedVariable
- else:
- name = getNameFromScannableOrString(scannable_or_string)
- if val is None:
- print '%s: %f' % (name, settings.hardware.get_cuts()[name]) # @UndefinedVariable
- else:
- oldcut = settings.hardware.get_cuts()[name] # @UndefinedVariable
- settings.hardware.set_cut(name, float(val)) # @UndefinedVariable
- newcut = settings.hardware.get_cuts()[name] # @UndefinedVariable
-
-@command
-def setmin(name=None, val=None):
- """setmin {axis {val}} -- set lower limits used by auto sector code (None to clear)""" #@IgnorePep8
- _setMinOrMax(name, val, settings.hardware.set_lower_limit) # @UndefinedVariable
-
-@command
-def setmax(name=None, val=None):
- """setmax {name {val}} -- sets upper limits used by auto sector code (None to clear)""" #@IgnorePep8
- _setMinOrMax(name, val, settings.hardware.set_upper_limit) # @UndefinedVariable
-
-@command
-def setrange(name=None, lower=None, upper=None):
- """setrange {axis {min} {max}} -- set lower and upper limits used by auto sector code (None to clear)""" #@IgnorePep8
- _setMinOrMax(name, lower, settings.hardware.set_lower_limit) # @UndefinedVariable
- _setMinOrMax(name, upper, settings.hardware.set_upper_limit) # @UndefinedVariable
-
-def _setMinOrMax(name, val, setMethod):
- if name is None:
- print settings.hardware.repr_sector_limits_and_cuts() # @UndefinedVariable
- else:
- name = getNameFromScannableOrString(name)
- if val is None:
- print settings.hardware.repr_sector_limits_and_cuts(name) # @UndefinedVariable
- else:
- setMethod(name, float(val))
-
-
-commands_for_help = ['Hardware',
- hardware,
- setcut,
- setmin,
- setmax]
-
-
-class HardwareAdapter(object):
-
- def __init__(self, diffractometerAngleNames, defaultCuts={},
- energyScannableMultiplierToGetKeV=1):
-
- self._diffractometerAngleNames = diffractometerAngleNames
- self._upperLimitDict = {}
- self._lowerLimitDict = {}
- self._cut_angles = {}
- self._configure_cuts(defaultCuts)
- self.energyScannableMultiplierToGetKeV = \
- energyScannableMultiplierToGetKeV
- self._name = 'base'
-
- @property
- def name(self):
- return self._name
-
- def get_axes_names(self):
- return tuple(self._diffractometerAngleNames)
-
- def get_position(self):
- """pos = get_position() -- returns the current physical diffractometer
- position as a diffcalc.util object in degrees
- """
- raise NotImplementedError()
-
- def get_wavelength(self):
- """wavelength = get_wavelength() -- returns wavelength in Angstroms
- """
- return 12.39842 / self.get_energy()
-
- def get_energy(self):
- """energy = get_energy() -- returns energy in kEv """
- raise NotImplementedError()
-
- def __str__(self):
- s = self.name + ":\n"
- s += " energy : " + str(self.get_energy()) + " keV\n"
- s += " wavelength : " + str(self.get_wavelength()) + " Angstrom\n"
- names = self._diffractometerAngleNames
- for name, pos in zip(names, self.get_position()):
- s += " %s : %r deg\n" % (name, pos)
- return s
-
- def __repr__(self):
- return self.__str__()
-
- def get_position_by_name(self, angleName):
- names = list(self._diffractometerAngleNames)
- return self.get_position()[names.index(angleName)]
-
-### Limits ###
-
- def get_lower_limit(self, name):
- '''returns lower limits by axis name. Limit may be None if not set
- '''
- if name not in self._diffractometerAngleNames:
- raise ValueError("No angle called %s. Try one of: %s" %
- (name, self._diffractometerAngleNames))
- return self._lowerLimitDict.get(name)
-
- def get_upper_limit(self, name):
- '''returns upper limit by axis name. Limit may be None if not set
- '''
- if name not in self._diffractometerAngleNames:
- raise ValueError("No angle called %s. Try one of: %s" %
- name, self._diffractometerAngleNames)
- return self._upperLimitDict.get(name)
-
- def set_lower_limit(self, name, value):
- """value may be None to remove limit"""
- if name not in self._diffractometerAngleNames:
- raise ValueError(
- "Cannot set lower Diffcalc limit: No angle called %s. Try one "
- "of: %s" % (name, self._diffractometerAngleNames))
- if value is None:
- try:
- del self._lowerLimitDict[name]
- except KeyError:
- print ("WARNING: There was no lower Diffcalc limit %s set to "
- "clear" % name)
- else:
- self._lowerLimitDict[name] = value
-
- def set_upper_limit(self, name, value):
- """value may be None to remove limit"""
- if name not in self._diffractometerAngleNames:
- raise ValueError(
- "Cannot set upper Diffcalc limit: No angle called %s. Try one "
- "of: %s" % (name, self._diffractometerAngleNames))
- if value is None:
- try:
- del self._upperLimitDict[name]
- except KeyError:
- print ("WARNING: There was no upper Diffcalc limit %s set to "
- "clear" % name)
- else:
- self._upperLimitDict[name] = value
-
- def is_position_within_limits(self, positionArray):
- """
- where position array is in degrees and cut to be between -180 and 180
- """
- names = self._diffractometerAngleNames
- for axis_name, value in zip(names, positionArray):
- if not self.is_axis_value_within_limits(axis_name, value):
- return False
- return True
-
- def is_axis_value_within_limits(self, axis_name, value):
- if axis_name in self._upperLimitDict:
- if value > self._upperLimitDict[axis_name]:
- return False
- if axis_name in self._lowerLimitDict:
- if value < self._lowerLimitDict[axis_name]:
- return False
- return True
-
- def repr_sector_limits_and_cuts(self, name=None):
- if name is None:
- s = ''
- for name in self.get_axes_names():
- s += self.repr_sector_limits_and_cuts(name) + '\n'
- s += "Note: When auto sector/transforms are used,\n "
- s += " cuts are applied before checking limits."
- return s
- # limits:
- low = self.get_lower_limit(name)
- high = self.get_upper_limit(name)
- s = ' '
- if low is not None:
- s += "% 6.1f <= " % low
- else:
- s += ' ' * 10
- s += '%5s' % name
- if high is not None:
- s += " <= % 6.1f" % high
- else:
- s += ' ' * 10
- # cuts:
- try:
- if self.get_cuts()[name] is not None:
- s += " (cut: % 6.1f)" % self.get_cuts()[name]
- except KeyError:
- pass
-
- return s
-
-### Cutting Stuff ###
-
- def _configure_cuts(self, defaultCutsDict):
- # 1. Set default cut angles
- self._cut_angles = dict.fromkeys(self._diffractometerAngleNames, -180.)
- if 'phi' in self._cut_angles:
- self._cut_angles['phi'] = 0.
- # 2. Overide with user-specified cuts
- for name, val in defaultCutsDict.iteritems():
- self.set_cut(name, val)
-
- def set_cut(self, name, value):
- if name in self._cut_angles:
- self._cut_angles[name] = value
- else:
- raise KeyError("Diffractometer has no angle %s. Try: %s." %
- (name, self._diffractometerAngleNames))
-
- def get_cuts(self):
- return self._cut_angles
-
- def cut_angles(self, positionArray):
- '''Assumes each angle in positionArray is between -360 and 360
- '''
- cutArray = []
- names = self._diffractometerAngleNames
- for axis_name, value in zip(names, positionArray):
- cutArray.append(self.cut_angle(axis_name, value))
- return tuple(cutArray)
-
- def cut_angle(self, axis_name, value):
- cut_angle = self._cut_angles[axis_name]
- if cut_angle is None:
- return value
- return cut_angle_at(cut_angle, value)
-
-
-def cut_angle_at(cut_angle, value):
- if (cut_angle == 0 and (abs(value - 360) < SMALL) or
- (abs(value + 360) < SMALL) or
- (abs(value) < SMALL)):
- value = 0.
- if value < (cut_angle - SMALL):
- return value + 360.
- elif value >= cut_angle + 360. + SMALL:
- return value - 360.
- else:
- return value
-
-
-class DummyHardwareAdapter(HardwareAdapter):
-
- def __init__(self, diffractometerAngleNames):
- super(self.__class__, self).__init__(diffractometerAngleNames)
-# HardwareAdapter.__init__(self, diffractometerAngleNames)
-
- self._position = [0.] * len(diffractometerAngleNames)
- self._wavelength = 1.
- self.energyScannableMultiplierToGetKeV = 1
- self._name = "Dummy"
-
-# Required methods
-
- def get_position(self):
- """
- pos = getDiffractometerPosition() -- returns the current physical
- diffractometer position as a list in degrees
- """
- return self._position
-
- def _set_position(self, pos):
- assert len(pos) == len(self.get_axes_names()), \
- "Wrong length of input list"
- self._position = pos
-
- position = property(get_position, _set_position)
-
- def get_energy(self):
- """energy = get_energy() -- returns energy in kEv """
- if self._wavelength is None:
- raise DiffcalcException(
- "Energy or wavelength have not been set")
- return (12.39842 /
- (self._wavelength * self.energyScannableMultiplierToGetKeV))
-
- def _set_energy(self, energy):
- self._wavelength = 12.39842 / energy
-
- energy = property(get_energy, _set_energy)
-
- def get_wavelength(self):
- """wavelength = get_wavelength() -- returns wavelength in Angstroms"""
- if self._wavelength is None:
- raise DiffcalcException(
- "Energy or wavelength have not been set")
- return self._wavelength
-
- def _set_wavelength(self, wavelength):
- self._wavelength = wavelength
-
- wavelength = property(get_wavelength, _set_wavelength)
-
-
-class ScannableHardwareAdapter(HardwareAdapter):
-
- def __init__(self, diffractometerScannable, energyScannable,
- energyScannableMultiplierToGetKeV=1):
- input_names = diffractometerScannable.getInputNames()
- super(self.__class__, self).__init__(input_names)
-# HardwareAdapter.__init__(self, input_names)
- self.diffhw = diffractometerScannable
- self.energyhw = energyScannable
- self.energyScannableMultiplierToGetKeV = \
- energyScannableMultiplierToGetKeV
- self._name = "ScannableHarwdareMonitor"
-
-# Required methods
-
- def get_position(self):
- """
- pos = getDiffractometerPosition() -- returns the current physical
- diffractometer position as a list in degrees
- """
- return self.diffhw.getPosition()
-
- def get_energy(self):
- """energy = get_energy() -- returns energy in kEv (NOT eV!) """
- multiplier = self.energyScannableMultiplierToGetKeV
- energy = self.energyhw.getPosition() * multiplier
- if energy is None:
- raise DiffcalcException("Energy has not been set")
- return energy
-
- def get_wavelength(self):
- """wavelength = get_wavelength() -- returns wavelength in Angstroms"""
- energy = self.get_energy()
- return 12.39842 / energy
-
- @property
- def name(self):
- return self.diffhw.getName()
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/hkl/__init__.py b/script/__Lib/diffcalc-2.1/diffcalc/hkl/__init__.py
deleted file mode 100755
index e69de29..0000000
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/hkl/calcbase.py b/script/__Lib/diffcalc-2.1/diffcalc/hkl/calcbase.py
deleted file mode 100755
index c4db5f3..0000000
--- a/script/__Lib/diffcalc-2.1/diffcalc/hkl/calcbase.py
+++ /dev/null
@@ -1,155 +0,0 @@
-###
-# Copyright 2008-2011 Diamond Light Source Ltd.
-# This file is part of Diffcalc.
-#
-# Diffcalc is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Diffcalc is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Diffcalc. If not, see .
-###
-
-from math import pi
-
-from diffcalc.util import DiffcalcException, differ
-
-TORAD = pi / 180
-TODEG = 180 / pi
-
-
-class HklCalculatorBase(object):
-
- def __init__(self, ubcalc, geometry, hardware,
- raiseExceptionsIfAnglesDoNotMapBackToHkl=False):
-
- self._ubcalc = ubcalc # to get the UBMatrix, tau and sigma
- self._geometry = geometry # to access information about the
- # diffractometer geometry and mode_selector
- self._hardware = hardware # Used for tracking parameters only
- self.raiseExceptionsIfAnglesDoNotMapBackToHkl = \
- raiseExceptionsIfAnglesDoNotMapBackToHkl
-
- def anglesToHkl(self, pos, wavelength):
- """
- Return hkl tuple and dictionary of all virtual angles in degrees from
- Position in degrees and wavelength in Angstroms.
- """
-
- h, k, l = self._anglesToHkl(pos.inRadians(), wavelength)
- paramDict = self.anglesToVirtualAngles(pos, wavelength)
- return ((h, k, l), paramDict)
-
- def anglesToVirtualAngles(self, pos, wavelength):
- """
- Return dictionary of all virtual angles in degrees from Position object
- in degrees and wavelength in Angstroms.
- """
- anglesDict = self._anglesToVirtualAngles(pos.inRadians(), wavelength)
- for name in anglesDict:
- anglesDict[name] = anglesDict[name] * TODEG
- return anglesDict
-
- def hklToAngles(self, h, k, l, wavelength):
- """
- Return verified Position and all virtual angles in degrees from
- h, k & l and wavelength in Angstroms.
-
- The calculated Position is verified by checking that it maps back using
- anglesToHkl() to the requested hkl value.
-
- Those virtual angles fixed or generated while calculating the position
- are verified by by checking that they map back using
- anglesToVirtualAngles to the virtual angles for the given position.
-
- Throws a DiffcalcException if either check fails and
- raiseExceptionsIfAnglesDoNotMapBackToHkl is True, otherwise displays a
- warning.
- """
-
- # Update tracked parameters. During this calculation parameter values
- # will be read directly from self._parameters instead of via
- # self.getParameter which would trigger another potentially time-costly
- # position update.
- self.parameter_manager.update_tracked()
-
- pos, virtualAngles = self._hklToAngles(h, k, l, wavelength) # in rad
-
- # to degrees:
- pos.changeToDegrees()
-
- for key, val in virtualAngles.items():
- if val is not None:
- virtualAngles[key] = val * TODEG
-
- self._verify_pos_map_to_hkl(h, k, l, wavelength, pos)
-
- virtualAnglesReadback = self._verify_virtual_angles(h, k, l, wavelength, pos, virtualAngles)
-
- return pos, virtualAnglesReadback
-
- def _verify_pos_map_to_hkl(self, h, k, l, wavelength, pos):
- hkl, _ = self.anglesToHkl(pos, wavelength)
- e = 0.001
- if ((abs(hkl[0] - h) > e) or (abs(hkl[1] - k) > e) or
- (abs(hkl[2] - l) > e)):
- s = "ERROR: The angles calculated for hkl=(%f,%f,%f) were %s.\n" % (h, k, l, str(pos))
- s += "Converting these angles back to hkl resulted in hkl="\
- "(%f,%f,%f)" % (hkl[0], hkl[1], hkl[2])
- if self.raiseExceptionsIfAnglesDoNotMapBackToHkl:
- raise DiffcalcException(s)
- else:
- print s
-
- def _verify_virtual_angles(self, h, k, l, wavelength, pos, virtualAngles):
- # Check that the virtual angles calculated/fixed during the hklToAngles
- # those read back from pos using anglesToVirtualAngles
- virtualAnglesReadback = self.anglesToVirtualAngles(pos, wavelength)
- for key, val in virtualAngles.items():
- if val != None: # Some values calculated in some mode_selector
- r = virtualAnglesReadback[key]
- if ((differ(val, r, .00001) and differ(val, r + 360, .00001) and differ(val, r - 360, .00001))):
- s = "ERROR: The angles calculated for hkl=(%f,%f,%f) with"\
- " mode=%s were %s.\n" % (h, k, l, self.repr_mode(), str(pos))
- s += "During verification the virtual angle %s resulting "\
- "from (or set for) this calculation of %f" % (key, val)
- s += "did not match that calculated by "\
- "anglesToVirtualAngles of %f" % virtualAnglesReadback[key]
- if self.raiseExceptionsIfAnglesDoNotMapBackToHkl:
- raise DiffcalcException(s)
- else:
- print s
-
- return virtualAnglesReadback
-
- def repr_mode(self):
- pass
-
-### Collect all math access to context here
-
- def _getUBMatrix(self):
- return self._ubcalc.UB
-
- def _getMode(self):
- return self.mode_selector.getMode()
-
- def _getSigma(self):
- return self._ubcalc.sigma
-
- def _getTau(self):
- return self._ubcalc.tau
-
- def _getParameter(self, name):
- # Does not use context.getParameter as this will trigger a costly
- # parameter collection
- pm = self.parameter_manager
- return pm.getParameterWithoutUpdatingTrackedParemeters(name)
-
- def _getGammaParameterName(self):
- return self._gammaParameterName
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/hkl/common.py b/script/__Lib/diffcalc-2.1/diffcalc/hkl/common.py
deleted file mode 100755
index 0b3c13a..0000000
--- a/script/__Lib/diffcalc-2.1/diffcalc/hkl/common.py
+++ /dev/null
@@ -1,55 +0,0 @@
-###
-# Copyright 2008-2011 Diamond Light Source Ltd.
-# This file is part of Diffcalc.
-#
-# Diffcalc is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Diffcalc is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Diffcalc. If not, see .
-###
-from diffcalc.util import allnum
-
-def getNameFromScannableOrString(o):
- try: # it may be a scannable
- return o.getName()
- except AttributeError:
- return str(o)
- raise TypeError()
-
-
-class DummyParameterManager(object):
-
- def getParameterDict(self):
- return {}
-
- def _setParameter(self, name, value):
- raise KeyError(name)
-
- def _getParameter(self, name):
- raise KeyError(name)
-
- def update_tracked(self):
- pass
-
-
-def sim(self, scn, hkl):
- """sim hkl scn -- simulates moving scannable (not all)
- """
- if not isinstance(hkl, (tuple, list)):
- raise TypeError
-
- if not allnum(hkl):
- raise TypeError()
-
- try:
- print scn.simulateMoveTo(hkl)
- except AttributeError:
- raise TypeError("The first argument does not support simulated moves")
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/hkl/vlieg/__init__.py b/script/__Lib/diffcalc-2.1/diffcalc/hkl/vlieg/__init__.py
deleted file mode 100755
index e69de29..0000000
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/hkl/vlieg/calc.py b/script/__Lib/diffcalc-2.1/diffcalc/hkl/vlieg/calc.py
deleted file mode 100755
index 215e31a..0000000
--- a/script/__Lib/diffcalc-2.1/diffcalc/hkl/vlieg/calc.py
+++ /dev/null
@@ -1,846 +0,0 @@
-###
-# Copyright 2008-2011 Diamond Light Source Ltd.
-# This file is part of Diffcalc.
-#
-# Diffcalc is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Diffcalc is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Diffcalc. If not, see .
-###
-
-from math import pi, asin, acos, sin, cos, sqrt, atan2, fabs, atan
-
-try:
- from numpy import matrix
- from numpy.linalg import norm
-except ImportError:
- from numjy import matrix
- from numjy.linalg import norm
-
-from diffcalc.hkl.calcbase import HklCalculatorBase
-from diffcalc.hkl.vlieg.transform import TransformCInRadians
-from diffcalc.util import dot3, cross3, bound, differ
-from diffcalc.hkl.vlieg.geometry import createVliegMatrices, \
- createVliegsPsiTransformationMatrix, \
- createVliegsSurfaceTransformationMatrices, calcPHI
-from diffcalc.hkl.vlieg.geometry import VliegPosition
-from diffcalc.hkl.vlieg.constraints import VliegParameterManager
-from diffcalc.hkl.vlieg.constraints import ModeSelector
-from diffcalc.ub.calc import PaperSpecificUbCalcStrategy
-
-
-TORAD = pi / 180
-TODEG = 180 / pi
-transformC = TransformCInRadians()
-
-
-PREFER_POSITIVE_CHI_SOLUTIONS = True
-
-I = matrix('1 0 0; 0 1 0; 0 0 1')
-y = matrix('0; 1; 0')
-
-
-def check(condition, ErrorOrStringOrCallable, *args):
- """
- fail = check(condition, ErrorOrString) -- if condition is false raises the
- Exception passed in, or creates one from a string. If a callable function
- is passed in this is called with any args specified and the thing returns
- false.
- """
- # TODO: Remove (really nasty) check function
- if condition == False:
- if callable(ErrorOrStringOrCallable):
- ErrorOrStringOrCallable(*args)
- return False
- elif isinstance(ErrorOrStringOrCallable, str):
- raise Exception(ErrorOrStringOrCallable)
- else: # assume input is an exception
- raise ErrorOrStringOrCallable
- return True
-
-
-def sign(x):
- if x < 0:
- return -1
- else:
- return 1
-
-
-def vliegAnglesToHkl(pos, wavelength, UBMatrix):
- """
- Returns hkl indices from pos object in radians.
- """
- wavevector = 2 * pi / wavelength
-
- # Create transformation matrices
- [ALPHA, DELTA, GAMMA, OMEGA, CHI, PHI] = createVliegMatrices(
- pos.alpha, pos.delta, pos.gamma, pos.omega, pos.chi, pos.phi)
-
- # Create the plane normal vector in the alpha axis coordinate frame
- qa = ((DELTA * GAMMA) - ALPHA.I) * matrix([[0], [wavevector], [0]])
-
- # Transform the plane normal vector from the alpha frame to reciprical
- # lattice frame.
- hkl = UBMatrix.I * PHI.I * CHI.I * OMEGA.I * qa
-
- return hkl[0, 0], hkl[1, 0], hkl[2, 0]
-
-
-class VliegUbCalcStrategy(PaperSpecificUbCalcStrategy):
-
- def calculate_q_phi(self, pos):
-
- [ALPHA, DELTA, GAMMA, OMEGA, CHI, PHI] = createVliegMatrices(
- pos.alpha, pos.delta, pos.gamma, pos.omega, pos.chi, pos.phi)
-
- u1a = (DELTA * GAMMA - ALPHA.I) * y
- u1p = PHI.I * CHI.I * OMEGA.I * u1a
- return u1p
-
-
-class VliegHklCalculator(HklCalculatorBase):
-
- def __init__(self, ubcalc, geometry, hardware,
- raiseExceptionsIfAnglesDoNotMapBackToHkl=True):
- r = raiseExceptionsIfAnglesDoNotMapBackToHkl
- HklCalculatorBase.__init__(self, ubcalc, geometry, hardware,
- raiseExceptionsIfAnglesDoNotMapBackToHkl=r)
- self._gammaParameterName = ({'arm': 'gamma', 'base': 'oopgamma'}
- [self._geometry.gamma_location])
- self.mode_selector = ModeSelector(self._geometry, None,
- self._gammaParameterName)
- self.parameter_manager = VliegParameterManager(
- self._geometry, self._hardware, self.mode_selector,
- self._gammaParameterName)
- self.mode_selector.setParameterManager(self.parameter_manager)
-
- def __str__(self):
- # should list paramemeters and indicate which are used in selected mode
- result = "Available mode_selector:\n"
- result += self.mode_selector.reportAvailableModes()
- result += '\nCurrent mode:\n'
- result += self.mode_selector.reportCurrentMode()
- result += '\n\nParameters:\n'
- result += self.parameter_manager.reportAllParameters()
- return result
-
- def _anglesToHkl(self, pos, wavelength):
- """
- Return hkl tuple from VliegPosition in radians and wavelength in
- Angstroms.
- """
- return vliegAnglesToHkl(pos, wavelength, self._getUBMatrix())
-
- def _anglesToVirtualAngles(self, pos, wavelength):
- """
- Return dictionary of all virtual angles in radians from VliegPosition
- object win radians and wavelength in Angstroms. The virtual angles are:
- Bin, Bout, azimuth and 2theta.
- """
-
- # Create transformation matrices
- [ALPHA, DELTA, GAMMA, OMEGA, CHI, PHI] = createVliegMatrices(
- pos.alpha, pos.delta, pos.gamma, pos.omega, pos.chi, pos.phi)
- [SIGMA, TAU] = createVliegsSurfaceTransformationMatrices(
- self._getSigma() * TORAD, self._getTau() * TORAD)
-
- S = TAU * SIGMA
- y_vector = matrix([[0], [1], [0]])
-
- # Calculate Bin from equation 15:
- surfacenormal_alpha = OMEGA * CHI * PHI * S * matrix([[0], [0], [1]])
- incoming_alpha = ALPHA.I * y_vector
- minusSinBetaIn = dot3(surfacenormal_alpha, incoming_alpha)
- Bin = asin(bound(-minusSinBetaIn))
-
- # Calculate Bout from equation 16:
- # surfacenormal_alpha has just ben calculated
- outgoing_alpha = DELTA * GAMMA * y_vector
- sinBetaOut = dot3(surfacenormal_alpha, outgoing_alpha)
- Bout = asin(bound(sinBetaOut))
-
- # Calculate 2theta from equation 25:
-
- cosTwoTheta = dot3(ALPHA * DELTA * GAMMA * y_vector, y_vector)
- twotheta = acos(bound(cosTwoTheta))
- psi = self._anglesToPsi(pos, wavelength)
-
- return {'Bin': Bin, 'Bout': Bout, 'azimuth': psi, '2theta': twotheta}
-
- def _hklToAngles(self, h, k, l, wavelength):
- """
- Return VliegPosition and virtual angles in radians from h, k & l and
- wavelength in Angstroms. The virtual angles are those fixed or
- generated while calculating the position: Bin, Bout and 2theta; and
- azimuth in four and five circle modes.
- """
-
- if self._getMode().group in ("fourc", "fivecFixedGamma",
- "fivecFixedAlpha"):
- return self._hklToAnglesFourAndFiveCirclesModes(h, k, l,
- wavelength)
- elif self._getMode().group == "zaxis":
- return self._hklToAnglesZaxisModes(h, k, l, wavelength)
- else:
- raise RuntimeError(
- 'The current mode (%s) has an unrecognised group: %s.'
- % (self._getMode().name, self._getMode().group))
-
- def _hklToAnglesFourAndFiveCirclesModes(self, h, k, l, wavelength):
- """
- Return VliegPosition and virtual angles in radians from h, k & l and
- wavelength in Angstrom for four and five circle modes. The virtual
- angles are those fixed or generated while calculating the position:
- Bin, Bout, 2theta and azimuth.
- """
-
- # Results in radians during calculations, returned in degreess
- pos = VliegPosition(None, None, None, None, None, None)
-
- # Normalise hkl
- wavevector = 2 * pi / wavelength
- hklNorm = matrix([[h], [k], [l]]) / wavevector
-
- # Compute hkl in phi axis coordinate frame
- hklPhiNorm = self._getUBMatrix() * hklNorm
-
- # Determine Bin and Bout
- if self._getMode().name == '4cPhi':
- Bin = Bout = None
- else:
- Bin, Bout = self._determineBinAndBoutInFourAndFiveCirclesModes(
- hklNorm)
-
- # Determine alpha and gamma
- if self._getMode().group == 'fourc':
- pos.alpha, pos.gamma = \
- self._determineAlphaAndGammaForFourCircleModes(hklPhiNorm)
- else:
- pos.alpha, pos.gamma = \
- self._determineAlphaAndGammaForFiveCircleModes(Bin, hklPhiNorm)
- if pos.alpha < -pi:
- pos.alpha += 2 * pi
- if pos.alpha > pi:
- pos.alpha -= 2 * pi
-
- # Determine delta
- (pos.delta, twotheta) = self._determineDelta(hklPhiNorm, pos.alpha,
- pos.gamma)
-
- # Determine omega, chi & phi
- pos.omega, pos.chi, pos.phi, psi = \
- self._determineSampleAnglesInFourAndFiveCircleModes(
- hklPhiNorm, pos.alpha, pos.delta, pos.gamma, Bin)
- # (psi will be None in fixed phi mode)
-
- # Ensure that by default omega is between -90 and 90, by possibly
- # transforming the sample angles
- if self._getMode().name != '4cPhi': # not in fixed-phi mode
- if pos.omega < -pi / 2 or pos.omega > pi / 2:
- pos = transformC.transform(pos)
-
- # Gather up the virtual angles calculated along the way...
- # -pi pi:
- psi -= 2 * pi
- if psi < (-1 * pi):
- psi += 2 * pi
-
- v = {'2theta': twotheta, 'Bin': Bin, 'Bout': Bout, 'azimuth': psi}
- return pos, v
-
- def _hklToAnglesZaxisModes(self, h, k, l, wavelength):
- """
- Return VliegPosition and virtual angles in radians from h, k & l and
- wavelength in Angstroms for z-axis modes. The virtual angles are those
- fixed or generated while calculating the position: Bin, Bout, and
- 2theta.
- """
- # Section 6:
-
- # Results in radians during calculations, returned in degreess
- pos = VliegPosition(None, None, None, None, None, None)
-
- # Normalise hkl
- wavevector = 2 * pi / wavelength
- hkl = matrix([[h], [k], [l]])
- hklNorm = hkl * (1.0 / wavevector)
-
- # Compute hkl in phi axis coordinate frame
- hklPhi = self._getUBMatrix() * hkl
- hklPhiNorm = self._getUBMatrix() * hklNorm
-
- # Determine Chi and Phi (Equation 29):
- pos.phi = -self._getTau() * TORAD
- pos.chi = -self._getSigma() * TORAD
-
- # Equation 30:
- [ALPHA, DELTA, GAMMA, OMEGA, CHI, PHI] = createVliegMatrices(
- None, None, None, None, pos.chi, pos.phi)
- del ALPHA, DELTA, GAMMA, OMEGA
- Hw = CHI * PHI * hklPhi
-
- # Determine Bin and Bout:
- (Bin, Bout) = self._determineBinAndBoutInZaxisModes(
- Hw[2, 0] / wavevector)
-
- # Determine Alpha and Gamma (Equation 32):
- pos.alpha = Bin
- pos.gamma = Bout
-
- # Determine Delta:
- (pos.delta, twotheta) = self._determineDelta(hklPhiNorm, pos.alpha,
- pos.gamma)
-
- # Determine Omega:
- delta = pos.delta
- gamma = pos.gamma
- d1 = (Hw[1, 0] * sin(delta) * cos(gamma) - Hw[0, 0] *
- (cos(delta) * cos(gamma) - cos(pos.alpha)))
- d2 = (Hw[0, 0] * sin(delta) * cos(gamma) + Hw[1, 0] *
- (cos(delta) * cos(gamma) - cos(pos.alpha)))
-
- if fabs(d2) < 1e-30:
- pos.omega = sign(d1) * sign(d2) * pi / 2.0
- else:
- pos.omega = atan2(d1, d2)
-
- # Gather up the virtual angles calculated along the way
- return pos, {'2theta': twotheta, 'Bin': Bin, 'Bout': Bout}
-
-###
-
- def _determineBinAndBoutInFourAndFiveCirclesModes(self, hklNorm):
- """(Bin, Bout) = _determineBinAndBoutInFourAndFiveCirclesModes()"""
- BinModes = ('4cBin', '5cgBin', '5caBin')
- BoutModes = ('4cBout', '5cgBout', '5caBout')
- BeqModes = ('4cBeq', '5cgBeq', '5caBeq')
- azimuthModes = ('4cAzimuth')
- fixedBusingAndLeviWmodes = ('4cFixedw')
-
- # Calculate RHS of equation 20
- # RHS (1/K)(S^-1*U*B*H)_3 where H/K = hklNorm
- UB = self._getUBMatrix()
- [SIGMA, TAU] = createVliegsSurfaceTransformationMatrices(
- self._getSigma() * TORAD, self._getTau() * TORAD)
- #S = SIGMA * TAU
- S = TAU * SIGMA
- RHS = (S.I * UB * hklNorm)[2, 0]
-
- if self._getMode().name in BinModes:
- Bin = self._getParameter('betain')
- check(Bin != None, "The parameter betain must be set for mode %s" %
- self._getMode().name)
- Bin = Bin * TORAD
- sinBout = RHS - sin(Bin)
- check(fabs(sinBout) <= 1, "Could not compute Bout")
- Bout = asin(sinBout)
-
- elif self._getMode().name in BoutModes:
- Bout = self._getParameter('betaout')
- check(Bout != None, "The parameter Bout must be set for mode %s" %
- self._getMode().name)
- Bout = Bout * TORAD
- sinBin = RHS - sin(Bout)
- check(fabs(sinBin) <= 1, "Could not compute Bin")
- Bin = asin(sinBin)
-
- elif self._getMode().name in BeqModes:
- sinBeq = RHS / 2
- check(fabs(sinBeq) <= 1, "Could not compute Bin=Bout")
- Bin = Bout = asin(sinBeq)
-
- elif self._getMode().name in azimuthModes:
- azimuth = self._getParameter('azimuth')
- check(azimuth != None, "The parameter azimuth must be set for "
- "mode %s" % self._getMode().name)
- del azimuth
- # TODO: codeit
- raise NotImplementedError()
-
- elif self._getMode().name in fixedBusingAndLeviWmodes:
- bandlomega = self._getParameter('blw')
- check(bandlomega != None, "The parameter abandlomega must be set "
- "for mode %s" % self._getMode().name)
- del bandlomega
- # TODO: codeit
- raise NotImplementedError()
- else:
- raise RuntimeError("AngleCalculator does not know how to handle "
- "mode %s" % self._getMode().name)
-
- return (Bin, Bout)
-
- def _determineBinAndBoutInZaxisModes(self, Hw3OverK):
- """(Bin, Bout) = _determineBinAndBoutInZaxisModes(HwOverK)"""
- BinModes = ('6czBin')
- BoutModes = ('6czBout')
- BeqModes = ('6czBeq')
-
- if self._getMode().name in BinModes:
- Bin = self._getParameter('betain')
- check(Bin != None, "The parameter betain must be set for mode %s" %
- self._getMode().name)
- Bin = Bin * TORAD
- # Equation 32a:
- Bout = asin(Hw3OverK - sin(Bin))
-
- elif self._getMode().name in BoutModes:
- Bout = self._getParameter('betaout')
- check(Bout != None, "The parameter Bout must be set for mode %s" %
- self._getMode().name)
- Bout = Bout * TORAD
- # Equation 32b:
- Bin = asin(Hw3OverK - sin(Bout))
-
- elif self._getMode().name in BeqModes:
- # Equation 32c:
- Bin = Bout = asin(Hw3OverK / 2)
-
- return (Bin, Bout)
-
-###
-
- def _determineAlphaAndGammaForFourCircleModes(self, hklPhiNorm):
-
- if self._getMode().group == 'fourc':
- alpha = self._getParameter('alpha') * TORAD
- gamma = self._getParameter(self._getGammaParameterName()) * TORAD
- check(alpha != None, "alpha parameter must be set in fourc modes")
- check(gamma != None, "gamma parameter must be set in fourc modes")
- return alpha, gamma
- else:
- raise RuntimeError(
- "determineAlphaAndGammaForFourCirclesModes() "
- "is not appropriate for %s modes" % self._getMode().group)
-
- def _determineAlphaAndGammaForFiveCircleModes(self, Bin, hklPhiNorm):
-
- ## Solve equation 34 for one possible Y, Yo
- # Calculate surface normal in phi frame
- [SIGMA, TAU] = createVliegsSurfaceTransformationMatrices(
- self._getSigma() * TORAD, self._getTau() * TORAD)
- S = TAU * SIGMA
- surfaceNormalPhi = S * matrix([[0], [0], [1]])
- # Compute beta in vector
- BetaVector = matrix([[0], [-sin(Bin)], [cos(Bin)]])
- # Find Yo
- Yo = self._findMatrixToTransformAIntoB(surfaceNormalPhi, BetaVector)
-
- ## Calculate Hv from equation 39
- Z = matrix([[1, 0, 0],
- [0, cos(Bin), sin(Bin)],
- [0, -sin(Bin), cos(Bin)]])
- Hv = Z * Yo * hklPhiNorm
- # Fixed gamma:
- if self._getMode().group == 'fivecFixedGamma':
- gamma = self._getParameter(self._getGammaParameterName())
- check(gamma != None,
- "gamma parameter must be set in fivecFixedGamma modes")
- gamma = gamma * TORAD
- H2 = (hklPhiNorm[0, 0] ** 2 + hklPhiNorm[1, 0] ** 2 +
- hklPhiNorm[2, 0] ** 2)
- a = -(0.5 * H2 * sin(Bin) - Hv[2, 0])
- b = -(1.0 - 0.5 * H2) * cos(Bin)
- c = cos(Bin) * sin(gamma)
- check((b * b + a * a - c * c) >= 0, 'Could not solve for alpha')
- alpha = 2 * atan2(-(b + sqrt(b * b + a * a - c * c)), -(a + c))
-
- # Fixed Alpha:
- elif self._getMode().group == 'fivecFixedAlpha':
- alpha = self._getParameter('alpha')
- check(alpha != None,
- "alpha parameter must be set in fivecFixedAlpha modes")
- alpha = alpha * TORAD
- H2 = (hklPhiNorm[0, 0] ** 2 + hklPhiNorm[1, 0] ** 2 +
- hklPhiNorm[2, 0] ** 2)
- t0 = ((2 * cos(alpha) * Hv[2, 0] - sin(Bin) * cos(alpha) * H2 +
- cos(Bin) * sin(alpha) * H2 - 2 * cos(Bin) * sin(alpha)) /
- (cos(Bin) * 2.0))
- check(abs(t0) <= 1, "Cannot compute gamma: sin(gamma)>1")
- gamma = asin(t0)
- else:
- raise RuntimeError(
- "determineAlphaAndGammaInFiveCirclesModes() is not "
- "appropriate for %s modes" % self._getMode().group)
-
- return (alpha, gamma)
-
-###
-
- def _determineDelta(self, hklPhiNorm, alpha, gamma):
- """
- (delta, twotheta) = _determineDelta(hklPhiNorm, alpha, gamma) --
- computes delta for all modes. Also returns twotheta for sanity
- checking. hklPhiNorm is a 3X1 matrix.
-
- alpha, gamma & delta - in radians.
- h k & l normalised to wavevector and in phi axis coordinates
- """
- h = hklPhiNorm[0, 0]
- k = hklPhiNorm[1, 0]
- l = hklPhiNorm[2, 0]
- # See Vlieg section 5 (with K=1)
- cosdelta = ((1 + sin(gamma) * sin(alpha) - (h * h + k * k + l * l) / 2)
- / (cos(gamma) * cos(alpha)))
- costwotheta = (cos(alpha) * cos(gamma) * bound(cosdelta) -
- sin(alpha) * sin(gamma))
- return (acos(bound(cosdelta)), acos(bound(costwotheta)))
-
- def _determineSampleAnglesInFourAndFiveCircleModes(self, hklPhiNorm, alpha,
- delta, gamma, Bin):
- """
- (omega, chi, phi, psi)=determineNonZAxisSampleAngles(hklPhiNorm, alpha,
- delta, gamma, sigma, tau) where hkl has been normalised by the
- wavevector and is in the phi Axis coordinate frame. All angles in
- radians. hklPhiNorm is a 3X1 matrix
- """
-
- def equation49through59(psi):
- # equation 49 R = (D^-1)*PI*D*Ro
- PSI = createVliegsPsiTransformationMatrix(psi)
- R = D.I * PSI * D * Ro
-
- # eq 57: extract omega from R
- if abs(R[0, 2]) < 1e-20:
- omega = -sign(R[1, 2]) * sign(R[0, 2]) * pi / 2
- else:
- omega = -atan2(R[1, 2], R[0, 2])
-
- # eq 58: extract chi from R
- sinchi = sqrt(pow(R[0, 2], 2) + pow(R[1, 2], 2))
- sinchi = bound(sinchi)
- check(abs(sinchi) <= 1, 'could not compute chi')
- # (there are two roots to this equation, but only the first is also
- # a solution to R33=cos(chi))
- chi = asin(sinchi)
-
- # eq 59: extract phi from R
- if abs(R[2, 0]) < 1e-20:
- phi = sign(R[2, 1]) * sign(R[2, 1]) * pi / 2
- else:
- phi = atan2(-R[2, 1], -R[2, 0])
- return omega, chi, phi
-
- def checkSolution(omega, chi, phi):
- _, _, _, OMEGA, CHI, PHI = createVliegMatrices(
- None, None, None, omega, chi, phi)
- R = OMEGA * CHI * PHI
- RtimesH_phi = R * H_phi
- print ("R*H_phi=%s, Q_alpha=%s" %
- (R * H_phi.tolist(), Q_alpha.tolist()))
- return not differ(RtimesH_phi, Q_alpha, .0001)
-
- # Using Vlieg section 7.2
-
- # Needed througout:
- [ALPHA, DELTA, GAMMA, _, _, _] = createVliegMatrices(
- alpha, delta, gamma, None, None, None)
-
- ## Find Ro, one possible solution to equation 46: R*H_phi=Q_alpha
-
- # Normalise hklPhiNorm (As it is currently normalised only to the
- # wavevector)
- normh = norm(hklPhiNorm)
- check(normh >= 1e-10, "reciprical lattice vector too close to zero")
- H_phi = hklPhiNorm * (1 / normh)
-
- # Create Q_alpha from equation 47, (it comes normalised)
- Q_alpha = ((DELTA * GAMMA) - ALPHA.I) * matrix([[0], [1], [0]])
- Q_alpha = Q_alpha * (1 / norm(Q_alpha))
-
- if self._getMode().name == '4cPhi':
- ### Use the fixed value of phi as the final constraint ###
- phi = self._getParameter('phi') * TORAD
- PHI = calcPHI(phi)
- H_chi = PHI * H_phi
- omega, chi = _findOmegaAndChiToRotateHchiIntoQalpha(H_chi, Q_alpha)
- return (omega, chi, phi, None) # psi = None as not calculated
- else:
- ### Use Bin as the final constraint ###
-
- # Find a solution Ro to Ro*H_phi=Q_alpha
- Ro = self._findMatrixToTransformAIntoB(H_phi, Q_alpha)
-
- ## equation 50: Find a solution D to D*Q=norm(Q)*[[1],[0],[0]])
- D = self._findMatrixToTransformAIntoB(
- Q_alpha, matrix([[1], [0], [0]]))
-
- ## Find psi and create PSI
-
- # eq 54: compute u=D*Ro*S*[[0],[0],[1]], the surface normal in
- # psi frame
- [SIGMA, TAU] = createVliegsSurfaceTransformationMatrices(
- self._getSigma() * TORAD, self._getTau() * TORAD)
- S = TAU * SIGMA
- [u1], [u2], [u3] = (D * Ro * S * matrix([[0], [0], [1]])).tolist()
- # TODO: If u points along 100, then any psi is a solution. Choose 0
- if not differ([u1, u2, u3], [1, 0, 0], 1e-9):
- psi = 0
- omega, chi, phi = equation49through59(psi)
- else:
- # equation 53: V=A*(D^-1)
- V = ALPHA * D.I
- v21 = V[1, 0]
- v22 = V[1, 1]
- v23 = V[1, 2]
- # equation 55
- a = v22 * u2 + v23 * u3
- b = v22 * u3 - v23 * u2
- c = -sin(Bin) - v21 * u1 # TODO: changed sign from paper
-
- # equation 44
- # Try first root:
- def myatan2(y, x):
- if abs(x) < 1e-20 and abs(y) < 1e-20:
- return pi / 2
- else:
- return atan2(y, x)
- psi = 2 * myatan2(-(b - sqrt(b * b + a * a - c * c)), -(a + c))
- #psi = -acos(c/sqrt(a*a+b*b))+atan2(b,a)# -2*pi
- omega, chi, phi = equation49through59(psi)
-
- # if u points along z axis, the psi could have been either 0 or 180
- if (not differ([u1, u2, u3], [0, 0, 1], 1e-9) and
- abs(psi - pi) < 1e-10):
- # Choose 0 to match that read up by angles-to-virtual-angles
- psi = 0.
- # if u points a long
- return (omega, chi, phi, psi)
-
- def _anglesToPsi(self, pos, wavelength):
- """
- pos assumed in radians. -180<= psi <= 180
- """
- # Using Vlieg section 7.2
-
- # Needed througout:
- [ALPHA, DELTA, GAMMA, OMEGA, CHI, PHI] = createVliegMatrices(
- pos.alpha, pos.delta, pos.gamma, pos.omega, pos.chi, pos.phi)
-
- # Solve equation 49 for psi, the rotation of the a reference solution
- # about Qalpha or H_phi##
-
- # Find Ro, the reference solution to equation 46: R*H_phi=Q_alpha
-
- # Create Q_alpha from equation 47, (it comes normalised)
- Q_alpha = ((DELTA * GAMMA) - ALPHA.I) * matrix([[0], [1], [0]])
- Q_alpha = Q_alpha * (1 / norm(Q_alpha))
-
- # Finh H_phi
- h, k, l = self._anglesToHkl(pos, wavelength)
- H_phi = self._getUBMatrix() * matrix([[h], [k], [l]])
- normh = norm(H_phi)
- check(normh >= 1e-10, "reciprical lattice vector too close to zero")
- H_phi = H_phi * (1 / normh)
-
- # Find a solution Ro to Ro*H_phi=Q_alpha
- # This the reference solution with zero azimuth (psi)
- Ro = self._findMatrixToTransformAIntoB(H_phi, Q_alpha)
-
- # equation 48:
- R = OMEGA * CHI * PHI
-
- ## equation 50: Find a solution D to D*Q=norm(Q)*[[1],[0],[0]])
- D = self._findMatrixToTransformAIntoB(Q_alpha, matrix([[1], [0], [0]]))
-
- # solve equation 49 for psi
- # D*R = PSI*D*Ro
- # D*R*(D*Ro)^-1 = PSI
- PSI = D * R * ((D * Ro).I)
-
- # Find psi within PSI as defined in equation 51
- PSI_23 = PSI[1, 2]
- PSI_33 = PSI[2, 2]
- psi = atan2(PSI_23, PSI_33)
-
- #print "PSI: ", PSI.tolist()
- return psi
-
- def _findMatrixToTransformAIntoB(self, a, b):
- """
- Finds a particular matrix Mo that transforms the unit vector a into the
- unit vector b. Thats is it finds Mo Mo*a=b. a and b 3x1 matrixes and Mo
- is a 3x3 matrix.
-
- Throws an exception if this is not possible.
- """
- # Maths from the appendix of "Angle caluculations
- # for a 5-circle diffractometer used for surface X-ray diffraction",
- # E. Vlieg, J.F. van der Veen, J.E. Macdonald and M. Miller, J. of
- # Applied Cryst. 20 (1987) 330.
- # - courtesy of Elias Vlieg again
-
- # equation A2: compute angle xi between vectors a and b
- cosxi = dot3(a, b)
- try:
- cosxi = bound(cosxi)
- except ValueError:
- raise Exception("Could not compute cos(xi), vectors a=%f and b=%f "
- "must be of unit length" % (norm(a), norm(b)))
- xi = acos(cosxi)
-
- # Mo is identity matrix if xi zero (math below would blow up)
- if abs(xi) < 1e-10:
- return I
-
- # equation A3: c=cross(a,b)/sin(xi)
- c = cross3(a, b) * (1 / sin(xi))
-
- # equation A4: find D matrix that transforms a into the frame
- # x = a; y = c x a; z = c. */
- a1 = a[0, 0]
- a2 = a[1, 0]
- a3 = a[2, 0]
- c1 = c[0, 0]
- c2 = c[1, 0]
- c3 = c[2, 0]
- D = matrix([[a1, a2, a3],
- [c2 * a3 - c3 * a2, c3 * a1 - c1 * a3, c1 * a2 - c2 * a1],
- [c1, c2, c3]])
-
- # equation A5: create Xi to rotate by xi about z-axis
- XI = matrix([[cos(xi), -sin(xi), 0],
- [sin(xi), cos(xi), 0],
- [0, 0, 1]])
-
- # eq A6: compute Mo
- return D.I * XI * D
-
-
-def _findOmegaAndChiToRotateHchiIntoQalpha(h_chi, q_alpha):
- """
- (omega, chi) = _findOmegaAndChiToRotateHchiIntoQalpha(H_chi, Q_alpha)
-
- Solves for omega and chi in OMEGA*CHI*h_chi = q_alpha where h_chi and
- q_alpha are 3x1 matrices with unit length. Omega and chi are returned in
- radians.
-
- Throws an exception if this is not possible.
- """
-
- def solve(a, b, c):
- """
- x1,x2 = solve(a , b, c)
- solves for the two solutions to x in equations of the form
- a*sin(x) + b*cos(x) = c
- by using the trigonometric identity
- a*sin(x) + b*cos(x) = a*sin(x)+b*cos(x)=sqrt(a**2+b**2)-sin(x+p)
- where
- p = atan(b/a) + {0 if a>=0
- {pi if a<0
- """
- if a == 0:
- p = pi / 2 if b >= 0 else - pi / 2
- else:
- p = atan(b / a)
- if a < 0:
- p = p + pi
- guts = c / sqrt(a ** 2 + b ** 2)
- if guts < -1:
- guts = -1
- elif guts > 1:
- guts = 1
- left1 = asin(guts)
- left2 = pi - left1
- return (left1 - p, left2 - p)
-
- def ne(a, b):
- """
- shifts a and b in between -pi and pi and tests for near equality
- """
- def shift(a):
- if a > pi:
- return a - 2 * pi
- elif a <= -pi:
- return a + 2 * pi
- else:
- return a
- return abs(shift(a) - shift(b)) < .0000001
-
- # 1. Compute some solutions
- h_chi1 = h_chi[0, 0]
- h_chi2 = h_chi[1, 0]
- h_chi3 = h_chi[2, 0]
- q_alpha1 = q_alpha[0, 0]
- q_alpha2 = q_alpha[1, 0]
- q_alpha3 = q_alpha[2, 0]
-
- try:
- # a) Solve for chi using Equation 3
- chi1, chi2 = solve(-h_chi1, h_chi3, q_alpha3)
-
- # b) Solve for omega Equation 1 and each chi
- B = h_chi1 * cos(chi1) + h_chi3 * sin(chi1)
- eq1omega11, eq1omega12 = solve(h_chi2, B, q_alpha1)
- B = h_chi1 * cos(chi2) + h_chi3 * sin(chi2)
- eq1omega21, eq1omega22 = solve(h_chi2, B, q_alpha1)
-
- # c) Solve for omega Equation 2 and each chi
- A = -h_chi1 * cos(chi1) - h_chi3 * sin(chi1)
- eq2omega11, eq2omega12 = solve(A, h_chi2, q_alpha2)
- A = -h_chi1 * cos(chi2) - h_chi3 * sin(chi2)
- eq2omega21, eq2omega22 = solve(A, h_chi2, q_alpha2)
-
- except ValueError, e:
- raise ValueError(
- str(e) + ":\nProblem in fixed-phi calculation for:\nh_chi: " +
- str(h_chi.tolist()) + " q_alpha: " + str(q_alpha.tolist()))
-
- # 2. Choose values of chi and omega that are solutions to equations 1 and 2
- solutions = []
- # a) Check the chi1 solutions
- print "_findOmegaAndChiToRotateHchiIntoQalpha:"
- if ne(eq1omega11, eq2omega11) or ne(eq1omega11, eq2omega12):
-# print "1: eq1omega11, chi1 = ", eq1omega11, chi1
- solutions.append((eq1omega11, chi1))
- if ne(eq1omega12, eq2omega11) or ne(eq1omega12, eq2omega12):
-# print "2: eq1omega12, chi1 = ", eq1omega12, chi1
- solutions.append((eq1omega12, chi1))
- # b) Check the chi2 solutions
- if ne(eq1omega21, eq2omega21) or ne(eq1omega21, eq2omega22):
-# print "3: eq1omega21, chi2 = ", eq1omega21, chi2
- solutions.append((eq1omega21, chi2))
- if ne(eq1omega22, eq2omega21) or ne(eq1omega22, eq2omega22):
-# print "4: eq1omega22, chi2 = ", eq1omega22, chi2
- solutions.append((eq1omega22, chi2))
-# print solutions
-# print "*"
-
- if len(solutions) == 0:
- e = "h_chi: " + str(h_chi.tolist())
- e += " q_alpha: " + str(q_alpha.tolist())
- e += ("\nchi1:%4f eq1omega11:%4f eq1omega12:%4f eq2omega11:%4f "
- "eq2omega12:%4f" % (chi1 * TODEG, eq1omega11 * TODEG,
- eq1omega12 * TODEG, eq2omega11 * TODEG, eq2omega12 * TODEG))
- e += ("\nchi2:%4f eq1omega21:%4f eq1omega22:%4f eq2omega21:%4f "
- "eq2omega22:%4f" % (chi2 * TODEG, eq1omega21 * TODEG,
- eq1omega22 * TODEG, eq2omega21 * TODEG, eq2omega22 * TODEG))
- raise Exception("Could not find simultaneous solution for this fixed "
- "phi mode problem\n" + e)
-
- if not PREFER_POSITIVE_CHI_SOLUTIONS:
- return solutions[0]
-
- positive_chi_solutions = [sol for sol in solutions if sol[1] > 0]
-
- if len(positive_chi_solutions) == 0:
- print "WARNING: A +ve chi solution was requested, but none were found."
- print " Returning a -ve one. Try the mapper"
- return solutions[0]
-
- if len(positive_chi_solutions) > 1:
- print ("INFO: Multiple +ve chi solutions were found [(omega, chi) ...]"
- " = " + str(positive_chi_solutions))
- print " Returning the first"
-
- return positive_chi_solutions[0]
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/hkl/vlieg/constraints.py b/script/__Lib/diffcalc-2.1/diffcalc/hkl/vlieg/constraints.py
deleted file mode 100755
index 4751bef..0000000
--- a/script/__Lib/diffcalc-2.1/diffcalc/hkl/vlieg/constraints.py
+++ /dev/null
@@ -1,336 +0,0 @@
-###
-# Copyright 2008-2011 Diamond Light Source Ltd.
-# This file is part of Diffcalc.
-#
-# Diffcalc is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Diffcalc is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Diffcalc. If not, see .
-###
-
-from copy import copy
-
-from diffcalc.util import DiffcalcException
-
-
-class Mode(object):
-
- def __init__(self, index, name, group, description, parameterNames,
- implemented=True):
- self.index = index
- self.group = group
- self.name = name
- self.description = description
- self.parameterNames = parameterNames
- self.implemented = implemented
-
- def __repr__(self):
- return "%i) %s" % (self.index, self.description)
-
- def __str__(self):
- return self.__repr__()
-
- def usesParameter(self, name):
- return name in self.parameterNames
-
-
-class ModeSelector(object):
-
- def __init__(self, geometry, parameterManager=None,
- gammaParameterName='gamma'):
- self.parameter_manager = parameterManager
- self._geometry = geometry
- self._gammaParameterName = gammaParameterName
- self._modelist = {} # indexed by non-contiguous mode number
- self._configureAvailableModes()
- self._selectedIndex = 1
-
- def setParameterManager(self, manager):
- """
- Required as a ParameterManager and ModelSelector are mutually tied
- together in practice
- """
- self.parameter_manager = manager
-
- def _configureAvailableModes(self):
-
- gammaName = self._gammaParameterName
-
- ml = self._modelist
-
- ml[0] = Mode(0, '4cFixedw', 'fourc', 'fourc fixed-bandlw',
- ['alpha', gammaName, 'blw'], False)
-
- ml[1] = Mode(1, '4cBeq', 'fourc', 'fourc bisecting',
- ['alpha', gammaName])
-
- ml[2] = Mode(2, '4cBin', 'fourc', 'fourc incoming',
- ['alpha', gammaName, 'betain'])
-
- ml[3] = Mode(3, '4cBout', 'fourc', 'fourc outgoing',
- ['alpha', gammaName, 'betaout'])
-
- ml[4] = Mode(4, '4cAzimuth', 'fourc', 'fourc azimuth',
- ['alpha', gammaName, 'azimuth'], False)
-
- ml[5] = Mode(5, '4cPhi', 'fourc', 'fourc fixed-phi',
- ['alpha', gammaName, 'phi'])
-
- ml[10] = Mode(10, '5cgBeq', 'fivecFixedGamma', 'fivec bisecting',
- [gammaName])
-
- ml[11] = Mode(11, '5cgBin', 'fivecFixedGamma', 'fivec incoming',
- [gammaName, 'betain'])
-
- ml[12] = Mode(12, '5cgBout', 'fivecFixedGamma', 'fivec outgoing',
- [gammaName, 'betaout'])
-
- ml[13] = Mode(13, '5caBeq', 'fivecFixedAlpha', 'fivec bisecting',
- ['alpha'])
-
- ml[14] = Mode(14, '5caBin', 'fivecFixedAlpha', 'fivec incoming',
- ['alpha', 'betain'])
-
- ml[15] = Mode(15, '5caBout', 'fivecFixedAlpha', 'fivec outgoing',
- ['alpha', 'betaout'])
-
- ml[20] = Mode(20, '6czBeq', 'zaxis', 'zaxis bisecting',
- [])
-
- ml[21] = Mode(21, '6czBin', 'zaxis', 'zaxis incoming',
- ['betain'])
-
- ml[22] = Mode(22, '6czBout', 'zaxis', 'zaxiz outgoing',
- ['betaout'])
-
- def setModeByIndex(self, index):
- if index in self._modelist:
- self._selectedIndex = index
- else:
- raise DiffcalcException("mode %r is not defined" % index)
-
- def setModeByName(self, name):
- def findModeWithName(name):
- for index, mode in self._modelist.items():
- if mode.name == name:
- return index, mode
- raise ValueError
-
- try:
- index, mode = findModeWithName(name)
- except ValueError:
- raise DiffcalcException(
- 'Unknown mode. The diffraction calculator supports these '
- 'modeSelector: %s' % self._supportedModes.keys())
- if self._geometry.supports_mode_group(mode.group):
- self._selectedIndex = index
- else:
- raise DiffcalcException(
- "Mode %s not supported for this diffractometer (%s)." %
- (name, self._geometry.name))
-
- def getMode(self):
- return self._modelist[self._selectedIndex]
-
- def reportCurrentMode(self):
- return self.getMode().__str__()
-
- def reportAvailableModes(self):
- result = ''
- indecis = self._modelist.keys()
- indecis.sort()
- for index in indecis:
- mode = self._modelist[index]
- if self._geometry.supports_mode_group(mode.group):
- paramString = ''
- flags = ''
- pm = self.parameter_manager
- for paramName in pm.getUserChangableParametersForMode(mode):
- paramString += paramName + ", "
- if paramString:
- paramString = paramString[:-2] # remove trailing commas
- if not mode.implemented:
- flags += "(Not impl.)"
- result += ('%2i) %-15s (%s) %s\n' % (mode.index,
- mode.description, paramString, flags))
- return result
-
-
-class VliegParameterManager(object):
-
- def __init__(self, geometry, hardware, modeSelector,
- gammaParameterName='gamma'):
- self._geometry = geometry
- self._hardware = hardware
- self._modeSelector = modeSelector
- self._gammaParameterName = gammaParameterName
- self._parameters = {}
- self._defineParameters()
-
- def _defineParameters(self):
- # Set default fixed values (In degrees if angles)
- self._parameters = {}
- self._parameters['alpha'] = 0
- self._parameters[self._gammaParameterName] = 0
- self._parameters['blw'] = None # Busing and Levi omega!
- self._parameters['betain'] = None
- self._parameters['betaout'] = None
- self._parameters['azimuth'] = None
- self._parameters['phi'] = None
-
- self._parameterDisplayOrder = (
- 'alpha', self._gammaParameterName, 'betain', 'betaout', 'azimuth',
- 'phi', 'blw')
- self._trackableParameters = ('alpha', self._gammaParameterName, 'phi')
- self._trackedParameters = []
-
- # Overide parameters that are unchangable for this diffractometer
- for (name, value) in self._geometry.fixed_parameters.items():
- if name not in self._parameters:
- raise RuntimeError(
- "The %s diffractometer geometry specifies a fixed "
- "parameter %s that is not used by the diffractometer "
- "calculator" % (self._geometry.getName, name))
- self._parameters[name] = value
-
- def reportAllParameters(self):
- self.update_tracked()
- result = ''
- for name in self._parameterDisplayOrder:
- flags = ""
- if not self._modeSelector.getMode().usesParameter(name):
- flags += '(not relevant in this mode)'
- if self._geometry.parameter_fixed(name):
- flags += ' (fixed by this diffractometer)'
- if self.isParameterTracked(name):
- flags += ' (tracking hardware)'
- value = self._parameters[name]
- if value is None:
- value = '---'
- else:
- value = float(value)
- result += '%s: %s %s\n' % (name.rjust(8), value, flags)
- return result
-
- def reportParametersUsedInCurrentMode(self):
- self.update_tracked()
- result = ''
- for name in self.getUserChangableParametersForMode(
- self._modeSelector.getMode()):
- flags = ""
- value = self._parameters[name]
- if value is None:
- value = '---'
- else:
- value = float(value)
- if self.isParameterTracked(name):
- flags += ' (tracking hardware)'
- result += '%s: %s %s\n' % (name.rjust(8), value, flags)
- return result
-
- def getUserChangableParametersForMode(self, mode=None):
- """
- (p1,p2...p3) = getUserChangableParametersForMode(mode) returns a list
- of parameters names used in this mode for this diffractometer geometry.
- Checks current mode if no mode specified.
- """
- if mode is None:
- mode = self._mode
- result = []
- for name in self._parameterDisplayOrder:
- if self._isParameterChangeable(name, mode):
- result += [name]
- return result
-
-### Fixed parameters stuff ###
-
- def set_constraint(self, name, value):
- if not name in self._parameters:
- raise DiffcalcException("No fixed parameter %s is used by the "
- "diffraction calculator" % name)
- if self._geometry.parameter_fixed(name):
- raise DiffcalcException(
- "The parameter %s cannot be changed: It has been fixed by the "
- "%s diffractometer geometry"
- % (name, self._geometry.name))
- if self.isParameterTracked(name):
- # for safety and to avoid confusion:
- raise DiffcalcException(
- "Cannot change parameter %s as it is set to track an axis.\n"
- "To turn this off use a command like 'trackalpha 0'." % name)
-
- if not self.isParameterUsedInSelectedMode(name):
- print ("WARNING: The parameter %s is not used in mode %i" %
- (name, self._modeSelector.getMode().index))
- self._parameters[name] = value
-
- def isParameterUsedInSelectedMode(self, name):
- return self._modeSelector.getMode().usesParameter(name)
-
- def getParameterWithoutUpdatingTrackedParemeters(self, name):
- try:
- return self._parameters[name]
- except KeyError:
- raise DiffcalcException("No fixed parameter %s is used by the "
- "diffraction calculator" % name)
-
- def get_constraint(self, name):
- self.update_tracked()
- return self.getParameterWithoutUpdatingTrackedParemeters(name)
-
- def getParameterDict(self):
- self.update_tracked()
- return copy(self._parameters)
-
- @property
- def settable_constraint_names(self):
- """list of all available constraints that have settable values"""
- return sorted(self.getParameterDict().keys())
-
- def setTrackParameter(self, name, switch):
- if not name in self._parameters.keys():
- raise DiffcalcException("No fixed parameter %s is used by the "
- "diffraction calculator" % name)
- if not name in self._trackableParameters:
- raise DiffcalcException("Parameter %s is not trackable" % name)
- if not self._isParameterChangeable(name):
- print ("WARNING: Parameter %s is not used in mode %i" %
- (name, self._mode.index))
- if switch:
- if name not in self._trackedParameters:
- self._trackedParameters.append(name)
- else:
- if name in self._trackedParameters:
- self._trackedParameters.remove(name)
-
- def isParameterTracked(self, name):
- return (name in self._trackedParameters)
-
- def update_tracked(self):
- """Note that the name of a tracked parameter MUST map into the name of
- an external diffractometer angle
- """
- if self._trackedParameters:
- externalAnglePositionArray = self._hardware.get_position()
- externalAngleNames = list(self._hardware.get_axes_names())
- for name in self._trackedParameters:
- self._parameters[name] = \
- externalAnglePositionArray[externalAngleNames.index(name)]
-
- def _isParameterChangeable(self, name, mode=None):
- """
- Returns true if parameter is used in a mode (current mode if none
- specified), AND if it is not locked by the diffractometer geometry
- """
- if mode is None:
- mode = self._modeSelector.getMode()
- return (mode.usesParameter(name) and
- not self._geometry.parameter_fixed(name))
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/hkl/vlieg/geometry.py b/script/__Lib/diffcalc-2.1/diffcalc/hkl/vlieg/geometry.py
deleted file mode 100755
index fc26a83..0000000
--- a/script/__Lib/diffcalc-2.1/diffcalc/hkl/vlieg/geometry.py
+++ /dev/null
@@ -1,523 +0,0 @@
-###
-# Copyright 2008-2011 Diamond Light Source Ltd.
-# This file is part of Diffcalc.
-#
-# Diffcalc is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Diffcalc is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Diffcalc. If not, see .
-###
-
-from math import tan, cos, sin, asin, atan, pi, fabs
-
-try:
- from numpy import matrix
-except ImportError:
- from numjy import matrix
-
-from diffcalc.util import x_rotation, z_rotation, y_rotation
-from diffcalc.util import AbstractPosition
-from diffcalc.util import bound, nearlyEqual
-
-
-TORAD = pi / 180
-TODEG = 180 / pi
-
-
-def calcALPHA(alpha):
- return x_rotation(alpha)
-
-
-def calcDELTA(delta):
- return z_rotation(-delta)
-
-
-def calcGAMMA(gamma):
- return x_rotation(gamma)
-
-
-def calcOMEGA(omega):
- return z_rotation(-omega)
-
-
-def calcCHI(chi):
- return y_rotation(chi)
-
-
-def calcPHI(phi):
- return z_rotation(-phi)
-
-
-def createVliegMatrices(alpha=None, delta=None, gamma=None, omega=None,
- chi=None, phi=None):
-
- ALPHA = None if alpha is None else calcALPHA(alpha)
- DELTA = None if delta is None else calcDELTA(delta)
- GAMMA = None if gamma is None else calcGAMMA(gamma)
- OMEGA = None if omega is None else calcOMEGA(omega)
- CHI = None if chi is None else calcCHI(chi)
- PHI = None if phi is None else calcPHI(phi)
- return ALPHA, DELTA, GAMMA, OMEGA, CHI, PHI
-
-
-def createVliegsSurfaceTransformationMatrices(sigma, tau):
- """[SIGMA, TAU] = createVliegsSurfaceTransformationMatrices(sigma, tau)
- angles in radians
- """
- SIGMA = matrix([[cos(sigma), 0, sin(sigma)],
- [0, 1, 0], \
- [-sin(sigma), 0, cos(sigma)]])
-
- TAU = matrix([[cos(tau), sin(tau), 0],
- [-sin(tau), cos(tau), 0],
- [0, 0, 1]])
- return(SIGMA, TAU)
-
-
-def createVliegsPsiTransformationMatrix(psi):
- """PSI = createPsiTransformationMatrices(psi)
- angles in radians
- """
- return matrix([[1, 0, 0],
- [0, cos(psi), sin(psi)],
- [0, -sin(psi), cos(psi)]])
-
-
-class VliegPosition(AbstractPosition):
- """The position of all six diffractometer axis"""
- def __init__(self, alpha=None, delta=None, gamma=None, omega=None,
- chi=None, phi=None):
- self.alpha = alpha
- self.delta = delta
- self.gamma = gamma
- self.omega = omega
- self.chi = chi
- self.phi = phi
-
- def clone(self):
- return VliegPosition(self.alpha, self.delta, self.gamma, self.omega,
- self.chi, self.phi)
-
- def changeToRadians(self):
- self.alpha *= TORAD
- self.delta *= TORAD
- self.gamma *= TORAD
- self.omega *= TORAD
- self.chi *= TORAD
- self.phi *= TORAD
-
- def changeToDegrees(self):
- self.alpha *= TODEG
- self.delta *= TODEG
- self.gamma *= TODEG
- self.omega *= TODEG
- self.chi *= TODEG
- self.phi *= TODEG
-
- def inRadians(self):
- pos = self.clone()
- pos.changeToRadians()
- return pos
-
- def inDegrees(self):
- pos = self.clone()
- pos.changeToDegrees()
- return pos
-
- def nearlyEquals(self, pos2, maxnorm):
- for a, b in zip(self.totuple(), pos2.totuple()):
- if abs(a - b) > maxnorm:
- return False
- return True
-
- def totuple(self):
- return (self.alpha, self.delta, self.gamma, self.omega,
- self.chi, self.phi)
-
- def __str__(self):
- return ("VliegPosition(alpha %r delta: %r gamma: %r omega: %r chi: %r"
- " phi: %r)" % self.totuple())
-
- def __repr__(self):
- return self.__str__()
-
- def __eq__(self, b):
- return self.nearlyEquals(b, .001)
-
-
-class VliegGeometry(object):
-
-# Required methods
-
- def __init__(self, name, supported_mode_groups, fixed_parameters,
- gamma_location):
- """
- Set geometry name (String), list of supported mode groups (list of
- strings), list of axis names (list of strings). Define the parameters
- e.g. alpha and gamma for a four circle (dictionary). Define wether the
- gamma angle is on the 'arm' or the 'base'; used only by AngleCalculator
- to interpret the gamma parameter in fixed gamma mode: for instruments
- with gamma on the base, rather than on the arm as the code assume
- internally, the two methods physical_angles_to_internal_position and
- internal_position_to_physical_angles must still be used.
- """
- if gamma_location not in ('arm', 'base', None):
- raise RuntimeError(
- "Gamma must be on either 'arm' or 'base' or None")
-
- self.name = name
- self.supported_mode_groups = supported_mode_groups
- self.fixed_parameters = fixed_parameters
- self.gamma_location = gamma_location
-
- def physical_angles_to_internal_position(self, physicalAngles):
- raise NotImplementedError()
-
- def internal_position_to_physical_angles(self, physicalAngles):
- raise NotImplementedError()
-
-### Do not overide these these ###
-
- def supports_mode_group(self, name):
- return name in self.supported_mode_groups
-
- def parameter_fixed(self, name): # parameter_fixed
- return name in self.fixed_parameters.keys()
-
-
-class SixCircleGammaOnArmGeometry(VliegGeometry):
- """
- This six-circle diffractometer geometry simply passes through the
- angles from a six circle diffractometer with the same geometry and
- angle names as those defined in Vliegs's paper defined internally.
- """
-
- def __init__(self):
- VliegGeometry.__init__(
- self,
- name='sixc_gamma_on_arm',
- supported_mode_groups=('fourc', 'fivecFixedGamma',
- 'fivecFixedAlpha', 'zaxis'),
- fixed_parameters={},
- gamma_location='arm')
-
- def physical_angles_to_internal_position(self, physicalAngles):
- """ (a,d,g,o,c,p) = physicalAnglesToInternal(a,d,g,o,c,p)
- """
- assert (len(physicalAngles) == 6), "Wrong length of input list"
- return VliegPosition(*physicalAngles)
-
- def internal_position_to_physical_angles(self, internalPosition):
- """ (a,d,g,o,c,p) = physicalAnglesToInternal(a,d,g,o,c,p)
- """
- return internalPosition.totuple()
-
-
-class SixCircleGeometry(VliegGeometry):
- """
- This six-circle diffractometer geometry simply passes through the
- angles from a six circle diffractometer with the same geometry and
- angle names as those defined in Vliegs's paper defined internally.
- """
-
- def __init__(self):
- VliegGeometry.__init__(
- self,
- name='sixc',
- supported_mode_groups=('fourc', 'fivecFixedGamma',
- 'fivecFixedAlpha', 'zaxis'),
- fixed_parameters={},
- gamma_location='base')
- self.hardwareMonitor = None
-#(deltaA, gammaA) = gammaOnBaseToArm(deltaB, gammaB, alpha) (all in radians)
-#(deltaB, gammaB) = gammaOnArmToBase(deltaA, gammaA, alpha) (all in radians)
-
- def physical_angles_to_internal_position(self, physicalAngles):
- """ (a,d,g,o,c,p) = physicalAnglesToInternal(a,d,g,o,c,p)
- """
- assert (len(physicalAngles) == 6), "Wrong length of input list"
- alpha, deltaB, gammaB, omega, chi, phi = physicalAngles
- (deltaA, gammaA) = gammaOnBaseToArm(
- deltaB * TORAD, gammaB * TORAD, alpha * TORAD)
- return VliegPosition(
- alpha, deltaA * TODEG, gammaA * TODEG, omega, chi, phi)
-
- def internal_position_to_physical_angles(self, internalPosition):
- """ (a,d,g,o,c,p) = physicalAnglesToInternal(a,d,g,o,c,p)
- """
- alpha, deltaA, gammaA, omega, chi, phi = internalPosition.totuple()
- deltaB, gammaB = gammaOnArmToBase(
- deltaA * TORAD, gammaA * TORAD, alpha * TORAD)
- deltaB, gammaB = deltaB * TODEG, gammaB * TODEG
-
- if self.hardwareMonitor is not None:
- gammaName = self.hardwareMonitor.get_axes_names()[2]
- minGamma = self.hardwareMonitor.get_lower_limit(gammaName)
- maxGamma = self.hardwareMonitor.get_upper_limit(gammaName)
-
- if maxGamma is not None:
- if gammaB > maxGamma:
- gammaB = gammaB - 180
- deltaB = 180 - deltaB
- if minGamma is not None:
- if gammaB < minGamma:
- gammaB = gammaB + 180
- deltaB = 180 - deltaB
-
- return alpha, deltaB, gammaB, omega, chi, phi
-
-
-class FivecWithGammaOnBase(SixCircleGeometry):
-
- def __init__(self):
- VliegGeometry.__init__(
- self,
- name='fivec_with_gamma',
- supported_mode_groups=('fourc', 'fivecFixedGamma'),
- fixed_parameters={'alpha': 0.0},
- gamma_location='base')
- self.hardwareMonitor = None
-
- def physical_angles_to_internal_position(self, physicalAngles):
- """ (a,d,g,o,c,p) = physicalAnglesToInternal(d,g,o,c,p)
- """
- assert (len(physicalAngles) == 5), "Wrong length of input list"
- return SixCircleGeometry.physical_angles_to_internal_position(
- self, (0,) + tuple(physicalAngles))
-
- def internal_position_to_physical_angles(self, internalPosition):
- """ (d,g,o,c,p) = physicalAnglesToInternal(a,d,g,o,c,p)
- """
- return SixCircleGeometry.internal_position_to_physical_angles(
- self, internalPosition)[1:]
-
-
-class Fivec(VliegGeometry):
- """
- This five-circle diffractometer geometry is for diffractometers with the
- same geometry and angle names as those defined in Vliegs's paper defined
- internally, but with no out plane detector arm gamma."""
-
- def __init__(self):
- VliegGeometry.__init__(self,
- name='fivec',
- supported_mode_groups=('fourc', 'fivecFixedGamma'),
- fixed_parameters={'gamma': 0.0},
- gamma_location='arm'
- )
-
- def physical_angles_to_internal_position(self, physicalAngles):
- """ (a,d,g,o,c,p) = physicalAnglesToInternal(a,d,g,o,c,p)
- """
- assert (len(physicalAngles) == 5), "Wrong length of input list"
- physicalAngles = tuple(physicalAngles)
- angles = physicalAngles[0:2] + (0.0,) + physicalAngles[2:]
- return VliegPosition(*angles)
-
- def internal_position_to_physical_angles(self, internalPosition):
- """ (a,d,g,o,c,p) = physicalAnglesToInternal(a,d,g,o,c,p)
- """
- sixAngles = internalPosition.totuple()
- return sixAngles[0:2] + sixAngles[3:]
-
-
-class Fourc(VliegGeometry):
- """
- This five-circle diffractometer geometry is for diffractometers with the
- same geometry and angle names as those defined in Vliegs's paper defined
- internally, but with no out plane detector arm gamma."""
-
- def __init__(self):
- VliegGeometry.__init__(self,
- name='fourc',
- supported_mode_groups=('fourc'),
- fixed_parameters={'gamma': 0.0, 'alpha': 0.0},
- gamma_location='arm'
- )
-
- def physical_angles_to_internal_position(self, physicalAngles):
- """ (a,d,g,o,c,p) = physicalAnglesToInternal(a,d,g,o,c,p)
- """
- assert (len(physicalAngles) == 4), "Wrong length of input list"
- physicalAngles = tuple(physicalAngles)
- angles = (0.0, physicalAngles[0], 0.0) + physicalAngles[1:]
- return VliegPosition(*angles)
-
- def internal_position_to_physical_angles(self, internalPosition):
- """ (a,d,g,o,c,p) = physicalAnglesToInternal(a,d,g,o,c,p)
- """
- sixAngles = internalPosition.totuple()
- return sixAngles[1:2] + sixAngles[3:]
-
-
-def sign(x):
- if x < 0:
- return -1
- else:
- return 1
-
-"""
-Based on: Elias Vlieg, "A (2+3)-Type Surface Diffractometer: Mergence of
-the z-axis and (2+2)-Type Geometries", J. Appl. Cryst. (1998). 31.
-198-203
-"""
-
-
-def solvesEq8(alpha, deltaA, gammaA, deltaB, gammaB):
- tol = 1e-6
- return (nearlyEqual(sin(deltaA) * cos(gammaA), sin(deltaB), tol) and
- nearlyEqual(cos(deltaA) * cos(gammaA),
- cos(gammaB - alpha) * cos(deltaB), tol) and
- nearlyEqual(sin(gammaA), sin(gammaB - alpha) * cos(deltaB), tol))
-
-
-GAMMAONBASETOARM_WARNING = '''
-WARNING: This diffractometer has the gamma circle attached to the
- base rather than the end of
- the delta arm as Vlieg's paper defines. A conversion has
- been made from the physical angles to their internal
- representation (gamma-on-base-to-arm). This conversion has
- forced gamma to be positive by applying the mapping:
-
- delta --> 180+delta
- gamma --> 180+gamma.
-
- This should have no adverse effect.
-'''
-
-
-def gammaOnBaseToArm(deltaB, gammaB, alpha):
- """
- (deltaA, gammaA) = gammaOnBaseToArm(deltaB, gammaB, alpha) (all in
- radians)
-
- Maps delta and gamma for an instrument where the gamma circle rests on
- the base to the case where it is on the delta arm.
-
- There are always two possible solutions. To get the second apply the
- transform:
-
- delta --> 180+delta (flip to opposite side of circle)
- gamma --> 180+gamma (flip to opposite side of circle)
-
- This code will return the solution where gamma is between 0 and 180.
- """
-
- ### Equation11 ###
- if fabs(cos(gammaB - alpha)) < 1e-20:
- deltaA1 = sign(tan(deltaB)) * sign(cos(gammaB - alpha)) * pi / 2
- else:
- deltaA1 = atan(tan(deltaB) / cos(gammaB - alpha))
- # ...second root
- if deltaA1 <= 0:
- deltaA2 = deltaA1 + pi
- else:
- deltaA2 = deltaA1 - pi
-
- ### Equation 12 ###
- gammaA1 = asin(bound(cos(deltaB) * sin(gammaB - alpha)))
- # ...second root
- if gammaA1 >= 0:
- gammaA2 = pi - gammaA1
- else:
- gammaA2 = -pi - gammaA1
-
- # Choose the delta solution that fits equations 8
- if solvesEq8(alpha, deltaA1, gammaA1, deltaB, gammaB):
- deltaA, gammaA = deltaA1, gammaA1
- elif solvesEq8(alpha, deltaA2, gammaA1, deltaB, gammaB):
- deltaA, gammaA = deltaA2, gammaA1
- print "gammaOnBaseToArm choosing 2nd delta root (to internal)"
- elif solvesEq8(alpha, deltaA1, gammaA2, deltaB, gammaB):
- print "gammaOnBaseToArm choosing 2nd gamma root (to internal)"
- deltaA, gammaA = deltaA1, gammaA2
- elif solvesEq8(alpha, deltaA2, gammaA2, deltaB, gammaB):
- print "gammaOnBaseToArm choosing 2nd delta root and 2nd gamma root"
- deltaA, gammaA = deltaA2, gammaA2
- else:
- raise RuntimeError(
- "No valid solutions found mapping from gamma-on-base to gamma-on-arm")
-
- return deltaA, gammaA
-
-GAMMAONARMTOBASE_WARNING = '''
- WARNING: This diffractometer has the gamma circle attached to the base
- rather than the end of the delta arm as Vlieg's paper defines.
- A conversion has been made from the internal representation of
- angles to physical angles (gamma-on-arm-to-base). This
- conversion has forced gamma to be positive by applying the
- mapping:
-
- delta --> 180-delta
- gamma --> 180+gamma.
-
- This should have no adverse effect.
-'''
-
-
-def gammaOnArmToBase(deltaA, gammaA, alpha):
- """
- (deltaB, gammaB) = gammaOnArmToBase(deltaA, gammaA, alpha) (all in
- radians)
-
- Maps delta and gamma for an instrument where the gamma circle is on
- the delta arm to the case where it rests on the base.
-
- There are always two possible solutions. To get the second apply the
- transform:
-
- delta --> 180-delta (reflect and flip to opposite side)
- gamma --> 180+gamma (flip to opposite side)
-
- This code will return the solution where gamma is positive, but will
- warn if a sign change was made.
- """
-
- ### Equation 9 ###
- deltaB1 = asin(bound(sin(deltaA) * cos(gammaA)))
- # ...second root:
- if deltaB1 >= 0:
- deltaB2 = pi - deltaB1
- else:
- deltaB2 = -pi - deltaB1
-
- ### Equation 10 ###:
- if fabs(cos(deltaA)) < 1e-20:
- gammaB1 = sign(tan(gammaA)) * sign(cos(deltaA)) * pi / 2 + alpha
- else:
- gammaB1 = atan(tan(gammaA) / cos(deltaA)) + alpha
- #... second root:
- if gammaB1 <= 0:
- gammaB2 = gammaB1 + pi
- else:
- gammaB2 = gammaB1 - pi
-
- ### Choose the solution that fits equation 8 ###
- if (solvesEq8(alpha, deltaA, gammaA, deltaB1, gammaB1) and
- 0 <= gammaB1 <= pi):
- deltaB, gammaB = deltaB1, gammaB1
- elif (solvesEq8(alpha, deltaA, gammaA, deltaB2, gammaB1) and
- 0 <= gammaB1 <= pi):
- deltaB, gammaB = deltaB2, gammaB1
- print "gammaOnArmToBase choosing 2nd delta root (to physical)"
- elif (solvesEq8(alpha, deltaA, gammaA, deltaB1, gammaB2) and
- 0 <= gammaB2 <= pi):
- print "gammaOnArmToBase choosing 2nd gamma root (to physical)"
- deltaB, gammaB = deltaB1, gammaB2
- elif (solvesEq8(alpha, deltaA, gammaA, deltaB2, gammaB2)
- and 0 <= gammaB2 <= pi):
- print "gammaOnArmToBase choosing 2nd delta root and 2nd gamma root"
- deltaB, gammaB = deltaB2, gammaB2
- else:
- raise RuntimeError(
- "No valid solutions found mapping gamma-on-arm to gamma-on-base")
-
- return deltaB, gammaB
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/hkl/vlieg/hkl.py b/script/__Lib/diffcalc-2.1/diffcalc/hkl/vlieg/hkl.py
deleted file mode 100755
index ae05018..0000000
--- a/script/__Lib/diffcalc-2.1/diffcalc/hkl/vlieg/hkl.py
+++ /dev/null
@@ -1,139 +0,0 @@
-###
-# Copyright 2008-2011 Diamond Light Source Ltd.
-# This file is part of Diffcalc.
-#
-# Diffcalc is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Diffcalc is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Diffcalc. If not, see .
-###
-
-from diffcalc.hkl.common import getNameFromScannableOrString
-from diffcalc.util import command
-from diffcalc import settings
-
-
-from diffcalc.ub import ub
-from diffcalc.hkl.vlieg.calc import VliegHklCalculator
-
-
-__all__ = ['hklmode', 'setpar', 'trackalpha', 'trackgamma', 'trackphi',
- 'parameter_manager', 'hklcalc']
-
-
-hklcalc = VliegHklCalculator(ub.ubcalc, settings.geometry, settings.hardware)
-
-parameter_manager = hklcalc.parameter_manager
-
-def __str__(self):
- return hklcalc.__str__()
-
-@command
-def hklmode(num=None):
- """hklmode {num} -- changes mode or shows current and available modes and all settings""" #@IgnorePep8
-
- if num is None:
- print hklcalc.__str__()
- else:
- hklcalc.mode_selector.setModeByIndex(int(num))
- pm = hklcalc.parameter_manager
- print (hklcalc.mode_selector.reportCurrentMode() + "\n" +
- pm.reportParametersUsedInCurrentMode())
-
-def _setParameter(name, value):
- hklcalc.parameter_manager.set_constraint(name, value)
-
-def _getParameter(name):
- return hklcalc.parameter_manager.get_constraint(name)
-
-@command
-def setpar(scannable_or_string=None, val=None):
- """setpar {parameter_scannable {{val}} -- sets or shows a parameter'
- setpar {parameter_name {val}} -- sets or shows a parameter'
- """
-
- if scannable_or_string is None:
- #show all
- parameterDict = hklcalc.parameter_manager.getParameterDict()
- names = parameterDict.keys()
- names.sort()
- for name in names:
- print _representParameter(name)
- else:
- name = getNameFromScannableOrString(scannable_or_string)
- if val is None:
- _representParameter(name)
- else:
- oldval = _getParameter(name)
- _setParameter(name, float(val))
- print _representParameter(name, oldval, float(val))
-
-def _representParameter(name, oldval=None, newval=None):
- flags = ''
- if hklcalc.parameter_manager.isParameterTracked(name):
- flags += '(tracking hardware) '
- if settings.geometry.parameter_fixed(name): # @UndefinedVariable
- flags += '(fixed by geometry) '
- pm = hklcalc.parameter_manager
- if not pm.isParameterUsedInSelectedMode(name):
- flags += '(not relevant in this mode) '
- if oldval is None:
- val = _getParameter(name)
- if val is None:
- val = "---"
- else:
- val = str(val)
- return "%s: %s %s" % (name, val, flags)
- else:
- return "%s: %s --> %f %s" % (name, oldval, newval, flags)
-
-def _checkInputAndSetOrShowParameterTracking(name, b=None):
- """
- for track-parameter commands: If no args displays parameter settings,
- otherwise sets the tracking switch for the given parameter and displays
- settings.
- """
- # set if arg given
- if b is not None:
- hklcalc.parameter_manager.setTrackParameter(name, b)
- # Display:
- lastValue = _getParameter(name)
- if lastValue is None:
- lastValue = "---"
- else:
- lastValue = str(lastValue)
- flags = ''
- if hklcalc.parameter_manager.isParameterTracked(name):
- flags += '(tracking hardware)'
- print "%s: %s %s" % (name, lastValue, flags)
-
-@command
-def trackalpha(b=None):
- """trackalpha {boolean} -- determines wether alpha parameter will track alpha axis""" #@IgnorePep8
- _checkInputAndSetOrShowParameterTracking('alpha', b)
-
-@command
-def trackgamma(b=None):
- """trackgamma {boolean} -- determines wether gamma parameter will track alpha axis""" #@IgnorePep8
- _checkInputAndSetOrShowParameterTracking('gamma', b)
-
-@command
-def trackphi(b=None):
- """trackphi {boolean} -- determines wether phi parameter will track phi axis""" #@IgnorePep8
- _checkInputAndSetOrShowParameterTracking('phi', b)
-
-
-commands_for_help = ['Mode',
- hklmode,
- setpar,
- trackalpha,
- trackgamma,
- trackphi]
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/hkl/vlieg/transform.py b/script/__Lib/diffcalc-2.1/diffcalc/hkl/vlieg/transform.py
deleted file mode 100755
index a41e8b9..0000000
--- a/script/__Lib/diffcalc-2.1/diffcalc/hkl/vlieg/transform.py
+++ /dev/null
@@ -1,480 +0,0 @@
-###
-# Copyright 2008-2011 Diamond Light Source Ltd.
-# This file is part of Diffcalc.
-#
-# Diffcalc is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Diffcalc is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Diffcalc. If not, see .
-###
-
-from diffcalc.util import command
-
-from copy import copy
-from math import pi
-
-from diffcalc.hkl.vlieg.geometry import VliegPosition as P
-
-SMALL = 1e-10
-
-
-class Transform(object):
-
- def transform(self, pos):
- raise RuntimeError('Not implemented')
-
-
-### Transforms, currently for definition and testing the theory only
-
-class TransformC(Transform):
- '''Flip omega, invert chi and flip phi
- '''
- def transform(self, pos):
- pos = pos.clone()
- pos.omega -= 180
- pos.chi *= -1
- pos.phi -= 180
- return pos
-
-
-class TransformB(Transform):
- '''Flip chi, and invert and flip omega
- '''
- def transform(self, pos):
- pos = pos.clone()
- pos.chi -= 180
- pos.omega = 180 - pos.omega
- return pos
-
-
-class TransformA(Transform):
- '''Invert scattering plane: invert delta and omega and flip chi'''
- def transform(self, pos):
- pos = pos.clone()
- pos.delta *= -1
- pos.omega *= -1
- pos.chi -= 180
- return pos
-
-
-class TransformCInRadians(Transform):
- '''
- Flip omega, invert chi and flip phi. Using radians and keeping
- -pi 0:
- pos.omega -= pi
- else:
- pos.omega += pi
- pos.chi *= -1
- pos.phi += pi
- return pos
-
-
-###
-
-transformsFromSector = {
- 0: (),
- 1: ('c',),
- 2: ('a',),
- 3: ('a', 'c'),
- 4: ('b', 'c'),
- 5: ('b',),
- 6: ('a', 'b', 'c'),
- 7: ('a', 'b')
-}
-
-sectorFromTransforms = {}
-for k, v in transformsFromSector.iteritems():
- sectorFromTransforms[v] = k
-
-
-class VliegPositionTransformer(object):
-
- def __init__(self, geometry, hardware, solution_transformer):
- self._geometry = geometry
- self._hardware = hardware
- self._solution_transformer = solution_transformer
- solution_transformer.limitCheckerFunction = self.is_position_within_limits
-
- def transform(self, pos):
- # 1. Choose the correct sector/transforms
- return self._solution_transformer.transformPosition(pos)
-
- def is_position_within_limits(self, position):
- '''where position is Position object in degrees'''
- angleTuple = self._geometry.internal_position_to_physical_angles(position)
- angleTuple = self._hardware.cut_angles(angleTuple)
- return self._hardware.is_position_within_limits(angleTuple)
-
-
-class VliegTransformSelector(object):
- '''All returned angles are between -180. and 180. -180.<=angle<180.
- '''
-### basic sector selection
-
- def __init__(self):
- self.transforms = []
- self.autotransforms = []
- self.autosectors = []
- self.limitCheckerFunction = None # inject
- self.sector = None
- self.setSector(0)
-
- def setSector(self, sector):
- if not 0 <= sector <= 7:
- raise ValueError('%i must between 0 and 7.' % sector)
- self.sector = sector
- self.transforms = list(transformsFromSector[sector])
-
- def setTransforms(self, transformList):
- transformList = list(transformList)
- transformList.sort()
- self.sector = sectorFromTransforms[tuple(transformList)]
- self.transforms = transformList
-
- def addTransorm(self, transformName):
- if transformName not in ('a', 'b', 'c'):
- raise ValueError('%s is not a recognised transform. Try a, b or c'
- % transformName)
- if transformName in self.transforms:
- print "WARNING, transform %s is already selected"
- else:
- self.setTransforms(self.transforms + [transformName])
-
- def removeTransorm(self, transformName):
- if transformName not in ('a', 'b', 'c'):
- raise ValueError('%s is not a recognised transform. Try a, b or c'
- % transformName)
- if transformName in self.transforms:
- new = copy(self.transforms)
- new.remove(transformName)
- self.setTransforms(new)
- else:
- print "WARNING, transform %s was not selected" % transformName
-
- def addAutoTransorm(self, transformOrSector):
- '''
- If input is a string (letter), tags one of the transofrms as being a
- candidate for auto application. If a number, tags a sector as being a
- candidate for auto application, and removes similar tags for any
- transforms (as the two are incompatable).
- '''
- if type(transformOrSector) == str:
- transform = transformOrSector
- if transform not in ('a', 'b', 'c'):
- raise ValueError(
- '%s is not a recognised transform. Try a, b or c' %
- transform)
- if transform not in self.autotransforms:
- self.autosectors = []
- self.autotransforms.append(transform)
- else:
- print "WARNING: %s is already set to auto apply" % transform
- elif type(transformOrSector) == int:
- sector = transformOrSector
- if not 0 <= sector <= 7:
- raise ValueError('%i must between 0 and 7.' % sector)
- if sector not in self.autosectors:
- self.autotransforms = []
- self.autosectors.append(sector)
- else:
- print "WARNING: %i is already set to auto apply" % sector
- else:
- raise ValueError("Input must be 'a', 'b' or 'c', "
- "or 1,2,3,4,5,6 or 7.")
-
- def removeAutoTransform(self, transformOrSector):
- if type(transformOrSector) == str:
- transform = transformOrSector
- if transform not in ('a', 'b', 'c'):
- raise ValueError("%s is not a recognised transform. "
- "Try a, b or c" % transform)
- if transform in self.autotransforms:
- self.autotransforms.remove(transform)
- else:
- print "WARNING: %s is not set to auto apply" % transform
- elif type(transformOrSector) == int:
- sector = transformOrSector
- if not 0 <= sector <= 7:
- raise ValueError('%i must between 0 and 7.' % sector)
- if sector in self.autosectors:
- self.autosectors.remove(sector)
- else:
- print "WARNING: %s is not set to auto apply" % sector
- else:
- raise ValueError("Input must be 'a', 'b' or 'c', "
- "or 1,2,3,4,5,6 or 7.")
-
- def setAutoSectors(self, sectorList):
- for sector in sectorList:
- if not 0 <= sector <= 7:
- raise ValueError('%i must between 0 and 7.' % sector)
- self.autosectors = list(sectorList)
-
- def transformPosition(self, pos):
- pos = self.transformNWithoutCut(self.sector, pos)
- cutpos = self.cutPosition(pos)
- # -180 <= cutpos < 180, NOT the externally applied cuts
- if len(self.autosectors) > 0:
- if self.is_position_within_limits(cutpos):
- return cutpos
- else:
- return self.autoTransformPositionBySector(cutpos)
- if len(self.autotransforms) > 0:
- if self.is_position_within_limits(cutpos):
- return cutpos
- else:
- return self.autoTransformPositionByTransforms(pos)
- #else
- return cutpos
-
- def transformNWithoutCut(self, n, pos):
-
- if n == 0:
- return P(pos.alpha, pos.delta, pos.gamma,
- pos.omega, pos.chi, pos.phi)
- if n == 1:
- return P(pos.alpha, pos.delta, pos.gamma,
- pos.omega - 180., -pos.chi, pos.phi - 180.)
- if n == 2:
- return P(pos.alpha, -pos.delta, pos.gamma,
- -pos.omega, pos.chi - 180., pos.phi)
- if n == 3:
- return P(pos.alpha, -pos.delta, pos.gamma,
- 180. - pos.omega, 180. - pos.chi, pos.phi - 180.)
- if n == 4:
- return P(pos.alpha, pos.delta, pos.gamma,
- -pos.omega, 180. - pos.chi, pos.phi - 180.)
- if n == 5:
- return P(pos.alpha, pos.delta, pos.gamma,
- 180. - pos.omega, pos.chi - 180., pos.phi)
- if n == 6:
- return P(pos.alpha, -pos.delta, pos.gamma,
- pos.omega, -pos.chi, pos.phi - 180.)
- if n == 7:
- return P(pos.alpha, -pos.delta, pos.gamma,
- pos.omega - 180., pos.chi, pos.phi)
- else:
- raise Exception("sector must be between 0 and 7")
-
-### autosector
-
- def hasAutoSectorsOrTransformsToApply(self):
- return len(self.autosectors) > 0 or len(self.autotransforms) > 0
-
- def autoTransformPositionBySector(self, pos):
- okaysectors = []
- okaypositions = []
- for sector in self.autosectors:
- newpos = self.transformNWithoutCut(sector, pos)
- if self.is_position_within_limits(newpos):
- okaysectors.append(sector)
- okaypositions.append(newpos)
- if len(okaysectors) == 0:
- raise Exception(
- "Autosector could not find a sector (from %s) to move %s into "
- "limits." % (self.autosectors, str(pos)))
- if len(okaysectors) > 1:
- print ("WARNING: Autosector found multiple sectors that would "
- "move %s to move into limits: %s" % (str(pos), okaysectors))
-
- print ("INFO: Autosector changed sector from %i to %i" %
- (self.sector, okaysectors[0]))
- self.sector = okaysectors[0]
- return okaypositions[0]
-
- def autoTransformPositionByTransforms(self, pos):
- possibleTransforms = self.createListOfPossibleTransforms()
- okaytransforms = []
- okaypositions = []
- for transforms in possibleTransforms:
- sector = sectorFromTransforms[tuple(transforms)]
- newpos = self.cutPosition(self.transformNWithoutCut(sector, pos))
- if self.is_position_within_limits(newpos):
- okaytransforms.append(transforms)
- okaypositions.append(newpos)
- if len(okaytransforms) == 0:
- raise Exception(
- "Autosector could not find a sector (from %r) to move %r into "
- "limits." % (self.autosectors, pos))
- if len(okaytransforms) > 1:
- print ("WARNING: Autosector found multiple sectors that would "
- "move %s to move into limits: %s" %
- (repr(pos), repr(okaytransforms)))
-
- print ("INFO: Autosector changed selected transforms from %r to %r" %
- (self.transforms, okaytransforms[0]))
- self.setTransforms(okaytransforms[0])
- return okaypositions[0]
-
- def createListOfPossibleTransforms(self):
- def vary(possibleTransforms, name):
- result = []
- for transforms in possibleTransforms:
- # add the original.
- result.append(transforms)
- # add a modified one
- toadd = list(copy(transforms))
- if name in transforms:
- toadd.remove(name)
- else:
- toadd.append(name)
- toadd.sort()
- result.append(toadd)
- return result
- # start with the currently selected list of transforms
- if len(self.transforms) == 0:
- possibleTransforms = [()]
- else:
- possibleTransforms = copy(self.transforms)
-
- for name in self.autotransforms:
- possibleTransforms = vary(possibleTransforms, name)
-
- return possibleTransforms
-
- def is_position_within_limits(self, pos):
- '''where pos os a poistion object in degrees'''
- return self.limitCheckerFunction(pos)
-
- def __repr__(self):
- def createPrefix(transform):
- if transform in self.transforms:
- s = '*on* '
- else:
- s = 'off '
- if len(self.autotransforms) > 0:
- if transform in self.autotransforms:
- s += '*auto*'
- else:
- s += ' '
- return s
- s = 'Transforms/sector:\n'
- s += (' %s (a transform) Invert scattering plane: invert delta and '
- 'omega and flip chi\n' % createPrefix('a'))
- s += (' %s (b transform) Flip chi, and invert and flip omega\n' %
- createPrefix('b'))
- s += (' %s (c transform) Flip omega, invert chi and flip phi\n' %
- createPrefix('c'))
- s += ' Current sector: %i (Spec fourc equivalent)\n' % self.sector
- if len(self.autosectors) > 0:
- s += ' Auto sectors: %s\n' % self.autosectors
- return s
-
- def cutPosition(self, position):
- '''Cuts angles at -180.; moves each argument between -180. and 180.
- '''
- def cut(a):
- if a is None:
- return None
- else:
- if a < (-180. - SMALL):
- return a + 360.
- if a > (180. + SMALL):
- return a - 360.
- return a
- return P(cut(position.alpha), cut(position.delta), cut(position.gamma),
- cut(position.omega), cut(position.chi), cut(position.phi))
-
-
-def getNameFromScannableOrString(o):
- try: # it may be a scannable
- return o.getName()
- except AttributeError:
- return str(o)
-
-
-class TransformCommands(object):
-
- def __init__(self, sector_selector):
- self._sectorSelector = sector_selector
-
- @command
- def transform(self):
- """transform -- show transform configuration"""
- print self._sectorSelector.__repr__()
-
- @command
- def transforma(self, *args):
- """transforma {on|off|auto|manual} -- configure transform A application
- """
- self._transform('transforma', 'a', args)
-
- @command
- def transformb(self, *args):
- """transformb {on|off|auto|manual} -- configure transform B application
- """
- self._transform('transformb', 'b', args)
-
- @command
- def transformc(self, *args):
- """transformc {on|off|auto|manual} -- configure transform C application
- """
-
- self._transform('transformc', 'c', args)
-
- def _transform(self, commandName, transformName, args):
- if len(args) == 0:
- print self._sectorSelector.__repr__()
- return
- # get name
- if len(args) != 1:
- raise TypeError()
- if type(args[0]) is not str:
- raise TypeError()
-
- ss = self._sectorSelector
- if args[0] == 'on':
- ss.addTransorm(transformName)
- elif args[0] == 'off':
- ss.removeTransorm(transformName)
- elif args[0] == 'auto':
- ss.addAutoTransorm(transformName)
- elif args[0] == 'manual':
- ss.removeAutoTransform(transformName)
- else:
- raise TypeError()
- print self._sectorSelector.__repr__()
-
- @command
- def sector(self, sector=None):
- """sector {0-7} -- Select or display sector (a la Spec)
- """
- if sector is None:
- print self._sectorSelector.__repr__()
- else:
- if type(sector) is not int and not (0 <= sector <= 7):
- raise TypeError()
- self._sectorSelector.setSector(sector)
- print self._sectorSelector.__repr__()
-
- @command
- def autosector(self, *args):
- """autosector [None] [0-7] [0-7]... -- Set sectors that might be automatically applied""" #@IgnorePep8
- if len(args) == 0:
- print self._sectorSelector.__repr__()
- elif len(args) == 1 and args[0] is None:
- self._sectorSelector.setAutoSectors([])
- print self._sectorSelector.__repr__()
- else:
- sectorList = []
- for arg in args:
- if type(arg) is not int:
- raise TypeError()
- sectorList.append(arg)
- self._sectorSelector.setAutoSectors(sectorList)
- print self._sectorSelector.__repr__()
-
-
-
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/hkl/willmott/__init__.py b/script/__Lib/diffcalc-2.1/diffcalc/hkl/willmott/__init__.py
deleted file mode 100755
index e69de29..0000000
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/hkl/willmott/calc.py b/script/__Lib/diffcalc-2.1/diffcalc/hkl/willmott/calc.py
deleted file mode 100755
index a8e94ba..0000000
--- a/script/__Lib/diffcalc-2.1/diffcalc/hkl/willmott/calc.py
+++ /dev/null
@@ -1,292 +0,0 @@
-###
-# Copyright 2008-2011 Diamond Light Source Ltd.
-# This file is part of Diffcalc.
-#
-# Diffcalc is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Diffcalc is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Diffcalc. If not, see .
-###
-
-from math import pi, asin, acos, atan2, sin, cos, sqrt
-
-try:
- from numpy import matrix
-except ImportError:
- from numjy import matrix
-
-from diffcalc.log import logging
-from diffcalc.util import bound, AbstractPosition, DiffcalcException,\
- x_rotation, z_rotation
-from diffcalc.hkl.vlieg.geometry import VliegGeometry
-from diffcalc.ub.calc import PaperSpecificUbCalcStrategy
-from diffcalc.hkl.calcbase import HklCalculatorBase
-from diffcalc.hkl.common import DummyParameterManager
-
-logger = logging.getLogger("diffcalc.hkl.willmot.calcwill")
-
-CHOOSE_POSITIVE_GAMMA = True
-
-TORAD = pi / 180
-TODEG = 180 / pi
-I = matrix('1 0 0; 0 1 0; 0 0 1')
-SMALL = 1e-10
-
-TEMPORARY_CONSTRAINTS_DICT_RAD = {'betain': 2 * TORAD}
-
-
-def create_matrices(delta, gamma, omegah, phi):
- return (calc_DELTA(delta), calc_GAMMA(gamma), calc_OMEGAH(omegah),
- calc_PHI(phi))
-
-
-def calc_DELTA(delta):
- return x_rotation(delta) # (39)
-
-
-def calc_GAMMA(gamma):
- return z_rotation(gamma) # (40)
-
-
-def calc_OMEGAH(omegah):
- return x_rotation(omegah) # (41)
-
-
-def calc_PHI(phi):
- return z_rotation(phi) # (42)
-
-
-def angles_to_hkl_phi(delta, gamma, omegah, phi):
- """Calculate hkl matrix in phi frame in units of 2*pi/lambda
- """
- DELTA, GAMMA, OMEGAH, PHI = create_matrices(delta, gamma, omegah, phi)
- H_lab = (GAMMA * DELTA - I) * matrix([[0], [1], [0]]) # (43)
- H_phi = PHI.I * OMEGAH.I * H_lab # (44)
- return H_phi
-
-
-def angles_to_hkl(delta, gamma, omegah, phi, wavelength, UB):
- """Calculate hkl matrix in reprical lattice space in units of 1/Angstrom
- """
- H_phi = angles_to_hkl_phi(delta, gamma, omegah, phi) * 2 * pi / wavelength
- hkl = UB.I * H_phi # (5)
- return hkl
-
-
-class WillmottHorizontalPosition(AbstractPosition):
-
- def __init__(self, delta=None, gamma=None, omegah=None, phi=None):
- self.delta = delta
- self.gamma = gamma
- self.omegah = omegah
- self.phi = phi
-
- def clone(self):
- return WillmottHorizontalPosition(self.delta, self.gamma, self.omegah,
- self.phi)
-
- def changeToRadians(self):
- self.delta *= TORAD
- self.gamma *= TORAD
- self.omegah *= TORAD
- self.phi *= TORAD
-
- def changeToDegrees(self):
- self.delta *= TODEG
- self.gamma *= TODEG
- self.omegah *= TODEG
- self.phi *= TODEG
-
- def totuple(self):
- return (self.delta, self.gamma, self.omegah, self.phi)
-
- def __str__(self):
- return ('WillmottHorizontalPosition('
- 'delta: %.4f gamma: %.4f omegah: %.4f phi: %.4f)' %
- (self.delta, self.gamma, self.omegah, self.phi))
-
-
-class WillmottHorizontalGeometry(object):
-
- def __init__(self):
- self.name = 'willmott_horizontal'
-
- def physical_angles_to_internal_position(self, physicalAngles):
- return WillmottHorizontalPosition(*physicalAngles)
-
- def internal_position_to_physical_angles(self, internalPosition):
- return internalPosition.totuple()
-
- def create_position(self, delta, gamma, omegah, phi):
- return WillmottHorizontalPosition(delta, gamma, omegah, phi)
-
-
-class WillmottHorizontalUbCalcStrategy(PaperSpecificUbCalcStrategy):
-
- def calculate_q_phi(self, pos):
- H_phi = angles_to_hkl_phi(*pos.totuple())
- return matrix(H_phi.tolist())
-
-
-class DummyConstraints(object):
-
- @property
- def reference(self):
- """dictionary of constrained reference circles"""
- return TEMPORARY_CONSTRAINTS_DICT_RAD
-
-
-class ConstraintAdapter(object):
-
- def __init__(self, constraints):
- self._constraints = constraints
-
- def getParameterDict(self):
- names = self._constraints.available
- return dict(zip(names, [None] * len(names)))
-
- def setParameter(self, name, value):
- self._constraints.set_constraint(name, value)
-
- def get(self, name):
- if name in self._constraints.all:
- val = self._constraints.get_value(name)
- return 999 if val is None else val
- else:
- return 999
-
- def update_tracked(self):
- pass
-
-
-class WillmottHorizontalCalculator(HklCalculatorBase):
-
- def __init__(self, ubcalc, geometry, hardware, constraints,
- raiseExceptionsIfAnglesDoNotMapBackToHkl=True):
- """"
- Where constraints.reference is a one element dict with the key either
- ('betain', 'betaout' or 'equal') and the value a number or None for
- 'betain_eq_betaout'
- """
-
- HklCalculatorBase.__init__(self, ubcalc, geometry, hardware,
- raiseExceptionsIfAnglesDoNotMapBackToHkl)
-
- if constraints is not None:
- self.constraints = constraints
- self.parameter_manager = ConstraintAdapter(constraints)
- else:
- self.constraints = DummyConstraints()
- self.parameter_manager = DummyParameterManager()
-
- @property
- def _UB(self):
- return self._ubcalc.UB
-
- def _anglesToHkl(self, pos, wavelength):
- """
- Calculate miller indices from position in radians.
- """
- hkl_matrix = angles_to_hkl(pos.delta, pos.gamma, pos.omegah, pos.phi,
- wavelength, self._UB)
- return hkl_matrix[0, 0], hkl_matrix[1, 0], hkl_matrix[2, 0],
-
- def _anglesToVirtualAngles(self, pos, wavelength):
- """
- Calculate virtual-angles in radians from position in radians.
-
- Return theta, alpha, and beta in a dictionary.
- """
-
- betain = pos.omegah # (52)
-
- hkl = angles_to_hkl(pos.delta, pos.gamma, pos.omegah, pos.phi,
- wavelength, self._UB)
- H_phi = self._UB * hkl
- H_phi = H_phi / (2 * pi / wavelength)
- l_phi = H_phi[2, 0]
- sin_betaout = l_phi - sin(betain)
- betaout = asin(bound(sin_betaout)) # (54)
-
- cos_2theta = cos(pos.delta) * cos(pos.gamma)
- theta = acos(bound(cos_2theta)) / 2.
-
- return {'theta': theta, 'betain': betain, 'betaout': betaout}
-
- def _hklToAngles(self, h, k, l, wavelength):
- """
- Calculate position and virtual angles in radians for a given hkl.
- """
-
- H_phi = self._UB * matrix([[h], [k], [l]]) # units: 1/Angstrom
- H_phi = H_phi / (2 * pi / wavelength) # units: 2*pi/wavelength
- h_phi = H_phi[0, 0]
- k_phi = H_phi[1, 0]
- l_phi = H_phi[2, 0] # (5)
-
- ### determine betain (omegah) and betaout ###
-
- if not self.constraints.reference:
- raise ValueError("No reference constraint has been constrained.")
-
- ref_name, ref_value = self.constraints.reference.items()[0]
- if ref_value is not None:
- ref_value *= TORAD
- if ref_name == 'betain':
- betain = ref_value
- betaout = asin(bound(l_phi - sin(betain))) # (53)
- elif ref_name == 'betaout':
- betaout = ref_value
- betain = asin(bound(l_phi - sin(betaout))) # (54)
- elif ref_name == 'bin_eq_bout':
- betain = betaout = asin(bound(l_phi / 2)) # (55)
- else:
- raise ValueError("Unexpected constraint name'%s'." % ref_name)
-
- if abs(betain) < SMALL:
- raise DiffcalcException('required betain was 0 degrees (requested '
- 'q is perpendicular to surface normal)')
- if betain < -SMALL:
- raise DiffcalcException("betain was -ve (%.4f)" % betain)
-# logger.info('betain = %.4f, betaout = %.4f',
-# betain * TODEG, betaout * TODEG)
- omegah = betain # (52)
-
- ### determine H_lab (X, Y and Z) ###
-
- Y = -(h_phi ** 2 + k_phi ** 2 + l_phi ** 2) / 2 # (45)
-
- Z = (sin(betaout) + sin(betain) * (Y + 1)) / cos(omegah) # (47)
-
- X_squared = (h_phi ** 2 + k_phi ** 2 -
- ((cos(betain) * Y + sin(betain) * Z) ** 2)) # (48)
- if (X_squared < 0) and (abs(X_squared) < SMALL):
- X_squared = 0
- Xpositive = sqrt(X_squared)
- if CHOOSE_POSITIVE_GAMMA:
- X = -Xpositive
- else:
- X = Xpositive
-# logger.info('H_lab (X,Y,Z) = [%.4f, %.4f, %.4f]', X, Y, Z)
- ### determine diffractometer angles ###
-
- gamma = atan2(-X, Y + 1) # (49)
- if (abs(gamma) < SMALL):
- # degenerate case, only occurs when q || z
- delta = 2 * omegah
- else:
- delta = atan2(Z * sin(gamma), -X) # (50)
- M = cos(betain) * Y + sin(betain) * Z
- phi = atan2(h_phi * M - k_phi * X, h_phi * X + k_phi * M) # (51)
-
- pos = WillmottHorizontalPosition(delta, gamma, omegah, phi)
- virtual_angles = {'betain': betain, 'betaout': betaout}
- return pos, virtual_angles
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/hkl/willmott/commands.py b/script/__Lib/diffcalc-2.1/diffcalc/hkl/willmott/commands.py
deleted file mode 100755
index 1d6cadd..0000000
--- a/script/__Lib/diffcalc-2.1/diffcalc/hkl/willmott/commands.py
+++ /dev/null
@@ -1,58 +0,0 @@
-###
-# Copyright 2008-2011 Diamond Light Source Ltd.
-# This file is part of Diffcalc.
-#
-# Diffcalc is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Diffcalc is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Diffcalc. If not, see .
-###
-
-from diffcalc.hkl.common import getNameFromScannableOrString
-from diffcalc.util import command
-
-
-class WillmottHklCommands(object):
-
- def __init__(self, hklcalc):
- self._hklcalc = hklcalc
- self.commands = [self.con,
- self.uncon,
- self.cons]
-
- def __str__(self):
- return self._hklcalc.__str__()
-
- @command
- def con(self, scn_or_string):
- """con -- constrains constraint
- """
- name = getNameFromScannableOrString(scn_or_string)
- self._hklcalc.constraints.constrain(name)
- print self._report_constraints()
-
- @command
- def uncon(self, scn_or_string):
- """uncon -- unconstrains constraint
- """
- name = getNameFromScannableOrString(scn_or_string)
- self._hklcalc.constraints.unconstrain(name)
- print self._report_constraints()
-
- @command
- def cons(self):
- """cons -- list available constraints and values
- """
- print self._report_constraints()
-
- def _report_constraints(self):
- return (self._hklcalc.constraints.build_display_table_lines() + '\n\n' +
- self._hklcalc.constraints._report_constraints())
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/hkl/willmott/constraints.py b/script/__Lib/diffcalc-2.1/diffcalc/hkl/willmott/constraints.py
deleted file mode 100755
index 9ab5abd..0000000
--- a/script/__Lib/diffcalc-2.1/diffcalc/hkl/willmott/constraints.py
+++ /dev/null
@@ -1,156 +0,0 @@
-###
-# Copyright 2008-2011 Diamond Light Source Ltd.
-# This file is part of Diffcalc.
-#
-# Diffcalc is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Diffcalc is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Diffcalc. If not, see .
-###
-
-from diffcalc.util import DiffcalcException
-
-
-def filter_dict(d, keys):
- """Return a copy of d containing only keys that are in keys"""
- ##return {k: d[k] for k in keys} # requires Python 2.6
- return dict((k, d[k]) for k in keys if k in d.keys())
-
-
-ref_constraints = ('betain', 'betaout', 'bin_eq_bout')
-valueless_constraints = ('bin_eq_bout')
-all_constraints = ref_constraints
-
-
-class WillmottConstraintManager(object):
- """Constraints in degrees.
- """
-
- def __init__(self):
- self._constrained = {'bin_eq_bout': None}
-
- @property
- def available_constraint_names(self):
- """list of all available constraints"""
- return all_constraints
-
- @property
- def all(self): # @ReservedAssignment
- """dictionary of all constrained values"""
- return self._constrained.copy()
-
- @property
- def reference(self):
- """dictionary of constrained reference circles"""
- return filter_dict(self.all, ref_constraints)
-
- @property
- def constrained_names(self):
- """ordered tuple of constained circles"""
- names = self.all.keys()
- names.sort(key=lambda name: list(all_constraints).index(name))
- return tuple(names)
-
- def is_constrained(self, name):
- return name in self._constrained
-
- def get_value(self, name):
- return self._constrained[name]
-
- def _build_display_table(self):
- constraint_types = (ref_constraints,)
- num_rows = max([len(col) for col in constraint_types])
- max_name_width = max(
- [len(name) for name in sum(constraint_types[:2], ())])
- # headings
- lines = [' ' + 'REF'.ljust(max_name_width)]
- lines.append(' ' + '=' * max_name_width + ' ')
-
- # constraint rows
- for n_row in range(num_rows):
- cells = []
- for col in constraint_types:
- name = col[n_row] if n_row < len(col) else ''
- cells.append(self._label_constraint(name))
- cells.append(('%-' + str(max_name_width) + 's ') % name)
- lines.append(''.join(cells))
- lines.append
- return '\n'.join(lines)
-
- def _report_constraints(self):
- if not self.reference:
- return "!!! No reference constraint set"
- name, val = self.reference.items()[0]
- if name in valueless_constraints:
- return " %s" % name
- else:
- if val is None:
- return "!!! %s: ---" % name
- else:
- return " %s: %.4f" % (name, val)
-
- def _label_constraint(self, name):
- if name == '':
- label = ' '
- elif (self.is_constrained(name) and (self.get_value(name) is None) and
- name not in valueless_constraints):
- label = 'o-> '
- elif self.is_constrained(name):
- label = '--> '
- else:
- label = ' '
- return label
-
- def constrain(self, name):
- if name in self.all:
- return "%s is already constrained." % name.capitalize()
- elif name in ref_constraints:
- return self._constrain_reference(name)
- else:
- raise DiffcalcException('%s is not a valid constraint name')
-
- def _constrain_reference(self, name):
- if self.reference:
- constrained_name = self.reference.keys()[0]
- del self._constrained[constrained_name]
- self._constrained[name] = None
- return '%s constraint replaced.' % constrained_name.capitalize()
- else:
- self._constrained[name] = None
-
- def unconstrain(self, name):
- if name in self._constrained:
- del self._constrained[name]
- else:
- return "%s was not already constrained." % name.capitalize()
-
-###
- def _check_constraint_settable(self, name, verb):
- if name not in all_constraints:
- raise DiffcalcException(
- 'Could not %(verb)s %(name)s as this is not an available '
- 'constraint.' % locals())
- elif name not in self.all.keys():
- raise DiffcalcException(
- 'Could not %(verb)s %(name)s as this is not currently '
- 'constrained.' % locals())
- elif name in valueless_constraints:
- raise DiffcalcException(
- 'Could not %(verb)s %(name)s as this constraint takes no '
- 'value.' % locals())
-
- def set_constraint(self, name, value): # @ReservedAssignment
- self._check_constraint_settable(name, 'set')
- old_value = self.all[name]
- old = str(old_value) if old_value is not None else '---'
- self._constrained[name] = float(value)
- new = str(value)
- return "%(name)s : %(old)s --> %(new)s" % locals()
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/hkl/you/__init__.py b/script/__Lib/diffcalc-2.1/diffcalc/hkl/you/__init__.py
deleted file mode 100755
index e69de29..0000000
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/hkl/you/calc.py b/script/__Lib/diffcalc-2.1/diffcalc/hkl/you/calc.py
deleted file mode 100755
index 5062f84..0000000
--- a/script/__Lib/diffcalc-2.1/diffcalc/hkl/you/calc.py
+++ /dev/null
@@ -1,1162 +0,0 @@
-###
-# Copyright 2008-2011 Diamond Light Source Ltd.
-# This file is part of Diffcalc.
-#
-# Diffcalc is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Diffcalc is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Diffcalc. If not, see .
-###
-
-from math import pi, sin, cos, acos, asin, atan2, sqrt
-from itertools import product
-
-try:
- from numpy import matrix
- from numpy.linalg import norm
-except ImportError:
- from numjy import matrix
- from numjy.linalg import norm
-
-from diffcalc.log import logging
-from diffcalc.hkl.calcbase import HklCalculatorBase
-from diffcalc.hkl.you.geometry import create_you_matrices, calcMU, calcPHI, \
- calcCHI, calcETA
-from diffcalc.hkl.you.geometry import YouPosition
-from diffcalc.util import DiffcalcException, bound, angle_between_vectors,\
- y_rotation
-from diffcalc.util import cross3, z_rotation, x_rotation
-from diffcalc.ub.calc import PaperSpecificUbCalcStrategy
-
-from diffcalc.hkl.you.constraints import NUNAME
-logger = logging.getLogger("diffcalc.hkl.you.calc")
-I = matrix('1 0 0; 0 1 0; 0 0 1')
-
-SMALL = 1e-6
-TORAD = pi / 180
-TODEG = 180 / pi
-
-PRINT_DEGENERATE = False
-
-
-def is_small(x):
- return abs(x) < SMALL
-
-
-def sign(x):
- if is_small(x):
- return 0
- if x > 0:
- return 1
- # x < 0
- return -1
-
-
-def normalised(vector):
- return vector * (1 / norm(vector))
-
-
-def cut_at_minus_pi(value):
- if value < (-pi - SMALL):
- return value + 2 * pi
- if value >= pi + SMALL:
- return value - 2 * pi
- return value
-
-
-def _calc_N(Q, n):
- """Return N as described by Equation 31"""
- Q = normalised(Q)
- n = normalised(n)
- if is_small(angle_between_vectors(Q, n)):
- # Replace the reference vector with an alternative vector from Eq.(78)
- idx_min, _ = min(enumerate([abs(Q[0, 0]), abs(Q[1, 0]), abs(Q[2, 0])]), key=lambda v: v[1])
- idx_1, idx_2 = [idx for idx in range(3) if idx != idx_min]
- qval = sqrt(Q[idx_1, 0] * Q[idx_1, 0] + Q[idx_2, 0] * Q[idx_2, 0])
- n[idx_min, 0] = qval
- n[idx_1, 0] = -Q[idx_min, 0] * Q[idx_1, 0] / qval
- n[idx_2, 0] = -Q[idx_min, 0] * Q[idx_2, 0] / qval
- if is_small(norm(n)):
- n[idx_min, 0] = 0
- n[idx_1, 0] = Q[idx_2, 0] / qval
- n[idx_2, 0] = -Q[idx_1, 0] / qval
- Qxn = cross3(Q, n)
- QxnxQ = cross3(Qxn, Q)
- QxnxQ = normalised(QxnxQ)
- Qxn = normalised(Qxn)
- return matrix([[Q[0, 0], QxnxQ[0, 0], Qxn[0, 0]],
- [Q[1, 0], QxnxQ[1, 0], Qxn[1, 0]],
- [Q[2, 0], QxnxQ[2, 0], Qxn[2, 0]]])
-
-
-def _calc_angle_between_naz_and_qaz(theta, alpha, tau):
- # Equation 30:
- top = cos(tau) - sin(alpha) * sin(theta)
- bottom = cos(alpha) * cos(theta)
- if is_small(bottom):
- if is_small(cos(alpha)):
- raise ValueError('cos(alpha) is too small')
- if is_small(cos(theta)):
- raise ValueError('cos(theta) is too small')
- if is_small(sin(tau)):
- return 0.
- return acos(bound(top / bottom))
-
-
-def youAnglesToHkl(pos, wavelength, UBmatrix):
- """Calculate miller indices from position in radians.
- """
-
- [MU, DELTA, NU, ETA, CHI, PHI] = create_you_matrices(*pos.totuple())
-
- q_lab = (NU * DELTA - I) * matrix([[0], [2 * pi / wavelength], [0]]) # 12
-
- hkl = UBmatrix.I * PHI.I * CHI.I * ETA.I * MU.I * q_lab
-
- return hkl[0, 0], hkl[1, 0], hkl[2, 0]
-
-
-def _tidy_degenerate_solutions(pos, constraints):
-
- original = pos.inDegrees()
- detector_like_constraint = constraints.detector or constraints.naz
- nu_constrained_to_0 = is_small(pos.nu) and detector_like_constraint
- mu_constrained_to_0 = is_small(pos.mu) and 'mu' in constraints.sample
- delta_constrained_to_0 = is_small(pos.delta) and detector_like_constraint
- eta_constrained_to_0 = is_small(pos.eta) and 'eta' in constraints.sample
- phi_not_constrained = not 'phi' in constraints.sample
-
- if nu_constrained_to_0 and mu_constrained_to_0 and phi_not_constrained:
- # constrained to vertical 4-circle like mode
- if is_small(pos.chi): # phi || eta
- desired_eta = pos.delta / 2.
- eta_diff = desired_eta - pos.eta
- pos.eta = desired_eta
- pos.phi -= eta_diff
- if PRINT_DEGENERATE:
- print ('DEGENERATE: with chi=0, phi and eta are colinear:'
- 'choosing eta = delta/2 by adding % 7.3f to eta and '
- 'removing it from phi. (mu=%s=0 only)' % (eta_diff * TODEG, NUNAME))
- print ' original:', original
-
- elif delta_constrained_to_0 and eta_constrained_to_0 and phi_not_constrained:
- # constrained to horizontal 4-circle like mode
- if is_small(pos.chi - pi / 2): # phi || mu
- desired_mu = pos.nu / 2.
- mu_diff = desired_mu - pos.mu
- pos.mu = desired_mu
- pos.phi += mu_diff
- if PRINT_DEGENERATE:
- print ('DEGENERATE: with chi=90, phi and mu are colinear: choosing'
- ' mu = %s/2 by adding % 7.3f to mu and to phi. '
- '(delta=eta=0 only)' % (NUNAME, mu_diff * TODEG))
- print ' original:', original
-
- return pos
-
-
-def _theta_and_qaz_from_detector_angles(delta, nu):
- # Equation 19:
- cos_2theta = cos(delta) * cos(nu)
- theta = acos(cos_2theta) / 2.
- sgn = sign(sin(2. * theta))
- qaz = atan2(sgn * sin(delta), sgn * cos(delta) * sin(nu))
- return theta, qaz
-
-
-class YouUbCalcStrategy(PaperSpecificUbCalcStrategy):
-
- def calculate_q_phi(self, pos):
-
- [MU, DELTA, NU, ETA, CHI, PHI] = create_you_matrices(*pos.totuple())
- # Equation 12: Compute the momentum transfer vector in the lab frame
- y = matrix('0; 1; 0')
- q_lab = (NU * DELTA - I) * y
- # Transform this into the phi frame.
- return PHI.I * CHI.I * ETA.I * MU.I * q_lab
-
-
-UNREACHABLE_MSG = (
- 'The current combination of constraints with %s = %.4f\n'
- 'prohibits a solution for the specified reflection.')
-
-
-class YouHklCalculator(HklCalculatorBase):
-
- def __init__(self, ubcalc, geometry, hardware, constraints,
- raiseExceptionsIfAnglesDoNotMapBackToHkl=True):
- HklCalculatorBase.__init__(self, ubcalc, geometry, hardware,
- raiseExceptionsIfAnglesDoNotMapBackToHkl)
- self._hardware = hardware # for checking limits only
- self.constraints = constraints
- self.parameter_manager = constraints # TODO: remove need for this attr
-
- def __str__(self):
- return self.constraints.__str__()
-
- def _get_n_phi(self):
- return self._ubcalc.n_phi
-
- def _get_ubmatrix(self):
- return self._getUBMatrix() # for consistency
-
- def repr_mode(self):
- return repr(self.constraints.all)
-
- def _anglesToHkl(self, pos, wavelength):
- """Calculate miller indices from position in radians.
- """
- return youAnglesToHkl(pos, wavelength, self._get_ubmatrix())
-
- def _anglesToVirtualAngles(self, pos, _wavelength):
- """Calculate pseudo-angles in radians from position in radians.
-
- Return theta, qaz, alpha, naz, tau, psi and beta in a dictionary.
-
- """
-
- # depends on surface normal n_lab.
- mu, delta, nu, eta, chi, phi = pos.totuple()
-
- theta, qaz = _theta_and_qaz_from_detector_angles(delta, nu) # (19)
-
- [MU, _, _, ETA, CHI, PHI] = create_you_matrices(mu,
- delta, nu, eta, chi, phi)
- Z = MU * ETA * CHI * PHI
- n_lab = Z * self._get_n_phi()
- alpha = asin(bound((-n_lab[1, 0])))
- naz = atan2(n_lab[0, 0], n_lab[2, 0]) # (20)
-
- cos_tau = cos(alpha) * cos(theta) * cos(naz - qaz) + \
- sin(alpha) * sin(theta)
- tau = acos(bound(cos_tau)) # (23)
-
- # Compute Tau using the dot product directly (THIS ALSO WORKS)
-# q_lab = ( (NU * DELTA - I ) * matrix([[0],[1],[0]])
-# norm = norm(q_lab)
-# q_lab = matrix([[1],[0],[0]]) if norm == 0 else q_lab * (1/norm)
-# tau_from_dot_product = acos(bound(dot3(q_lab, n_lab)))
-
- sin_beta = 2 * sin(theta) * cos(tau) - sin(alpha)
- beta = asin(bound(sin_beta)) # (24)
-
- psi = next(self._calc_psi(alpha, theta, tau, qaz, naz))
-
- return {'theta': theta, 'qaz': qaz, 'alpha': alpha,
- 'naz': naz, 'tau': tau, 'psi': psi, 'beta': beta}
-
-
- def _choose_single_solution(self, pos_virtual_angles_pairs_in_degrees):
-
- if len(pos_virtual_angles_pairs_in_degrees) == 1:
- return pos_virtual_angles_pairs_in_degrees[0]
-
- absolute_distances = []
- for pos_, _ in pos_virtual_angles_pairs_in_degrees:
- absolute_distances.append(sum([abs(pos_.totuple()[i]) for i in (0, 3, 4, 5)]))
-
- shortest_solution_index = absolute_distances.index(
- min(absolute_distances))
- pos, virtual_angles = pos_virtual_angles_pairs_in_degrees[shortest_solution_index]
-
- if logger.isEnabledFor(logging.INFO):
- msg = ('Multiple sample solutions found (choosing solution with '
- 'shortest distance to all-zeros position):\n')
- i = 0
- for (pos_, _), distance in zip(pos_virtual_angles_pairs_in_degrees,
- absolute_distances):
- msg += '*' if i == shortest_solution_index else '.'
-
- msg += ('mu=% 7.3f, delta=% 7.3f, nu=% 7.3f, eta=% 7.3f, chi=% 7.3f, phi=% 7.3f' %
- pos_.totuple())
- msg += ' (distance=% 4.3f)\n' % (distance * TODEG)
- i += 1
- msg += ':\n'
- logger.info(msg)
-
- return pos, virtual_angles
-
- def hklToAngles(self, h, k, l, wavelength, return_all_solutions=False):
- """
- Return verified Position and all virtual angles in degrees from
- h, k & l and wavelength in Angstroms.
-
- The calculated Position is verified by checking that it maps back using
- anglesToHkl() to the requested hkl value.
-
- Those virtual angles fixed or generated while calculating the position
- are verified by by checking that they map back using
- anglesToVirtualAngles to the virtual angles for the given position.
-
- Throws a DiffcalcException if either check fails and
- raiseExceptionsIfAnglesDoNotMapBackToHkl is True, otherwise displays a
- warning.
- """
-
- pos_virtual_angles_pairs = self._hklToAngles(h, k, l, wavelength, return_all_solutions) # in rad
- assert pos_virtual_angles_pairs
- pos_virtual_angles_pairs_in_degrees = []
- for pos, virtual_angles in pos_virtual_angles_pairs:
-
- # to degrees:
- pos.changeToDegrees()
- for key, val in virtual_angles.items():
- if val is not None:
- virtual_angles[key] = val * TODEG
-
- self._verify_pos_map_to_hkl(h, k, l, wavelength, pos)
-
- pos_virtual_angles_pairs_in_degrees.append((pos, virtual_angles))
-
- if return_all_solutions:
- return pos_virtual_angles_pairs_in_degrees
- else:
- pos, virtual_angles = self._choose_single_solution(pos_virtual_angles_pairs_in_degrees)
- return pos, virtual_angles
-
-
- def hkl_to_all_angles(self, h, k, l, wavelength):
- return self.hklToAngles(h, k, l, wavelength, True)
-
-
- def _hklToAngles(self, h, k, l, wavelength, return_all_solutions=False):
- """(pos, virtualAngles) = hklToAngles(h, k, l, wavelength) --- with
- Position object pos and the virtual angles returned in degrees. Some
- modes may not calculate all virtual angles.
- """
-
- if not self.constraints.is_fully_constrained():
- raise DiffcalcException(
- "Diffcalc is not fully constrained.\n"
- "Type 'help con' for instructions")
-
- if not self.constraints.is_current_mode_implemented():
- raise DiffcalcException(
- "Sorry, the selected constraint combination is valid but "
- "is not implemented. Type 'help con' for implemented combinations")
-
- # constraints are dictionaries
- ref_constraint = self.constraints.reference
- if ref_constraint:
- ref_constraint_name, ref_constraint_value = ref_constraint.items()[0]
- det_constraint = self.constraints.detector
- naz_constraint = self.constraints.naz
- samp_constraints = self.constraints.sample
-
- assert not (det_constraint and naz_constraint), (
- "Two 'detector' constraints given")
-
-
- h_phi = self._get_ubmatrix() * matrix([[h], [k], [l]])
- theta = self._calc_theta(h_phi, wavelength)
- tau = angle_between_vectors(h_phi, self._get_n_phi())
-
- if is_small(sin(tau)) and ref_constraint:
- if ref_constraint_name == 'psi':
- raise DiffcalcException("Azimuthal angle 'psi' is undefined as reference and scattering vectors parallel.\n"
- "Please constrain one of the sample angles or choose different reference vector orientation.")
- elif ref_constraint_name == 'a_eq_b':
- raise DiffcalcException("Reference constraint 'a_eq_b' is redundant as reference and scattering vectors are parallel.\n"
- "Please constrain one of the sample angles or choose different reference vector orientation.")
-
- ### Reference constraint column ###
-
- if ref_constraint:
- # An angle for the reference vector (n) is given (Section 5.2)
- alpha, _ = self._calc_remaining_reference_angles(
- ref_constraint_name, ref_constraint_value, theta, tau)
-
- solution_tuples = []
- if det_constraint or naz_constraint:
-
- if len(samp_constraints) == 1:
- for qaz, naz, delta, nu in self._calc_det_angles_given_det_or_naz_constraint(
- det_constraint, naz_constraint, theta, tau, alpha):
- for mu, eta, chi, phi in self._calc_sample_angles_from_one_sample_constraint(
- samp_constraints, h_phi, theta, alpha, qaz, naz):
- solution_tuples.append((mu, delta, nu, eta, chi, phi))
-
- elif len(samp_constraints) == 2:
- if det_constraint:
- det_constraint_name, det_constraint_val = det_constraint.items()[0]
- for delta, nu, qaz in self._calc_remaining_detector_angles(det_constraint_name, det_constraint_val, theta):
- for mu, eta, chi, phi in self._calc_sample_angles_given_two_sample_and_detector(
- samp_constraints, qaz, theta, h_phi, self._get_n_phi()):
- solution_tuples.append((mu, delta, nu, eta, chi, phi))
-
- else:
- raise DiffcalcException(
- 'No code yet to handle this combination of detector and sample constraints!')
-
- elif len(samp_constraints) == 2:
- if ref_constraint_name == 'psi':
- psi_vals = [ref_constraint_value,]
- else:
- psi_vals = self._calc_psi(alpha, theta, tau)
- for psi in psi_vals:
- angles = list(self._calc_sample_given_two_sample_and_reference(
- samp_constraints, h_phi, theta, psi))
- solution_tuples.extend(angles)
-
- elif len(samp_constraints) == 3:
- for angles in self._calc_angles_given_three_sample_constraints(
- h, k, l, wavelength, return_all_solutions, samp_constraints,
- h_phi, theta):
- solution_tuples.append(angles)
-
- if not solution_tuples:
- raise DiffcalcException('No solutions were found. '
- 'Please consider using an alternative set of constraints.')
-
- tidy_solutions = [_tidy_degenerate_solutions(YouPosition(*pos, unit='RAD'),
- self.constraints).totuple() for pos in solution_tuples]
- merged_solution_tuples = set(self._filter_angle_limits(tidy_solutions,
- not return_all_solutions))
- if not merged_solution_tuples:
- raise DiffcalcException('No solutions were found matching existing hardware limits. '
- 'Please consider using an alternative set of constraints.')
-
- #def _find_duplicate_angles(el):
- # idx, tpl = el
- # for tmp_tpl in filtered_solutions[idx:]:
- # if False not in [abs(x-y) < SMALL for x,y in zip(tmp_tpl, tpl)]:
- # return False
- # return True
- #merged_solution_tuples = filter(_find_duplicate_angles, enumerate(filtered_solutions, 1))
- position_pseudo_angles_pairs = self._create_position_pseudo_angles_pairs(wavelength, merged_solution_tuples)
- if not position_pseudo_angles_pairs:
- raise DiffcalcException('No solutions were found. Please check hardware limits and '
- 'consider using an alternative pseudo-angle constraints.')
-
- return position_pseudo_angles_pairs
-
-
- def _create_position_pseudo_angles_pairs(self, wavelength, merged_solution_tuples):
-
- position_pseudo_angles_pairs = []
- for pos in merged_solution_tuples:
- # Create position
- position = YouPosition(*pos, unit='RAD')
- #position = _tidy_degenerate_solutions(position, self.constraints)
- #if position.phi <= -pi + SMALL:
- # position.phi += 2 * pi
- # pseudo angles calculated along the way were for the initial solution
- # and may be invalid for the chosen solution TODO: anglesToHkl need no
- # longer check the pseudo_angles as they will be generated with the
- # same function and it will prove nothing
- pseudo_angles = self._anglesToVirtualAngles(position, wavelength)
- is_sol = True
- for constraint in [self.constraints.reference,
- self.constraints.detector,
- self.constraints.naz]:
- try:
- constraint_name, constraint_value = constraint.items()[0]
- if constraint_name == 'a_eq_b':
- if not is_small(pseudo_angles['alpha'] - pseudo_angles['beta']):
- is_sol = False
- break
- else:
- if not is_small(constraint_value - pseudo_angles[constraint_name]):
- is_sol = False
- break
- except:
- continue
- if is_sol:
- position_pseudo_angles_pairs.append((position, pseudo_angles))
- return position_pseudo_angles_pairs
-
-
- def _calc_theta(self, h_phi, wavelength):
- """Calculate theta using Equation1
- """
- q_length = norm(h_phi)
- if is_small(q_length):
- raise DiffcalcException('Reflection is unreachable as |Q| is too small')
- wavevector = 2 * pi / wavelength
- try:
- theta = asin(bound(q_length / (2 * wavevector)))
- except AssertionError:
- raise DiffcalcException(
- 'Reflection is unreachable as |Q| is too long')
- if is_small(cos(theta)):
- raise DiffcalcException(
- 'Reflection is unreachable as theta angle is too close to 90 deg')
- return theta
-
- def _calc_psi(self, alpha, theta, tau, qaz=None, naz=None):
- """Calculate psi from Eq. (18), (25) and (28)
- """
- sin_tau = sin(tau)
- cos_theta = cos(theta)
- if is_small(sin_tau):
- # The reference vector is parallel to the scattering vector
- yield float('nan')
- elif is_small(cos_theta):
- # Reflection is unreachable as theta angle is too close to 90 deg
- yield float('nan')
- elif is_small(sin(theta)):
- # Reflection is unreachable as |Q| is too small
- yield float('nan')
- else:
- cos_psi = ((cos(tau) * sin(theta) - sin(alpha)) / cos_theta) # (28)
- if qaz is None or naz is None :
- try:
- acos_psi = acos(bound(cos_psi / sin_tau))
- if is_small(acos_psi):
- yield 0.
- else:
- for psi in [acos_psi, -acos_psi]:
- yield psi
- except AssertionError:
- print ('WARNING: Diffcalc could not calculate an azimuth (psi)')
- yield float('nan')
- else:
- sin_psi = cos(alpha) * sin(qaz - naz)
- sgn = sign(sin_tau)
- eps = sin_psi**2 + cos_psi**2
- sigma_ = eps/sin_tau**2 - 1
- if not is_small(sigma_):
- print ('WARNING: Diffcalc could not calculate a unique azimuth '
- '(psi) because of loss of accuracy in numerical calculation')
- yield float('nan')
- else:
- psi = atan2(sgn * sin_psi, sgn * cos_psi)
- yield psi
-
-
- def _calc_remaining_reference_angles(self, name, value, theta, tau):
- """Return alpha and beta given one of a_eq_b, alpha, beta or psi
- """
- if name == 'psi':
- psi = value
- # Equation 26 for alpha
- sin_alpha = (cos(tau) * sin(theta) -
- cos(theta) * sin(tau) * cos(psi))
- if abs(sin_alpha) > 1 + SMALL:
- raise DiffcalcException(UNREACHABLE_MSG % (name, value * TODEG))
- alpha = asin(bound(sin_alpha))
- # Equation 27 for beta
- sin_beta = cos(tau) * sin(theta) + cos(theta) * sin(tau) * cos(psi)
- if abs(sin_beta) > 1 + SMALL:
- raise DiffcalcException(UNREACHABLE_MSG % (name, value * TODEG))
-
- beta = asin(bound(sin_beta))
-
- elif name == 'a_eq_b':
- alpha = beta = asin(cos(tau) * sin(theta)) # (24)
-
- elif name == 'alpha':
- alpha = value # (24)
- sin_beta = 2 * sin(theta) * cos(tau) - sin(alpha)
- if abs(sin_beta) > 1 + SMALL:
- raise DiffcalcException(UNREACHABLE_MSG % (name, value * TODEG))
- beta = asin(sin_beta)
-
- elif name == 'beta':
- beta = value
- sin_alpha = 2 * sin(theta) * cos(tau) - sin(beta) # (24)
- if abs(sin_alpha) > 1 + SMALL:
- raise DiffcalcException(UNREACHABLE_MSG % (name, value * TODEG))
-
- alpha = asin(sin_alpha)
-
- return alpha, beta
-
- def _calc_det_angles_given_det_or_naz_constraint(
- self, det_constraint, naz_constraint, theta, tau, alpha):
-
- assert det_constraint or naz_constraint
- try:
- naz_qaz_angle = _calc_angle_between_naz_and_qaz(theta, alpha, tau)
- except AssertionError:
- return
- if det_constraint:
- # One of the detector angles is given (Section 5.1)
- det_constraint_name, det_constraint = det_constraint.items()[0]
- for delta, nu, qaz in self._calc_remaining_detector_angles(
- det_constraint_name, det_constraint, theta):
- if is_small(naz_qaz_angle):
- naz_angles = [qaz,]
- else:
- naz_angles = [qaz - naz_qaz_angle, qaz + naz_qaz_angle]
- for naz in naz_angles:
- yield qaz, naz, delta, nu
- elif naz_constraint: # The 'detector' angle naz is given:
- det_constraint_name, det_constraint = naz_constraint.items()[0]
- naz_name, naz = det_constraint_name, det_constraint
- assert naz_name == 'naz'
- if is_small(naz_qaz_angle):
- qaz_angles = [naz,]
- else:
- qaz_angles = [naz - naz_qaz_angle, naz + naz_qaz_angle]
- for qaz in qaz_angles:
- for delta, nu, _ in self._calc_remaining_detector_angles(
- 'qaz', qaz, theta):
- yield qaz, naz, delta, nu
-
- def _calc_remaining_detector_angles(self, constraint_name,
- constraint_value, theta):
- """Return delta, nu and qaz given one detector angle
- """
- # (section 5.1)
- # Find qaz using various derivations of 17 and 18
- sin_2theta = sin(2 * theta)
- cos_2theta = cos(2 * theta)
- if is_small(sin_2theta):
- raise DiffcalcException(
- 'No meaningful scattering vector (Q) can be found when '
- 'theta is so small (%.4f).' % theta * TODEG)
-
- if constraint_name == 'delta':
- delta = constraint_value
- try:
- asin_qaz = asin(bound(sin(delta) / sin_2theta)) # (17 & 18)
- except AssertionError:
- return
- cos_delta = cos(delta)
- if is_small(cos_delta):
- #raise DiffcalcException(
- # 'The %s and %s circles are redundant when delta is constrained to %.0f degrees.'
- # 'Please change delta constraint or use 4-circle mode.' % (NUNAME, 'mu', delta * TODEG))
- print (('DEGENERATE: with delta=90, %s is degenerate: choosing '
- '%s = 0 (allowed because %s is unconstrained)') %
- (NUNAME, NUNAME, NUNAME))
- acos_nu = 1.
- else:
- try:
- acos_nu = acos(bound(cos_2theta / cos_delta))
- except AssertionError:
- return
- if is_small(cos(asin_qaz)):
- qaz_angles = [sign(asin_qaz) * pi / 2.,]
- else:
- qaz_angles = [asin_qaz, pi - asin_qaz]
- if is_small(acos_nu):
- nu_angles = [0.,]
- else:
- nu_angles = [acos_nu, -acos_nu]
- for qaz, nu in product(qaz_angles, nu_angles):
- sgn_ref = sign(sin_2theta) * sign(cos(qaz))
- sgn_ratio = sign(sin(nu)) * sign(cos_delta)
- if sgn_ref == sgn_ratio:
- yield delta, nu, qaz
-
- elif constraint_name == NUNAME:
- nu = constraint_value
- cos_nu = cos(nu)
- if is_small(cos_nu):
- raise DiffcalcException(
- 'The %s circle constraint to %.0f degrees is redundant.'
- 'Please change this constraint or use 4-circle mode.' % (NUNAME, nu * TODEG))
- cos_delta = cos_2theta / cos(nu)
- cos_qaz = cos_delta * sin(nu) / sin_2theta
- try:
- acos_delta = acos(bound(cos_delta))
- acos_qaz = acos(bound(cos_qaz))
- except AssertionError:
- return
- if is_small(acos_qaz):
- qaz_angles = [0.,]
- else:
- qaz_angles = [acos_qaz, -acos_qaz]
- if is_small(acos_delta):
- delta_angles = [0.,]
- else:
- delta_angles = [acos_delta, -acos_delta]
- for qaz, delta in product(qaz_angles, delta_angles):
- sgn_ref = sign(sin(delta))
- sgn_ratio = sign(sin(qaz)) * sign(sin_2theta)
- if sgn_ref == sgn_ratio:
- yield delta, nu, qaz
-
- elif constraint_name == 'qaz':
- qaz = constraint_value
- asin_delta = asin(sin(qaz) * sin_2theta)
- if is_small(cos(asin_delta)):
- delta_angles = [sign(asin_delta) * pi / 2.,]
- else:
- delta_angles = [asin_delta, pi - asin_delta]
- for delta in delta_angles:
- cos_delta = cos(delta)
- if is_small(cos_delta):
- print (('DEGENERATE: with delta=90, %s is degenerate: choosing '
- '%s = 0 (allowed because %s is unconstrained)') %
- (NUNAME, NUNAME, NUNAME))
- #raise DiffcalcException(
- # 'The %s circle is redundant when delta is at %.0f degrees.'
- # 'Please change detector constraint or use 4-circle mode.' % (NUNAME, delta * TODEG))
- nu = 0.
- else:
- sgn_delta = sign(cos_delta)
- nu = atan2(sgn_delta * sin_2theta * cos(qaz), sgn_delta * cos_2theta)
- yield delta, nu, qaz
- else:
- raise DiffcalcException(
- constraint_name + ' is not an explicit detector angle '
- '(naz cannot be handled here)')
-
-
- def _calc_sample_angles_from_one_sample_constraint(
- self, samp_constraints, h_phi, theta, alpha, qaz, naz):
-
- sample_constraint_name, sample_value = samp_constraints.items()[0]
- q_lab = matrix([[cos(theta) * sin(qaz)],
- [-sin(theta)],
- [cos(theta) * cos(qaz)]]) # (18)
- n_lab = matrix([[cos(alpha) * sin(naz)],
- [-sin(alpha)],
- [cos(alpha) * cos(naz)]]) # (20)
- mu_eta_chi_phi_tuples = list(self._calc_remaining_sample_angles(
- sample_constraint_name, sample_value, q_lab, n_lab, h_phi,
- self._get_n_phi()))
- return mu_eta_chi_phi_tuples
-
- def _calc_sample_given_two_sample_and_reference(
- self, samp_constraints, h_phi, theta, psi):
-
- for angles in self._calc_sample_angles_given_two_sample_and_reference(
- samp_constraints, psi, theta, h_phi, self._get_n_phi()):
- qaz, psi, mu, eta, chi, phi = angles
- values_in_deg = tuple(v * TODEG for v in angles)
- logger.info('Initial angles: xi=%.3f, psi=%.3f, mu=%.3f, '
- 'eta=%.3f, chi=%.3f, phi=%.3f' %
- values_in_deg) # Try to find a solution for each possible transformed xi
-
- logger.info("")
- msg = "---Trying psi=%.3f, qaz=%.3f" % (psi * TODEG, qaz * TODEG)
- logger.info(msg)
-
- for delta, nu, _ in self._calc_remaining_detector_angles('qaz', qaz, theta):
- logger.info("delta=%.3f, %s=%.3f", delta * TODEG, NUNAME, nu * TODEG)
- #for mu, eta, chi, phi in self._generate_sample_solutions(
- # mu, eta, chi, phi, samp_constraints.keys(), delta,
- # nu, wavelength, (h, k, l), ref_constraint_name,
- # ref_constraint_value):
- yield mu, delta, nu, eta, chi, phi
-
- def _calc_remaining_sample_angles(self, constraint_name, constraint_value,
- q_lab, n_lab, q_phi, n_phi):
- """Return phi, chi, eta and mu, given one of these"""
- # (section 5.3)
-
- N_lab = _calc_N(q_lab, n_lab)
- N_phi = _calc_N(q_phi, n_phi)
- Z = N_lab * N_phi.T
-
- if constraint_name == 'mu': # (35)
- mu = constraint_value
- V = calcMU(mu).I * N_lab * N_phi.T
- try:
- acos_chi = acos(bound(V[2, 2]))
- except AssertionError:
- return
- if is_small(sin(acos_chi)):
- # chi ~= 0 or 180 and therefor phi || eta The solutions for phi
- # and eta here will be valid but will be chosen unpredictably.
- # Choose eta=0:
- #
- # tan(phi+eta)=v12/v11 from docs/extensions_to_yous_paper.wxm
- chi = acos_chi
- eta = 0.
- phi = atan2(-V[1, 0], V[1, 1])
- logger.debug(
- 'Eta and phi cannot be chosen uniquely with chi so close '
- 'to 0 or 180. Returning phi=%.3f and eta=%.3f',
- phi * TODEG, eta * TODEG)
- yield mu, eta, chi, phi
- else:
- for chi in [acos_chi, -acos_chi]:
- sgn = sign(sin(chi))
- phi = atan2(-sgn * V[2, 1], -sgn * V[2, 0])
- eta = atan2(-sgn * V[1, 2], sgn * V[0, 2])
- yield mu, eta, chi, phi
-
- elif constraint_name == 'phi': # (37)
- phi = constraint_value
- V = N_lab * N_phi.I * calcPHI(phi).T
- try:
- asin_eta = asin(bound(V[0, 1]))
- except AssertionError:
- return
- if is_small(cos(asin_eta)):
- raise DiffcalcException('Chi and mu cannot be chosen uniquely '
- 'with eta so close to +/-90.')
- for eta in [asin_eta, pi - asin_eta]:
- sgn = sign(cos(eta))
- mu = atan2(sgn * V[2, 1], sgn * V[1, 1])
- chi = atan2(sgn * V[0, 2], sgn * V[0, 0])
- yield mu, eta, chi, phi
-
- elif constraint_name in ('eta', 'chi'):
- if constraint_name == 'eta': # (39)
- eta = constraint_value
- cos_eta = cos(eta)
- if is_small(cos_eta):
- #TODO: Not likely to happen in real world!?
- raise DiffcalcException(
- 'Chi and mu cannot be chosen uniquely with eta '
- 'constrained so close to +-90.')
- try:
- asin_chi = asin(bound(Z[0, 2] / cos_eta))
- except AssertionError:
- return
- all_eta = [eta,]
- all_chi = [asin_chi, pi - asin_chi]
-
- else: # constraint_name == 'chi' # (40)
- chi = constraint_value
- sin_chi = sin(chi)
- if is_small(sin_chi):
- raise DiffcalcException(
- 'Eta and phi cannot be chosen uniquely with chi '
- 'constrained so close to 0. (Please contact developer '
- 'if this case is useful for you)')
- try:
- acos_eta = acos(bound(Z[0, 2] / sin_chi))
- except AssertionError:
- return
- all_eta = [acos_eta, -acos_eta]
- all_chi = [chi,]
-
- for chi, eta in product(all_chi, all_eta):
- top_for_mu = Z[2, 2] * sin(eta) * sin(chi) + Z[1, 2] * cos(chi)
- bot_for_mu = -Z[2, 2] * cos(chi) + Z[1, 2] * sin(eta) * sin(chi)
- if is_small(top_for_mu) and is_small(bot_for_mu):
- # chi == +-90, eta == 0/180 and therefore phi || mu cos(chi) ==
- # 0 and sin(eta) == 0 Experience shows that even though e.g.
- # the z[2, 2] and z[1, 2] values used to calculate mu may be
- # basically 0 (1e-34) their ratio in every case tested so far
- # still remains valid and using them will result in a phi
- # solution that is continuous with neighbouring positions.
- #
- # We cannot test phi minus mu here unfortunately as the final
- # phi and mu solutions have not yet been chosen (they may be
- # +-x or 180+-x). Otherwise we could choose a sensible solution
- # here if the one found was incorrect.
-
- # tan(phi+eta)=v12/v11 from extensions_to_yous_paper.wxm
- phi_minus_mu = -atan2(Z[2, 0], Z[1, 1])
- logger.debug(
- 'Mu and phi cannot be chosen uniquely with chi so close '
- 'to +/-90 and eta so close 0 or 180.\n After the final '
- 'solution has been chose phi-mu should equal: %.3f',
- phi_minus_mu * TODEG)
- mu = atan2(-top_for_mu, -bot_for_mu) # (41)
-
- top_for_phi = Z[0, 1] * cos(eta) * cos(chi) - Z[0, 0] * sin(eta)
- bot_for_phi = Z[0, 1] * sin(eta) + Z[0, 0] * cos(eta) * cos(chi)
- phi = atan2(top_for_phi, bot_for_phi) # (42)
- # if is_small(bot_for_phi) and is_small(top_for_phi):
- # raise DiffcalcException(
- # 'phi=%.3f cannot be known with confidence as top and '
- # 'bottom are both close to zero. chi=%.3f, eta=%.3f'
- # % (mu * TODEG, chi * TODEG, eta * TODEG))
- yield mu, eta, chi, phi
-
- else:
- raise DiffcalcException('Given angle must be one of phi, chi, eta or mu')
-
- def _calc_angles_given_three_sample_constraints(
- self, h, k, l, wavelength, return_all_solutions, samp_constraints,
- h_phi, theta):
-
- if not 'mu' in samp_constraints:
- eta_ = self.constraints.sample['eta']
- chi_ = self.constraints.sample['chi']
- phi_ = self.constraints.sample['phi']
- try:
- two_mu_qaz_pairs = _mu_and_qaz_from_eta_chi_phi(eta_, chi_, phi_, theta, h_phi)
- except AssertionError:
- return
- else:
- raise DiffcalcException(
- 'No code yet to handle this combination of 3 sample constraints!')
- # TODO: Code duplicated above
- for mu_, qaz in two_mu_qaz_pairs:
- logger.debug("--- Trying mu_:%.f qaz_%.f", mu_ * TODEG, qaz * TODEG)
- for delta, nu, _ in self._calc_remaining_detector_angles('qaz', qaz, theta):
- logger.info("delta=%.3f, %s=%.3f", delta * TODEG, NUNAME, nu * TODEG)
- yield mu_, delta, nu, eta_, chi_, phi_
-
- def _calc_sample_angles_given_two_sample_and_reference(
- self, samp_constraints, psi, theta, q_phi, n_phi):
- """Available combinations:
- chi, phi, reference
- mu, eta, reference,
- chi, eta, reference
- chi, mu, reference
- """
-
- def __get_phi_and_qaz(chi, eta, mu):
- a = sin(chi) * cos(eta)
- b = sin(chi) * sin(eta) * sin(mu) - cos(chi) * cos(mu)
- #atan2_xi = atan2(V[2, 2] * a + V[2, 0] * b,
- # V[2, 0] * a - V[2, 2] * b) # (54)
- qaz = atan2(V[2, 0] * a - V[2, 2] * b,
- -V[2, 2] * a - V[2, 0] * b) # (54)
-
- a = sin(chi) * sin(mu) - cos(mu) * cos(chi) * sin(eta)
- b = cos(mu) * cos(eta)
- phi = atan2(V[1, 1] * a - V[0, 1] * b,
- V[0, 1] * a + V[1, 1] * b) # (55)
- # if is_small(mu+pi/2) and is_small(eta) and False:
- # phi_general = phi
- # # solved in extensions_to_yous_paper.wxm
- # phi = atan2(V[1, 1], V[0, 1])
- # logger.info("phi = %.3f or %.3f (std)",
- # phi*TODEG, phi_general*TODEG )
-
- return qaz, phi
-
- N_phi = _calc_N(q_phi, n_phi)
- THETA = z_rotation(-theta)
- PSI = x_rotation(psi)
-
- if 'chi' in samp_constraints and 'phi' in samp_constraints:
-
- chi = samp_constraints['chi']
- phi = samp_constraints['phi']
-
- CHI = calcCHI(chi)
- PHI = calcPHI(phi)
- V = CHI * PHI * N_phi * PSI.T * THETA.T # (46)
-
- #atan2_xi = atan2(-V[2, 0], V[2, 2])
- #atan2_eta = atan2(-V[0, 1], V[1, 1])
- #atan2_mu = atan2(-V[2, 1], sqrt(V[2, 2] ** 2 + V[2, 0] ** 2))
- try:
- asin_mu = asin(bound(-V[2, 1]))
- except AssertionError:
- return
- for mu in [asin_mu, pi - asin_mu]:
- sgn_cosmu = sign(cos(mu))
- #xi = atan2(-sgn_cosmu * V[2, 0], sgn_cosmu * V[2, 2])
- qaz = atan2(sgn_cosmu * V[2, 2], sgn_cosmu * V[2, 0], )
- eta = atan2(-sgn_cosmu * V[0, 1], sgn_cosmu * V[1, 1])
- yield qaz, psi, mu, eta, chi, phi
-
- elif 'mu' in samp_constraints and 'eta' in samp_constraints:
-
- mu = samp_constraints['mu']
- eta = samp_constraints['eta']
-
- V = N_phi * PSI.T * THETA.T # (49)
- try:
- bot = bound(-V[2, 1] / sqrt(sin(eta) ** 2 * cos(mu) ** 2 + sin(mu) ** 2))
- except AssertionError:
- return
- if is_small(cos(mu) * sin(eta)):
- eps = atan2(sin(eta) * cos(mu), sin(mu))
- chi_vals = [eps + acos(bot), eps - acos(bot)]
- else:
- eps = atan2(sin(mu), sin(eta) * cos(mu))
- chi_vals = [asin(bot) - eps, pi - asin(bot) - eps] # (52)
-
- ## Choose final chi solution here to obtain compatable xi and mu
- ## TODO: This temporary solution works only for one case used on i07
- ## Return a list of possible solutions?
- #if is_small(eta) and is_small(mu + pi / 2):
- # for chi in _generate_transformed_values(chi_orig):
- # if pi / 2 <= chi < pi:
- # break
- #else:
- # chi = chi_orig
-
- for chi in chi_vals:
- qaz, phi = __get_phi_and_qaz(chi, eta, mu)
- yield qaz, psi, mu, eta, chi, phi
-
- elif 'chi' in samp_constraints and 'eta' in samp_constraints:
-
- chi = samp_constraints['chi']
- eta = samp_constraints['eta']
-
- V = N_phi * PSI.T * THETA.T # (49)
- try:
- bot = bound(-V[2, 1] / sqrt(sin(eta) ** 2 * sin(chi) ** 2 + cos(chi) ** 2))
- except AssertionError:
- return
- if is_small(cos(chi)):
- eps = atan2(cos(chi), sin(chi) * sin(eta))
- mu_vals = [eps + acos(bot), eps - acos(bot)]
- else:
- eps = atan2(sin(chi) * sin(eta), cos(chi))
- mu_vals = [asin(bot) - eps, pi - asin(bot) - eps] # (52)
-
- for mu in mu_vals:
- qaz, phi = __get_phi_and_qaz(chi, eta, mu)
- yield qaz, psi, mu, eta, chi, phi
-
- elif 'chi' in samp_constraints and 'mu' in samp_constraints:
-
- chi = samp_constraints['chi']
- mu = samp_constraints['mu']
-
- V = N_phi * PSI.T * THETA.T # (49)
-
- try:
- asin_eta = asin(bound((-V[2, 1] - cos(chi) * sin(mu)) / (sin(chi) * cos(mu))))
- except AssertionError:
- return
-
- for eta in [asin_eta, pi - asin_eta]:
- qaz, phi = __get_phi_and_qaz(chi, eta, mu)
- yield qaz, psi, mu, eta, chi, phi
-
- else:
- raise DiffcalcException(
- 'No code yet to handle this combination of 2 sample '
- 'constraints and one reference!:' + str(samp_constraints))
-
- def _calc_sample_angles_given_two_sample_and_detector(
- self, samp_constraints, qaz, theta, q_phi, n_phi):
- """Available combinations:
- chi, phi, detector
- mu, eta, detector
- mu, phi, detector
- """
-
- N_phi = _calc_N(q_phi, n_phi)
-
- if 'mu' in samp_constraints and 'eta' in samp_constraints:
-
- mu = samp_constraints['mu']
- eta = samp_constraints['eta']
-
- F = y_rotation(qaz - pi/2.)
- THETA = z_rotation(-theta)
- V = calcETA(eta).T * calcMU(mu).T * F * THETA # (56)
-
- try:
- bot = bound(-V[1, 0] / sqrt(N_phi[0, 0]**2 + N_phi[1, 0]**2))
- eps = atan2(N_phi[1, 0], N_phi[0, 0])
- phi_vals = [asin(bot) + eps, pi - asin(bot) + eps] # (59)
- except (AssertionError, ZeroDivisionError):
- # For the case of (00l) reflection, where N_phi[0,0] = N_phi[1,0] = 0
- chi = atan2(V[0, 0] * N_phi[2, 0], V[2, 0] * N_phi[2, 0]) # (57)
- sgn_denom = sign(N_phi[1, 1] * N_phi[0, 2] - N_phi[1, 2] * N_phi[0, 1])
- sin_phi = V[1, 1] * N_phi[1, 2] - V[1, 2] * N_phi[1, 1]
- cos_phi = V[1, 1] * N_phi[0, 2] - V[1, 2] * N_phi[0, 1]
- phi = atan2(sin_phi * sgn_denom, cos_phi * sgn_denom)
- yield mu, eta, chi, phi
- return
- for phi in phi_vals:
- a = N_phi[0, 0] * cos(phi) + N_phi[1, 0] * sin(phi)
- chi = atan2(N_phi[2, 0] * V[0, 0] - a * V[2, 0],
- N_phi[2, 0] * V[2, 0] + a * V[0, 0]) # (60)
- yield mu, eta, chi, phi
-
- elif 'chi' in samp_constraints and 'phi' in samp_constraints:
-
- chi = samp_constraints['chi']
- phi = samp_constraints['phi']
-
- CHI = calcCHI(chi)
- PHI = calcPHI(phi)
- V = CHI * PHI * N_phi # (62)
-
- try:
- bot = bound(V[2, 0] / sqrt(cos(qaz) ** 2 * cos(theta) ** 2 + sin(theta) ** 2))
- except AssertionError:
- return
- eps = atan2(-cos(qaz) * cos(theta), sin(theta))
- for mu in [asin(bot) + eps, pi - asin(bot) + eps]:
- a = cos(theta) * sin(qaz)
- b = -cos(theta) * sin(mu) * cos(qaz) + cos(mu) * sin(theta)
- eta = atan2(V[1, 0] * a + V[0, 0] * b, V[0, 0] * a - V[1, 0]* b)
-
- #a = -cos(mu) * cos(qaz) * sin(theta) + sin(mu) * cos(theta)
- #b = cos(mu) * sin(qaz)
- #psi = atan2(-V[2, 2] * a - V[2, 1] * b, V[2, 1] * a - V[2, 2] * b)
- yield mu, eta, chi, phi
-
- elif 'mu' in samp_constraints and 'phi' in samp_constraints:
-
- mu = samp_constraints['mu']
- phi = samp_constraints['phi']
-
- F = y_rotation(qaz - pi/2.)
- THETA = z_rotation(-theta)
- V = calcMU(mu).T * F * THETA
- E = calcPHI(phi) * N_phi
-
- try:
- bot = bound(-V[2, 0] / sqrt(E[0, 0]**2 + E[2, 0]**2))
- except AssertionError:
- return
- eps = atan2(E[2, 0], E[0, 0])
- for chi in [asin(bot) + eps, pi - asin(bot) + eps]:
- a = E[0, 0] * cos(chi) + E[2, 0] * sin(chi)
- eta = atan2(V[0, 0] * E[1, 0] - V[1, 0] * a, V[0, 0] * a + V[1, 0] * E[1, 0])
- yield mu, eta, chi, phi
- else:
- raise DiffcalcException(
- 'No code yet to handle this combination of 2 sample '
- 'constraints and one detector!:' + str(samp_constraints))
-
- def _filter_angle_limits(self, possible_solutions, filter_out_of_limits=True):
- res = []
- angle_names = self._hardware.get_axes_names()
- for possible_solution in possible_solutions:
- hw_sol = []
- hw_possible_solution = self._geometry.internal_position_to_physical_angles(YouPosition(*possible_solution, unit='RAD'))
- for name, value in zip(angle_names, hw_possible_solution):
- hw_sol.append(self._hardware.cut_angle(name, value))
- if filter_out_of_limits:
- is_in_limits = all([self._hardware.is_axis_value_within_limits(name, value) for name, value in zip(angle_names, hw_sol)])
- else:
- is_in_limits = True
- if is_in_limits:
- sol = self._geometry.physical_angles_to_internal_position(tuple(hw_sol))
- sol.changeToRadians()
- res.append(sol.totuple())
- return res
-
-def _mu_and_qaz_from_eta_chi_phi(eta, chi, phi, theta, h_phi):
-
- h_phi_norm = normalised(h_phi) # (68,69)
- h1, h2, h3 = h_phi_norm[0, 0], h_phi_norm[1, 0], h_phi_norm[2, 0]
- a = sin(chi) * h2 * sin(phi) + sin(chi) * h1 * cos(phi) - cos(chi) * h3
- b = (- cos(chi) * sin(eta) * h2 * sin(phi)
- - cos(eta) * h1 * sin(phi) + cos(eta) * h2 * cos(phi)
- - cos(chi) * sin(eta) * h1 * cos(phi)
- - sin(chi) * sin(eta) * h3)
- c = -sin(theta)
- sin_bit = bound(c / sqrt(a * a + b * b))
- mu1 = asin(sin_bit) - atan2(b, a)
- mu2 = pi - asin(sin_bit) - atan2(b, a)
-
- mu1 = cut_at_minus_pi(mu1)
- mu2 = cut_at_minus_pi(mu2)
-
- # TODO: This special case should be *removed* when the general case has shown
- # to encompass it. It exists as fallback for a particular i16 experiment in
- # May 2013 --RobW.
-# if eta == chi == 0:
-# logger.debug("Testing against simplified equations for eta == chi == 0")
-# a = - h3
-# b = - h1 * sin(phi) + h2 * cos(phi)
-# sin_bit = bound(c / sqrt(a * a + b * b))
-# mu_simplified = pi - asin(sin_bit) - atan2(b, a)
-# mu_simplified = cut_at_minus_pi(mu_simplified)
-# if not ne(mu_simplified, mu):
-# raise AssertionError("mu_simplified != mu , %f!=%f" % (mu_simplified, mu))
-
-
- [MU, _, _, ETA, CHI, PHI] = create_you_matrices(mu1, None, None, eta, chi, phi)
- h_lab = MU * ETA * CHI * PHI * h_phi # (11)
- qaz1 = atan2(h_lab[0, 0] , h_lab[2, 0])
-
- [MU, _, _, ETA, CHI, PHI] = create_you_matrices(mu2, None, None, eta, chi, phi)
- h_lab = MU * ETA * CHI * PHI * h_phi # (11)
- qaz2 = atan2(h_lab[0, 0] , h_lab[2, 0])
-
- return (mu1, qaz1) , (mu2, qaz2)
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/hkl/you/constraints.py b/script/__Lib/diffcalc-2.1/diffcalc/hkl/you/constraints.py
deleted file mode 100755
index 1fe08d7..0000000
--- a/script/__Lib/diffcalc-2.1/diffcalc/hkl/you/constraints.py
+++ /dev/null
@@ -1,377 +0,0 @@
-###
-# Copyright 2008-2011 Diamond Light Source Ltd.
-# This file is part of Diffcalc.
-#
-# Diffcalc is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Diffcalc is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Diffcalc. If not, see .
-###
-
-from math import pi
-
-try:
- from numpy import matrix
-except ImportError:
- from numjy import matrix
-
-from diffcalc.util import DiffcalcException, bold
-
-TODEG = 180 / pi
-TORAD = pi / 180
-
-NUNAME = 'gam'
-
-def filter_dict(d, keys):
- """Return a copy of d containing only keys that are in keys"""
- ##return {k: d[k] for k in keys} # requires Python 2.6
- return dict((k, d[k]) for k in keys if k in d.keys())
-
-
-det_constraints = ('delta', NUNAME, 'qaz', 'naz')
-ref_constraints = ('a_eq_b', 'alpha', 'beta', 'psi')
-samp_constraints = ('mu', 'eta', 'chi', 'phi', 'mu_is_' + NUNAME)
-
-valueless_constraints = ('a_eq_b', 'mu_is_' + NUNAME)
-all_constraints = det_constraints + ref_constraints + samp_constraints
-
-
-number_single_sample = (len(det_constraints) * len(ref_constraints) *
- len(samp_constraints))
-
-
-class YouConstraintManager(object):
-
- def __init__(self, hardware, fixed_constraints = {}):
- self._hardware = hardware
- self._constrained = {}
-# self._tracking = []
- self.n_phi = matrix([[0], [0], [1]])
- self._hide_detector_constraint = False # default
- self._fixed_samp_constraints = ()
- self._fix_constraints(fixed_constraints)
-
- def __str__(self):
- lines = []
-# TODO: Put somewhere with access to UB matrix!
-# WIDTH = 13
-# n_phi = self.n_phi
-# fmt = "% 9.5f % 9.5f % 9.5f"
-# lines.append(" n_phi:".ljust(WIDTH) +
-# fmt % (n_phi[0, 0], n_phi[1, 0], n_phi[2, 0]))
-# if self._getUBMatrix():
-# n_cryst = self._getUMatrix().I * self.n_phi
-# lines.append(" n_cryst:".ljust(WIDTH) +
-# fmt % (n_cryst[0, 0], n_cryst[1, 0], n_cryst[2, 0]))
-# n_recip = self._getUBMatrix().I * self.n_phi
-# lines.append(" n_recip:".ljust(WIDTH) +
-# fmt % (n_recip[0, 0], n_recip[1, 0], n_recip[2, 0]))
-# else:
-# lines.append(
-# " n_cryst:".ljust(WIDTH) + ' "<<< No U matrix >>>"')
-# lines.append(
-# " n_recip:".ljust(WIDTH) + ' "<<< No UB matrix >>>"')
-
- lines.extend(self.build_display_table_lines())
- lines.append("")
- lines.extend(self.report_constraints_lines())
- lines.append("")
- if (self.is_fully_constrained() and
- not self.is_current_mode_implemented()):
- lines.append(
- " Sorry, this constraint combination is not implemented")
- lines.append(" Type 'help con' for available combinations")
- else:
- lines.append(" Type 'help con' for instructions") # okay
- return '\n'.join(lines)
-
- @property
- def available_constraint_names(self):
- """list of all available constraints"""
- return all_constraints
-
- @property
- def settable_constraint_names(self):
- """list of all available constraints that have settable values"""
- all_copy = list(all_constraints)
- for valueless in valueless_constraints:
- all_copy.remove(valueless)
- return all_copy
-
- @property
- def all(self): # @ReservedAssignment
- """dictionary of all constrained values"""
- return self._constrained.copy()
-
- @property
- def detector(self):
- """dictionary of constrained detector circles"""
- return filter_dict(self.all, det_constraints[:-1])
-
- @property
- def reference(self):
- """dictionary of constrained reference circles"""
- return filter_dict(self.all, ref_constraints)
-
- @property
- def sample(self):
- """dictionary of constrained sample circles"""
- return filter_dict(self.all, samp_constraints)
-
- @property
- def naz(self):
- """dictionary with naz and value if constrained"""
- return filter_dict(self.all, ('naz',))
-
- @property
- def constrained_names(self):
- """ordered tuple of constained circles"""
- names = self.all.keys()
- names.sort(key=lambda name: list(all_constraints).index(name))
- return tuple(names)
-
- def _fix_constraints(self, fixed_constraints):
- for name in fixed_constraints:
- self.constrain(name)
- self.set_constraint(name, fixed_constraints[name])
-
- if self.detector or self.naz:
- self._hide_detector_constraint = True
-
- fixed_samp_constraints = list(self.sample.keys())
- if 'mu' in self.sample or NUNAME in self.detector:
- fixed_samp_constraints.append('mu_is_' + NUNAME)
- self._fixed_samp_constraints = tuple(fixed_samp_constraints)
-
-
- def is_constrained(self, name):
- return name in self._constrained
-
- def get_value(self, name):
- return self._constrained[name]
-
- def build_display_table_lines(self):
- unfixed_samp_constraints = list(samp_constraints)
- for name in self._fixed_samp_constraints:
- unfixed_samp_constraints.remove(name)
- if self._hide_detector_constraint:
- constraint_types = (ref_constraints, unfixed_samp_constraints)
- else:
- constraint_types = (det_constraints, ref_constraints,
- unfixed_samp_constraints)
- num_rows = max([len(col) for col in constraint_types])
- max_name_width = max(
- [len(name) for name in sum(constraint_types[:-1], ())])
-
- cells = []
-
- header_cells = []
- if not self._hide_detector_constraint:
- header_cells.append(bold(' ' + 'DET'.ljust(max_name_width)))
- header_cells.append(bold(' ' + 'REF'.ljust(max_name_width)))
- header_cells.append(bold(' ' + 'SAMP'))
- cells.append(header_cells)
-
- underline_cells = [' ' + '-' * max_name_width] * len(constraint_types)
- cells.append(underline_cells)
-
- for n_row in range(num_rows):
- row_cells = []
- for col in constraint_types:
- name = col[n_row] if n_row < len(col) else ''
- row_cells.append(self._label_constraint(name))
- row_cells.append(('%-' + str(max_name_width) + 's') % name)
- cells.append(row_cells)
-
- lines = [' '.join(row_cells).rstrip() for row_cells in cells]
- return lines
-
- def _report_constraint(self, name):
- val = self.get_constraint(name)
- if name in valueless_constraints:
- return " %s" % name
- else:
- if val is None:
- return "! %-5s: ---" % name
- else:
- return " %-5s: %.4f" % (name, val)
-
- def report_constraints_lines(self):
- lines = []
- required = 3 - len(self.all)
- if required == 0:
- pass
- elif required == 1:
- lines.append('! 1 more constraint required')
- else:
- lines.append('! %d more constraints required' % required)
- constraints = []
- constraints.extend(self.detector.keys())
- constraints.extend(self.naz.keys())
- constraints.extend(self.reference.keys())
- constraints.extend(sorted(self.sample.keys()))
- for name in constraints:
- lines.append(self._report_constraint(name))
- return lines
-
- def is_fully_constrained(self):
- return len(self.all) == 3
-
- def is_current_mode_implemented(self):
- if not self.is_fully_constrained():
- raise ValueError("Three constraints required")
-
- if len(self.sample) == 3:
- if set(self.sample.keys()) == set(['chi', 'phi', 'eta']):
- return True
- return False
-
- if len(self.sample) == 1:
- return True
-
- if len(self.reference) == 1:
- return (set(self.sample.keys()) == set(['chi', 'phi']) or
- set(self.sample.keys()) == set(['chi', 'eta']) or
- set(self.sample.keys()) == set(['chi', 'mu']) or
- set(self.sample.keys()) == set(['mu', 'eta']))
-
- if len(self.detector) == 1:
- return (set(self.sample.keys()) == set(['chi', 'phi']) or
- set(self.sample.keys()) == set(['mu', 'eta']) or
- set(self.sample.keys()) == set(['mu', 'phi'])
- )
-
- return False
-
-
- def _label_constraint(self, name):
- if name == '':
- label = ' '
-# elif self.is_tracking(name): # implies constrained
-# label = '~~> '
- elif (self.is_constrained(name) and (self.get_value(name) is None) and
- name not in valueless_constraints):
- label = 'o->'
- elif self.is_constrained(name):
- label = '-->'
- else:
- label = ' '
- return label
-
- def constrain(self, name):
- if self.is_constraint_fixed(name):
- raise DiffcalcException('%s is not a valid constraint name' % name)
- if name in self.all:
- return "%s is already constrained." % name.capitalize()
- elif name in det_constraints:
- return self._constrain_detector(name)
- elif name in ref_constraints:
- return self._constrain_reference(name)
- elif name in samp_constraints:
- return self._constrain_sample(name)
- else:
- raise DiffcalcException("%s is not a valid constraint name. Type 'con' for a table of constraint name" % name)
-
- def is_constraint_fixed(self, name):
- return ((name in det_constraints and self._hide_detector_constraint) or
- (name in samp_constraints and name in self._fixed_samp_constraints))
-
- def _constrain_detector(self, name):
- if self.naz:
- del self._constrained['naz']
- self._constrained[name] = None
- return 'Naz constraint replaced.'
- elif self.detector:
- constrained_name = self.detector.keys()[0]
- del self._constrained[constrained_name]
- self._constrained[name] = None
- return'%s constraint replaced.' % constrained_name.capitalize()
- elif len(self.all) == 3: # and no detector
- raise self._could_not_constrain_exception(name)
- else:
- self._constrained[name] = None
-
- def _could_not_constrain_exception(self, name):
- return DiffcalcException(
- "%s could not be constrained. First un-constrain one of the\n"
- "angles %s, %s or %s (with 'uncon')" %
- ((name.capitalize(),) + self.constrained_names))
-
- def _constrain_reference(self, name):
- if self.reference:
- constrained_name = self.reference.keys()[0]
- del self._constrained[constrained_name]
- self._constrained[name] = None
- return '%s constraint replaced.' % constrained_name.capitalize()
- elif len(self.all) == 3: # and no reference
- raise self._could_not_constrain_exception(name)
- else:
- self._constrained[name] = None
-
- def _constrain_sample(self, name):
- if len(self._constrained) < 3:
- # okay, more to add
- self._constrained[name] = None
- # else: three constraints are set
- elif len(self.sample) == 1:
- # (detector and reference constraints set)
- # it is clear which sample constraint to remove
- constrained_name = self.sample.keys()[0]
- del self._constrained[constrained_name]
- self._constrained[name] = None
- return '%s constraint replaced.' % constrained_name.capitalize()
- else:
- raise self._could_not_constrain_exception(name)
-
- def unconstrain(self, name):
- if self.is_constraint_fixed(name):
- raise DiffcalcException('%s is not a valid constraint name')
- if name in self._constrained:
- del self._constrained[name]
- else:
- return "%s was not already constrained." % name.capitalize()
-
- def _check_constraint_settable(self, name):
- if name not in all_constraints:
- raise DiffcalcException(
- 'Could not set %(name)s. This is not an available '
- 'constraint.' % locals())
- elif name not in self.all.keys():
- raise DiffcalcException(
- 'Could not set %(name)s. This is not currently '
- 'constrained.' % locals())
- elif name in valueless_constraints:
- raise DiffcalcException(
- 'Could not set %(name)s. This constraint takes no '
- 'value.' % locals())
-
- def clear_constraints(self):
- self._constrained = {}
-
- def set_constraint(self, name, value): # @ReservedAssignment
- if self.is_constraint_fixed(name):
- raise DiffcalcException('%s is not a valid constraint name')
- self._check_constraint_settable(name)
-# if name in self._tracking:
-# raise DiffcalcException(
-# "Could not set %s as this constraint is configured to track "
-# "its associated\nphysical angle. First remove this tracking "
-# "(use 'untrack %s').""" % (name, name))
- old_value = self.get_constraint(name)
- old = str(old_value) if old_value is not None else '---'
- self._constrained[name] = float(value) * TORAD
- new = str(value)
- return "%(name)s : %(old)s --> %(new)s" % locals()
-
- def get_constraint(self, name):
- value = self.all[name]
- return None if value is None else value * TODEG
-
\ No newline at end of file
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/hkl/you/geometry.py b/script/__Lib/diffcalc-2.1/diffcalc/hkl/you/geometry.py
deleted file mode 100755
index d8d034a..0000000
--- a/script/__Lib/diffcalc-2.1/diffcalc/hkl/you/geometry.py
+++ /dev/null
@@ -1,219 +0,0 @@
-###
-# Copyright 2008-2011 Diamond Light Source Ltd.
-# This file is part of Diffcalc.
-#
-# Diffcalc is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Diffcalc is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Diffcalc. If not, see .
-###
-
-from math import pi
-
-from diffcalc.util import AbstractPosition, DiffcalcException
-
-TORAD = pi / 180
-TODEG = 180 / pi
-from diffcalc.util import x_rotation, z_rotation, y_rotation
-
-from diffcalc.hkl.you.constraints import NUNAME
-
-class YouGeometry(object):
-
- def __init__(self, name, fixed_constraints, beamline_axes_transform=None):
- self.name = name
- self.fixed_constraints = fixed_constraints
- # beamline_axes_transform matrix is composed of the diffcalc basis vector coordinates
- # in the beamline coordinate system, i.e. it transforms the beamline coordinate system
- # into the reference diffcalc one.
- self.beamline_axes_transform = beamline_axes_transform
-
- def physical_angles_to_internal_position(self, physical_angle_tuple):
- raise NotImplementedError()
-
- def internal_position_to_physical_angles(self, internal_position):
- raise NotImplementedError()
-
- def create_position(self, *args):
- return YouPosition(*args, unit='DEG')
-
-
-#==============================================================================
-#==============================================================================
-# Geometry plugins for use with 'You' hkl calculation engine
-#==============================================================================
-#==============================================================================
-
-
-class SixCircle(YouGeometry):
- def __init__(self, beamline_axes_transform=None):
- YouGeometry.__init__(self, 'sixc', {}, beamline_axes_transform)
-
- def physical_angles_to_internal_position(self, physical_angle_tuple):
- # mu, delta, nu, eta, chi, phi
- return YouPosition(*physical_angle_tuple, unit='DEG')
-
- def internal_position_to_physical_angles(self, internal_position):
- clone_position = internal_position.clone()
- clone_position.changeToDegrees()
- return clone_position.totuple()
-
-
-class FourCircle(YouGeometry):
- """For a diffractometer with angles:
- delta, eta, chi, phi
- """
- def __init__(self, beamline_axes_transform=None):
- YouGeometry.__init__(self, 'fourc', {'mu': 0, NUNAME: 0}, beamline_axes_transform)
-
- def physical_angles_to_internal_position(self, physical_angle_tuple):
- # mu, delta, nu, eta, chi, phi
- delta, eta, chi, phi = physical_angle_tuple
- return YouPosition(0, delta, 0, eta, chi, phi, 'DEG')
-
- def internal_position_to_physical_angles(self, internal_position):
- clone_position = internal_position.clone()
- clone_position.changeToDegrees()
- _, delta, _, eta, chi, phi = clone_position.totuple()
- return delta, eta, chi, phi
-
-
-class FiveCircle(YouGeometry):
- """For a diffractometer with angles:
- delta, nu, eta, chi, phi
- """
- def __init__(self, beamline_axes_transform=None):
- YouGeometry.__init__(self, 'fivec', {'mu': 0}, beamline_axes_transform)
-
- def physical_angles_to_internal_position(self, physical_angle_tuple):
- # mu, delta, nu, eta, chi, phi
- delta, nu, eta, chi, phi = physical_angle_tuple
- return YouPosition(0, delta, nu, eta, chi, phi, 'DEG')
-
- def internal_position_to_physical_angles(self, internal_position):
- clone_position = internal_position.clone()
- clone_position.changeToDegrees()
- _, delta, nu, eta, chi, phi = clone_position.totuple()
- return delta, nu, eta, chi, phi
-
-
-#==============================================================================
-
-
-def create_you_matrices(mu=None, delta=None, nu=None, eta=None, chi=None,
- phi=None):
- """
- Create transformation matrices from H. You's paper.
- """
- MU = None if mu is None else calcMU(mu)
- DELTA = None if delta is None else calcDELTA(delta)
- NU = None if nu is None else calcNU(nu)
- ETA = None if eta is None else calcETA(eta)
- CHI = None if chi is None else calcCHI(chi)
- PHI = None if phi is None else calcPHI(phi)
- return MU, DELTA, NU, ETA, CHI, PHI
-
-
-def calcNU(nu):
- return x_rotation(nu)
-
-
-def calcDELTA(delta):
- return z_rotation(-delta)
-
-
-def calcMU(mu_or_alpha):
- return x_rotation(mu_or_alpha)
-
-
-def calcETA(eta):
- return z_rotation(-eta)
-
-
-def calcCHI(chi):
- return y_rotation(chi)
-
-
-def calcPHI(phi):
- return z_rotation(-phi)
-
-
-def you_position_names():
- return ('mu', 'delta', NUNAME, 'eta', 'chi', 'phi')
-
-class YouPosition(AbstractPosition):
-
- def __init__(self, mu, delta, nu, eta, chi, phi, unit):
- self.mu = mu
- self.delta = delta
- self.nu = nu
- self.eta = eta
- self.chi = chi
- self.phi = phi
- if unit not in ['DEG', 'RAD']:
- raise DiffcalcException("Invalid angle unit value %s." % str(unit))
- else:
- self.unit = unit
-
- def clone(self):
- return YouPosition(self.mu, self.delta, self.nu, self.eta, self.chi,
- self.phi, self.unit)
-
- def changeToRadians(self):
- if self.unit == 'DEG':
- self.mu *= TORAD
- self.delta *= TORAD
- self.nu *= TORAD
- self.eta *= TORAD
- self.chi *= TORAD
- self.phi *= TORAD
- self.unit = 'RAD'
- elif self.unit == 'RAD':
- return
- else:
- raise DiffcalcException("Invalid angle unit value %s." % str(self.unit))
-
- def changeToDegrees(self):
- if self.unit == 'RAD':
- self.mu *= TODEG
- self.delta *= TODEG
- self.nu *= TODEG
- self.eta *= TODEG
- self.chi *= TODEG
- self.phi *= TODEG
- self.unit = 'DEG'
- elif self.unit == 'DEG':
- return
- else:
- raise DiffcalcException("Invalid angle unit value %s." % str(self.unit))
-
- def totuple(self):
- return (self.mu, self.delta, self.nu, self.eta, self.chi, self.phi)
-
- def __str__(self):
- mu, delta, nu, eta, chi, phi = self.totuple()
- return ("YouPosition(mu %r delta: %r nu: %r eta: %r chi: %r phi: %r) in %s"
- % (mu, delta, nu, eta, chi, phi, self.unit))
-
- def __eq__(self, other):
- return self.totuple() == other.totuple()
-
-
-class WillmottHorizontalPosition(YouPosition):
-
- def __init__(self, delta=None, gamma=None, omegah=None, phi=None):
- self.mu = 0
- self.delta = delta
- self.nu = gamma
- self.eta = omegah
- self.chi = -90
- self.phi = phi
- self.unit= 'DEG'
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/hkl/you/hkl.py b/script/__Lib/diffcalc-2.1/diffcalc/hkl/you/hkl.py
deleted file mode 100755
index fe3e806..0000000
--- a/script/__Lib/diffcalc-2.1/diffcalc/hkl/you/hkl.py
+++ /dev/null
@@ -1,187 +0,0 @@
-###
-# Copyright 2008-2011 Diamond Light Source Ltd.
-# This file is part of Diffcalc.
-#
-# Diffcalc is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Diffcalc is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Diffcalc. If not, see .
-###
-
-from __future__ import absolute_import
-
-from diffcalc.hkl.common import getNameFromScannableOrString
-from diffcalc.util import command
-from diffcalc.hkl.you.calc import YouHklCalculator
-from diffcalc import settings
-
-
-
-import diffcalc.ub.ub
-from diffcalc.hkl.you.constraints import YouConstraintManager
-
-__all__ = ['allhkl', 'con', 'uncon', 'hklcalc', 'constraint_manager']
-
-
-_fixed_constraints = settings.geometry.fixed_constraints # @UndefinedVariable
-
-constraint_manager = YouConstraintManager(settings.hardware, _fixed_constraints)
-
-hklcalc = YouHklCalculator(
- diffcalc.ub.ub.ubcalc, settings.geometry, settings.hardware, constraint_manager)
-
-
-def __str__(self):
- return hklcalc.__str__()
-
-@command
-def con(*args):
- """
- con -- list available constraints and values
- con {val} -- constrains and optionally sets one constraint
- con {val} {val} {val} -- clears and then fully constrains
-
- Select three constraints using 'con' and 'uncon'. Choose up to one
- from each of the sample and detector columns and up to three from
- the sample column.
-
- Not all constraint combinations are currently available:
-
- 1 x samp: all 80 of 80
-
- 2 x samp and 1 x ref: chi & phi
- chi & eta
- chi & mu
- mu & eta (4 of 6)
-
- 2 x samp and 1 x det: chi & phi
- mu & eta
- mu & phi (3 of 6)
-
- 3 x samp: eta, chi & phi (1 of 4)
-
- See also 'uncon'
- """
- args = list(args)
- msg = _handle_con(args)
- if (hklcalc.constraints.is_fully_constrained() and
- not hklcalc.constraints.is_current_mode_implemented()):
- msg += ("\n\nWARNING:. The selected constraint combination is valid but "
- "is not implemented.\n\nType 'help con' to see implemented combinations")
-
- if msg:
- print msg
-
-def _handle_con(args):
- if not args:
- return hklcalc.constraints.__str__()
-
- if len(args) > 6:
- raise TypeError("Unexpected args: " + str(args))
-
- cons_value_pairs = []
- while args:
- scn_or_str = args.pop(0)
- name = getNameFromScannableOrString(scn_or_str)
- if args and isinstance(args[0], (int, long, float)):
- value = args.pop(0)
- else:
- try:
- value = settings.hardware.get_position_by_name(name)
- except ValueError:
- value = None
- cons_value_pairs.append((name, value))
-
- if len(cons_value_pairs) == 1:
- pass
- elif len(cons_value_pairs) == 3:
- hklcalc.constraints.clear_constraints()
- else:
- raise TypeError("Either one or three constraints must be specified")
- for name, value in cons_value_pairs:
- hklcalc.constraints.constrain(name)
- if value is not None:
- hklcalc.constraints.set_constraint(name, value)
- return '\n'.join(hklcalc.constraints.report_constraints_lines())
-
-
-@command
-def uncon(scn_or_string):
- """uncon -- remove constraint
-
- See also 'con'
- """
- name = getNameFromScannableOrString(scn_or_string)
- hklcalc.constraints.unconstrain(name)
- print '\n'.join(hklcalc.constraints.report_constraints_lines())
-
-@command
-def allhkl(hkl, wavelength=None):
- """allhkl [h k l] -- print all hkl solutions ignoring limits
-
- """
- hardware = hklcalc._hardware
- geometry = hklcalc._geometry
- if wavelength is None:
- wavelength = hardware.get_wavelength()
- h, k, l = hkl
- pos_virtual_angles_pairs = hklcalc.hkl_to_all_angles(
- h, k, l, wavelength)
- cells = []
- # virtual_angle_names = list(pos_virtual_angles_pairs[0][1].keys())
- # virtual_angle_names.sort()
- virtual_angle_names = ['qaz', 'psi', 'naz', 'tau', 'theta', 'alpha', 'beta']
- header_cells = list(hardware.get_axes_names()) + [' '] + virtual_angle_names
- cells.append(['%9s' % s for s in header_cells])
- cells.append([''] * len(header_cells))
-
-
- for pos, virtual_angles in pos_virtual_angles_pairs:
- row_cells = []
-
-
- angle_tuple = geometry.internal_position_to_physical_angles(pos)
- angle_tuple = hardware.cut_angles(angle_tuple)
- for val in angle_tuple:
- row_cells.append('%9.4f' % val)
-
- row_cells.append('|')
-
- for name in virtual_angle_names:
- row_cells.append('%9.4f' % virtual_angles[name])
- cells.append(row_cells)
-
-
- column_widths = []
- for col in range(len(cells[0])):
- widths = []
- for row in range(len(cells)):
- cell = cells[row][col]
- width = len(cell.strip())
- widths.append(width)
- column_widths.append(max(widths))
-
- lines = []
- for row_cells in cells:
- trimmed_row_cells = []
- for cell, width in zip(row_cells, column_widths):
- trimmed_cell = cell.strip().rjust(width)
- trimmed_row_cells.append(trimmed_cell)
- lines.append(' '.join(trimmed_row_cells))
- print '\n'.join(lines)
-
-
-commands_for_help = ['Constraints',
- con,
- uncon,
- 'Hkl',
- allhkl
- ]
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/log.py b/script/__Lib/diffcalc-2.1/diffcalc/log.py
deleted file mode 100755
index ac4f1af..0000000
--- a/script/__Lib/diffcalc-2.1/diffcalc/log.py
+++ /dev/null
@@ -1,27 +0,0 @@
-###
-# Copyright 2008-2011 Diamond Light Source Ltd.
-# This file is part of Diffcalc.
-#
-# Diffcalc is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Diffcalc is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Diffcalc. If not, see .
-###
-
-from __future__ import absolute_import
-
-import logging
-import getpass
-
-logging.basicConfig(format="%(asctime)s %(levelname)s:%(name)s:%(message)s",
- datefmt='%m/%d/%Y %I:%M:%S',
- filename='/tmp/diffcalc_%s.log' % getpass.getuser(),
- level=logging.DEBUG)
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/settings.py b/script/__Lib/diffcalc-2.1/diffcalc/settings.py
deleted file mode 100755
index 5221212..0000000
--- a/script/__Lib/diffcalc-2.1/diffcalc/settings.py
+++ /dev/null
@@ -1,24 +0,0 @@
-'''
-Created on Aug 5, 2013
-
-@author: walton
-'''
-import os
-
-from diffcalc.ub.persistence import UbCalculationNonPersister
-
-# These should be by the user *before* importing other modules
-geometry = None
-hardware = None
-ubcalc_persister = UbCalculationNonPersister()
-
-axes_scannable_group = None
-energy_scannable = None
-energy_scannable_multiplier_to_get_KeV=1
-
-
-# These will be set by dcyou, dcvlieg or dcwillmot
-ubcalc_strategy = None
-angles_to_hkl_function = None # Used by checkub to avoid coupling it to an hkl module
-include_sigtau=False
-include_reference=False
\ No newline at end of file
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/ub/__init__.py b/script/__Lib/diffcalc-2.1/diffcalc/ub/__init__.py
deleted file mode 100755
index e69de29..0000000
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/ub/calc.py b/script/__Lib/diffcalc-2.1/diffcalc/ub/calc.py
deleted file mode 100755
index d71bc5e..0000000
--- a/script/__Lib/diffcalc-2.1/diffcalc/ub/calc.py
+++ /dev/null
@@ -1,854 +0,0 @@
-###
-# Copyright 2008-2011 Diamond Light Source Ltd.
-# This file is part of Diffcalc.
-#
-# Diffcalc is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Diffcalc is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Diffcalc. If not, see .
-###
-
-from diffcalc.ub.calcstate import decode_ubcalcstate
-from diffcalc.ub.calcstate import UBCalcState
-from diffcalc.ub.crystal import CrystalUnderTest
-from diffcalc.ub.reflections import ReflectionList
-from diffcalc.ub.persistence import UBCalculationJSONPersister, UBCalculationPersister
-from diffcalc.util import DiffcalcException, cross3, dot3, bold, xyz_rotation,\
- bound
-from math import acos, cos, sin, pi
-from diffcalc.ub.reference import YouReference
-from diffcalc.ub.orientations import OrientationList
-
-try:
- from numpy import matrix, hstack
- from numpy.linalg import norm
-except ImportError:
- from numjy import matrix, hstack
- from numjy.linalg import norm
-
-SMALL = 1e-7
-TODEG = 180 / pi
-
-WIDTH = 13
-
-def z(num):
- """Round to zero if small. This is useful to get rid of erroneous
- minus signs resulting from float representation close to zero.
- """
- if abs(num) < SMALL:
- num = 0
- return num
-
-#The UB matrix is used to find or set the orientation of a set of
-#planes described by an hkl vector. The U matrix can be used to find
-#or set the orientation of the crystal lattices' y axis. If there is
-#crystal miscut the crystal lattices y axis is not parallel to the
-#crystals optical surface normal. For surface diffraction experiments,
-#where not only the crystal lattice must be oriented appropriately but
-#so must the crystal's optical surface, two angles tau and sigma are
-#used to describe the difference between the two. Sigma is (minus) the
-#ammount of chi axis rotation and tau (minus) the ammount of phi axis
-#rotation needed to move the surface normal into the direction of the
-
-
-class PaperSpecificUbCalcStrategy(object):
-
- def calculate_q_phi(self, pos):
- """Calculate hkl in the phi frame in units of 2 * pi / lambda from
- pos object in radians"""
- raise NotImplementedError()
-
-
-class UBCalculation:
- """A UB matrix calculation for an experiment.
-
- Contains the parameters for the _crystal under test, a list of measured
- reflections and, if its been calculated, a UB matrix to be used by the rest
- of the code.
- """
-
- def __init__(self, hardware, diffractometerPluginObject,
- persister, strategy, include_sigtau=True, include_reference=True):
-
- # The diffractometer geometry is required to map the internal angles
- # into those used by this diffractometer (for display only)
-
- self._hardware = hardware
- self._geometry = diffractometerPluginObject
- self._persister = persister
- self._strategy = strategy
- self.include_sigtau = include_sigtau
- self.include_reference = include_reference
- try:
- self._ROT = diffractometerPluginObject.beamline_axes_transform
- except AttributeError:
- self._ROT = None
- self._clear()
-
- def _get_diffractometer_axes_names(self):
- return self._hardware.get_axes_names()
-
- def _clear(self, name=None):
- # NOTE the Diffraction calculator is expecting this object to exist in
- # the long run. We can't remove this entire object, and recreate it.
- # It also contains a required link to the angle calculator.
- reflist = ReflectionList(self._geometry, self._get_diffractometer_axes_names())
- orientlist = OrientationList()
- reference = YouReference(self._get_UB)
- self._state = UBCalcState(name=name, reflist=reflist, orientlist=orientlist, reference=reference)
- self._U = None
- self._UB = None
- self._state.configure_calc_type()
-
-### State ###
- def start_new(self, name):
- """start_new(name) --- creates a new blank ub calculation"""
- # Create storage object if name does not exist (TODO)
- if name in self._persister.list():
- print ("No UBCalculation started: There is already a calculation "
- "called: " + name)
- print "Saved calculations: " + repr(self._persister.list())
- return
- self._clear(name)
- self.save()
-
- def load(self, name):
- state = self._persister.load(name)
- if isinstance(self._persister, UBCalculationJSONPersister):
- self._state = decode_ubcalcstate(state, self._geometry, self._get_diffractometer_axes_names())
- self._state.reference.get_UB = self._get_UB
- elif isinstance(self._persister, UBCalculationPersister):
- self._state = state
- else:
- raise Exception('Unexpected persister type: ' + str(self._persister))
- if self._state.manual_U is not None:
- self._U = self._state.manual_U
- self._UB = self._U * self._state.crystal.B
- self.save()
- elif self._state.manual_UB is not None:
- self._UB = self._state.manual_UB
- self.save()
- elif self._state.or0 is not None:
- if self._state.or1 is None:
- self.calculate_UB_from_primary_only()
- else:
- if self._state.reflist:
- self.calculate_UB()
- elif self._state.orientlist:
- self.calculate_UB_from_orientation()
- else:
- pass
- else:
- pass
-
- def save(self):
- self.saveas(self._state.name)
-
- def saveas(self, name):
- self._state.name = name
- self._persister.save(self._state, name)
-
- def listub(self):
- return self._persister.list()
-
- def listub_metadata(self):
- return self._persister.list_metadata()
-
- def remove(self, name):
- self._persister.remove(name)
- if self._state == name:
- self._clear(name)
-
- def getState(self):
- return self._state.getState()
-
- def __str__(self):
-
- if self._state.name is None:
- return "<<< No UB calculation started >>>"
- lines = []
- lines.append(bold("UBCALC"))
- lines.append("")
- lines.append(
- " name:".ljust(WIDTH) + self._state.name.rjust(9))
-
- if self.include_sigtau:
- lines.append("")
- lines.append(
- " sigma:".ljust(WIDTH) + ("% 9.5f" % self._state.sigma).rjust(9))
- lines.append(
- " tau:".ljust(WIDTH) + ("% 9.5f" % self._state.tau).rjust(9))
-
- if self.include_reference:
- lines.append("")
- ub_calculated = self._UB is not None
- lines.extend(self._state.reference.repr_lines(ub_calculated, WIDTH, self._ROT))
-
- lines.append("")
- lines.append(bold("CRYSTAL"))
- lines.append("")
-
- if self._state.crystal is None:
- lines.append(" <<< none specified >>>")
- else:
- lines.extend(self._state.crystal.str_lines())
-
- lines.append("")
- lines.append(bold("UB MATRIX"))
- lines.append("")
-
- if self._UB is None:
- lines.append(" <<< none calculated >>>")
- else:
- lines.extend(self.str_lines_u())
- lines.append("")
- lines.extend(self.str_lines_u_angle_and_axis())
- lines.append("")
- lines.extend(self.str_lines_ub())
-
- lines.append("")
- lines.append(bold("REFLECTIONS"))
- lines.append("")
-
- lines.extend(self._state.reflist.str_lines())
-
- lines.append("")
- lines.append(bold("CRYSTAL ORIENTATIONS"))
- lines.append("")
-
- lines.extend(self._state.orientlist.str_lines(R=self._ROT))
-
- return '\n'.join(lines)
-
- def str_lines_u(self):
- lines = []
- fmt = "% 9.5f % 9.5f % 9.5f"
- try:
- U = self._ROT.I * self.U * self._ROT
- except AttributeError:
- U = self.U
- lines.append(" U matrix:".ljust(WIDTH) +
- fmt % (z(U[0, 0]), z(U[0, 1]), z(U[0, 2])))
- lines.append(' ' * WIDTH + fmt % (z(U[1, 0]), z(U[1, 1]), z(U[1, 2])))
- lines.append(' ' * WIDTH + fmt % (z(U[2, 0]), z(U[2, 1]), z(U[2, 2])))
- return lines
-
- def str_lines_u_angle_and_axis(self):
- lines = []
- fmt = "% 9.5f % 9.5f % 9.5f"
- y = matrix('0; 0; 1')
- try:
- rotation_axis = cross3(self._ROT * y, self._ROT * self.U * y)
- except TypeError:
- rotation_axis = cross3(y, self.U * y)
- if abs(norm(rotation_axis)) < SMALL:
- lines.append(" miscut angle:".ljust(WIDTH) + " 0")
- else:
- rotation_axis = rotation_axis * (1 / norm(rotation_axis))
- cos_rotation_angle = dot3(y, self.U * y)
- rotation_angle = acos(cos_rotation_angle)
-
- lines.append(" miscut:")
- lines.append(" angle:".ljust(WIDTH) + "% 9.5f" % (rotation_angle * TODEG))
- lines.append(" axis:".ljust(WIDTH) + fmt % tuple((rotation_axis.T).tolist()[0]))
-
- return lines
-
- def str_lines_ub(self):
- lines = []
- fmt = "% 9.5f % 9.5f % 9.5f"
- try:
- RI = self._ROT.I
- B = self._state.crystal.B
- UB = RI * self.UB * B.I * self._ROT * B
- except AttributeError:
- UB = self.UB
- lines.append(" UB matrix:".ljust(WIDTH) +
- fmt % (z(UB[0, 0]), z(UB[0, 1]), z(UB[0, 2])))
- lines.append(' ' * WIDTH + fmt % (z(UB[1, 0]), z(UB[1, 1]), z(UB[1, 2])))
- lines.append(' ' * WIDTH + fmt % (z(UB[2, 0]), z(UB[2, 1]), z(UB[2, 2])))
- return lines
-
- @property
- def name(self):
- return self._state.name
-### Lattice ###
-
- def set_lattice(self, name, *shortform):
- """
- Converts a list shortform crystal parameter specification to a six-long
- tuple returned as . Returns None if wrong number of input args. See
- set_lattice() for a description of the shortforms supported.
-
- shortformLattice -- a tuple as follows:
- [a] - assumes cubic
- [a,b]) - assumes tetragonal
- [a,b,c]) - assumes ortho
- [a,b,c,gam]) - assumes mon/hex gam different from 90.
- [a,b,c,alp,bet,gam]) - for arbitrary
- where all measurements in angstroms and angles in degrees
- """
- self._set_lattice_without_saving(name, *shortform)
- self.save()
-
- def _set_lattice_without_saving(self, name, *shortform):
- sf = shortform
- if len(sf) == 1:
- fullform = (sf[0], sf[0], sf[0], 90., 90., 90.) # cubic
- elif len(sf) == 2:
- fullform = (sf[0], sf[0], sf[1], 90., 90., 90.) # tetragonal
- elif len(sf) == 3:
- fullform = (sf[0], sf[1], sf[2], 90., 90., 90.) # ortho
- elif len(sf) == 4:
- fullform = (sf[0], sf[1], sf[2], 90., 90., sf[3]) # mon/hex gam
- # not 90
- elif len(sf) == 5:
- raise ValueError("wrong length input to set_lattice")
- elif len(sf) == 6:
- fullform = sf # triclinic/arbitrary
- else:
- raise ValueError("wrong length input to set_lattice")
- self._set_lattice(name, *fullform)
-
- def _set_lattice(self, name, a, b, c, alpha, beta, gamma):
- """set lattice parameters in degrees"""
- if self._state.name is None:
- raise DiffcalcException(
- "Cannot set lattice until a UBCalcaluation has been started "
- "with newubcalc")
- self._state.crystal = CrystalUnderTest(name, a, b, c, alpha, beta, gamma)
- # Clear U and UB if these exist
- if self._U is not None: # (UB will also exist)
- print "Warning: the old UB calculation has been cleared."
- print " Use 'calcub' to recalculate with old reflections or"
- print " 'orientub' to recalculate with old orientations."
-
-### Surface normal stuff ###
-
- def _gettau(self):
- """
- Returns tau (in degrees): the (minus) ammount of phi axis rotation ,
- that together with some chi axis rotation (minus sigma) brings the
- optical surface normal parallel to the omega axis.
- """
- return self._state.tau
-
- def _settau(self, tau):
- self._state.tau = tau
- self.save()
-
- tau = property(_gettau, _settau)
-
- def _getsigma(self):
- """
- Returns sigma (in degrees): the (minus) ammount of phi axis rotation ,
- that together with some phi axis rotation (minus tau) brings the
- optical surface normal parallel to the omega axis.
- """
- return self._state.sigma
-
- def _setsigma(self, sigma):
- self.state._sigma = sigma
- self.save()
-
- sigma = property(_getsigma, _setsigma)
-
-
-### Reference vector ###
-
- def _get_n_phi(self):
- return self._state.reference.n_phi
-
- n_phi = property(_get_n_phi)
-
- def set_n_phi_configured(self, n_phi):
- try:
- self._state.reference.n_phi_configured = self._ROT.I * n_phi
- except AttributeError:
- self._state.reference.n_phi_configured = n_phi
- self.save()
-
- def set_n_hkl_configured(self, n_hkl):
- self._state.reference.n_hkl_configured = n_hkl
- self.save()
-
- def print_reference(self):
- print '\n'.join(self._state.reference.repr_lines(self.is_ub_calculated(), R=self._ROT))
-
-### Reflections ###
-
- def add_reflection(self, h, k, l, position, energy, tag, time):
- """add_reflection(h, k, l, position, tag=None) -- adds a reflection
-
- position is in degrees and in the systems internal representation.
- """
- if self._state.reflist is None:
- raise DiffcalcException("No UBCalculation loaded")
- self._state.reflist.add_reflection(h, k, l, position, energy, tag, time)
- self.save() # incase autocalculateUbAndReport fails
-
- # If second reflection has just been added then calculateUB
- if len(self._state.reflist) == 2:
- self._autocalculateUbAndReport()
- self.save()
-
- def edit_reflection(self, num, h, k, l, position, energy, tag, time):
- """
- edit_reflection(num, h, k, l, position, tag=None) -- adds a reflection
-
- position is in degrees and in the systems internal representation.
- """
- if self._state.reflist is None:
- raise DiffcalcException("No UBCalculation loaded")
- self._state.reflist.edit_reflection(num, h, k, l, position, energy, tag, time)
-
- # If first or second reflection has been changed and there are at least
- # two reflections then recalculate UB
- if (num == 1 or num == 2) and len(self._state.reflist) >= 2:
- self._autocalculateUbAndReport()
- self.save()
-
- def get_reflection(self, num):
- """--> ( [h, k, l], position, energy, tag, time
- num starts at 1, position in degrees"""
- return self._state.reflist.getReflection(num)
-
- def get_reflection_in_external_angles(self, num):
- """--> ( [h, k, l], position, energy, tag, time
- num starts at 1, position in degrees"""
- return self._state.reflist.get_reflection_in_external_angles(num)
-
- def get_number_reflections(self):
- return 0 if self._state.reflist is None else len(self._state.reflist)
-
- def del_reflection(self, reflectionNumber):
- self._state.reflist.removeReflection(reflectionNumber)
- if ((reflectionNumber == 1 or reflectionNumber == 2) and
- (self._U is not None)):
- self._autocalculateUbAndReport()
- self.save()
-
- def swap_reflections(self, num1, num2):
- self._state.reflist.swap_reflections(num1, num2)
- if ((num1 == 1 or num1 == 2 or num2 == 1 or num2 == 2) and
- (self._U is not None)):
- self._autocalculateUbAndReport()
- self.save()
-
- def _autocalculateUbAndReport(self):
- if len(self._state.reflist) < 2:
- pass
- elif self._state.crystal is None:
- print ("Not calculating UB matrix as no lattice parameters have "
- "been specified.")
- elif not self._state.is_okay_to_autocalculate_ub:
- print ("Not calculating UB matrix as it has been manually set. "
- "Use 'calcub' to explicitly recalculate it.")
- else: # okay to autocalculate
- if self._UB is None:
- print "Calculating UB matrix."
- else:
- print "Recalculating UB matrix."
- self.calculate_UB()
-
-### Orientations ###
-
- def add_orientation(self, h, k, l, x, y, z, tag, time):
- """add_reflection(h, k, l, x, y, z, tag=None) -- adds a crystal orientation
- """
- if self._state.orientlist is None:
- raise DiffcalcException("No UBCalculation loaded")
- try:
- xyz_rot = self._ROT * matrix([[x],[y],[z]])
- xr, yr, zr = xyz_rot.T.tolist()[0]
- self._state.orientlist.add_orientation(h, k, l, xr, yr, zr, tag, time)
- except TypeError:
- self._state.orientlist.add_orientation(h, k, l, x, y, z, tag, time)
- self.save() # incase autocalculateUbAndReport fails
-
- # If second reflection has just been added then calculateUB
- if len(self._state.orientlist) == 2:
- self._autocalculateOrientationUbAndReport()
- self.save()
-
- def edit_orientation(self, num, h, k, l, x, y, z, tag, time):
- """
- edit_orientation(num, h, k, l, x, y, z, tag=None) -- edit a crystal reflection """
- if self._state.orientlist is None:
- raise DiffcalcException("No UBCalculation loaded")
- try:
- xyz_rot = self._ROT * matrix([[x],[y],[z]])
- xr, yr, zr = xyz_rot.T.tolist()[0]
- self._state.orientlist.edit_orientation(num, h, k, l, xr, yr, zr, tag, time)
- except TypeError:
- self._state.orientlist.edit_orientation(num, h, k, l, x, y, z, tag, time)
-
- # If first or second orientation has been changed and there are
- # two orientations then recalculate UB
- if (num == 1 or num == 2) and len(self._state.orientlist) == 2:
- self._autocalculateOrientationUbAndReport()
- self.save()
-
- def get_orientation(self, num):
- """--> ( [h, k, l], [x, y, z], tag, time )
- num starts at 1"""
- try:
- hkl, xyz, tg, tm = self._state.orientlist.getOrientation(num)
- xyz_rot = self._ROT.I * matrix([[xyz[0]],[xyz[1]],[xyz[2]]])
- xyz_lst = xyz_rot.T.tolist()[0]
- return hkl, xyz_lst, tg, tm
- except AttributeError:
- return self._state.orientlist.getOrientation(num)
-
-
- def get_number_orientations(self):
- return 0 if self._state.orientlist is None else len(self._state.reflist)
-
- def del_orientation(self, orientationNumber):
- self._state.orientlist.removeOrientation(orientationNumber)
- if ((orientationNumber == 2) and (self._U is not None)):
- self._autocalculateOrientationUbAndReport()
- self.save()
-
- def swap_orientations(self, num1, num2):
- self._state.orientlist.swap_orientations(num1, num2)
- if ((num1 == 2 or num2 == 2) and
- (self._U is not None)):
- self._autocalculateOrientationUbAndReport()
- self.save()
-
- def _autocalculateOrientationUbAndReport(self):
- if len(self._state.orientlist) < 2:
- pass
- elif self._state.crystal is None:
- print ("Not calculating UB matrix as no lattice parameters have "
- "been specified.")
- elif not self._state.is_okay_to_autocalculate_ub:
- print ("Not calculating UB matrix as it has been manually set. "
- "Use 'orientub' to explicitly recalculate it.")
- else: # okay to autocalculate
- if self._UB is None:
- print "Calculating UB matrix."
- else:
- print "Recalculating UB matrix."
- self.calculate_UB_from_orientation()
-
-# @property
-# def reflist(self):
-# return self._state.reflist
-### Calculations ###
-
- def set_U_manually(self, m):
- """Manually sets U. matrix must be 3*3 Jama or python matrix.
- Turns off aution UB calcualtion."""
-
- # Check matrix is a 3*3 Jama matrix
- if m.__class__ != matrix:
- m = matrix(m) # assume its a python matrix
- if m.shape[0] != 3 or m.shape[1] != 3:
- raise ValueError("Expects 3*3 matrix")
-
- if self._UB is None:
- print "Calculating UB matrix."
- else:
- print "Recalculating UB matrix."
-
- if self._ROT is not None:
- self._U = self._ROT * m * self._ROT.I
- else:
- self._U = m
- self._state.configure_calc_type(manual_U=self._U)
- if self._state.crystal is None:
- raise DiffcalcException(
- "A crystal must be specified before manually setting U")
- self._UB = self._U * self._state.crystal.B
- print ("NOTE: A new UB matrix will not be automatically calculated "
- "when the orientation reflections are modified.")
- self.save()
-
- def set_UB_manually(self, m):
- """Manually sets UB. matrix must be 3*3 Jama or python matrix.
- Turns off aution UB calcualtion."""
-
- # Check matrix is a 3*3 Jama matrix
- if m.__class__ != matrix:
- m = matrix(m) # assume its a python matrix
- if m.shape[0] != 3 or m.shape[1] != 3:
- raise ValueError("Expects 3*3 matrix")
-
- if self._ROT is not None:
- self._UB = self._ROT * m
- else:
- self._UB = m
- self._state.configure_calc_type(manual_UB=self._UB)
- self.save()
-
- @property
- def U(self):
- if self._U is None:
- raise DiffcalcException(
- "No U matrix has been calculated during this ub calculation")
- return self._U
-
- @property
- def UB(self):
- return self._get_UB()
-
- def is_ub_calculated(self):
- return self._UB is not None
-
- def _get_UB(self):
- if not self.is_ub_calculated():
- raise DiffcalcException(
- "No UB matrix has been calculated during this ub calculation")
- else:
- return self._UB
-
- def _calc_UB(self, h1, h2, u1p, u2p):
- B = self._state.crystal.B
- h1c = B * h1
- h2c = B * h2
-
- # Create modified unit vectors t1, t2 and t3 in crystal and phi systems
- t1c = h1c
- t3c = cross3(h1c, h2c)
- t2c = cross3(t3c, t1c)
-
- t1p = u1p # FIXED from h1c 9July08
- t3p = cross3(u1p, u2p)
- t2p = cross3(t3p, t1p)
-
- # ...and nornmalise and check that the reflections used are appropriate
- SMALL = 1e-4 # Taken from Vlieg's code
- e = DiffcalcException("Invalid orientation reflection(s)")
-
- def normalise(m):
- d = norm(m)
- if d < SMALL:
- raise e
- return m / d
-
- t1c = normalise(t1c)
- t2c = normalise(t2c)
- t3c = normalise(t3c)
-
- t1p = normalise(t1p)
- t2p = normalise(t2p)
- t3p = normalise(t3p)
-
- Tc = hstack([t1c, t2c, t3c])
- Tp = hstack([t1p, t2p, t3p])
- self._state.configure_calc_type(or0=1, or1=2)
- self._U = Tp * Tc.I
- self._UB = self._U * B
- self.save()
-
- def calculate_UB(self):
- """
- Calculate orientation matrix. Uses first two orientation reflections
- as in Busang and Levy, but for the diffractometer in Lohmeier and
- Vlieg.
- """
-
- # Major variables:
- # h1, h2: user input reciprical lattice vectors of the two reflections
- # h1c, h2c: user input vectors in cartesian crystal plane
- # pos1, pos2: measured diffractometer positions of the two reflections
- # u1a, u2a: measured reflection vectors in alpha frame
- # u1p, u2p: measured reflection vectors in phi frame
-
-
- # Get hkl and angle values for the first two refelctions
- if self._state.reflist is None:
- raise DiffcalcException("Cannot calculate a U matrix until a "
- "UBCalculation has been started with "
- "'newub'")
- try:
- (h1, pos1, _, _, _) = self._state.reflist.getReflection(1)
- (h2, pos2, _, _, _) = self._state.reflist.getReflection(2)
- except IndexError:
- raise DiffcalcException(
- "Two reflections are required to calculate a U matrix")
- h1 = matrix([h1]).T # row->column
- h2 = matrix([h2]).T
- pos1.changeToRadians()
- pos2.changeToRadians()
-
- # Compute the two reflections' reciprical lattice vectors in the
- # cartesian crystal frame
- u1p = self._strategy.calculate_q_phi(pos1)
- u2p = self._strategy.calculate_q_phi(pos2)
-
- self._calc_UB(h1, h2, u1p, u2p)
-
- def calculate_UB_from_orientation(self):
- """
- Calculate orientation matrix. Uses first two crystal orientations.
- """
-
- # Major variables:
- # h1, h2: user input reciprical lattice vectors of the two reflections
- # h1c, h2c: user input vectors in cartesian crystal plane
- # pos1, pos2: measured diffractometer positions of the two reflections
- # u1a, u2a: measured reflection vectors in alpha frame
- # u1p, u2p: measured reflection vectors in phi frame
-
-
- # Get hkl and angle values for the first two crystal orientations
- if self._state.orientlist is None:
- raise DiffcalcException("Cannot calculate a U matrix until a "
- "UBCalculation has been started with "
- "'newub'")
- try:
- (h1, x1, _, _) = self._state.orientlist.getOrientation(1)
- (h2, x2, _, _) = self._state.orientlist.getOrientation(2)
- except IndexError:
- raise DiffcalcException(
- "Two crystal orientations are required to calculate a U matrix")
- h1 = matrix([h1]).T # row->column
- h2 = matrix([h2]).T
- u1p = matrix([x1]).T
- u2p = matrix([x2]).T
-
- self._calc_UB(h1, h2, u1p, u2p)
-
- def calculate_UB_from_primary_only(self):
- """
- Calculate orientation matrix with the shortest absolute angle change.
- Uses first orientation reflection
- """
-
- # Algorithm from http://www.j3d.org/matrix_faq/matrfaq_latest.html
-
- # Get hkl and angle values for the first two refelctions
- if self._state.reflist is None:
- raise DiffcalcException(
- "Cannot calculate a u matrix until a UBCalcaluation has been "
- "started with newub")
- try:
- (h, pos, _, _, _) = self._state.reflist.getReflection(1)
- except IndexError:
- raise DiffcalcException(
- "One reflection is required to calculate a u matrix")
-
- h = matrix([h]).T # row->column
- pos.changeToRadians()
- B = self._state.crystal.B
- h_crystal = B * h
- h_crystal = h_crystal * (1 / norm(h_crystal))
-
- q_measured_phi = self._strategy.calculate_q_phi(pos)
- q_measured_phi = q_measured_phi * (1 / norm(q_measured_phi))
-
- rotation_axis = cross3(h_crystal, q_measured_phi)
- rotation_axis = rotation_axis * (1 / norm(rotation_axis))
-
- cos_rotation_angle = dot3(h_crystal, q_measured_phi)
- rotation_angle = acos(cos_rotation_angle)
-
- uvw = rotation_axis.T.tolist()[0] # TODO: cleanup
- print "resulting U angle: %.5f deg" % (rotation_angle * TODEG)
- u_repr = (', '.join(['% .5f' % el for el in uvw]))
- print "resulting U axis direction: [%s]" % u_repr
-
- u, v, w = uvw
- rcos = cos(rotation_angle)
- rsin = sin(rotation_angle)
- m = [[0, 0, 0], [0, 0, 0], [0, 0, 0]] # TODO: tidy
- m[0][0] = rcos + u * u * (1 - rcos)
- m[1][0] = w * rsin + v * u * (1 - rcos)
- m[2][0] = -v * rsin + w * u * (1 - rcos)
- m[0][1] = -w * rsin + u * v * (1 - rcos)
- m[1][1] = rcos + v * v * (1 - rcos)
- m[2][1] = u * rsin + w * v * (1 - rcos)
- m[0][2] = v * rsin + u * w * (1 - rcos)
- m[1][2] = -u * rsin + v * w * (1 - rcos)
- m[2][2] = rcos + w * w * (1 - rcos)
-
- if self._UB is None:
- print "Calculating UB matrix from the first reflection only."
- else:
- print "Recalculating UB matrix from the first reflection only."
- print ("NOTE: A new UB matrix will not be automatically calculated "
- "when the orientation reflections are modified.")
-
- self._state.configure_calc_type(or0=1)
-
- self._U = matrix(m)
- self._UB = self._U * B
-
- self.save()
-
- def set_miscut(self, xyz, angle, add_miscut=False):
- """Calculate U matrix using a miscut axis and an angle"""
- if xyz is None:
- rot_matrix = xyz_rotation([0, 1, 0], angle)
- if self.is_ub_calculated() and add_miscut:
- self._U = rot_matrix * self._U
- else:
- self._U = rot_matrix
- else:
- rot_matrix = xyz_rotation(xyz, angle)
- try:
- rot_matrix = self._ROT * rot_matrix * self._ROT.I
- except TypeError:
- pass
- if self.is_ub_calculated() and add_miscut:
- self._U = rot_matrix * self._U
- else:
- self._U = rot_matrix
- self._state.configure_calc_type(manual_U=self._U)
- self._UB = self._U * self._state.crystal.B
- self.print_reference()
- self.save()
-
- def get_hkl_plane_distance(self, hkl):
- """Calculates and returns the distance between planes"""
- return self._state.crystal.get_hkl_plane_distance(hkl)
-
- def get_hkl_plane_angle(self, hkl1, hkl2):
- """Calculates and returns the angle between planes"""
- return self._state.crystal.get_hkl_plane_angle(hkl1, hkl2)
-
- def rescale_unit_cell(self, h, k, l, pos):
- """
- Calculate unit cell scaling parameter that matches
- given hkl position and diffractometer angles
- """
- q_vec = self._strategy.calculate_q_phi(pos)
- q_hkl = norm(q_vec) / self._hardware.get_wavelength()
- d_hkl = self._state.crystal.get_hkl_plane_distance([h, k, l])
- sc = 1/ (q_hkl * d_hkl)
- name, a1, a2, a3, alpha1, alpha2, alpha3 = self._state.crystal.getLattice()
- if abs(sc - 1.) < SMALL:
- return None, None
- return sc, (name, sc * a1, sc* a2, sc * a3, alpha1, alpha2, alpha3)
-
- def calc_miscut(self, h, k, l, pos):
- """
- Calculate miscut angle and axis that matches
- given hkl position and diffractometer angles
- """
- q_vec = self._strategy.calculate_q_phi(pos)
- hkl_nphi = self._UB * matrix([[h], [k], [l]])
- try:
- axis = cross3(self._ROT.I * q_vec, self._ROT.I * hkl_nphi)
- except AttributeError:
- axis = cross3(q_vec, hkl_nphi)
- norm_axis = norm(axis)
- if norm_axis < SMALL:
- return None, None
- axis = axis / norm(axis)
- try:
- miscut = acos(bound(dot3(q_vec, hkl_nphi) / (norm(q_vec) * norm(hkl_nphi)))) * TODEG
- except AssertionError:
- return None, None
- return miscut, axis.T.tolist()[0]
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/ub/calcstate.py b/script/__Lib/diffcalc-2.1/diffcalc/ub/calcstate.py
deleted file mode 100755
index 1e8f438..0000000
--- a/script/__Lib/diffcalc-2.1/diffcalc/ub/calcstate.py
+++ /dev/null
@@ -1,220 +0,0 @@
-from diffcalc.hkl.vlieg.geometry import VliegPosition
-from diffcalc.ub.crystal import CrystalUnderTest
-from diffcalc.ub.reflections import ReflectionList, _Reflection
-from math import pi
-import datetime # @UnusedImport For crazy time eval code!
-from diffcalc.ub.reference import YouReference
-from diffcalc.ub.orientations import _Orientation, OrientationList
-
-try:
- from collection import OrderedDict
-except ImportError:
- from simplejson import OrderedDict
-
-try:
- import json
-except ImportError:
- import simplejson as json
-
-try:
- from numpy import matrix
-except ImportError:
- from numjy import matrix
-
-
-TODEG = 180 / pi
-
-
-class UBCalcState():
-
- def __init__(self, name=None, crystal=None, reflist=None, orientlist=None, tau=0, sigma=0,
- manual_U=None, manual_UB=None, or0=None, or1=None, reference=None):
-
- assert reflist is not None
- self.name = name
- self.crystal = crystal
- self.reflist = reflist
- self.orientlist = orientlist
- self.tau = tau # degrees
- self.sigma = sigma # degrees
- self.manual_U = manual_U
- self.manual_UB = manual_UB
- self.or0 = or0
- self.or1 = or1
- self.reference = reference
-
- @property
- def is_okay_to_autocalculate_ub(self):
- nothing_set = ((self.manual_U is None) and
- (self.manual_UB is None) and
- (self.or0 is None) and
- (self.or1 is None))
- or0_and_or1_used = (self.or0 is not None) and (self.or1 is not None)
- return nothing_set or or0_and_or1_used
-
-
- def configure_calc_type(self,
- manual_U=None,
- manual_UB=None,
- or0=None,
- or1=None):
- self.manual_U = manual_U
- self.manual_UB = manual_UB
- self.or0 = or0
- self.or1 = or1
-
-
-class UBCalcStateEncoder(json.JSONEncoder):
-
- def default(self, obj):
-
- if isinstance(obj, UBCalcState):
- d = OrderedDict()
- d['name'] = obj.name
- d['crystal'] = obj.crystal
- d['reflist'] = obj.reflist
- d['orientlist'] = obj.orientlist
- d['tau'] = obj.tau
- d['sigma'] = obj.sigma
- d['reference'] = obj.reference
- d['u'] = obj.manual_U
- d['ub'] = obj.manual_UB
- d['or0'] = obj.or0
- d['or1'] = obj.or1
-
- return d
-
- if isinstance(obj, CrystalUnderTest):
- return repr([obj._name, obj._a1, obj._a2, obj._a3, obj._alpha1 * TODEG,
- obj._alpha2 * TODEG, obj._alpha3 * TODEG])
-
- if isinstance(obj, matrix):
- l = [', '.join((repr(e) for e in row)) for row in obj.tolist()]
- return l
-
- if isinstance(obj, ReflectionList):
- d = OrderedDict()
- for n, ref in enumerate(obj._reflist):
- d[str(n+1)] = ref
- return d
-
- if isinstance(obj, _Reflection):
- d = OrderedDict()
- d['tag'] = obj.tag
- d['hkl'] = repr([obj.h, obj.k, obj.l])
- d['pos'] = repr(list(obj.pos.totuple()))
- d['energy'] = obj.energy
- dt = eval(obj.time) # e.g. --> datetime.datetime(2013, 8, 5, 15, 47, 7, 962432)
- d['time'] = None if dt is None else dt.isoformat()
- return d
-
- if isinstance(obj, OrientationList):
- d = OrderedDict()
- for n, orient in enumerate(obj._orientlist):
- d[str(n+1)] = orient
- return d
-
- if isinstance(obj, _Orientation):
- d = OrderedDict()
- d['tag'] = obj.tag
- d['hkl'] = repr([obj.h, obj.k, obj.l])
- d['xyz'] = repr([obj.x, obj.y, obj.z])
- dt = eval(obj.time) # e.g. --> datetime.datetime(2013, 8, 5, 15, 47, 7, 962432)
- d['time'] = None if dt is None else dt.isoformat()
- return d
-
- if isinstance(obj, YouReference):
- d = OrderedDict()
- if obj.n_hkl_configured is not None:
- d['n_hkl_configured'] = repr(obj.n_hkl_configured.T.tolist()[0])
- else:
- d['n_hkl_configured'] = None
- if obj.n_phi_configured is not None:
- d['n_phi_configured'] = repr(obj.n_phi_configured.T.tolist()[0])
- else:
- d['n_phi_configured'] = None
- return d
-
-
- return json.JSONEncoder.default(self, obj)
-
-
-def decode_ubcalcstate(state, geometry, diffractometer_axes_names):
-
- # Backwards compatibility code
- orientlist_=OrientationList([])
- try:
- orientlist_=decode_orientlist(state['orientlist'])
- except KeyError:
- pass
- return UBCalcState(
- name=state['name'],
- crystal=state['crystal'] and CrystalUnderTest(*eval(state['crystal'])),
- reflist=decode_reflist(state['reflist'], geometry, diffractometer_axes_names),
- orientlist=orientlist_,
- tau=state['tau'],
- sigma=state['sigma'],
- manual_U=state['u'] and decode_matrix(state['u']),
- manual_UB=state['ub'] and decode_matrix(state['ub']),
- or0=state['or0'],
- or1=state['or1'],
- reference=decode_reference(state.get('reference', None))
- )
-
-
-def decode_matrix(rows):
- return matrix([[eval(e) for e in row.split(', ')] for row in rows])
-
-
-def decode_reflist(reflist_dict, geometry, diffractometer_axes_names):
- reflections = []
- for key in sorted(reflist_dict.keys()):
- reflections.append(decode_reflection(reflist_dict[key], geometry))
-
- return ReflectionList(geometry, diffractometer_axes_names, reflections)
-
-
-def decode_orientlist(orientlist_dict):
- orientations = []
- for key in sorted(orientlist_dict.keys()):
- orientations.append(decode_orientation(orientlist_dict[key]))
-
- return OrientationList(orientations)
-
-
-def decode_reflection(ref_dict, geometry):
- h, k, l = eval(ref_dict['hkl'])
- time = ref_dict['time'] and gt(ref_dict['time'])
- pos_tuple = eval(ref_dict['pos'])
- try:
- position = geometry.create_position(*pos_tuple)
- except AttributeError:
- position = VliegPosition(*pos_tuple)
- return _Reflection(h, k, l, position, ref_dict['energy'], str(ref_dict['tag']), repr(time))
-
-
-def decode_reference(ref_dict):
- reference = YouReference(None) # TODO: We can't set get_ub method yet (tangles!)
- if ref_dict:
- nhkl = ref_dict.get('n_hkl_configured', None)
- nphi = ref_dict.get('n_phi_configured', None)
- if nhkl:
- reference.n_hkl_configured = matrix([eval(nhkl)]).T
- if nphi:
- reference.n_phi_configured = matrix([eval(nphi)]).T
- return reference
-
-
-def decode_orientation(orient_dict):
- h, k, l = eval(orient_dict['hkl'])
- x, y, z = eval(orient_dict['xyz'])
- time = orient_dict['time'] and gt(orient_dict['time'])
- return _Orientation(h, k, l, x, y, z, str(orient_dict['tag']), repr(time))
-
-
-# From: http://stackoverflow.com/questions/127803/how-to-parse-iso-formatted-date-in-python
-def gt(dt_str):
- dt, _, us= dt_str.partition(".")
- dt= datetime.datetime.strptime(dt, "%Y-%m-%dT%H:%M:%S")
- us= int(us.rstrip("Z"), 10)
- return dt + datetime.timedelta(microseconds=us)
\ No newline at end of file
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/ub/crystal.py b/script/__Lib/diffcalc-2.1/diffcalc/ub/crystal.py
deleted file mode 100755
index 84072d9..0000000
--- a/script/__Lib/diffcalc-2.1/diffcalc/ub/crystal.py
+++ /dev/null
@@ -1,147 +0,0 @@
-###
-# Copyright 2008-2011 Diamond Light Source Ltd.
-# This file is part of Diffcalc.
-#
-# Diffcalc is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Diffcalc is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Diffcalc. If not, see .
-###
-
-from math import pi, cos, sin, acos, sqrt
-from diffcalc.util import angle_between_vectors
-
-
-try:
- from numpy import matrix
-except ImportError:
- from numjy import matrix
-
-TORAD = pi / 180
-TODEG = 180 / pi
-SMALL = 1e-7
-
-def z(num):
- """Round to zero if small. This is useful to get rid of erroneous
- minus signs resulting from float representation close to zero.
- """
- if abs(num) < SMALL:
- num = 0
- return num
-
-
-class CrystalUnderTest(object):
- """
- Contains the lattice parameters and calculated B matrix for the crytsal
- under test. Also Calculates the distance between planes at a given hkl
- value.
-
- The lattice paraemters can be specified and then if desired saved to a
- __library to be loaded later. The parameters are persisted across restarts.
- Lattices stored in config/var/crystals.xml .
- """
-
- def __init__(self, name, a, b, c, alpha, beta, gamma):
- '''Creates a new lattice and calculates related values.
-
- Keyword arguments:
- name -- a string
- a,b,c,alpha,beta,gamma -- lengths and angles (in degrees)
- '''
-
- self._name = name
-
- # Set the direct lattice parameters
- self._a1 = a1 = a
- self._a2 = a2 = b
- self._a3 = a3 = c
- self._alpha1 = alpha1 = alpha * TORAD
- self._alpha2 = alpha2 = beta * TORAD
- self._alpha3 = alpha3 = gamma * TORAD
-
- # Calculate the reciprocal lattice parameters
- self._beta1 = acos((cos(alpha2) * cos(alpha3) - cos(alpha1)) /
- (sin(alpha2) * sin(alpha3)))
-
- self._beta2 = beta2 = acos((cos(alpha1) * cos(alpha3) - cos(alpha2)) /
- (sin(alpha1) * sin(alpha3)))
-
- self._beta3 = beta3 = acos((cos(alpha1) * cos(alpha2) - cos(alpha3)) /
- (sin(alpha1) * sin(alpha2)))
-
- volume = (a1 * a2 * a3 *
- sqrt(1 + 2 * cos(alpha1) * cos(alpha2) * cos(alpha3) -
- cos(alpha1) ** 2 - cos(alpha2) ** 2 - cos(alpha3) ** 2))
-
- self._b1 = b1 = 2 * pi * a2 * a3 * sin(alpha1) / volume
- self._b2 = b2 = 2 * pi * a1 * a3 * sin(alpha2) / volume
- self._b3 = b3 = 2 * pi * a1 * a2 * sin(alpha3) / volume
-
- # Calculate the BMatrix from the direct and reciprical parameters.
- # Reference: Busang and Levy (1967)
- self._bMatrix = matrix([
- [b1, b2 * cos(beta3), b3 * cos(beta2)],
- [0.0, b2 * sin(beta3), -b3 * sin(beta2) * cos(alpha1)],
- [0.0, 0.0, 2 * pi / a3]])
-
- @property
- def B(self):
- '''
- Returns the B matrix, may be null if crystal is not set, or if there
- was a problem calculating this'''
- return self._bMatrix
-
- def get_hkl_plane_distance(self, hkl):
- '''Calculates and returns the distance between planes'''
- hkl = matrix([hkl])
- bReduced = self._bMatrix / (2 * pi)
- bMT = bReduced.I * bReduced.T.I
- return 1.0 / sqrt((hkl * bMT.I * hkl.T)[0,0])
-
- def get_hkl_plane_angle(self, hkl1, hkl2):
- '''Calculates and returns the angle between [hkl1] and [hkl2] planes'''
- hkl1 = matrix([hkl1]).T
- hkl2 = matrix([hkl2]).T
- nphi1 = self._bMatrix * hkl1
- nphi2 = self._bMatrix * hkl2
- angle = angle_between_vectors(nphi1, nphi2)
- return angle
-
- def __str__(self):
- ''' Returns lattice name and all set and calculated parameters'''
- return '\n'.join(self.str_lines())
-
- def str_lines(self):
- WIDTH = 13
- if self._name is None:
- return [" none specified"]
-
- b = self._bMatrix
- lines = []
- lines.append(" name:".ljust(WIDTH) + self._name.rjust(9))
- lines.append("")
- lines.append(" a, b, c:".ljust(WIDTH) +
- "% 9.5f % 9.5f % 9.5f" % (self.getLattice()[1:4]))
- lines.append(" " * WIDTH +
- "% 9.5f % 9.5f % 9.5f" % (self.getLattice()[4:]))
- lines.append("")
-
- fmt = "% 9.5f % 9.5f % 9.5f"
- lines.append(" B matrix:".ljust(WIDTH) +
- fmt % (z(b[0, 0]), z(b[0, 1]), z(b[0, 2])))
- lines.append(' ' * WIDTH + fmt % (z(b[1, 0]), z(b[1, 1]), z(b[1, 2])))
- lines.append(' ' * WIDTH + fmt % (z(b[2, 0]), z(b[2, 1]), z(b[2, 2])))
- return lines
-
- def getLattice(self):
- return(self._name, self._a1, self._a2, self._a3, self._alpha1 * TODEG,
- self._alpha2 * TODEG, self._alpha3 * TODEG)
-
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/ub/orientations.py b/script/__Lib/diffcalc-2.1/diffcalc/ub/orientations.py
deleted file mode 100755
index 1726136..0000000
--- a/script/__Lib/diffcalc-2.1/diffcalc/ub/orientations.py
+++ /dev/null
@@ -1,118 +0,0 @@
-###
-# Copyright 2008-2017 Diamond Light Source Ltd.
-# This file is part of Diffcalc.
-#
-# Diffcalc is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Diffcalc is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Diffcalc. If not, see .
-###
-
-from copy import deepcopy
-import datetime # @UnusedImport for the eval below
-
-try:
- from numpy import matrix
-except ImportError:
- from numjy import matrix
-
-from diffcalc.util import DiffcalcException, bold
-
-
-class _Orientation:
- """A orientation"""
- def __init__(self, h, k, l, x, y, z, tag, time):
-
- self.h = float(h)
- self.k = float(k)
- self.l = float(l)
- self.x = float(x)
- self.y = float(y)
- self.z = float(z)
- self.tag = tag
- self.time = time # Saved as e.g. repr(datetime.now())
-
- def __str__(self):
- return ("h=%-4.2f k=%-4.2f l=%-4.2f x=%-4.2f "
- "y=%-4.2f z=%-4.2 "
- " %-s %s" % (self.h, self.k, self.l,
- self.x, self.y, self.z,
- self.tag, self.time))
-
-
-class OrientationList:
-
- def __init__(self, orientations=None):
- self._orientlist = orientations if orientations else []
-
-
- def add_orientation(self, h, k, l, x, y, z, tag, time):
- """adds a crystal orientation
- """
- self._orientlist += [_Orientation(h, k, l, x, y, z, tag,
- time.__repr__())]
-
- def edit_orientation(self, num, h, k, l, x, y, z, tag, time):
- """num starts at 1"""
- try:
- self._orientlist[num - 1] = _Orientation(h, k, l, x, y, z, tag,
- time.__repr__())
- except IndexError:
- raise DiffcalcException("There is no orientation " + repr(num)
- + " to edit.")
-
- def getOrientation(self, num):
- """
- getOrientation(num) --> ( [h, k, l], [x, y, z], tag, time ) --
- num starts at 1
- """
- r = deepcopy(self._orientlist[num - 1]) # for convenience
- return [r.h, r.k, r.l], [r.x, r.y, r.z], r.tag, eval(r.time)
-
- def removeOrientation(self, num):
- del self._orientlist[num - 1]
-
- def swap_orientations(self, num1, num2):
- orig1 = self._orientlist[num1 - 1]
- self._orientlist[num1 - 1] = self._orientlist[num2 - 1]
- self._orientlist[num2 - 1] = orig1
-
- def __len__(self):
- return len(self._orientlist)
-
- def __str__(self):
- return '\n'.join(self.str_lines())
-
- def str_lines(self, R=None):
- if not self._orientlist:
- return [" <<< none specified >>>"]
-
- lines = []
-
- str_format = (" %5s %5s %5s %5s %5s %5s TAG")
- values = ('H', 'K', 'L', 'X', 'Y', 'Z')
- lines.append(bold(str_format % values))
-
- for n in range(len(self._orientlist)):
- orient_tuple = self.getOrientation(n + 1)
- [h, k, l], [x, y, z], tag, _ = orient_tuple
- try:
- xyz_rot = R.I * matrix([[x],[y],[z]])
- xr, yr, zr = xyz_rot.T.tolist()[0]
- except AttributeError:
- xr, yr, zr = x ,y ,z
- if tag is None:
- tag = ""
- str_format = (" %2d % 4.2f % 4.2f % 4.2f " +
- "% 4.2f % 4.2f % 4.2f %s")
- values = (n + 1, h, k, l, xr, yr, zr, tag)
- lines.append(str_format % values)
- return lines
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/ub/persistence.py b/script/__Lib/diffcalc-2.1/diffcalc/ub/persistence.py
deleted file mode 100755
index 526dbcd..0000000
--- a/script/__Lib/diffcalc-2.1/diffcalc/ub/persistence.py
+++ /dev/null
@@ -1,151 +0,0 @@
-###
-# Copyright 2008-2011 Diamond Light Source Ltd.
-# This file is part of Diffcalc.
-#
-# Diffcalc is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Diffcalc is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Diffcalc. If not, see .
-###
-
-from __future__ import with_statement
-
-import os, glob
-from diffcalc.ub.calcstate import UBCalcStateEncoder
-import datetime
-
-try:
- import json
-except ImportError:
- import simplejson as json
-
-
-def is_writable(directory):
- """Return true if the file is writable from the current user
- """
- probe = os.path.join(directory, "probe")
- try:
- open(probe, 'w')
- except IOError:
- return False
- else:
- os.remove(probe)
- return True
-
-def check_directory_appropriate(directory):
-
- if not os.path.exists(directory):
- raise IOError("'%s' does not exist")
-
- if not os.path.isdir(directory):
- raise IOError("'%s' is not a directory")
-
- if not is_writable(directory):
- raise IOError("'%s' is not writable")
-
-
-class UBCalculationJSONPersister(object):
-
- def __init__(self, directory):
- check_directory_appropriate(directory)
- self.directory = directory
- self.description = directory
-
- def filepath(self, name):
- return os.path.join(self.directory, name + '.json')
-
- def save(self, state, name):
- # FORMAT = '%Y-%m-%d %H:%M:%S'
- # time_string = datetime.datetime.strftime(datetime.datetime.now(), FORMAT)
- with open(self.filepath(name), 'w') as f:
- json.dump(state, f, indent=4, cls=UBCalcStateEncoder)
-
- def load(self, name):
- with open(self.filepath(name), 'r') as f:
- return json.load(f)
-
- def list(self): # @ReservedAssignment
- files = self._get_save_files()
- return [os.path.basename(f + '.json').split('.json')[0] for f in files]
-
- def list_metadata(self):
- metadata = []
- for f in self._get_save_files():
- dt = datetime.datetime.fromtimestamp(os.path.getmtime(f))
- metadata.append(dt.strftime('%d %b %Y (%H:%M)'))
- return metadata
-
- def _get_save_files(self):
- files = filter(os.path.isfile, glob.glob(os.path.join(self.directory, '*.json')))
- files.sort(key=lambda x: os.path.getmtime(x))
- files.reverse()
- return files
-
- def remove(self, name):
- os.remove(self.filepath(name))
-
-
-
-class UBCalculationPersister(object):
- """Attempts to the use the gda's database to store ub calculation state
- """
- def __init__(self):
- try:
- from uk.ac.diamond.daq.persistence.jythonshelf import LocalJythonShelfManager
- from uk.ac.diamond.daq.persistence.jythonshelf.LocalDatabase import \
- LocalDatabaseException
- self.shelf = LocalJythonShelfManager.getLocalObjectShelf(
- 'diffcalc.ub')
- except ImportError, e:
- print ("!!! UBCalculationPersister could not import the gda database "
- "code: " + repr(e))
- self.shelf = None
- except LocalDatabaseException, e:
- print ("UBCalculationPersister could not connect to the gda "
- "database: " + repr(e))
- self.shelf = None
- self.description = 'GDA sql database'
-
- def save(self, state, key):
- if self.shelf is not None:
- self.shelf[key] = state
- else:
- print "<<>>"
-
- def load(self, name):
- if self.shelf is not None:
- return self.shelf[name]
- else:
- raise IOError("Could not load UB calculation: no database available")
-
- def list(self): # @ReservedAssignment
- if self.shelf is not None:
- names = list(self.shelf.keys())
- names.sort()
- return names
- else:
- return []
-
- def remove(self, name):
- if self.shelf is not None:
- del self.shelf[name]
- else:
- raise IOError("Could not remove UB calculation: no database available")
-
-
-class UbCalculationNonPersister(UBCalculationPersister):
- """
- A version of UBCalculationPersister that simply stores to a local dict
- rather than a database. Useful for testing.
- """
- def __init__(self):
- self.shelf = dict()
- self.description = 'memory only'
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/ub/reference.py b/script/__Lib/diffcalc-2.1/diffcalc/ub/reference.py
deleted file mode 100755
index 53a8e4b..0000000
--- a/script/__Lib/diffcalc-2.1/diffcalc/ub/reference.py
+++ /dev/null
@@ -1,99 +0,0 @@
-from math import pi, acos
-
-try:
- from numpy import matrix
- from numpy.linalg import norm
-except ImportError:
- from numjy import matrix
- from numjy.linalg import norm
-
-from diffcalc.util import cross3, dot3
-
-
-SMALL = 1e-7
-TODEG = 180 / pi
-
-class YouReference(object):
-
- def __init__(self, get_UB):
- self.get_UB = get_UB # callable
- self._n_phi_configured = None
- self._n_hkl_configured = None
- self._set_n_phi_configured(matrix('0; 0; 1'))
-
- def _set_n_phi_configured(self, n_phi):
- self._n_phi_configured = n_phi
- self._n_hkl_configured = None
-
- def _get_n_phi_configured(self):
- return self._n_phi_configured
-
- n_phi_configured = property(_get_n_phi_configured, _set_n_phi_configured)
-
- def _set_n_hkl_configured(self, n_hkl):
- self._n_phi_configured = None
- self._n_hkl_configured = n_hkl
-
- def _get_n_hkl_configured(self):
- return self._n_hkl_configured
-
- n_hkl_configured = property(_get_n_hkl_configured, _set_n_hkl_configured)
-
- @property
- def n_phi(self):
- n_phi = (self.get_UB() * self._n_hkl_configured if self._n_phi_configured is None
- else self._n_phi_configured)
- return n_phi / norm(n_phi)
-
- @property
- def n_hkl(self):
- n_hkl = (self.get_UB().I * self._n_phi_configured if self._n_hkl_configured is None
- else self._n_hkl_configured)
- return n_hkl / norm(n_hkl)
-
- def _pretty_vector(self, m):
- return ' '.join([('% 9.5f' % e).rjust(9) for e in m.T.tolist()[0]])
-
- def repr_lines(self, ub_calculated, WIDTH=9, R=None):
- SET_LABEL = ' <- set'
- lines = []
- if self._n_phi_configured is not None:
- nphi_label = SET_LABEL
- nhkl_label = ''
- elif self._n_hkl_configured is not None:
- nphi_label = ''
- nhkl_label = SET_LABEL
- else:
- raise AssertionError("Neither a manual n_phi nor n_hkl is configured")
-
- if ub_calculated:
- try:
- lines.append(" n_phi:".ljust(WIDTH) + self._pretty_vector(R.I * self.n_phi) + nphi_label)
- except AttributeError:
- lines.append(" n_phi:".ljust(WIDTH) + self._pretty_vector(self.n_phi) + nphi_label)
- lines.append(" n_hkl:".ljust(WIDTH) + self._pretty_vector(self.n_hkl) + nhkl_label)
- try:
- rotation_axis = R.I * cross3(matrix('0; 0; 1'), self.n_phi)
- except AttributeError:
- rotation_axis = cross3(matrix('0; 0; 1'), self.n_phi)
- if abs(norm(rotation_axis)) < SMALL:
- lines.append(" normal:".ljust(WIDTH) + " None")
- else:
- rotation_axis = rotation_axis * (1 / norm(rotation_axis))
- cos_rotation_angle = dot3(matrix('0; 0; 1'), self.n_phi)
- rotation_angle = acos(cos_rotation_angle)
- lines.append(" normal:")
- lines.append(" angle:".ljust(WIDTH) + "% 9.5f" % (rotation_angle * TODEG))
- lines.append(" axis:".ljust(WIDTH) + self._pretty_vector(rotation_axis))
-
- else: # no ub calculated
- if self._n_phi_configured is not None:
- try:
- lines.append(" n_phi:".ljust(WIDTH) + self._pretty_vector(R.I * self._n_phi_configured) + SET_LABEL)
- except AttributeError:
- lines.append(" n_phi:".ljust(WIDTH) + self._pretty_vector(self._n_phi_configured) + SET_LABEL)
- elif self._n_hkl_configured is not None:
- lines.append(" n_hkl:".ljust(WIDTH) + self._pretty_vector(self._n_hkl_configured) + SET_LABEL)
-
- return lines
-
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/ub/reflections.py b/script/__Lib/diffcalc-2.1/diffcalc/ub/reflections.py
deleted file mode 100755
index c447468..0000000
--- a/script/__Lib/diffcalc-2.1/diffcalc/ub/reflections.py
+++ /dev/null
@@ -1,126 +0,0 @@
-###
-# Copyright 2008-2011 Diamond Light Source Ltd.
-# This file is part of Diffcalc.
-#
-# Diffcalc is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Diffcalc is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Diffcalc. If not, see .
-###
-
-from copy import deepcopy
-import datetime # @UnusedImport for the eval below
-from diffcalc.util import DiffcalcException, bold
-from diffcalc.hkl.vlieg.geometry import VliegPosition
-
-
-class _Reflection:
- """A reflection"""
- def __init__(self, h, k, l, position, energy, tag, time):
-
- self.h = float(h)
- self.k = float(k)
- self.l = float(l)
- self.pos = position
- self.tag = tag
- self.energy = float(energy) # energy=12.39842/lambda
- self.wavelength = 12.3984 / self.energy
- self.time = time # Saved as e.g. repr(datetime.now())
-
- def __str__(self):
- return ("energy=%-6.3f h=%-4.2f k=%-4.2f l=%-4.2f alpha=%-8.4f "
- "delta=%-8.4f gamma=%-8.4f omega=%-8.4f chi=%-8.4f "
- "phi=%-8.4f %-s %s" % (self.energy, self.h, self.k, self.l,
- self.pos.alpha, self.pos.delta, self.pos.gamma, self.pos.omega,
- self.pos.chi, self.pos.phi, self.tag, self.time))
-
-
-class ReflectionList:
-
- def __init__(self, diffractometerPluginObject, externalAngleNames, reflections=None):
- self._geometry = diffractometerPluginObject
- self._externalAngleNames = externalAngleNames
- self._reflist = reflections if reflections else []
-
-
- def add_reflection(self, h, k, l, position, energy, tag, time):
- """adds a reflection, position in degrees
- """
- if type(position) in (list, tuple):
- try:
- position = self._geometry.create_position(*position)
- except AttributeError:
- position = VliegPosition(*position)
- self._reflist += [_Reflection(h, k, l, position, energy, tag,
- time.__repr__())]
-
- def edit_reflection(self, num, h, k, l, position, energy, tag, time):
- """num starts at 1"""
- if type(position) in (list, tuple):
- position = VliegPosition(*position)
- try:
- self._reflist[num - 1] = _Reflection(h, k, l, position, energy, tag,
- time.__repr__())
- except IndexError:
- raise DiffcalcException("There is no reflection " + repr(num)
- + " to edit.")
-
- def getReflection(self, num):
- """
- getReflection(num) --> ( [h, k, l], position, energy, tag, time ) --
- num starts at 1 position in degrees
- """
- r = deepcopy(self._reflist[num - 1]) # for convenience
- return [r.h, r.k, r.l], deepcopy(r.pos), r.energy, r.tag, eval(r.time)
-
- def get_reflection_in_external_angles(self, num):
- """getReflection(num) --> ( [h, k, l], (angle1...angleN), energy, tag )
- -- num starts at 1 position in degrees"""
- r = deepcopy(self._reflist[num - 1]) # for convenience
- externalAngles = self._geometry.internal_position_to_physical_angles(r.pos)
- result = [r.h, r.k, r.l], externalAngles, r.energy, r.tag, eval(r.time)
- return result
-
- def removeReflection(self, num):
- del self._reflist[num - 1]
-
- def swap_reflections(self, num1, num2):
- orig1 = self._reflist[num1 - 1]
- self._reflist[num1 - 1] = self._reflist[num2 - 1]
- self._reflist[num2 - 1] = orig1
-
- def __len__(self):
- return len(self._reflist)
-
- def __str__(self):
- return '\n'.join(self.str_lines())
-
- def str_lines(self):
- axes = tuple(s.upper() for s in self._externalAngleNames)
- if not self._reflist:
- return [" <<< none specified >>>"]
-
- lines = []
-
- format = (" %6s %5s %5s %5s " + "%8s " * len(axes) + " TAG")
- values = ('ENERGY', 'H', 'K', 'L') + axes
- lines.append(bold(format % values))
-
- for n in range(len(self._reflist)):
- ref_tuple = self.get_reflection_in_external_angles(n + 1)
- [h, k, l], externalAngles, energy, tag, _ = ref_tuple
- if tag is None:
- tag = ""
- format = (" %2d %6.3f % 4.2f % 4.2f % 4.2f " +
- "% 8.4f " * len(axes) + " %s")
- values = (n + 1, energy, h, k, l) + externalAngles + (tag,)
- lines.append(format % values)
- return lines
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/ub/ub.py b/script/__Lib/diffcalc-2.1/diffcalc/ub/ub.py
deleted file mode 100755
index afd2f47..0000000
--- a/script/__Lib/diffcalc-2.1/diffcalc/ub/ub.py
+++ /dev/null
@@ -1,768 +0,0 @@
-###
-# Copyright 2008-2011 Diamond Light Source Ltd.
-# This file is part of Diffcalc.
-#
-# Diffcalc is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Diffcalc is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Diffcalc. If not, see .
-###
-
-from diffcalc import settings
-from diffcalc.ub.calc import UBCalculation
-
-from math import asin, pi
-from datetime import datetime
-
-try:
- from numpy import matrix
-except ImportError:
- from numjy import matrix
-
-
-from diffcalc.util import getInputWithDefault as promptForInput, \
- promptForNumber, promptForList, allnum, isnum, bold, xyz_rotation
-from diffcalc.util import command
-
-TORAD = pi / 180
-TODEG = 180 / pi
-
-
-# When using ipython magic, these functions must not be imported to the top
-# level namespace. Doing so will stop them from being called with magic.
-
-__all__ = ['addorient', 'addref', 'c2th', 'hklangle', 'calcub', 'delorient', 'delref', 'editorient',
- 'editref', 'listub', 'loadub', 'newub', 'orientub', 'saveubas', 'setlat',
- 'addmiscut', 'setmiscut', 'setu', 'setub', 'showorient', 'showref', 'swaporient',
- 'swapref', 'trialub', 'checkub', 'ub', 'ubcalc', 'rmub', 'clearorient',
- 'clearref', 'lastub', 'refineub']
-
-if settings.include_sigtau:
- __all__.append('sigtau')
-
-if settings.include_reference:
- __all__.append('setnphi')
- __all__.append('setnhkl')
-
-
-ubcalc = UBCalculation(settings.hardware,
- settings.geometry,
- settings.ubcalc_persister,
- settings.ubcalc_strategy,
- settings.include_sigtau,
- settings.include_reference)
-
-
-
-### UB state ###
-
-@command
-def newub(name=None):
- """newub {'name'} -- start a new ub calculation name
- """
- if name is None:
- # interactive
- name = promptForInput('calculation name')
- ubcalc.start_new(name)
- setlat()
- elif isinstance(name, str):
- # just trying might cause confusion here
- ubcalc.start_new(name)
- else:
- raise TypeError()
-
-@command
-def loadub(name_or_num):
- """loadub 'name' | num -- load an existing ub calculation
- """
- if isinstance(name_or_num, str):
- ubcalc.load(name_or_num)
- else:
- ubcalc.load(ubcalc.listub()[int(name_or_num)])
-
-@command
-def lastub():
- """lastub -- load the last used ub calculation
- """
- try:
- lastub_name = ubcalc.listub()[0]
- print "Loading ub calculation: '%s'" % lastub_name
- loadub(0)
- except IndexError:
- print "WARNING: There is no record of the last ub calculation used"
-
-@command
-def rmub(name_or_num):
- """rmub 'name'|num -- remove existing ub calculation
- """
- if isinstance(name_or_num, str):
- ubcalc.remove(name_or_num)
- else:
- ubcalc.remove(ubcalc.listub()[int(name_or_num)])
-
-@command
-def listub():
- """listub -- list the ub calculations available to load.
- """
- if hasattr(ubcalc._persister, 'description'):
- print "UB calculations in: " + ubcalc._persister.description
- else:
- print "UB calculations:"
- print
- ubnames = ubcalc.listub()
- # TODO: whole mechanism of making two calls is messy
- try:
- ub_metadata = ubcalc.listub_metadata()
- except AttributeError:
- ub_metadata = [''] * len(ubnames)
-
- for n, name, data in zip(range(len(ubnames)), ubnames, ub_metadata):
- print "%2i) %-15s %s" % (n, name, data)
-
-@command
-def saveubas(name):
- """saveubas 'name' -- save the ub calculation with a new name
- """
- if isinstance(name, str):
- # just trying might cause confusion here
- ubcalc.saveas(name)
- else:
- raise TypeError()
-
-@command
-def ub():
- """ub -- show the complete state of the ub calculation
- """
- #wavelength = float(hardware.get_wavelength())
- #energy = float(hardware.get_energy())
- print ubcalc.__str__()
-
-@command
-def refineub(*args):
- """
- refineub {[h k l]} {pos} -- refine unit cell dimensions and U matrix to match diffractometer angles for a given hkl value
- """
- if len(args) > 0:
- args = list(args)
- h, k, l = args.pop(0)
- if not (isnum(h) and isnum(k) and isnum(l)):
- raise TypeError()
- else:
- h = promptForNumber('h', 0.)
- k = promptForNumber('k', 0.)
- l = promptForNumber('l', 0.)
- if None in (h, k, l):
- _handleInputError("h,k and l must all be numbers")
- if len(args) == 1:
- pos = settings.geometry.physical_angles_to_internal_position( # @UndefinedVariable
- args.pop(0))
- elif len(args) == 0:
- reply = promptForInput('current pos', 'y')
- if reply in ('y', 'Y', 'yes'):
- positionList = settings.hardware.get_position() # @UndefinedVariable
- else:
- currentPos = settings.hardware.get_position() # @UndefinedVariable
- positionList = []
- names = settings.hardware.get_axes_names() # @UndefinedVariable
- for i, angleName in enumerate(names):
- val = promptForNumber(angleName.rjust(7), currentPos[i])
- if val is None:
- _handleInputError("Please enter a number, or press"
- " Return to accept default!")
- return
- positionList.append(val)
- pos = settings.geometry.physical_angles_to_internal_position(positionList) # @UndefinedVariable
- else:
- raise TypeError()
-
- pos.changeToRadians()
- scale, lat = ubcalc.rescale_unit_cell(h, k, l, pos)
- if scale:
- lines = ["Unit cell scaling factor:".ljust(9) +
- "% 9.5f" % scale]
- lines.append("Refined crystal lattice:")
- lines.append(" a, b, c:".ljust(9) +
- "% 9.5f % 9.5f % 9.5f" % (lat[1:4]))
- lines.append(" " * 12 +
- "% 9.5f % 9.5f % 9.5f" % (lat[4:]))
- lines.append("")
- print '\n'.join(lines)
- reply = promptForInput('Update crystal settings?', 'y')
- if reply in ('y', 'Y', 'yes'):
- ubcalc.set_lattice(*lat)
- else:
- print "No unit cell mismatch detected"
- mc_angle, mc_axis = ubcalc.calc_miscut(h, k, l, pos)
- if mc_angle:
- lines = ["Miscut parameters:",]
- lines.append(" angle:".ljust(9) + "% 9.5f" % mc_angle)
- lines.append(" axis:".ljust(9) + "% 9.5f % 9.5f % 9.5f" % tuple(mc_axis))
- print '\n'.join(lines)
- reply = promptForInput('Apply miscut parameters?', 'y')
- if reply in ('y', 'Y', 'yes'):
- ubcalc.set_miscut(mc_axis, -mc_angle * TORAD, True)
- else:
- print "No miscut detected for the given settings"
-
-### UB lattice ###
-
-@command
-def setlat(name=None, *args):
- """
- setlat -- interactively enter lattice parameters (Angstroms and Deg)
- setlat name a -- assumes cubic
- setlat name a b -- assumes tetragonal
- setlat name a b c -- assumes ortho
- setlat name a b c gamma -- assumes mon/hex with gam not equal to 90
- setlat name a b c alpha beta gamma -- arbitrary
- """
-
- if name is None: # Interactive
- name = promptForInput("crystal name")
- a = promptForNumber(' a', 1)
- b = promptForNumber(' b', a)
- c = promptForNumber(' c', a)
- alpha = promptForNumber('alpha', 90)
- beta = promptForNumber('beta', 90)
- gamma = promptForNumber('gamma', 90)
- ubcalc.set_lattice(name, a, b, c, alpha, beta, gamma)
-
- elif (isinstance(name, str) and
- len(args) in (1, 2, 3, 4, 6) and
- allnum(args)):
- # first arg is string and rest are numbers
- ubcalc.set_lattice(name, *args)
- else:
- raise TypeError()
-
-@command
-def c2th(hkl, en=None):
- """
- c2th [h k l] -- calculate two-theta angle for reflection
- """
- if en is None:
- wl = settings.hardware.get_wavelength() # @UndefinedVariable
- else:
- wl = 12.39842 / en
- d = ubcalc.get_hkl_plane_distance(hkl)
- if wl > (2 * d):
- raise ValueError(
- 'Reflection un-reachable as wavelength (%f) is more than twice\n'
- 'the plane distance (%f)' % (wl, d))
- try:
- return 2.0 * asin(wl / (d * 2)) * TODEG
- except ValueError as e:
- raise ValueError('asin(wl / (d * 2) with wl=%f and d=%f: ' %(wl, d) + e.args[0])
-
-
-@command
-def hklangle(hkl1, hkl2):
- """
- hklangle [h1 k1 l1] [h2 k2 l2] -- calculate angle between [h1 k1 l1] and [h2 k2 l2] planes
- """
- return ubcalc.get_hkl_plane_angle(hkl1, hkl2) * TODEG
-
-### Surface and reference vector stuff ###
-
-@command
-def sigtau(sigma=None, tau=None):
- """sigtau {sigma tau} -- sets or displays sigma and tau"""
- if sigma is None and tau is None:
- chi = settings.hardware.get_position_by_name('chi') # @UndefinedVariable
- phi = settings.hardware.get_position_by_name('phi') # @UndefinedVariable
- _sigma, _tau = ubcalc.sigma, ubcalc.tau
- print "sigma, tau = %f, %f" % (_sigma, _tau)
- print " chi, phi = %f, %f" % (chi, phi)
- sigma = promptForInput("sigma", -chi)
- tau = promptForInput(" tau", -phi)
- ubcalc.sigma = sigma
- ubcalc.tau = tau
- else:
- ubcalc.sigma = float(sigma)
- ubcalc.tau = float(tau)
-
-
-@command
-def setnphi(xyz=None):
- """setnphi {[x y z]} -- sets or displays n_phi reference"""
- if xyz is None:
- ubcalc.print_reference()
- else:
- ubcalc.set_n_phi_configured(_to_column_vector_triple(xyz))
- ubcalc.print_reference()
-
-@command
-def setnhkl(hkl=None):
- """setnhkl {[h k l]} -- sets or displays n_hkl reference"""
- if hkl is None:
- ubcalc.print_reference()
- else:
- ubcalc.set_n_hkl_configured(_to_column_vector_triple(hkl))
- ubcalc.print_reference()
-
-
-def _to_column_vector_triple(o):
- m = matrix(o)
- if m.shape == (1, 3):
- return m.T
- elif m.shape == (3, 1):
- return m
- else:
- raise ValueError("Unexpected shape matrix: " + m)
-
-### UB refelections ###
-
-@command
-def showref():
- """showref -- shows full reflection list"""
- if ubcalc._state.reflist:
- print '\n'.join(ubcalc._state.reflist.str_lines())
- else:
- print "<<< No reflections stored >>>"
-
-@command
-def addref(*args):
- """
- addref -- add reflection interactively
- addref [h k l] {'tag'} -- add reflection with current position and energy
- addref [h k l] (p1, .., pN) energy {'tag'} -- add arbitrary reflection
- """
-
- if len(args) == 0:
- h = promptForNumber('h', 0.)
- k = promptForNumber('k', 0.)
- l = promptForNumber('l', 0.)
- if None in (h, k, l):
- _handleInputError("h,k and l must all be numbers")
- reply = promptForInput('current pos', 'y')
- if reply in ('y', 'Y', 'yes'):
- positionList = settings.hardware.get_position() # @UndefinedVariable
- energy = settings.hardware.get_energy() # @UndefinedVariable
- else:
- currentPos = settings.hardware.get_position() # @UndefinedVariable
- positionList = []
- names = settings.hardware.get_axes_names() # @UndefinedVariable
- for i, angleName in enumerate(names):
- val = promptForNumber(angleName.rjust(7), currentPos[i])
- if val is None:
- _handleInputError("Please enter a number, or press"
- " Return to accept default!")
- return
- positionList.append(val)
- muliplier = settings.hardware.energyScannableMultiplierToGetKeV # @UndefinedVariable
- energy = promptForNumber('energy', settings.hardware.get_energy() / muliplier) # @UndefinedVariable
- if val is None:
- _handleInputError("Please enter a number, or press "
- "Return to accept default!")
- return
- energy = energy * muliplier
- tag = promptForInput("tag")
- if tag == '':
- tag = None
- pos = settings.geometry.physical_angles_to_internal_position(positionList) # @UndefinedVariable
- ubcalc.add_reflection(h, k, l, pos, energy, tag,
- datetime.now())
- elif len(args) in (1, 2, 3, 4):
- args = list(args)
- h, k, l = args.pop(0)
- if not (isnum(h) and isnum(k) and isnum(l)):
- raise TypeError()
- if len(args) >= 2:
- pos = settings.geometry.physical_angles_to_internal_position( # @UndefinedVariable
- args.pop(0))
- energy = args.pop(0)
- if not isnum(energy):
- raise TypeError()
- else:
- pos = settings.geometry.physical_angles_to_internal_position( # @UndefinedVariable
- settings.hardware.get_position()) # @UndefinedVariable
- energy = settings.hardware.get_energy() # @UndefinedVariable
- if len(args) == 1:
- tag = args.pop(0)
- if not isinstance(tag, str):
- raise TypeError()
- else:
- tag = None
- ubcalc.add_reflection(h, k, l, pos, energy, tag,
- datetime.now())
- else:
- raise TypeError()
-
-@command
-def editref(num):
- """editref num -- interactively edit a reflection.
- """
- num = int(num)
-
- # Get old reflection values
- [oldh, oldk, oldl], oldExternalAngles, oldEnergy, oldTag, oldT = \
- ubcalc.get_reflection_in_external_angles(num)
- del oldT # current time will be used.
-
- h = promptForNumber('h', oldh)
- k = promptForNumber('k', oldk)
- l = promptForNumber('l', oldl)
- if None in (h, k, l):
- _handleInputError("h,k and l must all be numbers")
- reply = promptForInput('update position with current hardware setting',
- 'n')
- if reply in ('y', 'Y', 'yes'):
- positionList = settings.hardware.get_position() # @UndefinedVariable
- energy = settings.hardware.get_energy() # @UndefinedVariable
- else:
- positionList = []
- names = settings.hardware.get_axes_names() # @UndefinedVariable
- for i, angleName in enumerate(names):
- val = promptForNumber(angleName.rjust(7), oldExternalAngles[i])
- if val is None:
- _handleInputError("Please enter a number, or press "
- "Return to accept default!")
- return
- positionList.append(val)
- muliplier = settings.hardware.energyScannableMultiplierToGetKeV # @UndefinedVariable
- energy = promptForNumber('energy', oldEnergy / muliplier)
- if val is None:
- _handleInputError("Please enter a number, or press Return "
- "to accept default!")
- return
- energy = energy * muliplier
- tag = promptForInput("tag", oldTag)
- if tag == '':
- tag = None
- pos = settings.geometry.physical_angles_to_internal_position(positionList) # @UndefinedVariable
- ubcalc.edit_reflection(num, h, k, l, pos, energy, tag,
- datetime.now())
-
-@command
-def delref(num):
- """delref num -- deletes a reflection (numbered from 1)
- """
- ubcalc.del_reflection(int(num))
-
-@command
-def clearref():
- """clearref -- deletes all the reflections
- """
- while ubcalc.get_number_reflections():
- ubcalc.del_reflection(1)
-
-@command
-def swapref(num1=None, num2=None):
- """
- swapref -- swaps first two reflections used for calulating U matrix
- swapref num1 num2 -- swaps two reflections (numbered from 1)
- """
- if num1 is None and num2 is None:
- ubcalc.swap_reflections(1, 2)
- elif isinstance(num1, int) and isinstance(num2, int):
- ubcalc.swap_reflections(num1, num2)
- else:
- raise TypeError()
-
-### U calculation from crystal orientation
-@command
-def showorient():
- """showorient -- shows full list of crystal orientations"""
- if ubcalc._state.orientlist:
- print '\n'.join(ubcalc._state.orientlist.str_lines())
- else:
- print "<<< No crystal orientations stored >>>"
-
-@command
-def addorient(*args):
- """
- addorient -- add crystal orientation interactively
- addorient [h k l] [x y z] {'tag'} -- add crystal orientation in laboratory frame
- """
-
- if len(args) == 0:
- h = promptForNumber('h', 0.)
- k = promptForNumber('k', 0.)
- l = promptForNumber('l', 0.)
- if None in (h, k, l):
- _handleInputError("h,k and l must all be numbers")
-
- x = promptForNumber('x', 0.)
- y = promptForNumber('y', 0.)
- z = promptForNumber('z', 0.)
- if None in (x, y, z):
- _handleInputError("x,y and z must all be numbers")
-
- tag = promptForInput("tag")
- if tag == '':
- tag = None
- ubcalc.add_orientation(h, k, l, x , y, z, tag,
- datetime.now())
- elif len(args) in (1, 2, 3):
- args = list(args)
- h, k, l = args.pop(0)
- if not (isnum(h) and isnum(k) and isnum(l)):
- raise TypeError()
- x, y, z = args.pop(0)
- if not (isnum(x) and isnum(y) and isnum(z)):
- raise TypeError()
- if len(args) == 1:
- tag = args.pop(0)
- if not isinstance(tag, str):
- raise TypeError()
- else:
- tag = None
- ubcalc.add_orientation(h, k, l, x, y ,z, tag,
- datetime.now())
- else:
- raise TypeError()
-
-@command
-def editorient(num):
- """editorient num -- interactively edit a crystal orientation.
- """
- num = int(num)
-
- # Get old reflection values
- [oldh, oldk, oldl], [oldx, oldy, oldz], oldTag, oldT = \
- ubcalc.get_orientation(num)
- del oldT # current time will be used.
-
- h = promptForNumber('h', oldh)
- k = promptForNumber('k', oldk)
- l = promptForNumber('l', oldl)
- if None in (h, k, l):
- _handleInputError("h,k and l must all be numbers")
- x = promptForNumber('x', oldx)
- y = promptForNumber('y', oldy)
- z = promptForNumber('z', oldz)
- if None in (x, y, z):
- _handleInputError("x,y and z must all be numbers")
- tag = promptForInput("tag", oldTag)
- if tag == '':
- tag = None
- ubcalc.edit_orientation(num, h, k, l, x, y, z, tag,
- datetime.now())
-
-@command
-def delorient(num):
- """delorient num -- deletes a crystal orientation (numbered from 1)
- """
- ubcalc.del_orientation(int(num))
-
-@command
-def clearorient():
- """clearorient -- deletes all the crystal orientations
- """
- while ubcalc.get_number_orientations():
- ubcalc.del_orientation(1)
-
-@command
-def swaporient(num1=None, num2=None):
- """
- swaporient -- swaps first two crystal orientations used for calulating U matrix
- swaporient num1 num2 -- swaps two crystal orientations (numbered from 1)
- """
- if num1 is None and num2 is None:
- ubcalc.swap_orientations(1, 2)
- elif isinstance(num1, int) and isinstance(num2, int):
- ubcalc.swap_orientations(num1, num2)
- else:
- raise TypeError()
-
-
-### UB calculations ###
-
-@command
-def setu(U=None):
- """setu {[[..][..][..]]} -- manually set U matrix
- """
- if U is None:
- U = _promptFor3x3MatrixDefaultingToIdentity()
- if U is None:
- return # an error will have been printed or thrown
- if _is3x3TupleOrList(U) or _is3x3Matrix(U):
- ubcalc.set_U_manually(U)
- else:
- raise TypeError("U must be given as 3x3 list or tuple")
-
-@command
-def setub(UB=None):
- """setub {[[..][..][..]]} -- manually set UB matrix"""
- if UB is None:
- UB = _promptFor3x3MatrixDefaultingToIdentity()
- if UB is None:
- return # an error will have been printed or thrown
- if _is3x3TupleOrList(UB):
- ubcalc.set_UB_manually(UB)
- else:
- raise TypeError("UB must be given as 3x3 list or tuple")
-
-def _promptFor3x3MatrixDefaultingToIdentity():
- estring = "Please enter a number, or press Return to accept default!"
- row1 = promptForList("row1", (1, 0, 0))
- if row1 is None:
- _handleInputError(estring)
- return None
- row2 = promptForList("row2", (0, 1, 0))
- if row2 is None:
- _handleInputError(estring)
- return None
- row3 = promptForList("row3", (0, 0, 1))
- if row3 is None:
- _handleInputError(estring)
- return None
- return [row1, row2, row3]
-
-@command
-def calcub():
- """calcub -- (re)calculate U matrix from ref1 and ref2.
- """
- ubcalc.calculate_UB()
-
-@command
-def trialub():
- """trialub -- (re)calculate U matrix from ref1 only (check carefully).
- """
- ubcalc.calculate_UB_from_primary_only()
-
-@command
-def orientub():
- """orientub -- (re)calculate U matrix from orient1 and orient2.
- """
- ubcalc.calculate_UB_from_orientation()
-
-
- # This command requires the ubcalc
-
-def checkub():
- """checkub -- show calculated and entered hkl values for reflections.
- """
-
- s = "\n %7s %4s %4s %4s %6s %6s %6s TAG\n" % \
- ('ENERGY', 'H', 'K', 'L', 'H_COMP', 'K_COMP', 'L_COMP')
- s = bold(s)
- nref = ubcalc.get_number_reflections()
- if not nref:
- s += "<>"
- for n in range(nref):
- hklguess, pos, energy, tag, _ = ubcalc.get_reflection(n + 1)
- wavelength = 12.39842 / energy
- hkl = settings.angles_to_hkl_function(pos.inRadians(), wavelength, ubcalc.UB)
- h, k, l = hkl
- if tag is None:
- tag = ""
- s += ("% 2d % 6.4f % 4.2f % 4.2f % 4.2f % 6.4f % 6.4f "
- "% 6.4f %6s\n" % (n + 1, energy, hklguess[0],
- hklguess[1], hklguess[2], h, k, l, tag))
- print s
-
-
-@command
-def addmiscut(*args):
- """addmiscut angle {[x y z]} -- apply miscut to U matrix using a specified miscut angle in degrees and a rotation axis"""
-
- if len(args) == 0:
- _handleInputError("Please specify a miscut angle in degrees "
- "and, optionally, a rotation axis (default: [0 1 0])")
- else:
- args=list(args)
- angle = args.pop(0)
- rad_angle = float(angle) * TORAD
- if len(args) == 0:
- xyz = None
- else:
- xyz = args.pop(0)
- ubcalc.set_miscut(xyz, rad_angle, True)
-
-@command
-def setmiscut(*args):
- """setmiscut angle {[x y z]} -- manually set U matrix using a specified miscut angle in degrees and a rotation axis (default: [0 1 0])"""
-
- if len(args) == 0:
- _handleInputError("Please specify a miscut angle in degrees "
- "and, optionally, a rotation axis (default: [0 1 0])")
- else:
- args=list(args)
- angle = args.pop(0)
- rad_angle = float(angle) * TORAD
- if len(args) == 0:
- xyz = None
- else:
- xyz = args.pop(0)
- ubcalc.set_miscut(xyz, rad_angle, False)
-
-commands_for_help = ['State',
- newub,
- loadub,
- lastub,
- listub,
- rmub,
- saveubas,
- ub,
- 'Lattice',
- setlat,
- c2th,
- hklangle]
-
-if ubcalc.include_reference:
- commands_for_help.extend([
- 'Reference (surface)',
- setnphi,
- setnhkl])
-
-if ubcalc.include_sigtau:
- commands_for_help.extend([
- 'Surface',
- sigtau])
-
-commands_for_help.extend([
- 'Reflections',
- showref,
- addref,
- editref,
- delref,
- clearref,
- swapref,
- 'Orientations',
- showorient,
- addorient,
- editorient,
- delorient,
- clearorient,
- swaporient,
- 'UB matrix',
- checkub,
- setu,
- setub,
- calcub,
- orientub,
- trialub,
- refineub,
- addmiscut,
- setmiscut])
-
-
-
-def _is3x3TupleOrList(m):
- if type(m) not in (list, tuple):
- return False
- if len(m) != 3:
- return False
- for mrow in m:
- if type(mrow) not in (list, tuple):
- return False
- if len(mrow) != 3:
- return False
- return True
-
-
-def _is3x3Matrix(m):
- return isinstance(m, matrix) and tuple(m.shape) == (3, 3)
-
-
-def _handleInputError(msg):
- raise TypeError(msg)
\ No newline at end of file
diff --git a/script/__Lib/diffcalc-2.1/diffcalc/util.py b/script/__Lib/diffcalc-2.1/diffcalc/util.py
deleted file mode 100755
index 873040c..0000000
--- a/script/__Lib/diffcalc-2.1/diffcalc/util.py
+++ /dev/null
@@ -1,347 +0,0 @@
-###
-# Copyright 2008-2011 Diamond Light Source Ltd.
-# This file is part of Diffcalc.
-#
-# Diffcalc is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Diffcalc is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Diffcalc. If not, see .
-###
-
-from math import pi, acos, cos, sin
-from functools import wraps
-import textwrap
-
-try:
- from gda.jython.commands.InputCommands import requestInput as raw_input
- GDA = True
-except ImportError:
- GDA = False
- pass # raw_input unavailable in gda
-try:
- from numpy import matrix
- from numpy.linalg import norm
-except ImportError:
- from numjy import matrix
- from numjy.linalg import norm
-
-
-# from http://physics.nist.gov/
-h_in_eV_per_s = 4.135667516E-15
-c = 299792458
-TWELVEISH = c * h_in_eV_per_s # 12.39842
-
-
-SMALL = 1e-10
-TORAD = pi / 180
-TODEG = 180 / pi
-
-
-COLOURISE_TERMINAL_OUTPUT = not GDA
-
-def bold(s):
- if not COLOURISE_TERMINAL_OUTPUT:
- return s
- else:
- BOLD = '\033[1m'
- END = '\033[0m'
- return BOLD + s + END
-
-
-def x_rotation(th):
- return matrix(((1, 0, 0), (0, cos(th), -sin(th)), (0, sin(th), cos(th))))
-
-
-def y_rotation(th):
- return matrix(((cos(th), 0, sin(th)), (0, 1, 0), (-sin(th), 0, cos(th))))
-
-
-def z_rotation(th):
- return matrix(((cos(th), -sin(th), 0), (sin(th), cos(th), 0), (0, 0, 1)))
-
-
-def xyz_rotation(u, angle):
- u = [list(u), [0, 0, 0], [0, 0, 0]]
- u = matrix(u) / norm(matrix(u))
- e11=u[0,0]**2+(1-u[0,0]**2)*cos(angle)
- e12=u[0,0]*u[0,1]*(1-cos(angle))-u[0,2]*sin(angle)
- e13=u[0,0]*u[0,2]*(1-cos(angle))+u[0,1]*sin(angle)
- e21=u[0,0]*u[0,1]*(1-cos(angle))+u[0,2]*sin(angle)
- e22=u[0,1]**2+(1-u[0,1]**2)*cos(angle)
- e23=u[0,1]*u[0,2]*(1-cos(angle))-u[0,0]*sin(angle)
- e31=u[0,0]*u[0,2]*(1-cos(angle))-u[0,1]*sin(angle)
- e32=u[0,1]*u[0,2]*(1-cos(angle))+u[0,0]*sin(angle)
- e33=u[0,2]**2+(1-u[0,2]**2)*cos(angle)
- return matrix([[e11,e12,e13],[e21,e22,e23],[e31,e32,e33]])
-
-
-class DiffcalcException(Exception):
- """Error caused by user misuse of diffraction calculator.
- """
- def __str__(self):
- lines = []
- for msg_line in self.message.split('\n'):
- lines.append('* ' + msg_line)
- width = max(len(l) for l in lines)
- lines.insert(0, '\n\n' + '*' * width)
- lines.append('*' * width)
- return '\n'.join(lines)
-
-
-class AbstractPosition(object):
-
- def inRadians(self):
- pos = self.clone()
- pos.changeToRadians()
- return pos
-
- def inDegrees(self):
- pos = self.clone()
- pos.changeToDegrees()
- return pos
-
- def changeToRadians(self):
- raise NotImplementedError()
-
- def changeToDegrees(self):
- raise NotImplementedError()
-
- def totuple(self):
- raise NotImplementedError()
-
-
-### Matrices
-
-def cross3(x, y):
- """z = cross3(x ,y) -- where x, y & z are 3*1 Jama matrices"""
- [[x1], [x2], [x3]] = x.tolist()
- [[y1], [y2], [y3]] = y.tolist()
- return matrix([[x2 * y3 - x3 * y2],
- [x3 * y1 - x1 * y3],
- [x1 * y2 - x2 * y1]])
-
-
-def dot3(x, y):
- """z = dot3(x ,y) -- where x, y are 3*1 Jama matrices"""
- return x[0, 0] * y[0, 0] + x[1, 0] * y[1, 0] + x[2, 0] * y[2, 0]
-
-
-def angle_between_vectors(a, b):
- costheta = dot3(a * (1 / norm(a)), b * (1 / norm(b)))
- return acos(bound(costheta))
-
-
-## Math
-
-def bound(x):
- """
- moves x between -1 and 1. Used to correct for rounding errors which may
- have moved the sin or cosine of a value outside this range.
- """
- if abs(x) > (1 + SMALL):
- raise AssertionError(
- "The value (%f) was unexpectedly too far outside -1 or 1 to "
- "safely bound. Please report this." % x)
- if x > 1:
- return 1
- if x < -1:
- return -1
- return x
-
-
-def matrixToString(m):
- ''' str = matrixToString(m) --- displays a Jama matrix m as a string
- '''
- toReturn = ''
- for row in m.array:
- for el in row:
- toReturn += str(el) + '\t'
- toReturn += '\n'
- return toReturn
-
-
-def nearlyEqual(first, second, tolerance):
- if type(first) in (int, float):
- return abs(first - second) <= tolerance
-
- if type(first) != type(matrix([[1]])):
- # lists
- first = matrix([list(first)])
- second = matrix([list(second)])
- diff = first - (second)
- return norm(diff) <= tolerance
-
-
-def radiansEquivilant(first, second, tolerance):
- if abs(first - second) <= tolerance:
- return True
- if abs((first - 2 * pi) - second) <= tolerance:
- return True
- if abs((first + 2 * pi) - second) <= tolerance:
- return True
- if abs(first - (second - 2 * pi)) <= tolerance:
- return True
- if abs(first - (second + 2 * pi)) <= tolerance:
- return True
-
- return False
-
-
-def degreesEquivilant(first, second, tolerance):
- return radiansEquivilant(first * TORAD, second * TORAD, tolerance)
-
-
-def differ(first, second, tolerance):
- """Returns error message if the norm of the difference between two arrays
- or numbers is greater than the given tolerance. Else returns False.
- """
- # TODO: Fix spaghetti
- nonArray = False
- if type(first) in (int, float):
- if type(second) not in (int, float):
- raise TypeError(
- "If first is an int or float, so must second. "
- "first=%s, second=%s" & (repr(first), repr(second)))
- first = [first]
- second = [second]
- nonArray = True
- if not isinstance(first, matrix):
- first = matrix([list(first)])
- if not isinstance(second, matrix):
- second = matrix([list(second)])
- diff = first - second
- if norm(diff) >= tolerance:
- if nonArray:
- return ('%s!=%s' %
- (repr(first.tolist()[0][0]), repr(second.tolist()[0][0])))
- return ('%s!=%s' %
- (repr(tuple(first.tolist()[0])),
- repr(tuple(second.tolist()[0]))))
- return False
-
-
-### user input
-
-def getInputWithDefault(prompt, default=""):
- """
- Prompts user for input and returns if possible a float or a list of floats,
- or if failing this a string. default may be a number, array of numbers,
- or string.
- """
- if default is not "":
- # Generate default string
- if type(default) in (list, tuple):
- defaultString = ""
- for val in default:
- defaultString += str(val) + ' '
- defaultString = defaultString.strip()
- else:
- defaultString = str(default)
- prompt = str(prompt) + '[' + defaultString + ']: '
- else:
- prompt = str(prompt) + ': '
-
- rawresult = raw_input(prompt)
-
- # Return default if no input provided
- if rawresult == "":
- return default
-
- # Try to process result into list of numbers
- try:
- result = []
- for val in rawresult.split():
- result.append(float(val))
- except ValueError:
- # return a string
- return rawresult
- if len(result) == 1:
- result = result[0]
- return result
-
-
-class MockRawInput(object):
- def __init__(self, toReturnList):
- if type(toReturnList) != list:
- toReturnList = [toReturnList]
- self.toReturnList = toReturnList
-
- def __call__(self, prompt):
- toReturn = self.toReturnList.pop(0)
- if type(toReturn) != str:
- raise TypeError
- print prompt + toReturn
- return toReturn
-
-
-def getMessageFromException(e):
- try: # Jython
- return e.args[0]
- except:
- try: # Python
- return e.message
- except:
- # Java
- return e.args[0]
-
-
-def promptForNumber(prompt, default=""):
- val = getInputWithDefault(prompt, default)
- if type(val) not in (float, int):
- return None
- return val
-
-
-def promptForList(prompt, default=""):
- val = getInputWithDefault(prompt, default)
- if type(val) not in (list, tuple):
- return None
- return val
-
-
-def isnum(o):
- return isinstance(o, (int, float))
-
-
-def allnum(l):
- return not [o for o in l if not isnum(o)]
-
-
-DEBUG = False
-
-
-
-def command(f):
- """A decorator to wrap a command method or function.
-
- Calls to the decorated method or function are wrapped by call_command.
- """
- # TODO: remove one level of stack trace by not using wraps
- @wraps(f)
- def wrapper(*args, **kwds):
- return call_command(f, args)
-
- return wrapper
-
-
-def call_command(f, args):
-
- if DEBUG:
- return f(*args)
- try:
- return f(*args)
- except TypeError, e:
- # NOTE: TypeErrors resulting from bugs in the core code will be
- # erroneously caught here! TODO: check depth of TypeError stack
- raise TypeError(e.message + '\n\nUSAGE:\n' + f.__doc__)
- except DiffcalcException, e:
- # TODO: log and create a new one to shorten stack trace for user
- raise DiffcalcException(e.message)
diff --git a/script/__Lib/diffcalc-2.1/diffcmd/__init__.py b/script/__Lib/diffcalc-2.1/diffcmd/__init__.py
deleted file mode 100755
index e69de29..0000000
diff --git a/script/__Lib/diffcalc-2.1/diffcmd/diffcalc_launcher.py b/script/__Lib/diffcalc-2.1/diffcmd/diffcalc_launcher.py
deleted file mode 100755
index 0653460..0000000
--- a/script/__Lib/diffcalc-2.1/diffcmd/diffcalc_launcher.py
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/usr/bin/python
-
-import argparse
-import subprocess
-import os
-import getpass
-
-DIFFCALC_BIN = os.path.split(os.path.realpath(__file__))[0]
-DIFFCALC_ROOT = os.path.abspath(os.path.join(DIFFCALC_BIN, os.pardir))
-
-MODULE_FOR_MANUALS = '_make_sixcircle_manual'
-
-def main():
- parser = argparse.ArgumentParser(description='Diffcalc: A diffraction condition calculator of x-ray and neutron crystalography')
- parser.add_argument('--modules', dest='show_modules', action='store_true',
- help='list available modules')
- parser.add_argument('--python', dest='use_python', action='store_true',
- help='run within python rather than ipython')
- parser.add_argument('--debug', dest='debug', action='store_true',
- help='run in debug mode')
- parser.add_argument('--make-manuals-source', dest='make_manuals', action='store_true',
- help='make .rst manual files by running template through sixcircle')
- parser.add_argument('--non-interactive', dest='non_interactive', action='store_true',
- help='do not enter interactive mode after startup')
- parser.add_argument('module', type=str, nargs='?',
- help='the module to startup with')
- args = parser.parse_args()
-
- # Create list of available modules
- module_names = []
- for module_path in os.listdir(os.path.join(DIFFCALC_ROOT, 'startup')):
- if not module_path.startswith('_') and module_path.endswith('.py'):
- module_names.append(module_path.split('.')[0])
- module_names.sort()
-
- if args.show_modules:
- print_available_modules(module_names)
- exit(0)
-
- if not args.make_manuals and not args.module:
- print "A module name should be provided. Choose one of:"
- print_available_modules(module_names)
- exit(0)
-
- if args.make_manuals:
- if args.module:
- print "When building the manuals no module should be given"
- exit(1)
- args.module = MODULE_FOR_MANUALS
-
- if not args.make_manuals and args.module not in module_names:
- print "The provided argument '%s' is not one of:" % args.module
- print_available_modules(module_names)
- exit(1)
-
- env = os.environ.copy()
-
- if 'PYTHONPATH' not in env:
- env['PYTHONPATH'] = ''
- env['PYTHONPATH'] = DIFFCALC_ROOT + ':' + env['PYTHONPATH']
-
- diffcmd_start_path = os.path.join(DIFFCALC_ROOT, 'diffcmd', 'start.py')
-
- if args.use_python:
- cmd = 'python'
- else: # ipython
- cmd = 'ipython --no-banner --HistoryManager.hist_file=/tmp/ipython_hist_%s.sqlite' % getpass.getuser()
-
- iflag = '' if args.non_interactive else '-i'
- cmd = cmd + ' ' + ' '.join([iflag, diffcmd_start_path, args.module, str(args.debug)])
-
- print 'Running: ' + cmd
- rc = subprocess.call(cmd, env=env, shell=True)
- exit(rc)
-
-
-def print_available_modules(module_names):
- lines = []
- for m in sorted(module_names):
- lines.append(' ' + m)
- print '\n'.join(lines)
-
-
-if __name__ == '__main__':
- main()
-#
diff --git a/script/__Lib/diffcalc-2.1/diffcmd/diffcmd_utils.py b/script/__Lib/diffcalc-2.1/diffcmd/diffcmd_utils.py
deleted file mode 100755
index 57ed4aa..0000000
--- a/script/__Lib/diffcalc-2.1/diffcmd/diffcmd_utils.py
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# General utility functions to handle Diffcalc commands
-#
-
-from gda.jython.commands.GeneralCommands import alias
-
-try:
- import gda
- GDA = True
-except ImportError:
- GDA = False
-
-
-
-def alias_commands(global_namespace_dict):
- """Alias commands left in global_namespace_dict by previous import from
- diffcalc.
-
- This is the equivalent of diffcmd/ipython/magic_commands() for use
- when IPython is not available
- """
- gnd = global_namespace_dict
- global GLOBAL_NAMESPACE_DICT
- GLOBAL_NAMESPACE_DICT = gnd
- print "Aliasing commands"
-
- ### Alias commands in namespace ###
- commands = gnd['hkl_commands_for_help']
- commands += gnd['ub_commands_for_help']
- if not GDA: # TODO: encapsulation issue: this should be done outside this function!
- commands.append(gnd['pos'])
- commands.append(gnd['scan'])
- aliased_names = []
-
- for f in commands:
- # Skip section headers like 'Motion'
- if not hasattr(f, '__call__'):
- continue
-
- alias(f.__name__)
- aliased_names.append(f.__name__)
-
- print "Aliased commands: " + ' '.join(aliased_names)
diff --git a/script/__Lib/diffcalc-2.1/diffcmd/ipython.py b/script/__Lib/diffcalc-2.1/diffcmd/ipython.py
deleted file mode 100755
index 81b4c33..0000000
--- a/script/__Lib/diffcalc-2.1/diffcmd/ipython.py
+++ /dev/null
@@ -1,302 +0,0 @@
-import re
-from functools import wraps
-from IPython.core.magic import register_line_magic
-from IPython import get_ipython # @UnusedImport (used by register_line_magic)
-from diffcalc.gdasupport.scannable.hkl import Hkl
-
-"""
-For wrapping functions:
-
- In [1]: import diffcmd.ipython
-
- In [2]: diffcmd.ipython.GLOBAL_NAMESPACE_DICT = globals()
-
- In [3]: from IPython.core.magic import register_line_magic
-
- In [4]: from diffcmd.ipython import parse_line
-
- In [5]: @register_line_magic
- ...: @parse_line
- ...: def check_parser(*args):
- ...: return args
- ...:
-
- In [6]: check_parser
- Out[6]:
-
- In [7]: del check_parser
-
- In [8]: check_parser
- Out[8]: ()
-
- In [9]: check_parser 1
- Out[9]: (1,)
-
- In [10]: check_parser 1 2
- Out[10]: (1, 2)
-
- In [11]: check_parser 1 2 [3]
- Out[11]: (1, 2, [3])
-
- In [12]: b='bbb'
-
- In [13]: check_parser 1 2 [3] b
- Out[13]: (1, 2, [3], 'bbb')
-
-
-And to create something dynamically from a function:
-
- In [28]: def f(a, b, c):
- ....: ....: return a, b, c
- ....:
-
- In [29]: register_line_magic(parse_line(f))
- Out[29]:
-
- In [30]: del f
-
- In [31]: f 'a' -2 [1 3 -4]
- Out[31]: ('a', -2, [1, 3, -4])
-
-And from a list of functions:
-
- In [32]: def one(a):
- ....: return a
- ....:
-
- In [33]: def two(a, b):
- ....: return a, b
- ....:
-
- In [34]: functions = one, two
-
- In [35]: del one, two
-
- In [36]: for f in functions:
- ....: register_line_magic(parse_line(f))
- ....:
-
- In [37]: one 1
- Out[37]: 1
-
- In [39]: two 1 2
- Out[39]: (1, 2)
-
-And to check if we are running in iPython:
-
- In [47]: 'get_ipython' in globals()
- Out[47]: True
-
-def in_ipython():
- try:
- get_ipython()
- return True
- except NameError:
- return False
-
-
-"""
-
-
-GLOBAL_NAMESPACE_DICT = {}
-
-MATH_OPERATORS = set(['-', '+', '/', '*'])
-
-# Keep a copy of python's original help as we may remove it later
-if 'help' in __builtins__:
- ORIGINAL_PYTHON_HELP = __builtins__['help']
-
-
-COMMA_USAGE_HELP = \
-'''
-| When calling a function without brackets, whitespace must be used in
-| place of commas. For example:
-|
-| >>> function a b [1 2 3] 'c'
-|
-| is equivalent to:
-|
-| >>> function(a, b, [1, 2, 3], 'c')
-|
-'''
-
-
-MATH_OPERATOR_USAGE_HELP = \
-'''
-| When calling a function without brackets, whitespace is used in place of
-| commas. Therefore terms which require evaluation must contain no space.
-| These will fail for example:
-|
-| >>> function - 1
-| >>> function a() * 2
-
-| But this
-
-| >>> function -1 1-1 +1 a()+1 [-1 0+1 b()] c+1
-|
-| is okay and equivalent to:
-|
-| >>> function(-1, 0, 1, a() + 1, [-1, 1, b()], c + 1)
-|
-
-'''
-
-comma_finder = re.compile(r'''((?:[^,"']|"[^"]*"|'[^']*')+)''')
-space_finder = re.compile(r'''((?:[^ "']|"[^"]*"|'[^']*')+)''')
-hash_finder = re.compile(r'''((?:[^#"']|"[^"]*"|'[^']*')+)''')
-open_square_finder = re.compile(r'''((?:[^["']|"[^"]*"|'[^']*')+)''')
-close_square_finder = re.compile(r'''((?:[^]"']|"[^"]*"|'[^']*')+)''')
-
-def tokenify(s):
-
- # Don't accept commas outside strings.
- # Users are frustrated by not knowing when commas _are_ required.
- # Making it clear when they are not helps them understand the
- # difference.
-
- if ',' in comma_finder.split(s):
- print COMMA_USAGE_HELP
- print "(string was: %s)" % s
- raise SyntaxError('unexpected comma')
-
- # ignore comment
- hash_split = hash_finder.split(s)
- if '#' in hash_split:
- s = '' if hash_split[0] == '#' else hash_split[1]
-
- # surround square brackets with spaces to simplify token extraction
- s = ''.join(' [ ' if e == '[' else e for e in open_square_finder.split(s))
- s = ''.join(' ] ' if e == ']' else e for e in close_square_finder.split(s))
-
-
- # tokens are now separated by spaces
-
- tokens = space_finder.split(s)[1::2]
- tokens = [tok for tok in tokens if tok != '']
- return tokens
-
-
-def parse(s, d):
- s = str(s)
- tokens = tokenify(s)
- for tok in tokens:
- if tok in MATH_OPERATORS:
- print MATH_OPERATOR_USAGE_HELP
- raise SyntaxError('could not evaluate: "%s"' % tok)
-
-
- s = ', '.join(tokens)
-
- s = s.replace('[, ', '[')
- s = s.replace(',]', ']')
- s = s.replace(', ]', ']')
-
- try:
- args = eval('[' + s + ']', d)
- except SyntaxError:
- raise SyntaxError('could not evaluate: "%s"' % s)
- return args
-
-def parse_line(f, global_namespace_dict=None):
- '''A decorator that parses a single string argument into a list of arguments
- and calls the wrapped function with these.
- '''
- if not global_namespace_dict:
- global_namespace_dict = GLOBAL_NAMESPACE_DICT
- @wraps(f)
- def wrapper(line):
- args = parse(line, global_namespace_dict)
- return f(*args)
- return wrapper
-
-
-
-_DEFAULT_HELP = \
-"""
-For help with diffcalc's orientation phase try:
-
- >>> help ub
-
-For help with moving in reciprocal lattice space try:
-
- >>> help hkl
-
-For more detailed help try for example:
-
- >>> help newub
-
-For help with driving axes or scanning:
-
- >>> help pos
- >>> help scan
-
-For help with regular python try for example:
-
- >>> help list
-
-For more detailed help with diffcalc go to:
-
- https://diffcalc.readthedocs.io
-
-"""
-
-def magic_commands(global_namespace_dict):
- """Magic commands left in global_namespace_dict by previous import from
- diffcalc.
-
- Also creates a help command. NOTE that calling this will
- remove the original commands from the global namespace as otherwise these
- would shadow the ipython magiced versions.
-
- Depends on hkl_commands_for_help & ub_commands_for_help list having been
- left in the global namespace and assumes there is pos and scan command.
- """
- gnd = global_namespace_dict
- global GLOBAL_NAMESPACE_DICT
- GLOBAL_NAMESPACE_DICT = gnd
-
- ### Magic commands in namespace ###
- commands = list(gnd['hkl_commands_for_help'])
- commands += gnd['ub_commands_for_help']
- commands.append(gnd['pos'])
- commands.append(gnd['scan'])
- command_map = {}
- for f in commands:
- # Skip section headers like 'Motion'
- if not hasattr(f, '__call__'):
- continue
- # magic the function and remove from namespace (otherwise it would
- # shadow the magiced command)
- register_line_magic(parse_line(f, gnd))
- del gnd[f.__name__]
- command_map[f.__name__] = f
-
- ### Create help function ###
- #Expects python's original help to be named pythons_help and to be
- #available in the top-level global namespace (where non-diffcalc
- #objects may have help called from).
- def help(s): # @ReservedAssignment
- """Diffcalc help for iPython
- """
- if s == '':
- print _DEFAULT_HELP
- elif s == 'hkl':
- # Use help injected into hkl object
- print Hkl.dynamic_docstring
- elif s == 'ub':
- # Use help injected into ub command
- print command_map['ub'].__doc__
- elif s in command_map:
- print "%s (diffcalc command):" %s
- print command_map[s].__doc__
- else:
- exec('pythons_help(%s)' %s, gnd)
-
-
- ### Setup help command ###
- gnd['pythons_help'] = ORIGINAL_PYTHON_HELP
- register_line_magic(help)
- # Remove builtin help
- # (otherwise it would shadow magiced command
- if 'help' in __builtins__:
- del __builtins__['help']
diff --git a/script/__Lib/diffcalc-2.1/diffcmd/ipythonmagic.py b/script/__Lib/diffcalc-2.1/diffcmd/ipythonmagic.py
deleted file mode 100755
index 6679864..0000000
--- a/script/__Lib/diffcalc-2.1/diffcmd/ipythonmagic.py
+++ /dev/null
@@ -1,79 +0,0 @@
-
-import diffcmd.ipython
-from IPython.core.magic import register_line_magic
-from diffcmd.ipython import parse_line
-
-command_map = {}
-
-_DEFAULT_HELP = """
-For help with diffcalc's orientation phase try:
-
- >>> help ub
-
-For help with moving in reciprocal lattice space try:
-
- >>> help hkl
-
-For more detailed help try for example:
-
- >>> help newub
-
-For help with driving axes or scanning:
-
- >>> help pos
- >>> help scan
-
-For help with regular python try for example:
-
- >>> help list
-
-For more detailed help with diffcalc go to:
-
- https://diffcalc.readthedocs.io
-
-"""
-
-# This function should be called with parameter globals()
-def define_commands(dictionary):
- print "Ipython detected - magicing commands"
- magiced_names = []
- commands = hkl_commands_for_help + ub_commands_for_help # @UndefinedVariable
- commands += [pos, scan] # @UndefinedVariable
- ipython.GLOBAL_NAMESPACE_DICT = dictionary
- for f in commands:
- # Skip section headers like 'Motion'
- if not hasattr(f, '__call__'):
- continue
-
- # magic the function and remove from namespace (otherwise it would
- # shadow the magiced command)
- register_line_magic(parse_line(f))
- del dictionary[f.__name__]
- command_map[f.__name__] = f
- magiced_names.append(f.__name__)
-
- print "Magiced commands: " + ' '.join(magiced_names)
-
- # because the functions have gone from namespace we need to override
- pythons_help = __builtins__.help
- del __builtins__.help
-
- register_line_magic(help)
- del help
-
-def help(s):
- """Diffcalc help for iPython
- """
- if s == '':
- print _DEFAULT_HELP
- elif s == 'hkl':
- # Use help injected into hkl object
- print hkl.__doc__
- elif s == 'ub':
- # Use help injected into ub command
- print command_map['ub'].__doc__
- elif s in command_map:
- print "%s (diffcalc command):" %s
- print command_map[s].__doc__
- else:
- exec('pythons_help(%s)' %s)
diff --git a/script/__Lib/diffcalc-2.1/diffcmd/make_manual.py b/script/__Lib/diffcalc-2.1/diffcmd/make_manual.py
deleted file mode 100755
index a3b77bf..0000000
--- a/script/__Lib/diffcalc-2.1/diffcmd/make_manual.py
+++ /dev/null
@@ -1,146 +0,0 @@
-
-
-from StringIO import StringIO
-from IPython import get_ipython
-import sys
-from diffcalc.dc.help import format_commands_for_rst_table
-
-
-TEST_INPUT="""
-Diffcalc's Scannables
-=====================
-
-Please see :ref:`moving-in-hkl-space` and :ref:`scanning-in-hkl-space` for some relevant examples.
-
-To list and show the current positions of your beamline's scannables
-use ``pos`` with no arguments::
-
- >>> pos wl
-
-should do nought, but this should be replaced::
-
- ==> pos wl 2
-
-should do the thing
-
- ==> abcd
-"""
-
-
-
-def echorun(magic_cmd):
- print "\n>>> " + str(magic_cmd)
-
-
-
-def make_manual(input_file_path,
- output_file_path,
- ub_commands_for_help,
- hkl_commands_for_help):
-
- # Read input file (should be .rst file)
- with open(input_file_path, 'r') as f:
- input_string = f.read()
-
- # Parse input string
- output_lines = []
- for lineno, line in enumerate(input_string.split('\n')):
- process = '==>' in line
-
- if process and 'STOP' in line:
- print "'==> STOP' found on line. STOPPING", lineno + 1
- return
-
- elif process and 'UB_HELP_TABLE' in line:
- print 'Creating UB help table'
- output_lines_from_line = format_commands_for_rst_table(
- '', ub_commands_for_help)
-
- elif process and 'HKL_HELP_TABLE' in line:
- print 'Creating HKL help table'
- output_lines_from_line = format_commands_for_rst_table(
- '', hkl_commands_for_help)
-
- else:
- output_lines_from_line = parse_line(
- line, lineno + 1, input_file_path)
-
-# print '\n'.join(output_lines_from_line)
- output_lines.extend(output_lines_from_line)
-
- # Write output file
- if output_file_path:
- with open(output_file_path, 'w') as f:
- f.write('\n'.join(output_lines))
- print "Wrote file:", output_file_path
-# try:
-# if output_file_path:
-# orig_stdout = sys.stdout
-# f = file(output_file_path, 'w')
-# sys.stdout = f
-#
-#
-#
-# finally:
-# if output_file_path:
-# sys.stdout = orig_stdout
-# f.close()
-
-
-def parse_line(linein, lineno, filepath):
- output_lines = []
- if '==>' in linein:
- pre, cmd = linein.split('==>')
- _check_spaces_only(pre, lineno, filepath)
- cmd = cmd.strip() # strip whitespace
- output_lines.append(pre + ">>> " + cmd)
- result_lines = _capture_magic_command_output(cmd, lineno, filepath)
-
-
- # append to output
- for line in result_lines:
- output_lines.append(pre + line)
- else:
- output_lines.append(linein)
- return output_lines
-
-
-def _check_spaces_only(s, lineno, filepath):
- for c in s:
- if c != ' ':
- raise Exception('Error on line %i of %s :\n text proceeding --> must be '
- 'spaces only' % (lineno, filepath))
-
-def _capture_magic_command_output(magic_cmd, lineno, filepath):
- orig_stdout = sys.stdout
- result = StringIO()
- sys.stdout = result
-
- def log_error():
- msg = "Error on line %i of %s evaluating '%s'" % (lineno, filepath, magic_cmd)
- sys.stderr.write('\n' + '=' * 79 + '\n' + msg + '\n' +'v' * 79 + '\n')
- return msg
-
- try:
- line_magics = get_ipython().magics_manager.magics['line']
- magic = magic_cmd.split(' ')[0]
- if magic not in line_magics:
- msg = log_error()
- raise Exception(msg + " ('%s' is not a magic command)" % magic)
- get_ipython().magic(magic_cmd)
- except:
- log_error()
- raise
- finally:
- sys.stdout = orig_stdout
-
- result_lines = result.getvalue().split('\n')
-
- # trim trailing lines which are whitespace only
- while result_lines and (result_lines[-1].isspace() or not result_lines[-1]):
- result_lines.pop()
-
- return result_lines
-
-
-
\ No newline at end of file
diff --git a/script/__Lib/diffcalc-2.1/diffcmd/start.py b/script/__Lib/diffcalc-2.1/diffcmd/start.py
deleted file mode 100755
index faa7b6d..0000000
--- a/script/__Lib/diffcalc-2.1/diffcmd/start.py
+++ /dev/null
@@ -1,87 +0,0 @@
-"""
-start the diffcmd environemt using a script from startup.
-This should normally be run by the main diffcalc.py program.
-
-with diffcalc on PYTHONPATH
-$ ipython -i -m diffcm.diffcmd module_name_string debug_bool
-"""
-from __future__ import absolute_import
-
-import diffcalc
-import diffcalc.settings
-import os
-import sys
-from diffcalc.ub.persistence import UBCalculationJSONPersister
-from diffcalc.util import bold
-import diffcalc.util
-import diffcalc.gdasupport.minigda.command
-DIFFCALC_ROOT = os.path.realpath(diffcalc.__file__).split('diffcalc/__init__.py')[0]
-
-try:
- __IPYTHON__ # @UndefinedVariable
- IPYTHON = True
-except NameError:
- IPYTHON = False
-
-
-module_name = sys.argv[1] #3 if IPYTHON else 1]
-debug = sys.argv[2] == 'True' #4 if IPYTHON else 2])
-
-print
-print bold('-' * 34 + ' DIFFCALC ' + '-' * 35)
-
-# configure persisentence
-DIFFCALC_VAR = os.path.join(os.path.expanduser('~'), '.diffcalc', module_name)
-if not os.path.exists(DIFFCALC_VAR):
- print "Making diffcalc var folder:'%s'" % DIFFCALC_VAR
- os.makedirs(DIFFCALC_VAR)
-diffcalc.settings.ubcalc_persister = UBCalculationJSONPersister(DIFFCALC_VAR)
-
-# configure debug
-diffcalc.util.DEBUG = debug
-if debug:
- print "WARNING: debug mode on; help for command syntax errors disabled."
-
-# import script
-script = os.path.join(DIFFCALC_ROOT, 'startup', module_name) + '.py'
-
-print "Startup script: '%s'" % script
-namespace = {}
-execfile(script, namespace)
-globals().update(namespace)
-diffcalc.gdasupport.minigda.command.ROOT_NAMESPACE_DICT = dict(namespace)
-print bold('-' * 36 + ' Help ' + '-' * 37)
-print HELP_STRING # @UndefinedVariable
-if 'LOCAL_MANUAL' in locals():
- print "Local: " + LOCAL_MANUAL # @UndefinedVariable
-print bold('-' * 79)
-print
-
-
-# magic commands if IPython
-if IPYTHON:
- from diffcmd.ipython import magic_commands
- magic_commands(globals())
-
-
-if 'MANUALS_TO_MAKE' in locals():
- summary_lines = ['Made manuals:']
- from diffcmd.make_manual import make_manual
- for source_path in MANUALS_TO_MAKE: # @UndefinedVariable
- import diffcalc.ub.ub
- try:
- diffcalc.ub.ub.rmub('example')
- except KeyError:
- pass
- target_path = source_path.replace('_template', '')
- print '@' * 79
- print "Making manual"
- print " Source:", source_path
- print " Target:", target_path
-
- make_manual(source_path, target_path,
- ub_commands_for_help, # @UndefinedVariable
- hkl_commands_for_help) # @UndefinedVariable
- summary_lines.append(' - ' + source_path + ' -- > ' + target_path)
- print '\n'.join(summary_lines)
-
\ No newline at end of file
diff --git a/script/__Lib/diffcalc-2.1/doc/Makefile b/script/__Lib/diffcalc-2.1/doc/Makefile
deleted file mode 100755
index 032954a..0000000
--- a/script/__Lib/diffcalc-2.1/doc/Makefile
+++ /dev/null
@@ -1,193 +0,0 @@
-# Makefile for documentation
-# This makefile is a modified version of the makefile generated by the sphinx-quickstart command
-
-# set environment for Diamond Light Source
-ifeq ($(CONTEXT),diamond)
- @echo "Environment variable CONTEXT=diamond, so setting build environment suitable for Diamond Light Source"
- # get the location of a Python that has Sphinx installed
- SPHINXBUILD?=$(shell module load python/2.7.2;which sphinx-build)
- # set http proxy
- export http_proxy?=http://wwwcache.rl.ac.uk:8080
- export https_proxy?=https://wwwcache.rl.ac.uk:8080
-endif
-
-# optionally use Sphinx's "-W" options, which converts warnings into errors
-ifeq ($(HALTONWARNING),y)
- SPHINXEXTRAOPT=-W
-else ifeq ($(HALTONWARNING),Y)
- SPHINXEXTRAOPT=-W
-else
- SPHINXEXTRAOPT=
-endif
-
-### <-- start of Makefile contents generated by sphinx-quickstart --> ###
-
-# You can set these variables from the command line.
-SPHINXOPTS ?=
-SPHINXBUILD ?= sphinx-build
-PAPER ?=
-BUILDDIR ?= build
-
-# Internal variables.
-PAPEROPT_a4 = -D latex_paper_size=a4
-PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXEXTRAOPT) $(SPHINXOPTS) source
-
-.PHONY: help helpfull pwd clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest pdfa4 pdfletter pdf all
-
-help:
- @echo
- @echo "Please use \`make ' where is one of"
- @echo " html to make standalone HTML files"
- @echo " pdf to create pdf files for both A4- and Letter-sized paper"
- @echo " pdfa4 to create pdf files for A4-sized paper"
- @echo " pdfletter to create pdf files for Letter-sized paper"
- @echo " all to build html and pdf"
- @echo " clean to wipe the build directory"
- @echo
- @echo "You can use \`make helpfull' to get a full list of targets (not all have been tested)"
-
-helpfull:
- @echo "Please use \`make ' where is one of"
- @echo " html to make standalone HTML files"
- @echo " dirhtml to make HTML files named index.html in directories"
- @echo " singlehtml to make a single large HTML file"
- @echo " pickle to make pickle files"
- @echo " json to make JSON files"
- @echo " htmlhelp to make HTML files and a HTML help project"
- @echo " qthelp to make HTML files and a qthelp project"
- @echo " devhelp to make HTML files and a Devhelp project"
- @echo " epub to make an epub"
- @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
- @echo " latexpdf to make LaTeX files and run them through pdflatex"
- @echo " text to make text files"
- @echo " man to make manual pages"
- @echo " changes to make an overview of all changed/added/deprecated items"
- @echo " linkcheck to check all external links for integrity"
- @echo " doctest to run all doctests embedded in the documentation (if enabled)"
-
-pwd:
- @echo
- @echo "*******************************************************************************************************"
- @echo "Current directory = "`pwd`
- @echo "*******************************************************************************************************"
-
-clean: pwd
- -rm -rf $(BUILDDIR)/*
-
-html: pwd
- $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
- @echo
- @echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
-
-dirhtml:
- $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
- @echo
- @echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
-
-singlehtml:
- $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
- @echo
- @echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
-
-pickle:
- $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
- @echo
- @echo "Build finished; now you can process the pickle files."
-
-json:
- $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
- @echo
- @echo "Build finished; now you can process the JSON files."
-
-htmlhelp:
- $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
- @echo
- @echo "Build finished; now you can run HTML Help Workshop with the" \
- ".hhp project file in $(BUILDDIR)/htmlhelp."
-
-qthelp:
- $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
- @echo
- @echo "Build finished; now you can run "qcollectiongenerator" with the" \
- ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
- @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/GDA.qhcp"
- @echo "To view the help file:"
- @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/GDA.qhc"
-
-devhelp:
- $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
- @echo
- @echo "Build finished."
- @echo "To view the help file:"
- @echo "# mkdir -p $$HOME/.local/share/devhelp/GDA"
- @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/GDA"
- @echo "# devhelp"
-
-epub:
- $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
- @echo
- @echo "Build finished. The epub file is in $(BUILDDIR)/epub."
-
-latex: pwd
- $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
- @echo
- @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
- @echo "Run \`make' in that directory to run these through (pdf)latex" \
- "(use \`make latexpdf' here to do that automatically)."
-
-latexpdf: pwd
- $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
- @echo "Running LaTeX files through pdflatex..."
- make -C $(BUILDDIR)/latex all-pdf
- @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
-
-text:
- $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
- @echo
- @echo "Build finished. The text files are in $(BUILDDIR)/text."
-
-man:
- $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
- @echo
- @echo "Build finished. The manual pages are in $(BUILDDIR)/man."
-
-changes:
- $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
- @echo
- @echo "The overview file is in $(BUILDDIR)/changes."
-
-linkcheck:
- $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
- @echo
- @echo "Link check complete; look for any errors in the above output " \
- "or in $(BUILDDIR)/linkcheck/output.txt."
-
-doctest:
- $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
- @echo "Testing of doctests in the sources finished, look at the " \
- "results in $(BUILDDIR)/doctest/output.txt."
-
-### <-- end of Makefile contents generated by sphinx-quickstart --> ###
-
-pdfa4: pwd
- rm -rf $(BUILDDIR)/latex
- rm -rf $(BUILDDIR)/pdf-a4
- make latexpdf PAPER=a4
- mkdir $(BUILDDIR)/pdf-a4/
- cp $(BUILDDIR)/latex/*.pdf $(BUILDDIR)/pdf-a4/.
- @echo
- @echo "Build finished for A4-sized PDFs. The PDF files are in $(BUILDDIR)/pdf-a4."
-
-pdfletter: pwd
- rm -rf $(BUILDDIR)/latex
- rm -rf $(BUILDDIR)/pdf-letter
- make latexpdf PAPER=letter
- mkdir $(BUILDDIR)/pdf-letter/
- cp $(BUILDDIR)/latex/*.pdf $(BUILDDIR)/pdf-letter/.
- @echo
- @echo "Build finished for Letter-sized PDFs. The PDF files are in $(BUILDDIR)/pdf-letter."
-
-pdf: pwd pdfa4 pdfletter
-
-all: pwd html pdf
diff --git a/script/__Lib/diffcalc-2.1/doc/docs-build-diffcalc_doc-linux.launch b/script/__Lib/diffcalc-2.1/doc/docs-build-diffcalc_doc-linux.launch
deleted file mode 100755
index 0bba525..0000000
--- a/script/__Lib/diffcalc-2.1/doc/docs-build-diffcalc_doc-linux.launch
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/script/__Lib/diffcalc-2.1/doc/references b/script/__Lib/diffcalc-2.1/doc/references
deleted file mode 100755
index a094e55..0000000
--- a/script/__Lib/diffcalc-2.1/doc/references
+++ /dev/null
@@ -1,22 +0,0 @@
-
-.. [You1999] H. You. *Angle calculations for a '4S+2D' six-circle diffractometer.*
- J. Appl. Cryst. (1999). **32**, 614-623. `(pdf link)
- `__.
-
-.. [Busing1967] W. R. Busing and H. A. Levy. *Angle calculations for 3- and 4-circle X-ray
- and neutron diffractometers.* Acta Cryst. (1967). **22**, 457-464. `(pdf link)
- `__.
-
-.. [Vlieg1993] Martin Lohmeier and Elias Vlieg. *Angle calculations for a six-circle
- surface x-ray diffractometer.* J. Appl. Cryst. (1993). **26**, 706-716. `(pdf link)
- `__.
-
-.. [Vlieg1998] Elias Vlieg. *A (2+3)-type surface diffractometer: mergence of the z-axis and
- (2+2)-type geometries.* J. Appl. Cryst. (1998). **31**, 198-203. `(pdf link)
- `__.
-
-.. [Willmott2011] C. M. Schlepütz, S. O. Mariager, S. A. Pauli, R. Feidenhans'l and
- P. R. Willmott. *Angle calculations for a (2+3)-type diffractometer: focus
- on area detectors.* J. Appl. Cryst. (2011). **44**, 73-83. `(pdf link)
- `__.
-
diff --git a/script/__Lib/diffcalc-2.1/doc/source/ACKS.rst b/script/__Lib/diffcalc-2.1/doc/source/ACKS.rst
deleted file mode 100755
index 81fb355..0000000
--- a/script/__Lib/diffcalc-2.1/doc/source/ACKS.rst
+++ /dev/null
@@ -1,34 +0,0 @@
-################
-Acknowledgements
-################
-
-.. toctree::
- :maxdepth: 2
- :numbered:
-
-We would like to acknowledge the people who have made a direct impact on the
-Diffcalc project, knowingly or not, in terms of encouragement, suggestions,
-criticism, bug reports, code contributions, and related projects.
-
-Names are ordered alphabetically by surname.
-
-.. If you add new entries, keep the list sorted by surname!
-
-.. acks::
-
- * Allesandro Bombardi
- * Mark Booth
- * W. R. Busing
- * Steve Collins
- * Mirian Garcia-Fernandez
- * H. A. Levy
- * Martin Lohmier
- * Chris Nicklin
- * Elias Vlieg --- writer of DIF software used as a model for Diffcalc
- * Robert Walton
- * H. You
- * Fajin Yuan
-
-Thank you!
-
-Rob Walton & Irakli Sikharulidze
\ No newline at end of file
diff --git a/script/__Lib/diffcalc-2.1/doc/source/conf.py b/script/__Lib/diffcalc-2.1/doc/source/conf.py
deleted file mode 100755
index fe9ba1d..0000000
--- a/script/__Lib/diffcalc-2.1/doc/source/conf.py
+++ /dev/null
@@ -1,243 +0,0 @@
-# -*- coding: utf-8 -*-
-
-#
-# documentation build configuration file, created by
-# sphinx-quickstart on Fri Apr 15 10:03:07 2011.
-#
-# This file is execfile()d with the current directory set to its containing dir.
-#
-# Note that not all possible configuration values are present in this
-# autogenerated file.
-#
-# All configuration values have a default; values that are commented out
-# serve to show the default.
-
-import sys, os, time
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
-
-# -- General configuration -----------------------------------------------------
-
-# If your documentation needs a minimal Sphinx version, state it here.
-needs_sphinx = '1.0'
-
-# Add any Sphinx extension module names here, as strings. They can be extensions
-# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.autodoc', 'sphinx.ext.extlinks', 'sphinx.ext.intersphinx', 'sphinx.ext.todo', 'sphinx.ext.imgmath', 'sphinx.ext.ifconfig']
-
-# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
-
-# The suffix of source filenames.
-source_suffix = '.rst'
-
-# The encoding of source files.
-#source_encoding = 'utf-8-sig'
-
-# The master toctree document.
-master_doc = 'index'
-
-# General information about the project.
-project = u'Diffcalc'
-copyright = u'2017-%s, Diamond Light Source' % time.strftime('%Y')
-
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-version = '2.1'
-# The full version, including alpha/beta/rc tags.
-release = '2.1'
-
-# The language for content autogenerated by Sphinx. Refer to documentation
-# for a list of supported languages.
-#language = None
-
-# There are two options for replacing |today|: either, you set today to some
-# non-false value, then it is used:
-#today = ''
-# Else, today_fmt is used as the format for a strftime call.
-#today_fmt = '%B %d, %Y'
-
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
-exclude_patterns = []
-
-# The reST default role (used for this markup: `text`) to use for all documents.
-#default_role = None
-
-# If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
-
-# If true, the current module name will be prepended to all description
-# unit titles (such as .. function::).
-#add_module_names = True
-
-# If true, sectionauthor and moduleauthor directives will be shown in the
-# output. They are ignored by default.
-#show_authors = False
-
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
-
-# A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
-
-
-# -- Options for HTML output ---------------------------------------------------
-
-# The theme to use for HTML and HTML Help pages. See the documentation for
-# a list of builtin themes.
-#html_theme = 'default'
-
-# Theme options are theme-specific and customize the look and feel of a theme
-# further. For a list of options available for each theme, see the
-# documentation.
-#html_theme_options = {}
-# html_theme_options = {
-# 'sidebarbgcolor' : '#f2f2f2',
-# 'sidebartextcolor': '#444a95',
-# 'sidebarlinkcolor': '#0b0f40',
-# }
-
-# Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
-
-
-import sphinx_rtd_theme
-
-html_theme = "sphinx_rtd_theme"
-
-html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
-
-# The name for this set of Sphinx documents. If None, it defaults to
-# " v documentation".
-#html_title = None
-
-# A shorter title for the navigation bar. Default is the same as html_title.
-#html_short_title = None
-
-# The name of an image file (relative to this directory) to place at the top
-# of the sidebar.
-html_logo = 'diffcalc_web.png'
-
-# The name of an image file (within the static path) to use as favicon of the
-# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
-# pixels large.
-#html_favicon = None
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-#html_static_path = ['_static']
-html_static_path = []
-
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
-
-# If true, SmartyPants will be used to convert quotes and dashes to
-# typographically correct entities.
-#html_use_smartypants = True
-
-# Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
-
-# Additional templates that should be rendered to pages, maps page names to
-# template names.
-#html_additional_pages = {}
-
-# If false, no module index is generated.
-#html_domain_indices = True
-
-# If false, no index is generated.
-#html_use_index = True
-
-# If true, the index is split into individual pages for each letter.
-#html_split_index = False
-
-# If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
-html_show_sourcelink = False
-
-# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
-html_show_sphinx = False
-
-# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
-
-# If true, an OpenSearch description file will be output, and all pages will
-# contain a tag referring to it. The value of this option must be the
-# base URL from which the finished HTML is served.
-#html_use_opensearch = ''
-
-# This is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = None
-
-# -- Options for LaTeX output --------------------------------------------------
-
-# The paper size ('letter' or 'a4').
-#latex_paper_size = 'letter'
-latex_paper_size = 'a4'
-
-# The font size ('10pt', '11pt' or '12pt').
-#latex_font_size = '10pt'
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title, author, documentclass [howto/manual]).
-latex_documents = [
- ('youmanual', 'diffcalc_user_guide.tex', u'Diffcalc User Guide',
- u'Diamond Light Source', 'manual'),
-]
-
-# The name of an image file (relative to this directory) to place at the top of
-# the title page
-latex_logo = 'diffcalc_pdf.png'
-
-# For "manual" documents, if this is true, then toplevel headings are parts,
-# not chapters.
-#latex_use_parts = False
-
-# If true, show page references after internal links.
-#latex_show_pagerefs = False
-
-# If true, show URL addresses after external links.
-#latex_show_urls = False
-
-# Additional stuff for the LaTeX preamble.
-#latex_preamble = ''
-
-# Documents to append as an appendix to all manuals.
-#latex_appendices = []
-
-# If false, no module index is generated.
-#latex_domain_indices = True
-
-
-# -- Options for manual page output --------------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-#man_pages = []
-
-# Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {}
-
-"""
- Additional options for Diffcalc
-"""
-
-todo_include_todos = True
-
-extlinks = {
- 'opengda_url' :('http://www.opengda.org/%s', None),
- }
-
-rst_prolog = """
-.. |DLS| replace:: :abbr:`DLS (Diamond Light Source)`
-"""
diff --git a/script/__Lib/diffcalc-2.1/doc/source/developer/contents.rst b/script/__Lib/diffcalc-2.1/doc/source/developer/contents.rst
deleted file mode 100755
index d52fdd9..0000000
--- a/script/__Lib/diffcalc-2.1/doc/source/developer/contents.rst
+++ /dev/null
@@ -1,25 +0,0 @@
-########################
-Diffcalc Developer Guide
-########################
-
-:Author: Rob Walton
-:Contact: rob.walton (at) diamond (dot) ac (dot) uk
-:Website: http://www.opengda.org/
-
-.. rubric:: Diffcalc: A diffraction condition calculator for diffractometer control
-
-.. toctree::
- :maxdepth: 2
- :numbered:
-
- intro
- package
- quickstart_api
- development
-
-Indices and tables
-==================
-
-* :ref:`genindex`
-* :ref:`modindex`
-* :ref:`search`
\ No newline at end of file
diff --git a/script/__Lib/diffcalc-2.1/doc/source/developer/development.rst b/script/__Lib/diffcalc-2.1/doc/source/developer/development.rst
deleted file mode 100755
index 12b90c6..0000000
--- a/script/__Lib/diffcalc-2.1/doc/source/developer/development.rst
+++ /dev/null
@@ -1,24 +0,0 @@
-Development
-===========
-
-The files are kept here_ on github_. See bootcamp for an introduction to
-using github. To contribute please fork the project. Otherwise you can make
-a read-only clone or export.
-
-Code format should follow pep8 guidelines. PyDev has a good pep8 checker.
-
-To run the tests install nose_, change directory into the test folder and run::
-
- $ nosetests
- .......... ...
- ----------------------------------------------------------------------
- Ran 3914 tests in 9.584s
-
- OK (SKIP=15)
-
-
-
-.. _here: https://github.com/DiamondLightSource/diffcalc
-.. _github: https://github.com
-.. _nose: http://nose.readthedocs.org/en/latest/
-.. _pep8: http://www.python.org/dev/peps/pep-0008/
diff --git a/script/__Lib/diffcalc-2.1/doc/source/developer/intro.rst b/script/__Lib/diffcalc-2.1/doc/source/developer/intro.rst
deleted file mode 100755
index a45eae4..0000000
--- a/script/__Lib/diffcalc-2.1/doc/source/developer/intro.rst
+++ /dev/null
@@ -1,55 +0,0 @@
-Introduction
-============
-
-Diffcalc is a diffraction condition calculator used for controlling
-diffractometers within reciprocal lattice space. It performs the same
-task as the ``fourc``, ``sixc``, ``twoc``, ``kappa``, ``psic`` and
-``surf`` macros from SPEC_.
-
-Diffcalc's standard calculation engine is an implementation of
-[You1999]_ . The first versions of Diffcalc were based on
-[Vlieg1993]_ and [Vlieg1998]_ and a 'Vlieg' engine is still
-available. The 'You' engine is more generic and the plan is to remove
-the old 'Vlieg' engine once beamlines have been migrated. New users
-should use the 'You' engine.
-
-The foundations for this type of calculation were laid by by Busing &
-Levi in their classic paper [Busing1967]_. Diffcalc's orientation
-algorithm is taken from this paper. Busing & Levi also provided the
-original definition of the coordinate frames and of the U and B
-matrices used to describe a crystal's orientation and to convert between
-Cartesian and reciprical lattice space.
-
-Geometry plugins are used to adapt the six circle model used
-internally by Diffcalc to apply to other diffractometers. These
-contain a dictionary of the 'missing' angles which Diffcalc uses to
-constrain these angles internally, and a methods to map from external
-angles to Diffcalc angles and visa versa.
-
-Options to use Diffcalc:
-
-- **The User manual next to this developer manual or README file on github.**
-- The :ref:`quickstart-api` section describes how to run up only
- the core in Python_. This provides a base option for system integration.
-
-Diffcalc will work with Python 2.7 or higher with numpy_, or with
-Jython 2.7 of higher with Jama_.
-
-
-.. [*] The very small 'Willmott' engine currently handles the case for
- surface diffraction where the surface normal is held vertical
- [Willmott2011]_. The 'You' engine handles this case fine, but
- currently spins nu into an unhelpful quadrant. We hope to
- remove the need for this engine soon.
-
-
-.. _SPEC: http://www.certif.com/
-.. _Python: http://python.org
-.. _IPython: http://http://ipython.org/
-.. _Jython: http://jython.org
-.. _OpenGDA: http://opengda.org
-.. _numpy: http://numpy.scipy.org/
-.. _Jama: http://math.nist.gov/javanumerics/jama/
-
-
-.. include:: ../../references
diff --git a/script/__Lib/diffcalc-2.1/doc/source/developer/package.rst b/script/__Lib/diffcalc-2.1/doc/source/developer/package.rst
deleted file mode 100755
index e4d3210..0000000
--- a/script/__Lib/diffcalc-2.1/doc/source/developer/package.rst
+++ /dev/null
@@ -1,30 +0,0 @@
-Project Files & Directories
-===========================
-
-diffcalc
- The main source package.
-
-test
- Diffcalcs unit-test package (use Nose_ to run them).
-
-diffcmd
- A spec-like openGDA emulator.
-
-numjy
- A *very* minimal implentation of numpy for jython. It supports only what
- Diffcalc needs.
-
-doc
- The documentation is written in reStructuredText and can be compiled into
- html and pdf using Python's `Sphinx `_. With Sphinx
- installed use ``make clean all`` from within the user and developer guide
- folders to build the documentation.
-
-startup
- Starup scripts called by diffcmd or openGDA to startup diffcalc
-
-model
- Vrml models of diffractometers and a hokey script for animating then and
- controlling them from diffcalc.
-
-.. _Nose: http://readthedocs.org/docs/nose/en/latest/
\ No newline at end of file
diff --git a/script/__Lib/diffcalc-2.1/doc/source/developer/quickstart_api.rst b/script/__Lib/diffcalc-2.1/doc/source/developer/quickstart_api.rst
deleted file mode 100755
index 96bb9a2..0000000
--- a/script/__Lib/diffcalc-2.1/doc/source/developer/quickstart_api.rst
+++ /dev/null
@@ -1,266 +0,0 @@
-.. _quickstart-api:
-
-.. warning:: This documentation is out of date. The README and the user doc has been updated recently. For now if you need help with API, please contact me at Diamond. -- Rob Walton
-
-Quick-Start: Python API
-=======================
-
-This section describes how to run up only the core in Python or
-IPython. This provides an API which could be used to integrate Diffcalc into an
-existing data acquisition system; although the interface described in
-the README would normally provide a better starting point.
-
-For a full description of what Diffcalc does and how to use it please
-see the 'Diffcalc user manual'.
-
-Setup environment
------------------
-
-.. include:: quickstart_setup_environment
-
-
-Start
------
-
-With Python start the sixcircle_api.py example startup script (notice
-the -i and -m) and call `demo_all()`::
-
- $ python -i -m startup.api.sixcircle
- >>> demo_all()
-
-IPython requires::
-
- $ ipython -i startup/api/sixcircle.py
- >>> demo_all()
-
-Alternatively start Python or IPython and cut and paste lines from the rest of
-this tutorial.
-
-Configure a diffraction calculator
-----------------------------------
-
-By default some exceptions are handled in a way to make user interaction
-friendlier. Switch this off with::
-
- >>> import diffcalc.util
- >>> diffcalc.util.DEBUG = True
-
-To setup a Diffcalc calculator, first configure `diffcalc.settings` module::
-
- >>> from diffcalc import settings
- >>> from diffcalc.hkl.you.geometry import SixCircle
- >>> from diffcalc.hardware import DummyHardwareAdapter
- >>> settings.hardware = DummyHardwareAdapter(('mu', 'delta', 'gam', 'eta', 'chi', 'phi'))
- >>> settings.geometry = SixCircle() # @UndefinedVariable
-
-The hardware adapter is used by Diffcalc to read up the current angle
-settings, wavelength and axes limits. It is primarily used to simplify
-commands for end users. It could be dropped for this API use, but it
-is also used for the important job of checking axes limits while
-choosing solutions.
-
-Geometry plugins are used to adapt the six circle model used
-internally by Diffcalc to apply to other diffractometers. These
-contain a dictionary of the 'missing' angles which Diffcalc internally
-uses to constrain these angles, and a methods to map from
-external angles to Diffcalc angles and visa versa.
-
-
-Calling the API
----------------
-
-The ``diffcalc.dc.dcyou`` module (and others) read the ``diffcalc.settings`` module when first
-imported. Note that this means that changes to the settings will most likely
-have no effect unless ``diffcalc.dc.dcyou`` is reloaded::
-
- >>> import diffcalc.dc.dcyou as dc
-
-This includes the two critical functions::
-
- def hkl_to_angles(h, k, l, energy=None):
- """Convert a given hkl vector to a set of diffractometer angles
-
- return angle tuple and virtual angles dictionary
- """
-
- def angles_to_hkl(angle_tuple, energy=None):
- """Converts a set of diffractometer angles to an hkl position
-
- Return hkl tuple and virtual angles dictionary
- """
-
-``diffcalc.dc.dcyou`` also brings in all the commands from ``diffcalc.ub.ub``,
-``diffcalc.hardware`` and ``diffcalc.hkl.you.hkl``. That is it includes all the
-commands exposed in the top level namespace when diffcalc is used interactively::
-
- >>> dir(dc)
-
- ['__builtins__', '__doc__', '__file__', '__name__', '__package__',
- '_hardware','_hkl', '_ub', 'addref', 'allhkl', 'angles_to_hkl', 'c2th',
- 'calcub', 'checkub', 'clearref', 'con', 'constraint_manager', 'delref',
- 'diffcalc', 'editref', 'energy_to_wavelength', 'hardware', 'hkl_to_angles',
- 'hklcalc', 'lastub', 'listub', 'loadub', 'newub', 'rmub', 'saveubas', 'setcut',
- 'setlat', 'setmax', 'setmin', 'settings', 'setu', 'setub', 'showref',
- 'swapref', 'trialub', 'ub', 'ub_commands_for_help', 'ubcalc', 'uncon']
-
-This doesn't form the best API to program against though, so it is best to
-use the four modules more directly. The example below assumes you have
-also imported::
-
- >>> from diffcalc.ub import ub
- >>> from diffcalc import hardware
- >>> from diffcalc.hkl.you import hkl
-
-Getting help
-------------
-
-To get help for the diffcalc angle calculations, the orientation phase, the
-angle calculation phase, and the dummy hardware adapter commands::
-
- >>> help(dc)
- >>> help(ub)
- >>> help(hkl)
- >>> help(hardware)
-
-
-Orientation
------------
-
-To orient the crystal for example (see the user manual for a fuller
-tutorial) first find some reflections::
-
- # Create a new ub calculation and set lattice parameters
- ub.newub('test')
- ub.setlat('cubic', 1, 1, 1, 90, 90, 90)
-
- # Add 1st reflection (demonstrating the hardware adapter)
- hardware.settings.hardware.wavelength = 1
- ub.c2th([1, 0, 0]) # energy from hardware
- settings.hardware.position = 0, 60, 0, 30, 0, 0 # mu del nu eta chi ph
- ub.addref([1, 0, 0]) # energy & pos from hardware
-
- # Add 2nd reflection (this time without the hardware adapter)
- ub.c2th([0, 1, 0], 12.39842)
- ub.addref([0, 1, 0], [0, 60, 0, 30, 0, 90], 12.39842)
-
-
-To check the state of the current UB calculation::
-
- >>> ub.ub()
-
- UBCALC
-
- name: test
-
- n_phi: 0.00000 0.00000 1.00000 <- set
- n_hkl: -0.00000 0.00000 1.00000
- miscut: None
-
- CRYSTAL
-
- name: cubic
-
- a, b, c: 1.00000 1.00000 1.00000
- 90.00000 90.00000 90.00000
-
- B matrix: 6.28319 0.00000 0.00000
- 0.00000 6.28319 0.00000
- 0.00000 0.00000 6.28319
-
- UB MATRIX
-
- U matrix: 1.00000 0.00000 0.00000
- 0.00000 1.00000 0.00000
- 0.00000 0.00000 1.00000
-
- U angle: 0
-
- UB matrix: 6.28319 0.00000 0.00000
- 0.00000 6.28319 0.00000
- 0.00000 0.00000 6.28319
-
- REFLECTIONS
-
- ENERGY H K L MU DELTA GAM ETA CHI PHI TAG
- 1 12.398 1.00 0.00 0.00 0.0000 60.0000 0.0000 30.0000 0.0000 0.0000
- 2 12.398 0.00 1.00 0.00 0.0000 60.0000 0.0000 30.0000 0.0000 90.0000
-
-And finally to check the reflections were specified acurately::
-
- >>> dc.checkub()
-
- ENERGY H K L H_COMP K_COMP L_COMP TAG
- 1 12.3984 1.00 0.00 0.00 1.0000 0.0000 0.0000
- 2 12.3984 0.00 1.00 0.00 -0.0000 1.0000 0.0000
-
-Motion
-------
-
-Hkl positions and virtual angles can now be read up from angle
-settings (the easy direction!)::
-
-
- >>> dc.angles_to_hkl((0., 60., 0., 30., 0., 0.)) # energy from hardware
-
- ((1.0, 5.5511151231257827e-17, 0.0),
- {'alpha': -0.0,
- 'beta': 3.5083546492674376e-15,
- 'naz': 0.0,
- 'psi': 90.0,
- 'qaz': 90.0,
- 'tau': 90.0,
- 'theta': 29.999999999999996})
-
-Before calculating the settings to reach an hkl position (the trickier
-direction) hardware limits must be set and combination of constraints
-chosen. The constraints here result in a four circle like mode with a
-vertical scattering plane and incident angle 'alpha' equal to the exit
-angle 'beta'::
-
- >>> hkl.con('qaz', 90)
- ! 2 more constraints required
- qaz: 90.0000
-
- >>> hkl.con('a_eq_b')
- ! 1 more constraint required
- qaz: 90.0000
- a_eq_b
-
- >>> hkl.con('mu', 0)
- qaz: 90.0000
- a_eq_b
- mu: 0.0000
-
-To check the constraints::
-
- >>> hkl.con()
- DET REF SAMP
- ====== ====== ======
- delta --> a_eq_b --> mu
- alpha eta
- --> qaz beta chi
- naz psi phi
- mu_is_nu
-
- qaz: 90.0000
- a_eq_b
- mu: 0.0000
-
- Type 'help con' for instructions
-
-Limits can be set to help Diffcalc choose a solution::
-
- >>> hardware.setmin('delta', 0) # used when choosing solution
-
-Angles and virtual angles are then easily determined for a given hkl reflection::
-
- >>> dc.hkl_to_angles(1, 0, 0) # energy from hardware
- ((0.0, 60.0, 0.0, 30.0, 0.0, 0.0),
- {'alpha': -0.0,
- 'beta': 0.0,
- 'naz': 0.0,
- 'psi': 90.0,
- 'qaz': 90.0,
- 'tau': 90.0,
- 'theta': 30.0}
- )
diff --git a/script/__Lib/diffcalc-2.1/doc/source/developer/quickstart_setup_environment b/script/__Lib/diffcalc-2.1/doc/source/developer/quickstart_setup_environment
deleted file mode 100755
index fe36a74..0000000
--- a/script/__Lib/diffcalc-2.1/doc/source/developer/quickstart_setup_environment
+++ /dev/null
@@ -1,25 +0,0 @@
-
-Change directory to the diffcalc project (python adds the current
-working directory to the path)::
-
- $ cd diffcalc
- $ ls
- COPYING diffcalc doc example mock.py mock.pyc model numjy test
-
-If using Python make sure numpy and diffcalc can be imported::
-
- $ python
- Python 2.7.2+ (default, Oct 4 2011, 20:06:09)
- [GCC 4.6.1] on linux2
- Type "help", "copyright", "credits" or "license" for more information.
- >>> import numpy
- >>> import diffcalc
-
-If using Jython make sure Jama and diffcalc can be imported::
-
- $ jython -Dpython.path=:/Jama-1.0.1.jar
-
- Jython 2.2.1 on java1.5.0_11
- Type "copyright", "credits" or "license" for more information.
- >>> import Jama
- >>> import diffcalc
diff --git a/script/__Lib/diffcalc-2.1/doc/source/diffcalc_pdf.png b/script/__Lib/diffcalc-2.1/doc/source/diffcalc_pdf.png
deleted file mode 100755
index 7e08c66..0000000
Binary files a/script/__Lib/diffcalc-2.1/doc/source/diffcalc_pdf.png and /dev/null differ
diff --git a/script/__Lib/diffcalc-2.1/doc/source/diffcalc_web.png b/script/__Lib/diffcalc-2.1/doc/source/diffcalc_web.png
deleted file mode 100755
index d7ddec5..0000000
Binary files a/script/__Lib/diffcalc-2.1/doc/source/diffcalc_web.png and /dev/null differ
diff --git a/script/__Lib/diffcalc-2.1/doc/source/index.rst b/script/__Lib/diffcalc-2.1/doc/source/index.rst
deleted file mode 100755
index b65fbd4..0000000
--- a/script/__Lib/diffcalc-2.1/doc/source/index.rst
+++ /dev/null
@@ -1,26 +0,0 @@
-###################################
- Diffcalc User and Developer Guide
-###################################
-
-:Author: Rob Walton
-:Contact: rob.walton (at) diamond.ac.uk
-:Web site: https://github.com/DiamondLightSource/diffcalc
-
-.. rubric:: Diffcalc: A Diffraction Condition Calculator for Diffractometer Control
-
-See also the `quickstart guide at github `_.
-
-.. toctree::
- :maxdepth: 2
-
- youmanual
- vliegmanual/contents
- developer/contents
- ACKS
-
-Indices and tables
-==================
-
-* :ref:`genindex`
-* :ref:`modindex`
-* :ref:`search`
diff --git a/script/__Lib/diffcalc-2.1/doc/source/vliegmanual/contents.rst b/script/__Lib/diffcalc-2.1/doc/source/vliegmanual/contents.rst
deleted file mode 100755
index 7d60a69..0000000
--- a/script/__Lib/diffcalc-2.1/doc/source/vliegmanual/contents.rst
+++ /dev/null
@@ -1,22 +0,0 @@
-#############################################
-Diffcalc User Guide (Deprecated Vlieg Engine)
-#############################################
-
-:Author: Rob Walton
-:Contact: rob.walton (at) diamond (dot) ac (dot) uk
-:Website: http://www.opengda.org/
-
-.. rubric:: Diffcalc: A diffraction condition calculator for diffractometer control
-
-.. toctree::
- :maxdepth: 2
- :numbered:
-
- vliegmanual
-
-Indices and tables
-==================
-
-* :ref:`genindex`
-* :ref:`modindex`
-* :ref:`search`
\ No newline at end of file
diff --git a/script/__Lib/diffcalc-2.1/doc/source/vliegmanual/images/fix.png b/script/__Lib/diffcalc-2.1/doc/source/vliegmanual/images/fix.png
deleted file mode 100755
index b4307d4..0000000
Binary files a/script/__Lib/diffcalc-2.1/doc/source/vliegmanual/images/fix.png and /dev/null differ
diff --git a/script/__Lib/diffcalc-2.1/doc/source/vliegmanual/images/sixcircle_gamma_on_arm.pdf b/script/__Lib/diffcalc-2.1/doc/source/vliegmanual/images/sixcircle_gamma_on_arm.pdf
deleted file mode 100755
index 907a254..0000000
Binary files a/script/__Lib/diffcalc-2.1/doc/source/vliegmanual/images/sixcircle_gamma_on_arm.pdf and /dev/null differ
diff --git a/script/__Lib/diffcalc-2.1/doc/source/vliegmanual/images/sixcircle_gamma_on_arm.png b/script/__Lib/diffcalc-2.1/doc/source/vliegmanual/images/sixcircle_gamma_on_arm.png
deleted file mode 100755
index a1f2d93..0000000
Binary files a/script/__Lib/diffcalc-2.1/doc/source/vliegmanual/images/sixcircle_gamma_on_arm.png and /dev/null differ
diff --git a/script/__Lib/diffcalc-2.1/doc/source/vliegmanual/images/sixcircle_gamma_on_arm.ppt b/script/__Lib/diffcalc-2.1/doc/source/vliegmanual/images/sixcircle_gamma_on_arm.ppt
deleted file mode 100755
index 0af759a..0000000
Binary files a/script/__Lib/diffcalc-2.1/doc/source/vliegmanual/images/sixcircle_gamma_on_arm.ppt and /dev/null differ
diff --git a/script/__Lib/diffcalc-2.1/doc/source/vliegmanual/images/unit_cell.pdf b/script/__Lib/diffcalc-2.1/doc/source/vliegmanual/images/unit_cell.pdf
deleted file mode 100755
index 3114c35..0000000
Binary files a/script/__Lib/diffcalc-2.1/doc/source/vliegmanual/images/unit_cell.pdf and /dev/null differ
diff --git a/script/__Lib/diffcalc-2.1/doc/source/vliegmanual/images/unit_cell.png b/script/__Lib/diffcalc-2.1/doc/source/vliegmanual/images/unit_cell.png
deleted file mode 100755
index b431458..0000000
Binary files a/script/__Lib/diffcalc-2.1/doc/source/vliegmanual/images/unit_cell.png and /dev/null differ
diff --git a/script/__Lib/diffcalc-2.1/doc/source/vliegmanual/vliegmanual.rst b/script/__Lib/diffcalc-2.1/doc/source/vliegmanual/vliegmanual.rst
deleted file mode 100755
index 4638b3e..0000000
--- a/script/__Lib/diffcalc-2.1/doc/source/vliegmanual/vliegmanual.rst
+++ /dev/null
@@ -1,827 +0,0 @@
-Introduction
-============
-
-.. warning::
-
- This manual refers to the 'Vlieg' calculation available in Diffcalc I. By
- default Diffcalc II now uses its 'You' engine. This manual will be updated
- soon. For now the developer guide shows how the new constraint system works.
-
-This manual assumes that you are running Diffcalc within the external
-framework of the GDA or Minigda and that Diffcalc has been configured
-for the six circle diffractometer pictured here:
-
-.. figure:: images/sixcircle_gamma_on_arm.*
- :scale: 50
- :align: center
-
- Gamma-on-delta six-circle diffractometer, modified from Elias Vlieg
- & Martin Lohmeier (1993)
-
-Your Diffcalc configuration will have been customised for the geometry
-of your diffractometer and possibly the types of experiment you
-perform. For example: a five-circle diffractometer might be missing
-the Gamma circle above, some six-circle modes and the option to fix
-gamma that would otherwise exist in some modes.
-
-The laboratory, crystal and reciprocal-lattice coordinate frames are
-defined with respect to the beam and to gravity to be (for a cubic crystal):
-
-.. figure:: images/fix.png
- :align: center
-
- Laboratory and illustratrive crystal coordinate frames for a cubic crystal
-
-The crystal lattice basis vectors are defined within the Cartesian
-crystal coordinate frame to be:
-
-.. figure:: images/unit_cell.*
- :align: center
- :scale: 100
-
- Unit cell defined in crystal coordinate frame
-
-.. _overview:
-
-Overview
-========
-
-The following assumes that the diffractometer has been properly levelled, aligned with
-the beam and zeroed. See the `SPEC fourc manual `__.
-
-Before moving in hkl space you must calculate a UB matrix by
-specifying the crystal's lattice parameters (which define the B
-matrix) and finding two reflections (from which the
-U matrix can be inferred); and, optionally for surface-diffraction
-experiments, determine how the surface of the crystal is oriented with
-respect to the phi axis.
-
-
-Once a UB matrix has been calculated, the diffractometer may be driven
-in hkl coordinates. A valid diffractometer setting maps easily into a
-single hkl value. However for a diffractometer with more than three circles
-there are excess degrees of freedom when calculating a diffractometer
-setting from an hkl value. Diffcalc provides modes for using up
-the excess degrees of freedom.
-
-Diffcalc does not perform scans directly. Instead, scannables that use
-diffcalc to map between reciprocal lattice space and real
-diffractometer settings are scanned using the Gda's (or minigda's)
-generic scan mechanism.
-
-
-Theory
-------
-
-Thanks to Elias Vlieg for sharing his dos based ``DIF`` software that
-Diffcalc has borrowed heavily from. (See also the THANKS.txt file).
-
-See the papers (included in ``docs/ref``):
-
-* Busing & Levi (1966), "Angle Calculations for 3- and 4- Circle X-ray
- and Neutron Diffractometers", Acta Cryst. 22, 457
-
-* Elias Vlieg & Martin Lohmeier (1993), "Angle Calculations for a Six-Circle
- Surface X-ray Diffractometer", J. Appl. Cryst. 26, 706-716
-
-Getting Help
-============
-
-There are few commands to remember. If a command is called without
-arguments, Diffcalc will prompt for arguments and provide sensible
-defaults which can be chosen by pressing enter.
-
-The ``helpub`` and ``helphkl`` commands provide help with the crystal
-orientation and hkl movement phases of an experiment respectively::
-
- >>> helpub
-
- Diffcalc
- --------
- helpub ['command'] - lists all ub commands, or one if command is given
- helphkl ['command'] - lists all hkl commands, or one if command is given
-
- UB State
- --------
- newub 'name' - starts a new ub calculation with no lattice or
- reflection list
- loadub 'name' - loads an existing ub calculation: lattice and
- reflection list
- saveubas 'name' - saves the ubcalculation with a new name (other
- changes autosaved)
- ub - shows the complete state of the ub calculation
-
- UB lattice
- ----------
- setlat - prompts user to enter lattice parameters (in
- Angstroms and Deg.)
- setlat 'name' a - assumes cubic
- setlat 'name' a b - assumes tetragonal
- setlat 'name' a b c - assumes ortho
- setlat 'name' a b c gam - assumes mon/hex with gam not equal to 90
- setlat 'name' a b c alpha beta gamma - arbitrary
-
- UB surface
- ----------
- sigtau [sigma tau] - sets sigma and tau
-
- UB reflections
- --------------
- showref - shows full reflection list
- addref - add reflection
- addref h k l ['tag'] - add reflection with hardware position and energy
- addref h k l (p1,p2...pN) energy ['tag']- add reflection with specified position
- and energy
- delref num - deletes a reflection (numbered from 1)
- swapref - swaps first two reflections used for calculating U
- swapref num1 num2 - swaps two reflections (numbered from 1)
-
- UB calculation
- --------------
- setu [((,,),(,,),(,,))] - manually set u matrix
- setub ((,,),(,,),(,,)) - manually set ub matrix
- calcub - (re)calculate u matrix from ref1 and ref2
- checkub - show calculated and entered hkl values for reflections
-
- >>> helphkl
-
- Diffcalc
- --------
- helphkl [command] - lists all hkl commands, or one if command is given
- helpub [command] - lists all ub commands, or one if command is given
-
- Settings
- --------
- hklmode [num] - changes mode or shows current and available modes
- and all settings
- setalpha [num] - fixes alpha, or shows all settings if no num given
- setgamma [num] - fixes gamma, or shows all settings if no num given
- setbetain [num] - fixes betain, or shows all settings if no num given
- setbetaout [num] - fixes betaout, or shows all settings if no num given
- trackalpha [boolean] - determines wether alpha parameter will track alpha axis
- trackgamma [boolean] - determines wether gamma parameter will track gamma axis
- trackphi [boolean] - determines wether phi parameter will track phi axis
- setsectorlim [omega_high omega_low phi_high phi_low]- sets sector limits
-
- Motion
- ------
- pos hkl [h k l] - move diffractometer to hkl, or read hkl position.
- Use None to hold a value still
- sim hkl [h k l] - simulates moving hkl
- hkl - shows loads of info about current hkl position
- pos sixc [alpha, delta, gamma, omega, chi, phi,]- move diffractometer to Eularian
- position. Use None to hold a
- value still
- sim sixc [alpha, delta, gamma, omega, chi, phi,]- simulates moving sixc
- sixc - shows loads of info about current sixc position
-
-
-Diffcalc's Scannables
-=====================
-
-Please see :ref:`moving-in-hkl-space` and :ref:`scanning-in-hkl-space` for some relevant examples.
-
-To list and show the current positions of your beamline's scannables
-use ``pos`` with no arguments::
-
- >>> pos
-
-Results in:
-
-**Energy and wavelength scannables**::
-
- energy 12.3984
- wl: 1.0000
-
-**Diffractometer scannables**, as a group and in component axes (in
-the real GDA these have limits)::
-
- sixc: alpha: 0.0000 delta: 0.0000 gamma: 0.0000 omega: 0.0000 chi: 0.0000 phi: 0.0000
- alpha: 0.0000
- chi: 0.0000
- delta: 0.0000
- gamma: 0.0000
- omega: 0.0000
- phi: 0.0000
-
-**Dummy counter**, which in this example simply counts at 1hit/s::
-
- cnt: 0.0000
-
-**Hkl scannable**, as a group and in component::
-
- hkl: Error: No UB matrix
- h: Error: No UB matrix
- k: Error: No UB matrix
- l: Error: No UB matrix
-
-**Parameter scannables**, used in some modes, these provide a
-scannable alternative to the series of ``fix`` commands described in
-:ref:`moving-in-hkl-space`.::
-
- alpha_par:0.00000
- azimuth: ---
- betain: ---
- betaout: ---
- gamma_par:0.00000
- phi_par: ---
-
- Note that where a parameter corresponds with a physical
- diffractometer axis, it can also be set to track that axis
- directly. See `Tracking axis`_ below.
-
-Crystal orientation
-===================
-
-Before moving in hkl space you must calculate a UB matrix by
-specifying the crystal's lattice parameters (which define the B
-matrix) and finding two reflections (from which the
-U matrix can be inferred); and, optionally for surface-diffraction
-experiments, determine how the surface of the crystal is oriented with
-respect to the phi axis (see :ref:`overview`).
-
-Starting a UB calculation
--------------------------
-
-A *UB-calculation* contains the description of the crystal-under-test,
-any saved reflections, sigma & tau (both default to 0), and a B & UB
-matrix pair if they have been calculated or manually specified.
-Starting a new UB calculation will clear all of these.
-
-Before starting a UB-calculation, the ``ub`` command used to summarise
-the state of the current UB-calculation, will reflect that no
-UB-calculation has been started::
-
- >>> ub
- No UB calculation started.
- Wavelength: 1.239842
- Energy: 10.000000
-
-A new UB-calculation calculation may be started and lattice specified
-explicitly::
-
- >>> newub 'b16_270608'
- >>> setlat 'xtal' 3.8401 3.8401 5.43072 90 90 90
-
-or interactively::
-
- >>> newub
- calculation name: b16_270608
- crystal name: xtal
- a [1]: 3.8401
- b [3.8401]: 3.8401
- c [3.8401]: 5.43072
- alpha [90]: 90
- beta [90]: 90
- gamma [90]: 90
-
-where a,b and c are the lengths of the three unit cell basis vectors
-in Angstroms, and alpha, beta and gamma the typically used angles
-(defined in the figure above) in Degrees.
-
-The ``ub`` command will show the state of the current UB-calculation
-(and the current energy for reference)::
-
- UBCalc: b16_270608
- ======
-
- Crystal
- -------
- name: xtal
-
- lattice: a ,b ,c = 3.84010, 3.84010, 5.43072
- alpha, beta , gamma = 90.00000, 90.00000, 90.00000
-
- reciprocal: b1, b2, b3 = 1.63620, 1.63620, 1.15697
- beta1, beta2, beta3 = 1.57080, 1.57080, 1.57080
-
- B matrix: 1.6362035642769 -0.0000000000000 -0.000000000000
- 0.0000000000000 1.6362035642769 -0.000000000000
- 0.0000000000000 0.0000000000000 1.156970955450
-
- Reflections
- -----------
- energy h k l alpha delta gamma omega chi phi tag
-
- UB matrix
- ---------
- none calculated
-
- Sigma: 0.000000
- Tau: 0.000000
- Wavelength: 1.000000
- Energy: 12.398420
-
-
-Specifying Sigma and Tau for surface diffraction experiments
-------------------------------------------------------------
-Sigma and Tau are used in modes that fix either the beam exit or entry angle with
-respect to the crystal surface, or that keep the surface normal in the horizontal
-laboratory plane. For non surface-diffraction experiments these can
-safely be left at zero.
-
-For surface diffraction experiments, where not only the crystal's
-lattice planes must be oriented appropriately but so must the crystal's
-optical surface, two angles _Tau_ and _Sigma_ define the orientation of
-the surface with respect to the phi axis. Sigma is (minus) the amount of chi axis
-rotation and Tau (minus) the amount of phi axis rotation needed to
-move the surface normal parallel to the omega circle
-axis. These angles are often determined by reflecting a laser from the
-surface of the Crystal onto some thing and moving chi and tau until
-the reflected spot remains stationary with movements of omega.
-
-Use ``sigtau`` with no args to set interactively::
-
- >>> pos chi -3.1
- chi: -3.1000
- >>> pos phi 10.0
- phi: 10.0000
- >>> sigtau
- sigma, tau = 0.000000, 0.000000
- chi, phi = -3.100000, 10.000000
- sigma[ 3.1]: 3.1
- tau[-10.0]: 10.0
-
-Sigma and Tau can also be set explicitly::
-
- >>>sigtau 0 0
-
-
-Managing reflections
---------------------
-The normal way to calculate a UB matrix is to find the position of **two**
-reflections with known hkl values. Diffcalc allows many
-reflections to be recorded but currently only uses the first two when
-calculating a UB matrix.
-
-Add reflection at current location
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-It is normal to first move to a reflection::
-
- >>> pos en 10
- en: 10.0000
- >>> pos sixc [5.000, 22.790, 0.000, 1.552, 22.400, 14.255]
- sixc: alpha: 5.0000 delta: 22.7900 gamma: 0.0000 omega: 1.5520 chi: 22.4000 phi: 14.2550
-
-
-and then use the ``addref`` command either explicitly::
-
- addref 1 0 1.0628 'optional_tag'
-
-or interactively::
-
- >>> addref
- h: 1
- k: 0
- l: 1.0628
- current pos[y]: y
- tag: 'tag_string'
-
-to add a reflection.
-
-Add a reflection manually
-~~~~~~~~~~~~~~~~~~~~~~~~~
-
-If a reflection cannot be reached but its position is known (or if its
-position has been previously determined), a reflection may be added
-without first moving to it either explicitly::
-
- >>> addref 0 1 1.0628 [5.000, 22.790, 0.000,4.575, 24.275, 101.320] 'optional_tag'
-
-or interactively::
-
- >>> addref
- h: 0
- k: 1
- l: 1.0628
- current pos[y]: n
- alpha[5.000]:
- delta[22.79]:
- gamma[0.000]:
- omega[1.552]: 4.575
- chi[22.40]: 24.275
- phi[14.25]: 101.320
- en[9.998]:
- tag: optional_tag2
-
-Edit reflection list
-~~~~~~~~~~~~~~~~~~~~
-
-Use ``showref`` to show the reflection list::
-
- >>> showref
- energy h k l alpha delta gamma omega chi phi tag
- 1 9.999 1.00 0.00 1.06 5.0000 22.7900 0.0000 1.5520 22.4000 14.2550 1st
- 2 9.999 0.00 1.00 1.06 5.0000 22.7900 0.0000 4.5750 24.2750 101.32000 2nd
-
-Use ``swapref`` to swap reflections::
-
- >>> swapref 1 2
- Recalculating UB matrix.
- >>> showref
- energy h k l alpha delta gamma omega chi phi tag
- 1 9.999 0.00 1.00 1.06 5.0000 22.7900 0.0000 4.5750 24.2750 101.3200 2nd
- 2 9.999 1.00 0.00 1.06 5.0000 22.7900 0.0000 1.5520 22.4000 14.2550 1st
-
-Use ``delref`` to delete a reflection::
-
- >>> delref 1
- >>> showref
- energy h k l alpha delta gamma omega chi phi tag
- 1 9.999 1.00 0.00 1.06 5.0000 22.7900 0.0000 1.5520 22.4000 14.2550 1st
-
-Calculating a UB matrix
------------------------
-
-Unless a U or UB matrix has been manually specified, a new UB matrix
-will be calculated after the second reflection has been found, or
-whenever one of the first two reflections is changed.
-
-Use the command ``calcub`` to force the UB matrix to be calculated
-from the first two reflections.
-
-If you have misidentified a reflection used for the orientation the
-resulting UB matrix will be incorrect. Always use the ``checkub``
-command to check that the computed values agree with the estimated values::
-
- >>>checkub
- energy h k l h_comp k_comp l_comp tag
- 1 9.9987 1.00 0.00 1.06 1.0000 0.0000 1.0628 1st
- 2 9.9987 0.00 1.00 1.06 -0.0329 1.0114 1.0400 2nd
-
-Notice that the first reflection will always match, but that the
-second will not match exactly. (The system of equations used to
-calculate the U matrix is overdetermined and some information from the
-second reflection is thrown away.)
-
-Manually setting U and UB
--------------------------
-
-*To help find the initial reflections* it may be useful to set the U
-matrix manually---to the identity matrix for example. Use the ``setu``
-command to do this. Once set the diffractometer may be driven to the
-ideal location of a reflection and then the actual reflection
-sought. Normally this would be done in the default mode, four-circle-bisecting, (see
-:ref:`moving-in-hkl-space`). In the following example this has been done
-by setting the alpha to 5 and leaving gamma at 0 (it would be normal
-to leave alpha at 0)::
-
- >>> hklmode 1
- 1) fourc bisecting
- alpha: 0.0
- gamma: 0.0
-
- >>> setalpha 5
- alpha: 0 --> 5.000000
- >>> setu
- row1[1 0 0]:
- row2[0 1 0]:
- row3[0 0 1]:
- >>> sim hkl [1,0,1.0628] # Check it all makes sense
- sixc would move to:
- alpha : 5.00000 deg
- delta : 22.79026 deg
- gamma : 0.00000 deg
- omega : 5.82845 deg
- chi : 24.57658 deg
- phi : 6.14137 deg
-
- theta : 70702.991919
- 2theta : 23.303705
- Bin : 6.969151
- Bout : 6.969151
- azimuth : 7.262472
-
- >>> pos hkl [1,0,1.0628]
- hkl: h: 1.00000 k: 0.00000 l: 1.06280
-
- >>> # scan about to find actual reflection
-
- >>> addref
- h[0.0]: 1
- k[0.0]: 0
- l[0.0]: 1.0628
- current pos[y]: y
- tag: 'ref1'
- >>>
-
-
-There is currently no way to refine a manually specified U matrix by
-inferring as much as possible from just one found reflection.
-
-.. _moving-in-hkl-space:
-
-Moving in hkl space
-===================
-
-Once a UB matrix has been calculated, the diffractometer may be driven
-in hkl coordinates. A given diffractometer setting maps easily into a
-single hkl value. However for a diffractometer with more than three circles
-there are excess degrees of freedom when calculating a diffractometer
-setting from an hkl value. Diffcalc provides many for using up
-the excess degrees of freedom.
-
-By default Diffcalc selects four-circle bisecting mode (see below).
-
-Note that to play along with the following ``run`` the file in
-``example/session/sixc_example.py`` to configure the UB-calculation.
-
-
-Modes
------
-
-Use the command ``hklmode`` to summarise the state of Diffcalc's angle
-calculator. It shows a list the available modes for your
-diffractometer and the parameters that must be fixed for each, the
-current mode and the current parameter settings::
-
- >>> hklmode
- Available modes:
- 0) fourc fixed-bandlw (alpha, gamma, blw) (Not impl.)
- 1) fourc bisecting (alpha, gamma)
- 2) fourc incoming (alpha, gamma, betain)
- 3) fourc outgoing (alpha, gamma, betaout)
- 4) fourc azimuth (alpha, gamma, azimuth) (Not impl.)
- 5) fourc fixed-phi (alpha, gamma, phi) (Not impl.)
- 10) fivec bisecting (gamma)
- 11) fivec incoming (gamma, betain)
- 12) fivec outgoing (gamma, betaout)
- 13) fivec bisecting (alpha)
- 14) fivec incoming (alpha, betain)
- 15) fivec outgoing (alpha, betaout)
- 20) zaxis bisecting ()
- 21) zaxis incoming (betain)
- 22) zaxiz outgoing (betaout)
-
- Current mode:
-
- 1) fourc bisecting
- Parameters:
-
- alpha: 0.0
- gamma: 0.0
- betain: --- (not relevant in this mode)
- betaout: --- (not relevant in this mode)
- azimuth: --- (not relevant in this mode)
- phi: --- (not relevant in this mode)
- blw: --- (not relevant in this mode)
-
-Note that 'Not impl.' is short for 'not implemented'. Standby.
-
-Your output may differ. For example:
-
- - When listed with a typical five-circle diffractometer with no gamma
- circle: the fourc modes will have no gamma parameter to fix
- (actually it will have been fixed under the covers to 0), there
- will be no gamma or alpha parameters to fix in the five circle
- modes (again, under the covers gamma will have been fixed) and
- there will be no zaxis modes (as these require six circles, or an
- actual z-axis diffractometer).
-
- - When listed with a typical four-circle diffractometer with no alpha
- or gamma circle, the four-circle modes will appear with no alpha or
- gamma parameters (again, they are fixed under the covers), and
- there will be no five circle or zaxis modes.
-
-To change the current mode, call ``hklmode`` with an argument::
-
- >>> hklmode 2
- 2) fourc incoming
- alpha: 0.0
- gamma: 0.0
- betain: ---
-
-(The dashes next to the betain parameter indicate that a parameter
-has not yet been set.)
-
-Mode parameters
----------------
-
-A parameter can be set using either one of the series of {{{set}}}
-commands, by moving one of the scannables associated with each
-parameter or, where appropriate, by asking that a parameter track an
-axis.
-
-Set commands
-~~~~~~~~~~~~
-Use the series of commands ``set`` to set a parameter::
-
- >>> setalpha 3
- alpha: 0 --> 3.000000
- >>> setbetain 5
- WARNING: The parameter betain is not used in mode 1
- betain: --- --> 5.000000
- >>> setalpha # With no args, the current value is displayed
- alpha: 3
- >>> setbetain
- betain: ---
-
-
-Parameter Scannables
-~~~~~~~~~~~~~~~~~~~~
-
-In most installations there will be a scannable for each parameter. In
-this example installation, the parameters which correspond to physical
-axes have had '_par' appended to their names to prevent clashes. These
-may be used to change a parameter either with the ``pos`` command or
-by using them within a scan (see :ref:`scanning-in-hkl-space`).::
-
- >>> pos betain
- betain: 0.00000
- >>> pos betain 5
- betain: 5.00000
- >>> setbetain
- betain: 5
-
- >>> pos alpha_par
- alpha_par:3.00000
- >>> setalpha
- alpha: 3
-
-
-Tracking Axis
-~~~~~~~~~~~~~
-Where a parameter matches an axis name, that parameter may be set to
-track that axis::
-
- >>> pos alpha
- alpha: 5.0000
-
- >>> hklmode 1
- 1) fourc bisecting
- alpha: 0.0
- gamma: 0.0
-
- >>> trackalpha
- alpha: 5
-
- >>> pos alpha
- alpha: 6.0000
-
- >>> hklmode 1
- 1) fourc bisecting
- alpha: 6.0 (tracking physical axis)
- gamma: 0.0
-
-
-Although convenient, there is a danger with this method that in
-geometries where the axes are built from other axes (such as in a
-kappa geometry), the position of an axis may drift slightly during a
-scan.
-
-Sectors
--------
-
-When mapping from reciprocal lattice space to a set of diffractometer
-settings, there is normally a choice of solutions for the sample
-orientation. The selected sector mode will determine which solution is
-used. There is currently only one sector mode:
-
-Sector mode: Find first solution within sector limits
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-In this sector mode, taken from 'DIF', the first solution found within
-the 'sector limits' is chosen. These are different from the physical
-or software limits on the axes and can be checked/modified using
-``setsectorlim``::
-
- >>> setsectorlim
- omega_high[270]:
- omega_low[-90]:
- phi_high[180]:
- phi_low[-180]:
-
-
-The hkl scannable
------------------
-Once a UB matrix has been calculated, a mode chosen and parmeters set,
-use the hkl scannable to move to a point in reciprocal lattice space::
-
- >>> pos hkl [1,0,0]
- hkl: h: 1.00000 k: -0.00000 l: -0.00000
- >>> pos sixc
- sixc: alpha: 3.0000 delta: 17.2252 gamma: 4.0000 omega: 7.5046 chi: -24.6257 phi: 4.8026
- >>> pos hkl
- hkl: h: 1.00000 k: -0.00000 l: -0.00000
- >>> hkl
- hkl:
- h : 1.000000
- k : -0.000000
- l : -0.000000
- 2theta : 18.582618
- Bin : -0.387976
- Bout : -0.387976
- azimuth : 1.646099
-
-Notice that typing ``hkl`` will also display some virtual angles (such
-as twotheta and Bin), that checking the position with ``pos hkl`` will
-not.
-
-To get this extra information into a scan use the scannable hklverbose
-instead of hkl::
-
- >>> pos hklverbose [1,0,0]
- hklverbose: h: 1.00000 k: -0.00000 l: -0.00000 2theta : 18.582618 Bin : -0.387976
- Bout :-0.387976 azimuth : 1.646099
-
-The ``sim`` command will report, without moving the diffractometer,
-where an hkl position would be found::
-
- >>> sim hkl [1,0,0]
- sixc would move to:
- alpha : 3.00000 deg
- delta : 17.22516 deg
- gamma : 4.00000 deg
- omega : 7.50461 deg
- chi : -24.62568 deg
- phi : 4.80260 deg
-
- theta : 70702.991919
- 2theta : 18.582618
- Bin : -0.387976
- Bout : -0.387976
- azimuth : 1.646099
-
-
-
-Moving out of range
-~~~~~~~~~~~~~~~~~~~
-Not every hkl position can be reached::
-
- >>> pos hkl [10,10,10]
- Exception: Could not compute delta for this hkl position
-
-The diffractometer scannable (sixc)
------------------------------------
-We've seen this before, but it also works with sim::
-
- gda>>>sim sixc [3, 17.22516, 4, 7.50461, -24.62568, 4.80260]
- hkl would move to:
- h : 1.000000
- k : 0.000000
- l : -0.000000
-
-.. _scanning-in-hkl-space:
-
-Scanning in hkl space
-=====================
-
-All scans described below use the same generic scanning mechanism
-provided by the GDA system or by minigda. Here are some examples.
-
-Fixed hkl scans
----------------
-
-In a 'fixed hkl scan' something (such as energy or Bin) is scanned,
-and at each step hkl is 'moved' to keep the sample and detector
-aligned. Also plonk the diffractometer scannable (sixc) on there with no
-destination to monitor what is actually happening and then
-throw on a detector (cnt) with an exposure time if appropriate::
-
- >>> #scan scannable_name start stop step [scannable_name [pos or time]]..
-
- >>> scan en 9 11 .5 hkl [1,0,0] sixc cnt 1
-
- >>> scan en 9 11 .5 hklverbose [1,0,0] sixc cnt 1
-
- >>> scan betain 4 5 .2 hkl [1,0,0] sixc cnt 1
-
- >>> scan alpha_par 0 10 2 hkl [1,0,0] sixc cnt 1
-
- >>> trackalpha
- >>> scan alpha 0 10 2 hkl [1,0,0] sixc cnt 1 # Equivalent to last scan
-
-Scanning hkl
-------------
-
-Hkl, or one component, may also be scanned directly::
-
- >>> scan h .8 1.2 .1 hklverbose sixc cnt 1
-
-At each step, this will read the current hkl position, modify the h
-component and then move to the resulting vector. There is a danger
-that with this method k and l may drift. To get around this the start,
-stop and step values may also be specified as vectors. So for example::
-
- >>> scan hkl [1,0,0] [1,.3,0] [1,0.1,0] cnt1
-
-is equivilant to::
-
- >>> pos hkl [1,0,0]
- >>> scan k 0 .3 .1 cnt1
-
-but will not suffer from drifting. This method also allows scans along
-any direction in hkl space to be performed.
-
-Multidimension scans
---------------------
-
-Two and three dimensional scans::
-
- >>> scan en 9 11 .5 h .9 1.1 .2 hklverbose sixc cnt 1
- >>> scan h 1 3 1 k 1 3 1 l 1 3 1 hkl cnt 1
-
-
-
-Good luck --- RobW
diff --git a/script/__Lib/diffcalc-2.1/doc/source/youmanual.rst b/script/__Lib/diffcalc-2.1/doc/source/youmanual.rst
deleted file mode 100755
index a6f1b30..0000000
--- a/script/__Lib/diffcalc-2.1/doc/source/youmanual.rst
+++ /dev/null
@@ -1,888 +0,0 @@
-################################
-Diffcalc User Guide (You Engine)
-################################
-
-.. rubric:: Diffcalc: A diffraction condition calculator for diffractometer control
-
-:Author: Rob Walton
-:Contact: rob.walton (at) diamond (dot) ac (dot) uk
-:Website: https://github.com/DiamondLightSource/diffcalc
-
-.. toctree::
- :maxdepth: 2
- :numbered:
-
-See also the `quickstart guide at github `_
-
-Introduction
-============
-
-This manual assumes that you are running Diffcalc within OpenGDA or have started
-it using IPython. It assumes that Diffcalc has been configured for the six
-circle diffractometer pictured here:
-
-.. figure:: youmanual_images/4s_2d_diffractometer.png
- :scale: 100
- :align: center
-
- 4s + 2d six-circle diffractometer, from H.You (1999)
-
-Your Diffcalc configuration may have been customised for the geometry of your
-diffractometer and possibly the types of experiment you perform. For example, a
-five-circle diffractometer might be missing the nu circle above.
-
-The laboratory frame is shown above. With all settings at zero as shown the
-crystal cartesian frame aligns with the laboratory frame. Therefor a cubic
-crystal mounted squarely in a way that the U matrix (defined below) is unitary
-will have h||a||x, k||b||y & l||c||z, crystal and reciprocal-lattice coordinate
-frames are defined with respect to the beam and to gravity to be (for a cubic
-crystal):
-
-Overview
-========
-
-The following assumes that the diffractometer has been properly leveled, aligned
-with the beam and zeroed. See the `SPEC fourc manual
-`__.
-
-Before moving in hkl space you must calculate a UB matrix by specifying the
-crystal's lattice parameters (which define the B matrix) and finding two
-reflections (from which the U matrix defining any mismount can be inferred);
-and, optionally for surface-diffraction experiments, determine how the surface
-of the crystal is oriented with respect to the phi axis.
-
-Once a UB matrix has been calculated, the diffractometer may be driven in hkl
-coordinates. A valid diffractometer setting maps easily into a single hkl value.
-However for a diffractometer with more than three circles there are excess
-degrees of freedom when calculating a diffractometer setting from an hkl value.
-Diffcalc provides modes for using up the excess degrees of freedom.
-
-Diffcalc does not perform scans directly. Instead, Scannables that use diffcalc
-to map between reciprocal lattice space and real diffractometer settings are
-scanned using the Gda's (or minigda's) generic scan mechanism.
-
-
-Theory
-------
-
-Thanks to Elias Vlieg for sharing his dos based ``DIF`` software that Diffcalc
-has borrowed heavily from. The version of Diffcalc described here is based on papers by
-pHH. You. [You1999]_ and Busing & Levy [Busing1967]_. (See also the THANKS.txt file.)
-
-Getting Help
-============
-
-There are few commands to remember. If a command is called without
-arguments in some cases Diffcalc will prompt for arguments and provide sensible
-defaults which can be chosen by pressing enter.
-
-
-**Orientation**. The ``helpub`` command lists all commands related with crystal
-orientation and the reference vector (often used with surfaces). See the
-`Orientation Commands`_ section at the end of this manual::
-
- >>> help ub
- ...
-
-
-**HKL movement**. The ``help hkl`` list all commands related to moving in reciprocal-lattice
-space. See the `Motion Commands`_ section at the end of this manual::
-
- >>> help hkl
- ...
-
-
-Call help on any command. e.g.::
-
- >>> help loadub
- loadub (diffcalc command):
- loadub 'name' | num -- load an existing ub calculation
-
-Diffcalc's Scannables
-=====================
-
-To list and show the current positions of your beamline's scannables
-use ``pos`` with no arguments::
-
- >>> pos
-
-Results in:
-
-**Energy and wavelength scannables**::
-
- energy 12.3984
- wl: 1.0000
-
-**Diffractometer scannables**, as a group and in component axes (in
-the real GDA these have limits)::
-
- sixc: mu: 0.0000 delta: 0.0000 gamma: 0.0000 omega: 0.0000 chi: 0.0000 phi: 0.0000
- mu: 0.0000
- chi: 0.0000
- delta: 0.0000
- gamma: 0.0000
- omega: 0.0000
- phi: 0.0000
-
-**Dummy counter**, which in this example simply counts at 1hit/s::
-
- ct: 0.0000
-
-**Hkl scannable**, as a group and in component::
-
- hkl: Error: No UB matrix
- h: Error: No UB matrix
- k: Error: No UB matrix
- l: Error: No UB matrix
-
-**Parameter scannables**, used in some modes, these provide a
-scannable alternative to the `Motion`_ section. Some constrain of
-these constrain virtual angles::
-
- alpha: ---
- beta: ---
- naz: ---
- psi: ---
- qaz: ---
-
-and some constrain physical angles::
-
- phi_con: ---
- chi_con: ---
- delta_con:---
- eta_con: ---
- gam_con: ---
- mu_con: ---
-
-
-Crystal orientation
-===================
-
-Before moving in hkl space you must calculate a UB matrix by specifying the
-crystal's lattice parameters (which define the B matrix) and finding two
-reflections (from which the U matrix can be inferred); and, optionally for
-surface-diffraction experiments, determine how the surface of the crystal is
-oriented with respect to the phi axis.
-
-Start a new UB calculation
---------------------------
-
-A *UB calculation* contains the description of the crystal-under-test,
-any saved reflections, reference angle direction, and a B & UB
-matrix pair if they have been calculated or manually specified.
-Starting a new UB calculation will clear all of these.
-
-Before starting a UB-calculation, the ``ub`` command used to summarise
-the state of the current UB-calculation, will reflect that no
-UB-calculation has been started::
-
- >>> ub
- <<< No UB calculation started >>>
-
-A new UB-calculation calculation may be started and lattice specified
-explicitly::
-
- >>> newub 'example'
- >>> setlat '1Acube' 1 1 1 90 90 90
-
-or interactively::
-
- >>> newub
- calculation name: example
- crystal name: 1Acube
- a [1]: 1
- b [1]: 1
- c [1]: 1
- alpha [90]: 90
- beta [90]: 90
- gamma [90]: 90
-
-where a,b and c are the lengths of the three unit cell basis vectors
-in Angstroms, and alpha, beta and gamma are angles in Degrees.
-
-The ``ub`` command will show the state of the current UB-calculation
-(and the current energy for reference)::
-
- >>> ub
- UBCALC
-
- name: example
-
- n_phi: 0.00000 0.00000 1.00000 <- set
-
- CRYSTAL
-
- name: 1Acube
-
- a, b, c: 1.00000 1.00000 1.00000
- 90.00000 90.00000 90.00000
-
- B matrix: 6.28319 0.00000 0.00000
- 0.00000 6.28319 0.00000
- 0.00000 0.00000 6.28319
-
- UB MATRIX
-
- <<< none calculated >>>
-
- REFLECTIONS
-
- <<< none specified >>>
-
- CRYSTAL ORIENTATIONS
-
- <<< none specified >>>
-
-Load a UB calculation
----------------------
-
-To load the last used UB-calculation::
-
- >>> lastub
- Loading ub calculation: 'mono-Si'
-
-To load a previous UB-calculation::
-
- >>> listub
- UB calculations in: /Users/walton/.diffcalc/i16
-
- 0) mono-Si 15 Feb 2017 (22:32)
- 1) i16-32 13 Feb 2017 (18:32)
-
- >>> loadub 0
-
-Generate a U matrix from two reflections
-----------------------------------------
-
-The normal way to calculate a U matrix is to find the position of **two**
-reflections with known hkl values. Diffcalc allows many reflections to be
-recorded but currently only uses the first two when calculating a UB matrix.
-
-Find U matrix from two reflections::
-
- >>> pos wl 1
- wl: 1.0000
- >>> c2th [0 0 1]
- 59.99999999999999
-
- >>> pos sixc [0 60 0 30 90 0]
- sixc: mu: 0.0000 delta: 60.0000 gam: 0.0000 eta: 30.0000 chi: 90.0000 phi: 0.0000
- >>> addref [0 0 1]
-
- >>> pos sixc [0 90 0 45 45 90]
- sixc: mu: 0.0000 delta: 90.0000 gam: 0.0000 eta: 45.0000 chi: 45.0000 phi: 90.0000
- >>> addref [0 1 1]
- Calculating UB matrix.
-
-Check that it looks good::
-
- >>> checkub
-
- ENERGY H K L H_COMP K_COMP L_COMP TAG
- 1 12.3984 0.00 0.00 1.00 0.0000 0.0000 1.0000
- 2 12.3984 0.00 1.00 1.00 0.0000 1.0000 1.0000
-
-Generate a U matrix from one reflection
----------------------------------------
-
-To estimate based on first reflection only::
-
- >>> trialub
- resulting U angle: 0.00000 deg
- resulting U axis direction: [-1.00000, 0.00000, 0.00000]
- Recalculating UB matrix from the first reflection only.
- NOTE: A new UB matrix will not be automatically calculated when the orientation reflections are modified.
-
-Edit reflection list
---------------------
-
-Use ``showref`` to show the reflection list::
-
- >>> showref
- ENERGY H K L MU DELTA GAM ETA CHI PHI TAG
- 1 12.398 0.00 0.00 1.00 0.0000 60.0000 0.0000 30.0000 90.0000 0.0000
- 2 12.398 0.00 1.00 1.00 0.0000 90.0000 0.0000 45.0000 45.0000 90.0000
-
-Use ``swapref`` to swap reflections::
-
- >>> swapref 1 2
- Not calculating UB matrix as it has been manually set. Use 'calcub' to explicitly recalculate it.
- Recalculating UB matrix.
-
-Use ``delref`` to delete a reflection::
-
- >>> delref 1
-
-Generate a U matrix from two lattice directions
------------------------------------------------
-
-Another approach to calculate a U matrix is to provide orientation of **two** crystal lattice
-directions in laboratory frame of reference using ``addorient`` command. The first lattice
-direction will be aligned along the specified in the laboratory frame. The second lattice
-direction will be used to set azimuthal orientation of the crystal in the plane perpendicular
-to the first lattice orientation. Diffcalc allows many lattice directions to be recorded but
-currently uses only the first two when calculating a UB matrix.
-
-Find U matrix from two lattice directions::
-
- >>> addorient [0 0 1] [0 0 1]
-
- >>> addorient [1 0 0] [1 1 0]
- Calculating UB matrix.
-
-Calculate a UB matrix
----------------------
-
-Unless a U or UB matrix has been manually specified, a new UB matrix will be
-calculated after the second reflection has been found, or whenever one of the
-first two reflections is changed.
-
-Use the command ``calcub`` to force the UB matrix to be calculated from the
-first two reflections. In case of using lattice orientations instead of reflections,
-use command ``orientub`` to force the UB matrix to be calculated from the first two orientations.
-
-If you have misidentified a reflection used for the orientation the
-resulting UB matrix will be incorrect. Always use the ``checkub``command
-to check that the computed reflection indices agree with the estimated values::
-
- >>> checkub
-
- ENERGY H K L H_COMP K_COMP L_COMP TAG
- 1 12.3984 0.00 1.00 1.00 0.0000 1.0000 1.0000
- 2 12.3984 0.00 0.00 1.00 0.0000 0.0000 1.0000
-
-Calculate a U matrix from crystal mismount
--------------------------------------------
-
-U matrix can be defined from crystal mismount by using a rotation matrix calculated from a provided
-mismount angle and axis. ``setmiscut`` command defines new U matrix by setting it to a rotation matrix
-calculated from the specified angle and axis parameters. ``addmiscut`` command applies the calculated
-rotation matrix to the existing U matrix, i.e. adds extra mismount to the already existing one::
-
- >>> setmiscut 5 [1 0 0]
- n_phi: -0.00000 -0.08716 0.99619
- n_hkl: 0.00000 0.00000 1.00000 <- set
- normal:
- angle: 5.00000
- axis: 1.00000 -0.00000 0.00000
-
-
-Manually specify U matrix
--------------------------
-
-Set U matrix manually (pretending sample is squarely mounted)::
-
- >>> setu [[1 0 0] [0 1 0] [0 0 1]]
- Recalculating UB matrix.
- NOTE: A new UB matrix will not be automatically calculated when the orientation reflections are modified.
-
-Refining UB matrix from reflection
-----------------------------------
-
-UB matrix elements can be refined to match diffractometer settings and crystal orientation experimentally
-found for a given reflection with the corresponding reflection indices. ``refineub`` command rescales
-crystal unit cell dimensions to match with the found scattering angle value and recalculates mismount
-parameters to update U matrix::
-
- >>> refineub [1 0 0]
- current pos[y]: y
- Unit cell scaling factor: 0.99699
- Refined crystal lattice:
- a, b, c: 0.99699 0.99699 0.99699
- 90.00000 90.00000 90.00000
-
- Update crystal settings?[y]: y
- Warning: the old UB calculation has been cleared.
- Use 'calcub' to recalculate with old reflections or
- 'orientub' to recalculate with old orientations.
- Miscut parameters:
- angle: 2.90000
- axis: -0.00000 1.00000 -0.00000
- Apply miscut parameters?[y]: y
- n_phi: 0.67043 -0.00000 0.74198
- n_hkl: 0.00000 0.00000 1.00000 <- set
- normal:
- angle: 42.10000
- axis: 0.00000 1.00000 0.00000
-
-Set the reference vector
--------------------------
-
-When performing surface experiments the reference vector should be set normal
-to the surface. It can also be used to define other directions within the crystal
-with which we want to orient the incident or diffracted beam.
-
-By default the reference vector is set parallel to the phi axis. That is,
-along the z-axis of the phi coordinate frame.
-
-The `ub` command shows the current reference vector along with the orientation relative to
-the z-axis, at the top its report (or it can be shown by calling ``setnphi`` or
-``setnhkl'`` with no args)::
-
- >>> ub
- ...
- n_phi: 0.00000 0.00000 1.00000 <- set
- n_hkl: -0.00000 0.00000 1.00000
- normal: None
- ...
-
-The ``<- set`` label here indicates that the reference vector is set in the phi
-coordinate frame. In this case, therefore, its direction in the crystal's
-reciprocal lattice space is inferred from the UB matrix.
-
-To set the reference vector in the phi coordinate frame use::
-
- >>> setnphi [0 0 1]
- ...
-
-This is useful if the surface normal has be found with a laser or by x-ray
-occlusion. This vector must currently be manually calculated from the sample
-angle settings required to level the surface (sigma and tau commands on the
-way).
-
-To set the reference vector in the crystal's reciprocal lattice space use (this
-is a quick way to determine the surface orientation if the surface is known to
-be cleaved cleanly along a known axis)::
-
- >>> setnhkl [0 0 1]
- ...
-
-Motion
-======
-
-Once a UB matrix has been calculated, the diffractometer may be driven
-in hkl coordinates. A given diffractometer setting maps easily into a
-single hkl value. However for a diffractometer with more than three circles
-there are excess degrees of freedom when calculating a diffractometer
-setting from an hkl value. Diffcalc provides many for using up
-the excess degrees of freedom.
-
-By default Diffcalc selects no mode.
-
-Constraining solutions for moving in hkl space
-----------------------------------------------
-
-To get help and see current constraints::
-
- >>> help con
- ...
-
- >>> con
- DET REF SAMP
- ------ ------ ------
- delta a_eq_b mu
- gam alpha eta
- qaz beta chi
- naz psi phi
- mu_is_gam
-
- ! 3 more constraints required
-
- Type 'help con' for instructions
-
-Three constraints can be given: zero or one from the DET and REF columns and the
-remainder from the SAMP column. Not all combinations are currently available.
-Use ``help con`` to see a summary if you run into troubles.
-
-To configure four-circle vertical scattering::
-
- >>> con gam 0 mu 0 a_eq_b
- gam : 0.0000
- a_eq_b
- mu : 0.0000
-
-In the following the *scattering plane* is defined as the plane including the
-scattering vector, or momentum transfer vector, and the incident beam.
-
-**DETECTOR COLUMN:**
-
-- **delta** - physical delta setting (vertical detector motion) *del=0 is equivalent to qaz=0*
-- **gam** - physical gamma setting (horizontal detector motion) *gam=0 is equivalent to qaz=90*
-- **qaz** - azimuthal rotation of scattering vector (about the beam, from horizontal)
-- **naz** - azimuthal rotation of reference vector (about the beam, from horizontal)
-
-**REFERENCE COLUMN:**
-
-- **alpha** - incident angle to surface (if reference is normal to surface)
-- **beta** - exit angle from surface (if reference is normal to surface)
-- **psi** - azimuthal rotation about scattering vector of reference vector (from scattering plane)
-- **a_eq_b** - bisecting mode with alpha=beta. *Equivalent to psi=90*
-
-**SAMPLE COLUMN:**
-
-- **mu, eta, chi & phi** - physical settings
-- **mu_is_gam** - force mu to follow gamma (results in a 5-circle geometry)
-
-Diffcalc will report two other (un-constrainable) virtual angles:
-
-- **theta** - half of 2theta, the angle through the diffracted beam bends
-- **tau** - longitude of reference vector from scattering vector (in scattering plane)
-
-Example constraint modes
-------------------------
-
-There is sometimes more than one way to get the same effect.
-
-**Vertical four-circle mode**::
-
- >>> con gam 0 mu 0 a_eq_b # or equivalently:
- >>> con qaz 90 mu 0 a_eq_b
-
- >>> con alpha 1 # replaces a_eq_b
-
-**Horizontal four-circle mode**::
-
- >>> con del 0 eta 0 alpha 1 # or equivalently:
- >>> con qaz 0 mu 0 alpha 1
-
-**Surface vertical mode**::
-
- >>> con naz 90 mu 0 alpha 1
-
-**Surface horizontal mode**::
-
- >>> con naz 0 eta 0 alpha 1
-
-**Z-axis mode (surface horizontal)**::
-
- >>> con chi (-sigma) phi (-tau) alpha 1
-
-where sigma and tau are the offsets required in chi and phi to bring the surface
-normal parallel to eta. Alpha will determine mu directly leaving eta to orient
-the planes. Or::
-
- >>> con naz 0 phi 0 alpha 1 # or any another sample angle
-
-**Z-axis mode (surface vertical)**::
-
- >>> con naz 0 phi 0 alpha 1 # or any another sample angle
-
-Changing constrained values
----------------------------
-
-Once constraints are chosen constrained values may be changed directly::
-
- >>> con mu 10
- gam : 0.0000
- a_eq_b
- mu : 10.0000
-
-or via the associated scannable::
-
- >>> pos mu_con 10
- mu_con: 10.00000
-
-Configuring limits and cuts
----------------------------
-
-Diffcalc maintains its own limits on axes. These limits will be used when
-choosing solutions. If more than one detector solution is exists Diffcalc will
-ask you to reduce the the limits until there is only one. However if more than
-one solution for the sample settings is available it will choose one base on
-heuristics.
-
-Use the ``hardware`` command to see the current limits and cuts::
-
- >>> hardware
- mu (cut: -180.0)
- delta (cut: -180.0)
- gam (cut: -180.0)
- eta (cut: -180.0)
- chi (cut: -180.0)
- phi (cut: 0.0)
- Note: When auto sector/transforms are used,
- cuts are applied before checking limits.
-
-To set the limits::
-
- >>> setmin delta -1
- >>> setmax delta 145
-
-To set a cut::
-
- >>> setcut phi -180
-
-This causes requests to move phi to be between the configured -180 and +360
-degress above this. i.e. it might dive to -10 degrees rather than 350.
-
-
-Moving in hkl space
--------------------
-
-Configure a mode, e.g. four-circle vertical::
-
- >>> con gam 0 mu 0 a_eq_b
- gam : 0.0000
- a_eq_b
- mu : 0.0000
-
-Simulate moving to a reflection::
-
- >>> sim hkl [0 1 1]
- sixc would move to:
- mu : 0.0000
- delta : 90.0000
- gam : 0.0000
- eta : 45.0000
- chi : 45.0000
- phi : 90.0000
-
- alpha : 30.0000
- beta : 30.0000
- naz : 35.2644
- psi : 90.0000
- qaz : 90.0000
- tau : 45.0000
- theta : 45.0000
-
-Move to reflection::
-
- >>> pos hkl [0 1 1]
- hkl: h: 0.00000 k: 1.00000 l: 1.00000
-
- >>> pos sixc
- sixc: mu: 0.0000 delta: 90.0000 gam: 0.0000 eta: 45.0000 chi: 45.0000 phi: 90.0000
-
-Simulate moving to a location::
-
- >>> pos sixc [0 60 0 30 90 0]
- sixc: mu: 0.0000 delta: 60.0000 gam: 0.0000 eta: 30.0000 chi: 90.0000 phi: 0.0000
-
-Scanning in hkl space
-=====================
-
-All scans described below use the same generic scanning mechanism
-provided by the GDA system or by minigda. Here are some examples.
-
-Fixed hkl scans
----------------
-
-In a 'fixed hkl scan' something (such as energy or Bin) is scanned,
-and at each step hkl is 'moved' to keep the sample and detector
-aligned. Also plonk the diffractometer scannable (sixc) on there with no
-destination to monitor what is actually happening and then
-throw on a detector (ct) with an exposure time if appropriate::
-
- >>> #scan scannable_name start stop step [scannable_name [pos or time]]..
-
- >>> scan en 9 11 .5 hkl [1 0 0] sixc ct 1
-
- >>> scan en 9 11 .5 hklverbose [1 0 0] sixc ct 1
-
- >>> scan betain 4 5 .2 hkl [1 0 0] sixc ct 1
-
- >>> scan alpha_par 0 10 2 hkl [1 0 0] sixc ct 1
-
-Scanning hkl
-------------
-
-Hkl, or one component, may also be scanned directly::
-
- >>> scan h .8 1.2 .1 hklverbose sixc ct 1
-
-At each step, this will read the current hkl position, modify the h
-component and then move to the resulting vector. There is a danger
-that with this method k and l may drift. To get around this the start,
-stop and step values may also be specified as vectors. So for example::
-
- >>> scan hkl [1 0 0] [1 .3 0] [1 0.1 0] ct1
-
-is equivilant to::
-
- >>> pos hkl [1 0 0]
- >>> scan k 0 .3 .1 ct1
-
-but will not suffer from drifting. This method also allows scans along
-any direction in hkl space to be performed.
-
-Multidimension scans
---------------------
-
-Two and three dimensional scans::
-
- >>> scan en 9 11 .5 h .9 1.1 .2 hklverbose sixc ct 1
- >>> scan h 1 3 1 k 1 3 1 l 1 3 1 hkl ct 1
-
-Commands
-========
-
-Orientation Commands
---------------------
-
-+-----------------------------+---------------------------------------------------+
-| **STATE** |
-+-----------------------------+---------------------------------------------------+
-| **-- newub** {'name'} | start a new ub calculation name |
-+-----------------------------+---------------------------------------------------+
-| **-- loadub** 'name' | num | load an existing ub calculation |
-+-----------------------------+---------------------------------------------------+
-| **-- lastub** | load the last used ub calculation |
-+-----------------------------+---------------------------------------------------+
-| **-- listub** | list the ub calculations available to load |
-+-----------------------------+---------------------------------------------------+
-| **-- rmub** 'name'|num | remove existing ub calculation |
-+-----------------------------+---------------------------------------------------+
-| **-- saveubas** 'name' | save the ub calculation with a new name |
-+-----------------------------+---------------------------------------------------+
-| **LATTICE** |
-+-----------------------------+---------------------------------------------------+
-| **-- setlat** | interactively enter lattice parameters (Angstroms |
-| | and Deg) |
-+-----------------------------+---------------------------------------------------+
-| **-- setlat** name a | assumes cubic |
-+-----------------------------+---------------------------------------------------+
-| **-- setlat** name a b | assumes tetragonal |
-+-----------------------------+---------------------------------------------------+
-| **-- setlat** name a b c | assumes ortho |
-+-----------------------------+---------------------------------------------------+
-| **-- setlat** name a b c | assumes mon/hex with gam not equal to 90 |
-| gamma | |
-+-----------------------------+---------------------------------------------------+
-| **-- setlat** name a b c | arbitrary |
-| alpha beta gamma | |
-+-----------------------------+---------------------------------------------------+
-| **-- c2th** [h k l] | calculate two-theta angle for reflection |
-+-----------------------------+---------------------------------------------------+
-| **-- hklangle** [h1 k1 l1] | calculate angle between [h1 k1 l1] and [h2 k2 l2] |
-| [h2 k2 l2] | crystal planes |
-+-----------------------------+---------------------------------------------------+
-| **REFERENCE (SURFACE)** |
-+-----------------------------+---------------------------------------------------+
-| **-- setnphi** {[x y z]} | sets or displays n_phi reference |
-+-----------------------------+---------------------------------------------------+
-| **-- setnhkl** {[h k l]} | sets or displays n_hkl reference |
-+-----------------------------+---------------------------------------------------+
-| **REFLECTIONS** |
-+-----------------------------+---------------------------------------------------+
-| **-- showref** | shows full reflection list |
-+-----------------------------+---------------------------------------------------+
-| **-- addref** | add reflection interactively |
-+-----------------------------+---------------------------------------------------+
-| **-- addref** [h k l] | add reflection with current position and energy |
-| {'tag'} | |
-+-----------------------------+---------------------------------------------------+
-| **-- addref** [h k l] (p1, | add arbitrary reflection |
-| .., pN) energy {'tag'} | |
-+-----------------------------+---------------------------------------------------+
-| **-- editref** num | interactively edit a reflection |
-+-----------------------------+---------------------------------------------------+
-| **-- delref** num | deletes a reflection (numbered from 1) |
-+-----------------------------+---------------------------------------------------+
-| **-- clearref** | deletes all the reflections |
-+-----------------------------+---------------------------------------------------+
-| **-- swapref** | swaps first two reflections used for calculating |
-| | U matrix |
-+-----------------------------+---------------------------------------------------+
-| **-- swapref** num1 num2 | swaps two reflections (numbered from 1) |
-+-----------------------------+---------------------------------------------------+
-| **CRYSTAL ORIENTATIONS** |
-+-----------------------------+---------------------------------------------------+
-| **-- showorient** | shows full list of crystal orientations |
-+-----------------------------+---------------------------------------------------+
-| **-- addorient** | add crystal orientation interactively |
-+-----------------------------+---------------------------------------------------+
-| **-- addorient** [h k l] | add crystal orientation in laboratory frame |
-| [x y z] {'tag'} | |
-+-----------------------------+---------------------------------------------------+
-| **-- editorient** num | interactively edit a crystal orientation |
-+-----------------------------+---------------------------------------------------+
-| **-- delorient** num | deletes a crystal orientation (numbered from 1) |
-+-----------------------------+---------------------------------------------------+
-| **-- clearorient** | deletes all the crystal orientations |
-+-----------------------------+---------------------------------------------------+
-| **-- swaporient** | swaps first two crystal orientations used for |
-| | calculating U matrix |
-+-----------------------------+---------------------------------------------------+
-| **-- swaporient** num1 num2 | swaps two crystal orientations (numbered from 1) |
-+-----------------------------+---------------------------------------------------+
-| **UB MATRIX** |
-+-----------------------------+---------------------------------------------------+
-| **-- checkub** | show calculated and entered hkl values for |
-| | reflections |
-+-----------------------------+---------------------------------------------------+
-| **-- setu** | manually set u matrix |
-| {[[..][..][..]]} | |
-+-----------------------------+---------------------------------------------------+
-| **-- setub** | manually set ub matrix |
-| {[[..][..][..]]} | |
-+-----------------------------+---------------------------------------------------+
-| **-- calcub** | (re)calculate u matrix from ref1 and ref2 |
-+-----------------------------+---------------------------------------------------+
-| **-- trialub** | (re)calculate u matrix from ref1 only (check |
-| | carefully) |
-+-----------------------------+---------------------------------------------------+
-| **-- refineub** {[h k l]} | refine unit cell dimensions and U matrix to match |
-| {pos} | diffractometer angles for a given hkl value |
-+-----------------------------+---------------------------------------------------+
-| **-- addmiscut** angle | apply miscut to U matrix using a specified miscut |
-| {[x y z]} | angle in degrees and a rotation axis |
-| | (default: [0 1 0]) |
-+-----------------------------+---------------------------------------------------+
-| **-- setmiscut** angle | manually set U matrix using a specified miscut |
-| {[x y z]} | angle in degrees and a rotation axis |
-| | (default: [0 1 0]) |
-+-----------------------------+---------------------------------------------------+
-
-Motion commands
----------------
-
-+-----------------------------+---------------------------------------------------+
-| **CONSTRAINTS** |
-+-----------------------------+---------------------------------------------------+
-| **-- con** | list available constraints and values |
-+-----------------------------+---------------------------------------------------+
-| **-- con** {val} | constrains and optionally sets one constraint |
-+-----------------------------+---------------------------------------------------+
-| **-- con** {val} | clears and then fully constrains |
-| {val} {val} | |
-+-----------------------------+---------------------------------------------------+
-| **-- uncon** | remove constraint |
-+-----------------------------+---------------------------------------------------+
-| **HKL** |
-+-----------------------------+---------------------------------------------------+
-| **-- allhkl** [h k l] | print all hkl solutions ignoring limits |
-+-----------------------------+---------------------------------------------------+
-| **HARDWARE** |
-+-----------------------------+---------------------------------------------------+
-| **-- hardware** | show diffcalc limits and cuts |
-+-----------------------------+---------------------------------------------------+
-| **-- setcut** {name {val}} | sets cut angle |
-+-----------------------------+---------------------------------------------------+
-| **-- setmin** {axis {val}} | set lower limits used by auto sector code (None |
-| | to clear) |
-+-----------------------------+---------------------------------------------------+
-| **-- setmax** {name {val}} | sets upper limits used by auto sector code (None |
-| | to clear) |
-+-----------------------------+---------------------------------------------------+
-| **MOTION** |
-+-----------------------------+---------------------------------------------------+
-| **-- sim** hkl scn | simulates moving scannable (not all) |
-+-----------------------------+---------------------------------------------------+
-| **-- sixc** | show Eularian position |
-+-----------------------------+---------------------------------------------------+
-| **-- pos** sixc [mu, delta, | move to Eularian position(None holds an axis |
-| gam, eta, chi, phi] | still) |
-+-----------------------------+---------------------------------------------------+
-| **-- sim** sixc [mu, delta, | simulate move to Eulerian positionsixc |
-| gam, eta, chi, phi] | |
-+-----------------------------+---------------------------------------------------+
-| **-- hkl** | show hkl position |
-+-----------------------------+---------------------------------------------------+
-| **-- pos** hkl [h k l] | move to hkl position |
-+-----------------------------+---------------------------------------------------+
-| **-- pos** {h | k | l} val | move h, k or l to val |
-+-----------------------------+---------------------------------------------------+
-| **-- sim** hkl [h k l] | simulate move to hkl position |
-+-----------------------------+---------------------------------------------------+
-
-Good luck --- RobW
-
-References
-==========
-
-.. [You1999] H. You. *Angle calculations for a '4S+2D' six-circle diffractometer.*
- J. Appl. Cryst. (1999). **32**, 614-623. `(pdf link)
- `__.
-.. [Busing1967] W. R. Busing and H. A. Levy. *Angle calculations for 3- and 4-circle X-ray
- and neutron diffractometers.* Acta Cryst. (1967). **22**, 457-464. `(pdf link)
- `__.
diff --git a/script/__Lib/diffcalc-2.1/doc/source/youmanual_images/4s_2d_diffractometer.png b/script/__Lib/diffcalc-2.1/doc/source/youmanual_images/4s_2d_diffractometer.png
deleted file mode 100755
index 5216255..0000000
Binary files a/script/__Lib/diffcalc-2.1/doc/source/youmanual_images/4s_2d_diffractometer.png and /dev/null differ
diff --git a/script/__Lib/diffcalc-2.1/doc/source/youmanual_template.rst b/script/__Lib/diffcalc-2.1/doc/source/youmanual_template.rst
deleted file mode 100755
index 1b32fff..0000000
--- a/script/__Lib/diffcalc-2.1/doc/source/youmanual_template.rst
+++ /dev/null
@@ -1,565 +0,0 @@
-################################
-Diffcalc User Guide (You Engine)
-################################
-
-.. rubric:: Diffcalc: A diffraction condition calculator for diffractometer control
-
-:Author: Rob Walton
-:Contact: rob.walton (at) diamond (dot) ac (dot) uk
-:Website: https://github.com/DiamondLightSource/diffcalc
-
-.. toctree::
- :maxdepth: 2
- :numbered:
-
-See also the `quickstart guide at github `_
-
-Introduction
-============
-
-This manual assumes that you are running Diffcalc within OpenGDA or have started
-it using IPython. It assumes that Diffcalc has been configured for the six
-circle diffractometer pictured here:
-
-.. figure:: youmanual_images/4s_2d_diffractometer.png
- :scale: 100
- :align: center
-
- 4s + 2d six-circle diffractometer, from H.You (1999)
-
-Your Diffcalc configuration may have been customised for the geometry of your
-diffractometer and possibly the types of experiment you perform. For example, a
-five-circle diffractometer might be missing the nu circle above.
-
-The laboratory frame is shown above. With all settings at zero as shown the
-crystal cartesian frame aligns with the laboratory frame. Therefor a cubic
-crystal mounted squarely in a way that the U matrix (defined below) is unitary
-will have h||a||x, k||b||y & l||c||z, crystal and reciprocal-lattice coordinate
-frames are defined with respect to the beam and to gravity to be (for a cubic
-crystal):
-
-Overview
-========
-
-The following assumes that the diffractometer has been properly leveled, aligned
-with the beam and zeroed. See the `SPEC fourc manual
-`__.
-
-Before moving in hkl space you must calculate a UB matrix by specifying the
-crystal's lattice parameters (which define the B matrix) and finding two
-reflections (from which the U matrix defining any mismount can be inferred);
-and, optionally for surface-diffraction experiments, determine how the surface
-of the crystal is oriented with respect to the phi axis.
-
-Once a UB matrix has been calculated, the diffractometer may be driven in hkl
-coordinates. A valid diffractometer setting maps easily into a single hkl value.
-However for a diffractometer with more than three circles there are excess
-degrees of freedom when calculating a diffractometer setting from an hkl value.
-Diffcalc provides modes for using up the excess degrees of freedom.
-
-Diffcalc does not perform scans directly. Instead, Scannables that use diffcalc
-to map between reciprocal lattice space and real diffractometer settings are
-scanned using the Gda's (or minigda's) generic scan mechanism.
-
-
-Theory
-------
-
-Thanks to Elias Vlieg for sharing his dos based ``DIF`` software that Diffcalc
-has borrowed heavily from. The version of Diffcalc described here is based on papers by
-pHH. You. [You1999]_ and Busing & Levy [Busing1967]_. (See also the THANKS.txt file.)
-
-Getting Help
-============
-
-There are few commands to remember. If a command is called without
-arguments in some cases Diffcalc will prompt for arguments and provide sensible
-defaults which can be chosen by pressing enter.
-
-
-**Orientation**. The ``helpub`` command lists all commands related with crystal
-orientation and the reference vector (often used with surfaces). See the
-`Orientation Commands`_ section at the end of this manual::
-
- >>> help ub
- ...
-
-
-**HKL movement**. The ``help hkl`` list all commands related to moving in reciprocal-lattice
-space. See the `Motion Commands`_ section at the end of this manual::
-
- >>> help hkl
- ...
-
-
-Call help on any command. e.g.::
-
- ==> help loadub
-
-Diffcalc's Scannables
-=====================
-
-To list and show the current positions of your beamline's scannables
-use ``pos`` with no arguments::
-
- >>> pos
-
-Results in:
-
-**Energy and wavelength scannables**::
-
- energy 12.3984
- wl: 1.0000
-
-**Diffractometer scannables**, as a group and in component axes (in
-the real GDA these have limits)::
-
- sixc: mu: 0.0000 delta: 0.0000 gamma: 0.0000 omega: 0.0000 chi: 0.0000 phi: 0.0000
- mu: 0.0000
- chi: 0.0000
- delta: 0.0000
- gamma: 0.0000
- omega: 0.0000
- phi: 0.0000
-
-**Dummy counter**, which in this example simply counts at 1hit/s::
-
- ct: 0.0000
-
-**Hkl scannable**, as a group and in component::
-
- hkl: Error: No UB matrix
- h: Error: No UB matrix
- k: Error: No UB matrix
- l: Error: No UB matrix
-
-**Parameter scannables**, used in some modes, these provide a
-scannable alternative to the `Motion`_ section. Some constrain of
-these constrain virtual angles::
-
- alpha: ---
- beta: ---
- naz: ---
- psi: ---
- qaz: ---
-
-and some constrain physical angles::
-
- phi_con: ---
- chi_con: ---
- delta_con:---
- eta_con: ---
- gam_con: ---
- mu_con: ---
-
-
-Crystal orientation
-===================
-
-Before moving in hkl space you must calculate a UB matrix by specifying the
-crystal's lattice parameters (which define the B matrix) and finding two
-reflections (from which the U matrix can be inferred); and, optionally for
-surface-diffraction experiments, determine how the surface of the crystal is
-oriented with respect to the phi axis.
-
-Start a new UB calculation
---------------------------
-
-A *UB calculation* contains the description of the crystal-under-test,
-any saved reflections, reference angle direction, and a B & UB
-matrix pair if they have been calculated or manually specified.
-Starting a new UB calculation will clear all of these.
-
-Before starting a UB-calculation, the ``ub`` command used to summarise
-the state of the current UB-calculation, will reflect that no
-UB-calculation has been started::
-
- ==> ub
-
-A new UB-calculation calculation may be started and lattice specified
-explicitly::
-
- ==> newub 'example'
- ==> setlat '1Acube' 1 1 1 90 90 90
-
-or interactively::
-
- >>> newub
- calculation name: example
- crystal name: 1Acube
- a [1]: 1
- b [1]: 1
- c [1]: 1
- alpha [90]: 90
- beta [90]: 90
- gamma [90]: 90
-
-where a,b and c are the lengths of the three unit cell basis vectors
-in Angstroms, and alpha, beta and gamma are angles in Degrees.
-
-The ``ub`` command will show the state of the current UB-calculation
-(and the current energy for reference)::
-
- ==> ub
-
-Load a UB calculation
----------------------
-
-To load the last used UB-calculation::
-
- >>> lastub
- Loading ub calculation: 'mono-Si'
-
-To load a previous UB-calculation::
-
- >>> listub
- UB calculations in: /Users/walton/.diffcalc/i16
-
- 0) mono-Si 15 Feb 2017 (22:32)
- 1) i16-32 13 Feb 2017 (18:32)
-
- >>> loadub 0
-
-Generate a U matrix from two reflections
-----------------------------------------
-
-The normal way to calculate a U matrix is to find the position of **two**
-reflections with known hkl values. Diffcalc allows many reflections to be
-recorded but currently only uses the first two when calculating a UB matrix.
-
-Find U matrix from two reflections::
-
- ==> pos wl 1
- ==> c2th [0 0 1]
- 59.99999999999999
-
- ==> pos sixc [0 60 0 30 90 0]
- ==> addref [0 0 1]
-
- ==> pos sixc [0 90 0 45 45 90]
- ==> addref [0 1 1]
-
-Check that it looks good::
-
- ==> checkub
-
-Generate a U matrix from one reflection
----------------------------------------
-
-To estimate based on first reflection only::
-
- ==> trialub
-
-Manually specify U matrix
--------------------------
-
-Set U matrix manually (pretending sample is squarely mounted)::
-
- ==> setu [[1 0 0] [0 1 0] [0 0 1]]
-
-Edit reflection list
---------------------
-
-Use ``showref`` to show the reflection list::
-
- ==> showref
-
-Use ``swapref`` to swap reflections::
-
- ==> swapref 1 2
- Recalculating UB matrix.
-
-Use ``delref`` to delete a reflection::
-
- >>> delref 1
-
-Calculate a UB matrix
----------------------
-
-Unless a U or UB matrix has been manually specified, a new UB matrix will be
-calculated after the second reflection has been found, or whenever one of the
-first two reflections is changed.
-
-Use the command ``calcub`` to force the UB matrix to be calculated from the
-first two reflections.
-
-If you have misidentified a reflection used for the orientation the
-resulting UB matrix will be incorrect. Always use the ``checkub``
-command to check that the computed values agree with the estimated values::
-
- ==> checkub
-
-Set the reference vector
--------------------------
-
-When performing surface experiments the reference vector should be set normal
-to the surface. It can also be used to define other directions within the crystal
-with which we want to orient the incident or diffracted beam.
-
-By default the reference vector is set parallel to the phi axis. That is,
-along the z-axis of the phi coordinate frame.
-
-The `ub` command shows the current reference vector, along with any inferred
-miscut, at the top its report (or it can be shown by calling ``setnphi`` or
-``setnhkl'`` with no args)::
-
- >>> ub
- ...
- n_phi: 0.00000 0.00000 1.00000 <- set
- n_hkl: -0.00000 0.00000 1.00000
- miscut: None
- ...
-
-The ``<- set`` label here indicates that the reference vector is set in the phi
-coordinate frame. In this case, therefor, its direction in the crystal's
-reciprocal lattice space is inferred from the UB matrix.
-
-To set the reference vector in the phi coordinate frame use::
-
- >>> setnphi [0 0 1]
- ...
-
-This is useful if the surface normal has be found with a laser or by x-ray
-occlusion. This vector must currently be manually calculated from the sample
-angle settings required to level the surface (sigma and tau commands on the
-way).
-
-To set the reference vector in the crystal's reciprocal lattice space use (this
-is a quick way to determine the surface orientation if the surface is known to
-be cleaved cleanly along a known axis)::
-
- >>> setnhkl [0 0 1] ...
-
-Motion
-======
-
-Once a UB matrix has been calculated, the diffractometer may be driven
-in hkl coordinates. A given diffractometer setting maps easily into a
-single hkl value. However for a diffractometer with more than three circles
-there are excess degrees of freedom when calculating a diffractometer
-setting from an hkl value. Diffcalc provides many for using up
-the excess degrees of freedom.
-
-By default Diffcalc selects no mode.
-
-Constraining solutions for moving in hkl space
-----------------------------------------------
-
-To get help and see current constraints::
-
- >>> help con
- ...
-
- ==> con
-
-Three constraints can be given: zero or one from the DET and REF columns and the
-remainder from the SAMP column. Not all combinations are currently available.
-Use ``help con`` to see a summary if you run into troubles.
-
-To configure four-circle vertical scattering::
-
- ==> con gam 0 mu 0 a_eq_b
-
-In the following the *scattering plane* is defined as the plane including the
-scattering vector, or momentum transfer vector, and the incident beam.
-
-**DETECTOR COLUMN:**
-
-- **delta** - physical delta setting (vertical detector motion) *del=0 is equivalent to qaz=0*
-- **gam** - physical gamma setting (horizontal detector motion) *gam=0 is equivalent to qaz=90*
-- **qaz** - azimuthal rotation of scattering vector (about the beam, from horizontal)
-- **naz** - azimuthal rotation of reference vector (about the beam, from horizontal)
-
-**REFERENCE COLUMN:**
-
-- **alpha** - incident angle to surface (if reference is normal to surface)
-- **beta** - exit angle from surface (if reference is normal to surface)
-- **psi** - azimuthal rotation about scattering vector of reference vector (from scattering plane)
-- **a_eq_b** - bisecting mode with alpha=beta. *Equivalent to psi=90*
-
-**SAMPLE COLUMN:**
-
-- **mu, eta, chi & phi** - physical settings
-- **mu_is_gam** - force mu to follow gamma (results in a 5-circle geometry)
-
-Diffcalc will report two other (un-constrainable) virtual angles:
-
-- **theta** - half of 2theta, the angle through the diffracted beam bends
-- **tau** - longitude of reference vector from scattering vector (in scattering plane)
-
-Example constraint modes
-------------------------
-
-There is sometimes more than one way to get the same effect.
-
-**Vertical four-circle mode**::
-
- >>> con gam 0 mu 0 a_eq_b # or equivalently:
- >>> con qaz 90 mu 0 a_eq_b
-
- >>> con alpha 1 # replaces a_eq_b
-
-**Horizontal four-circle mode**::
-
- >>> con del 0 eta 0 alpha 1 # or equivalently:
- >>> con qaz 0 mu 0 alpha 1
-
-**Surface vertical mode**::
-
- >>> con naz 90 mu 0 alpha 1
-
-**Surface horizontal mode**::
-
- >>> con naz 0 eta 0 alpha 1
-
-**Z-axis mode (surface horizontal)**::
-
- >>> con chi (-sigma) phi (-tau) alpha 1
-
-where sigma and tau are the offsets required in chi and phi to bring the surface
-normal parallel to eta. Alpha will determine mu directly leaving eta to orient
-the planes. Or::
-
- >>> con naz 0 phi 0 alpha 1 # or any another sample angle
-
-**Z-axis mode (surface vertical)**::
-
- >>> con naz 0 phi 0 alpha 1 # or any another sample angle
-
-Changing constrained values
----------------------------
-
-Once constraints are chosen constrained values may be changed directly::
-
- ==> con mu 10
-
-or via the associated scannable::
-
- ==> pos mu_con 10
-
-Configuring limits and cuts
----------------------------
-
-Diffcalc maintains its own limits on axes. These limits will be used when
-choosing solutions. If more than one detector solution is exists Diffcalc will
-ask you to reduce the the limits until there is only one. However if more than
-one solution for the sample settings is available it will choose one base on
-heuristics.
-
-Use the ``hardware`` command to see the current limits and cuts::
-
- ==> hardware
-
-To set the limits::
-
- ==> setmin delta -1
- ==> setmax delta 145
-
-To set a cut::
-
- ==> setcut phi -180
-
-This causes requests to move phi to be between the configured -180 and +360
-degress above this. i.e. it might dive to -10 degrees rather than 350.
-
-
-Moving in hkl space
--------------------
-
-Configure a mode, e.g. four-circle vertical::
-
- ==> con gam 0 mu 0 a_eq_b
-
-Simulate moving to a reflection::
-
- ==> sim hkl [0 1 1]
-
-Move to reflection::
-
- ==> pos hkl [0 1 1]
-
- ==> pos sixc
-
-Simulate moving to a location::
-
- ==> pos sixc [0 60 0 30 90 0]
-
-Scanning in hkl space
-=====================
-
-All scans described below use the same generic scanning mechanism
-provided by the GDA system or by minigda. Here are some examples.
-
-Fixed hkl scans
----------------
-
-In a 'fixed hkl scan' something (such as energy or Bin) is scanned,
-and at each step hkl is 'moved' to keep the sample and detector
-aligned. Also plonk the diffractometer scannable (sixc) on there with no
-destination to monitor what is actually happening and then
-throw on a detector (ct) with an exposure time if appropriate::
-
- >>> #scan scannable_name start stop step [scannable_name [pos or time]]..
-
- >>> scan en 9 11 .5 hkl [1 0 0] sixc ct 1
-
- >>> scan en 9 11 .5 hklverbose [1 0 0] sixc ct 1
-
- >>> scan betain 4 5 .2 hkl [1 0 0] sixc ct 1
-
- >>> scan alpha_par 0 10 2 hkl [1 0 0] sixc ct 1
-
-Scanning hkl
-------------
-
-Hkl, or one component, may also be scanned directly::
-
- >>> scan h .8 1.2 .1 hklverbose sixc ct 1
-
-At each step, this will read the current hkl position, modify the h
-component and then move to the resulting vector. There is a danger
-that with this method k and l may drift. To get around this the start,
-stop and step values may also be specified as vectors. So for example::
-
- >>> scan hkl [1 0 0] [1 .3 0] [1 0.1 0] ct1
-
-is equivilant to::
-
- >>> pos hkl [1 0 0]
- >>> scan k 0 .3 .1 ct1
-
-but will not suffer from drifting. This method also allows scans along
-any direction in hkl space to be performed.
-
-Multidimension scans
---------------------
-
-Two and three dimensional scans::
-
- >>> scan en 9 11 .5 h .9 1.1 .2 hklverbose sixc ct 1
- >>> scan h 1 3 1 k 1 3 1 l 1 3 1 hkl ct 1
-
-Commands
-========
-
-Orientation Commands
---------------------
-
-==> UB_HELP_TABLE
-
-Motion commands
----------------
-
-==> HKL_HELP_TABLE
-
-Good luck --- RobW
-
-References
-==========
-
-.. [You1999] H. You. *Angle calculations for a '4S+2D' six-circle diffractometer.*
- J. Appl. Cryst. (1999). **32**, 614-623. `(pdf link)
- `__.
-.. [Busing1967] W. R. Busing and H. A. Levy. *Angle calculations for 3- and 4-circle X-ray
- and neutron diffractometers.* Acta Cryst. (1967). **22**, 457-464. `(pdf link)
- `__.
diff --git a/script/__Lib/diffcalc-2.1/doc/tmp/constraints.txt b/script/__Lib/diffcalc-2.1/doc/tmp/constraints.txt
deleted file mode 100755
index 5c64bf2..0000000
--- a/script/__Lib/diffcalc-2.1/doc/tmp/constraints.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-Take a six circle diffractometer with angles:
-
-delta, nu, mu, eta, chi, phi
-
-and virtual angles:
-
-qaz, naz, psi, alpha, beta.
-
-Many combinations of these can be constrained:
-
-
-constrain
->>> con nu
->>> con psi
->>> con mu
->>> con nu mu a_eq_b
-
-real angles are always constrained to there last set position. If they are too far from here
-an error will result.
-
->>> pos nu 0 (moves, parameter tracks last set value (actually checks it when hkl moved))
->>> pos psi 90 (does not move, sets parameter in diffcalc)
->>> pos mu 0 (moves)
->>> pos hkl [1 0 0] (moves based on last set nu, psi, mu)
->>> pos betain --> Exception, not constrained
-
-moving a virtual angle simply sets it to efftec the next hkl move
-
-Here we need onlu con, uncon and pos.
-
-......
-
-However it would be nice to be able to pos betain for example and have it change
-betain while staying on the same reflection. This might be enabled by locking the
-the current hkl position. It would be trick to make this work with the physical angles though.
-
->>> lock hkl
->>> pos psi 90 (moves immediately)
->>> scan psi 0 90 1 (scans, moving immediately)
->>> pos mu 0 (does not move immediately) (could work by listening to target positions, and triggering move when complete)
->>> pos c(mu) moves
->>> pos mu_c moves
-
-Only one thing would be varyable at a time unless they are put in a CoordinatedMotionGroup,
-which would be hard for the real motors)
-
-
diff --git a/script/__Lib/diffcalc-2.1/doc/tmp/extensions_to_yous_paper.wxm b/script/__Lib/diffcalc-2.1/doc/tmp/extensions_to_yous_paper.wxm
deleted file mode 100755
index 1e866bf..0000000
--- a/script/__Lib/diffcalc-2.1/doc/tmp/extensions_to_yous_paper.wxm
+++ /dev/null
@@ -1,525 +0,0 @@
-/* [wxMaxima batch file version 1] [ DO NOT EDIT BY HAND! ]*/
-/* [ Created with wxMaxima version 11.08.0 ] */
-
-/* [wxMaxima: input start ] */
-Rx:matrix([1,0,0],[0, cos(theta), -sin(theta)],[0, sin(theta), cos(theta)])$
-Ry:matrix([cos(theta), 0, sin(theta)], [0, 1, 0], [-sin(theta), 0, cos(theta)])$
-Rz:matrix([cos(theta), -sin(theta), 0], [sin(theta), cos(theta), 0], [0, 0, 1])$
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: comment start ]
-Equation 5:
- [wxMaxima: comment end ] */
-
-/* [wxMaxima: input start ] */
-PHI:subst(-phi, theta, Rz);
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-CHI:subst(chi, theta, Ry);
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-ETA:subst(-eta, theta, Rz);
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-MU:subst(mu, theta, Rx);
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: comment start ]
-Generic V:
- [wxMaxima: comment end ] */
-
-/* [wxMaxima: input start ] */
-V:matrix([v11, v12, v13], [v21, v22, v23], [v31, v32, v33]);
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: comment start ]
-
- [wxMaxima: comment end ] */
-
-/* [wxMaxima: section start ]
-When one sample-orienting angle is given
- [wxMaxima: section end ] */
-
-/* [wxMaxima: subsect start ]
-For mu fixed
- [wxMaxima: subsect end ] */
-
-/* [wxMaxima: input start ] */
-eq34:ETA.CHI.PHI;
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-eq34_chi0:subst(0, chi, eq34);
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: comment start ]
-*phi* with chi <> 0
- [wxMaxima: comment end ] */
-
-/* [wxMaxima: input start ] */
-trigreduce(trigsimp((eq34[3,2]=V[3,2])/(eq34[3,1]=V[3,1])));
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: comment start ]
-show that with phi with v31 == 0 and v12 <> 0, no special case is needed when using atan2
- [wxMaxima: comment end ] */
-
-/* [wxMaxima: input start ] */
-solve(cos(phi)=0, phi);
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-atan2(1234,0);
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: comment start ]
-show that with phi with v32 == 0 and v31 <> 0, no special case is needed when using atan2
- [wxMaxima: comment end ] */
-
-/* [wxMaxima: input start ] */
-solve(sin(phi)=0, phi);
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-atan2(0,1234);
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: comment start ]
-*eta* with chi <> 0
- [wxMaxima: comment end ] */
-
-/* [wxMaxima: input start ] */
-trigreduce(trigsimp((-eq34[2,3]=V[2,3]) / (eq34[1, 3]=V[1,3])));
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: comment start ]
-eta with v23 == 0 and v13 == 0 (phi||eta degeneracy because chi == 0)
-Then see equation for phi+eta above
- [wxMaxima: comment end ] */
-
-/* [wxMaxima: comment start ]
-*chi*
- [wxMaxima: comment end ] */
-
-/* [wxMaxima: input start ] */
-trigsimp(sqrt((eq34[3,1]=V[3,1])^2+(eq34[3,2]=V[3,2])^2)/(eq34[3,3]=V[3,3]));
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: comment start ]
-*phi + eta* with chi == 0
- [wxMaxima: comment end ] */
-
-/* [wxMaxima: input start ] */
-trigreduce(trigrat((eq34_chi0[1,2]=V[1,2])/(eq1:eq34_chi0[1,1]=V[1,1])));
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: subsect start ]
-For phi fixed
- [wxMaxima: subsect end ] */
-
-/* [wxMaxima: input start ] */
-eq36:MU.ETA.CHI;
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-eq36_eta90:subst(%pi/2, eta, eq36);
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: comment start ]
-*eta*
- [wxMaxima: comment end ] */
-
-/* [wxMaxima: input start ] */
-trigsimp((eq36[1,2]=V[1,2])/sqrt((eq36[2,2]=V[2,2])^2+(eq36[3,2]=V[3,2])^2));
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: comment start ]
-*mu* with eta <> +-90
- [wxMaxima: comment end ] */
-
-/* [wxMaxima: input start ] */
-trigreduce(trigsimp((eq36[3,2]=V[3,2])/(eq36[2,2]=V[2,2])));
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: comment start ]
-*chi* with eta <> +-90
- [wxMaxima: comment end ] */
-
-/* [wxMaxima: input start ] */
-trigreduce(trigsimp((eq36[1,3]=V[1,3])/(eq36[1,1]=V[1,1])));
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: comment start ]
-*chi + mu* with eta == +-90
- [wxMaxima: comment end ] */
-
-/* [wxMaxima: input start ] */
-trigreduce(trigrat((eq36_eta90[2,3]=V[2,3])/(eq36_eta90[2,1]=V[2,1])));
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: subsect start ]
-For eta or chi fixed
- [wxMaxima: subsect end ] */
-
-/* [wxMaxima: input start ] */
-eq38:MU.ETA.CHI.PHI;
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: comment start ]
-*chi* (eq. 39) given eta, and eta <> +-90 (with eta == +-90 chi||mu)
- [wxMaxima: comment end ] */
-
-/* [wxMaxima: input start ] */
-(eq38[1,3]=V[1,3])/cos(eta);
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: comment start ]
-
- [wxMaxima: comment end ] */
-
-/* [wxMaxima: comment start ]
-*eta* given chi, and chi <> 0 (with chi == 0 phi||eta)
- [wxMaxima: comment end ] */
-
-/* [wxMaxima: input start ] */
-(eq38[1,3]=V[1,3])/sin(chi);
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: comment start ]
-*mu* given that chi and eta have been given or calclulated respecitively
- [wxMaxima: comment end ] */
-
-/* [wxMaxima: input start ] */
-top:(eq38[3,3]=V[3,3])*sin(eta)*sin(chi) + (eq38[2,3]=V[2,3])*cos(chi);
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-bot:-(eq38[3,3]=V[3,3])*cos(chi)+(eq38[2,3]=V[2,3])*sin(eta)*sin(chi);
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-factor(top);
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-factor(bot);
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-trigsimp(top/bot);
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: comment start ]
-*phi - mu* when phi || mu because chi == +-90, eta == 0 or eta == 180
- [wxMaxima: comment end ] */
-
-/* [wxMaxima: input start ] */
-phi_mu_parallel:subst(0, eta, subst(%pi/2, chi, eq38));
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-trigreduce(trigrat((phi_mu_parallel[2,1]=V[2,1])/(phi_mu_parallel[2,2]=V[2,2])));
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: section start ]
-Two sample angles given
- [wxMaxima: section end ] */
-
-/* [wxMaxima: input start ] */
-THETA:subst(-theta, theta, Rz);
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-PSI:subst(psi, theta, Rx);
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-F:subst(xi, theta, Ry);
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: section start ]
-psi, mu, eta given
- [wxMaxima: section end ] */
-
-/* [wxMaxima: input start ] */
-eq49:transpose(PHI).transpose(CHI).transpose(ETA).transpose(MU).F;
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: comment start ]
-*chi*
- [wxMaxima: comment end ] */
-
-/* [wxMaxima: comment start ]
-using the linear combination identity
- [wxMaxima: comment end ] */
-
-/* [wxMaxima: input start ] */
-comb_idenity:sqrt(A^2+B^2)*sin(x+omega);
-omega:atan(B/A);
-A*sin(x)+B*cos(x)=comb_idenity;
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-a:-sin(eta)*cos(mu)$
-b:-sin(mu)$
-V32=a*sin(chi)+b*cos(chi);
-V32=subst(b, B, subst(a, A, comb_idenity));
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-asin(%/(sqrt(sin(mu)^2+sin(eta)^2*cos(mu)^2))), triginverses=all;
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: comment start ]
-*xi and phi*
-
- [wxMaxima: comment end ] */
-
-/* [wxMaxima: input start ] */
-top:factor(eq49[3,1]*cos(xi)+eq49[3,3]*sin(xi));
-bot:factor(eq49[3,1]*sin(xi)-eq49[3,3]*cos(xi));
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-factor(top/bot);
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: comment start ]
-When mu=-90 and eta = 0, used to for a surface normal vertical mode
- [wxMaxima: comment end ] */
-
-/* [wxMaxima: input start ] */
-eq49_vert:subst(-%pi/2, mu, subst(0, eta, eq49));
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-(eq49_vert[2,2]=V[2,2]) / (eq49_vert[1,2]=V[1,2]);
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: subsect start ]
-mu, phi, qaz (for three circle on i10 and i06, not in paper )
- [wxMaxima: subsect end ] */
-
-/* [wxMaxima: input start ] */
-thisV:transpose(MU).F.THETA;
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-Nphi:matrix([n11, n12, n13], [n21, n22, n23], [n31, n32, n33]);
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-eq:ETA.CHI.PHI.Nphi.transpose(PSI);
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: comment start ]
-*chi*
- [wxMaxima: comment end ] */
-
-/* [wxMaxima: comment start ]
-using the linear combination identity
- [wxMaxima: comment end ] */
-
-/* [wxMaxima: input start ] */
-comb_idenity:sqrt(A^2+B^2)*sin(x+omega);
-omega:atan(B/A);
-A*sin(x)+B*cos(x)=comb_idenity;
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: comment start ]
-on V31:
- [wxMaxima: comment end ] */
-
-/* [wxMaxima: input start ] */
-a:-1*(n21*sin(phi)+n11*cos(phi))$
-b:n31$
-V31=a*sin(chi)+b*cos(chi);
-V31=subst(b, B, subst(a, A, comb_idenity));
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-asin(%/sqrt((-n21*sin(phi)-n11*cos(phi))^2+n31^2)), triginverses=all;
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: comment start ]
-*xi and phi*
- [wxMaxima: comment end ] */
-
-/* [wxMaxima: input start ] */
-top:factor(eq49[3,1]*cos(xi)+eq49[3,3]*sin(xi));
-bot:factor(eq49[3,1]*sin(xi)-eq49[3,3]*cos(xi));
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-factor(top/bot);
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-solve();
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: section start ]
-Fixed mu, chi, psi (probably with mu=chi=0) (not in paper)
- [wxMaxima: section end ] */
-
-/* [wxMaxima: input start ] */
-Vcalulated:Nphi.transpose(PSI).transpose(THETA);
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-thisV:transpose(PHI).transpose(CHI).transpose(ETA).transpose(MU).F;
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-v:thisVvert:subst(0, chi, subst(0, mu, thisV));
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-acos(thisVvert[3,3]=V[3,3]), triginverses=all;
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-top:(v[1,2]=V[1,2])*cos(phi) + (v[2,2]=V[2,2])*sin(phi);
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-bot:(v[1,2]=V[1,2])*sin(phi) - (v[2,2]=V[2,2])*cos(phi);
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-factor(top);
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-factor(bot);
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-trigsimp(top/bot);
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: title start ]
-5.5 subset with eta=chi=0 & phi set
- [wxMaxima: title end ] */
-
-/* [wxMaxima: input start ] */
-matrix([cos(theta)*sin(qaz)], [-sin(theta)], [cos(theta)*cos(qaz)]);
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-h_phi:matrix([h1], [h2], [h3]);
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-Z:MU.ETA.CHI.PHI;
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-eq68yterm:-sin(theta) = ((Z.h_phi))[2][1];
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-expands(%);
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-eq68_chi_eta_0:subst(0, chi, subst(0, eta, Z.h_phi));
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-eq68_chi_eta_0_yterm:-sin(theta)=eq68_chi_eta_0[2];
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-subst(0, chi, subst(0, eta, eq68yterm));
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-a;
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-ratsubst(a, -h3, eq68_chi_eta_0_yterm);
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-a:-h3;
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-b:-h1*sin(phi) +h2*cos(phi);
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-c:-sin(theta);
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-ratsubst(cc, c, ratsubst(bb, b, ratsubst(aa, a, eq68_chi_eta_0_yterm)));
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-arcsin(c/sqrt(a^2+b^2)) - arctan(b, a);
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-eq68_chi_eta_0[1] /eq68_chi_eta_0[2];
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: comment start ]
-without chi=eta=0
- [wxMaxima: comment end ] */
-
-/* [wxMaxima: input start ] */
-eq68yterm:-sin(theta) = ((Z.h_phi))[2][1];
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-expand(eq68yterm);
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: comment start ]
-solve for mu unknown
- [wxMaxima: comment end ] */
-
-/* [wxMaxima: input start ] */
-c:-sin(theta);
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-a:sin(chi)*h2*sin(phi) + sin(chi)*h1*cos(phi) - cos(chi)*h3;
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-b: -cos(chi)*sin(eta)*h2*sin(phi) -cos(eta)*h1*sin(phi) +cos(eta)*h2*cos(phi) -cos(chi)*sin(eta)*h1*cos(phi) - sin(chi)*sin(eta)*h3;
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-expand(subst(a, aa, subst(b, bb, -sin(theta)=aa*sin(mu) + bb*cos(mu))));
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: comment start ]
-Check a and b expand to produce original (Okay)
- [wxMaxima: comment end ] */
-
-/* [wxMaxima: input start ] */
-expand(eq68yterm);
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: comment start ]
-Check against special case above (Okay)
- [wxMaxima: comment end ] */
-
-/* [wxMaxima: input start ] */
-subst(0, chi, subst(0, eta, a));
-/* [wxMaxima: input end ] */
-
-/* [wxMaxima: input start ] */
-subst(0, chi, subst(0, eta, b));
-/* [wxMaxima: input end ] */
-
-/* Maxima can't load/batch files which end with a comment! */
-"Created with wxMaxima"$
diff --git a/script/__Lib/diffcalc-2.1/doc/tmp/i16_non_diffcalc_manual.txt b/script/__Lib/diffcalc-2.1/doc/tmp/i16_non_diffcalc_manual.txt
deleted file mode 100755
index 16aa9d6..0000000
--- a/script/__Lib/diffcalc-2.1/doc/tmp/i16_non_diffcalc_manual.txt
+++ /dev/null
@@ -1,71 +0,0 @@
-Creating a UB Matrix
-There are three euler modes:
-
-=bisecting: eta and delta are fixed, phi and chi are not fixed.
-=fixed phi: phi and 2theta are fixed, eta and chi are not fixed.
-=fixed psi: Not used for creating a UB matrix .
-First creat a reflection file to store the reflections data using:
-
-reffile('name')
-
-Set the crystal lattice:
-
-latt([a]) assumes cubic
-latt([a,b]) assumes tetragonal
-latt([a,b,c]) assumes orthorhombic
-latt([a,b,c,gam]) assumes monclinic/hexagonal gam different from 90.
-latt([a,b,c,alp,bet,gam])
-
-Use:
-
-c2th([h k l])
-
-to calculate the 2 theta position for the hkl for example:
-
-c2th([0 0 2])
-
-Then use the following to move the diffractometer to the correct positions:
-
-pos delta c2th([0 0 2]) eta c2th([0 0 2])/2
-
-You can now scan eta, chi, and delta to optomise the peak intensity using the following scans for example:
-
-scancn eta 0.01 40 w 0.2 t 1
-
-scancn chi 0.01 40 w 0.2 t 1
-
-scancn delta 0.01 40 w 0.2 t 1
-
-A few iterations may be required.
-
-Now that you have the first reflection it can be stored using the following command:
-
-saveref('reflable',[h k l])
-
-saveref('Ti1',[0 0 2]) for the above example.
-
-Then create a dummy UB matrix using a dummy non-parallel hkl plane eg:
-
-ubm('Ti1',[2 0 0])
-
-Useing the following command to calculate the direction of the second reflection:
-
-hkl_calc([0 2 2])
-
-If the calculated positions can be safely achieved then type:
-
-pos hkl [0 2 2]
-
-Find the second reflection by scanning phi, once the reflection is found save the second reflection using:
-
-saveref('Ti2',[0 2 2]) for example.
-
-Now create a real UB-Matrix using:
-
-ubm('Ti1','Ti2')
-
-You can now drive in recriprocal space.
-
-To change the lattice parameters according the found Bragg peaks
-
-latt([latt()[0]*2/l()]) (cubic only)
\ No newline at end of file
diff --git a/script/__Lib/diffcalc-2.1/install-jython-environment.sh b/script/__Lib/diffcalc-2.1/install-jython-environment.sh
deleted file mode 100755
index 4ac8ef1..0000000
--- a/script/__Lib/diffcalc-2.1/install-jython-environment.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env sh
-
-JYTHON_URL='http://search.maven.org/remotecontent?filepath=org/python/jython-installer/2.7.1/jython-installer-2.7.1.jar'
-JAMA_JAR_URL='http://math.nist.gov/javanumerics/jama/Jama-1.0.3.jar'
-
-# Install Jama jar
-mkdir -p lib
-wget -P $HOME/lib $JAMA_JAR_URL
-export CLASSPATH=$HOME/lib/Jama-1.0.3.jar:$CLASSPATH
-
-# Install Jython
-wget $JYTHON_URL -O jython_installer.jar
-java -jar jython_installer.jar -s -d $HOME/jython
-
-# Install nose for Jython
-# TODO: move to a setup.py
-$HOME/jython/bin/pip install nose
-$HOME/jython/bin/pip install pytest==3.2.3
-$HOME/jython/bin/pip install pytest-xdist
diff --git a/script/__Lib/diffcalc-2.1/integration_checks.py b/script/__Lib/diffcalc-2.1/integration_checks.py
deleted file mode 100755
index d3fdacc..0000000
--- a/script/__Lib/diffcalc-2.1/integration_checks.py
+++ /dev/null
@@ -1,72 +0,0 @@
-'''
-Created on 9 Mar 2017
-
-@author: zrb13439
-
-'''
-
-'''
-Integration tests for startup scripts (named so that nosetests will *not* pick
-up by default.
-
-This is because these must be run with:
-
- $ nosetests --with-process-isolation integration_checks.py
-
-This is not a standard nose option. Install it with:
-
- $ pip install nosepipe
-
-nosepipe is described at https://github.com/dmccombs/nosepipe/
-'''
-
-from nose import SkipTest
-
-
-def test_sixcircle_startup():
- import startup.sixcircle
- startup.sixcircle.ct.pause = False
- startup.sixcircle.demo.all()
-
-
-def test_fivecircle_startup():
- import startup.fivecircle
- startup.fivecircle.ct.pause = False
- startup.fivecircle.demo.all()
-
-
-def test_fourcircle_startup():
- import startup.fourcircle
- startup.fourcircle.ct.pause = False
- startup.fourcircle.demo.all()
-
-
-def test_i13_startup():
- raise SkipTest('Still need to work out to use i13s very tight limits')
- import startup.i13
- startup.i13.ct.pause = False
- startup.i13.demo.all()
-
-
-def test_i16_startup():
- import startup.i16
- startup.i16.ct.pause = False
- startup.i16.demo.all()
-
-
-def test_i21_startup_standard():
- import startup.i21
- startup.i21.ct.pause = False
- startup.i21.demo.all()
-
-
-def test_i21_startup_bespoke():
- import startup.i21
- startup.i21.ct.pause = False
- startup.i21.demo.i21()
-
-
-def test_sixcirle_api():
- import startup.api.sixcircle
- startup.api.sixcircle.demo_all()
-
diff --git a/script/__Lib/diffcalc-2.1/mock.py b/script/__Lib/diffcalc-2.1/mock.py
deleted file mode 100755
index 24799cf..0000000
--- a/script/__Lib/diffcalc-2.1/mock.py
+++ /dev/null
@@ -1,2288 +0,0 @@
-# mock.py
-# Test tools for mocking and patching.
-# Copyright (C) 2007-2012 Michael Foord & the mock team
-# E-mail: fuzzyman AT voidspace DOT org DOT uk
-
-# mock 0.8.0
-# http://www.voidspace.org.uk/python/mock/
-
-# Released subject to the BSD License
-# Please see http://www.voidspace.org.uk/python/license.shtml
-
-# Scripts maintained at http://www.voidspace.org.uk/python/index.shtml
-# Comments, suggestions and bug reports welcome.
-
-
-__all__ = (
- 'Mock',
- 'MagicMock',
- 'mocksignature',
- 'patch',
- 'sentinel',
- 'DEFAULT',
- 'ANY',
- 'call',
- 'create_autospec',
- 'FILTER_DIR',
- 'NonCallableMock',
- 'NonCallableMagicMock',
-)
-
-
-__version__ = '0.8.0'
-
-
-import pprint
-import sys
-
-try:
- import inspect
-except ImportError:
- # for alternative platforms that
- # may not have inspect
- inspect = None
-
-try:
- from functools import wraps
-except ImportError:
- # Python 2.4 compatibility
- def wraps(original):
- def inner(f):
- f.__name__ = original.__name__
- f.__doc__ = original.__doc__
- f.__module__ = original.__module__
- return f
- return inner
-
-try:
- unicode
-except NameError:
- # Python 3
- basestring = unicode = str
-
-try:
- long
-except NameError:
- # Python 3
- long = int
-
-try:
- BaseException
-except NameError:
- # Python 2.4 compatibility
- BaseException = Exception
-
-try:
- next
-except NameError:
- def next(obj):
- return obj.next()
-
-
-BaseExceptions = (BaseException,)
-if 'java' in sys.platform:
- # jython
- import java
- BaseExceptions = (BaseException, java.lang.Throwable)
-
-try:
- _isidentifier = str.isidentifier
-except AttributeError:
- # Python 2.X
- import keyword
- import re
- regex = re.compile(r'^[a-z_][a-z0-9_]*$', re.I)
- def _isidentifier(string):
- if string in keyword.kwlist:
- return False
- return regex.match(string)
-
-
-inPy3k = sys.version_info[0] == 3
-
-# Needed to work around Python 3 bug where use of "super" interferes with
-# defining __class__ as a descriptor
-_super = super
-
-self = 'im_self'
-builtin = '__builtin__'
-if inPy3k:
- self = '__self__'
- builtin = 'builtins'
-
-FILTER_DIR = True
-
-
-def _is_instance_mock(obj):
- # can't use isinstance on Mock objects because they override __class__
- # The base class for all mocks is NonCallableMock
- return issubclass(type(obj), NonCallableMock)
-
-
-def _is_exception(obj):
- return (
- isinstance(obj, BaseExceptions) or
- isinstance(obj, ClassTypes) and issubclass(obj, BaseExceptions)
- )
-
-
-class _slotted(object):
- __slots__ = ['a']
-
-
-DescriptorTypes = (
- type(_slotted.a),
- property,
-)
-
-
-# getsignature and mocksignature heavily "inspired" by
-# the decorator module: http://pypi.python.org/pypi/decorator/
-# by Michele Simionato
-
-def _getsignature(func, skipfirst):
- if inspect is None:
- raise ImportError('inspect module not available')
-
- if inspect.isclass(func):
- func = func.__init__
- # will have a self arg
- skipfirst = True
- elif not (inspect.ismethod(func) or inspect.isfunction(func)):
- func = func.__call__
-
- regargs, varargs, varkwargs, defaults = inspect.getargspec(func)
-
- # instance methods need to lose the self argument
- if getattr(func, self, None) is not None:
- regargs = regargs[1:]
-
- _msg = ("_mock_ is a reserved argument name, can't mock signatures using "
- "_mock_")
- assert '_mock_' not in regargs, _msg
- if varargs is not None:
- assert '_mock_' not in varargs, _msg
- if varkwargs is not None:
- assert '_mock_' not in varkwargs, _msg
- if skipfirst:
- regargs = regargs[1:]
-
- signature = inspect.formatargspec(regargs, varargs, varkwargs, defaults,
- formatvalue=lambda value: "")
- return signature[1:-1], func
-
-
-def _getsignature2(func, skipfirst, instance=False):
- if inspect is None:
- raise ImportError('inspect module not available')
-
- if isinstance(func, ClassTypes) and not instance:
- try:
- func = func.__init__
- except AttributeError:
- return
- skipfirst = True
- elif not isinstance(func, FunctionTypes):
- # for classes where instance is True we end up here too
- try:
- func = func.__call__
- except AttributeError:
- return
-
- try:
- regargs, varargs, varkwargs, defaults = inspect.getargspec(func)
- except TypeError:
- # C function / method, possibly inherited object().__init__
- return
-
- # instance methods and classmethods need to lose the self argument
- if getattr(func, self, None) is not None:
- regargs = regargs[1:]
- if skipfirst:
- # this condition and the above one are never both True - why?
- regargs = regargs[1:]
-
- signature = inspect.formatargspec(regargs, varargs, varkwargs, defaults,
- formatvalue=lambda value: "")
- return signature[1:-1], func
-
-
-def _check_signature(func, mock, skipfirst, instance=False):
- if not _callable(func):
- return
-
- result = _getsignature2(func, skipfirst, instance)
- if result is None:
- return
- signature, func = result
-
- # can't use self because "self" is common as an argument name
- # unfortunately even not in the first place
- src = "lambda _mock_self, %s: None" % signature
- checksig = eval(src, {})
- _copy_func_details(func, checksig)
- type(mock)._mock_check_sig = checksig
-
-
-def _copy_func_details(func, funcopy):
- funcopy.__name__ = func.__name__
- funcopy.__doc__ = func.__doc__
- #funcopy.__dict__.update(func.__dict__)
- funcopy.__module__ = func.__module__
- if not inPy3k:
- funcopy.func_defaults = func.func_defaults
- return
- funcopy.__defaults__ = func.__defaults__
- funcopy.__kwdefaults__ = func.__kwdefaults__
-
-
-def _callable(obj):
- if isinstance(obj, ClassTypes):
- return True
- if getattr(obj, '__call__', None) is not None:
- return True
- return False
-
-
-def _is_list(obj):
- # checks for list or tuples
- # XXXX badly named!
- return type(obj) in (list, tuple)
-
-
-def _instance_callable(obj):
- """Given an object, return True if the object is callable.
- For classes, return True if instances would be callable."""
- if not isinstance(obj, ClassTypes):
- # already an instance
- return getattr(obj, '__call__', None) is not None
-
- klass = obj
- # uses __bases__ instead of __mro__ so that we work with old style classes
- if klass.__dict__.get('__call__') is not None:
- return True
-
- for base in klass.__bases__:
- if _instance_callable(base):
- return True
- return False
-
-
-def _set_signature(mock, original, instance=False):
- # creates a function with signature (*args, **kwargs) that delegates to a
- # mock. It still does signature checking by calling a lambda with the same
- # signature as the original. This is effectively mocksignature2.
- if not _callable(original):
- return
-
- skipfirst = isinstance(original, ClassTypes)
- result = _getsignature2(original, skipfirst, instance)
- if result is None:
- # was a C function (e.g. object().__init__ ) that can't be mocked
- return
-
- signature, func = result
-
- src = "lambda %s: None" % signature
- context = {'_mock_': mock}
- checksig = eval(src, context)
- _copy_func_details(func, checksig)
-
- name = original.__name__
- if not _isidentifier(name):
- name = 'funcopy'
- context = {'checksig': checksig, 'mock': mock}
- src = """def %s(*args, **kwargs):
- checksig(*args, **kwargs)
- return mock(*args, **kwargs)""" % name
- exec (src, context)
- funcopy = context[name]
- _setup_func(funcopy, mock)
- return funcopy
-
-
-def mocksignature(func, mock=None, skipfirst=False):
- """
- mocksignature(func, mock=None, skipfirst=False)
-
- Create a new function with the same signature as `func` that delegates
- to `mock`. If `skipfirst` is True the first argument is skipped, useful
- for methods where `self` needs to be omitted from the new function.
-
- If you don't pass in a `mock` then one will be created for you.
-
- The mock is set as the `mock` attribute of the returned function for easy
- access.
-
- Functions returned by `mocksignature` have many of the same attributes
- and assert methods as a mock object.
-
- `mocksignature` can also be used with classes. It copies the signature of
- the `__init__` method.
-
- When used with callable objects (instances) it copies the signature of the
- `__call__` method.
- """
- if mock is None:
- mock = Mock()
- signature, func = _getsignature(func, skipfirst)
- src = "lambda %(signature)s: _mock_(%(signature)s)" % {
- 'signature': signature
- }
-
- funcopy = eval(src, dict(_mock_=mock))
- _copy_func_details(func, funcopy)
- _setup_func(funcopy, mock)
- return funcopy
-
-
-def _setup_func(funcopy, mock):
- funcopy.mock = mock
-
- # can't use isinstance with mocks
- if not _is_instance_mock(mock):
- return
-
- def assert_called_with(*args, **kwargs):
- return mock.assert_called_with(*args, **kwargs)
- def assert_called_once_with(*args, **kwargs):
- return mock.assert_called_once_with(*args, **kwargs)
- def assert_has_calls(*args, **kwargs):
- return mock.assert_has_calls(*args, **kwargs)
- def assert_any_call(*args, **kwargs):
- return mock.assert_any_call(*args, **kwargs)
- def reset_mock():
- funcopy.method_calls = _CallList()
- funcopy.mock_calls = _CallList()
- mock.reset_mock()
- ret = funcopy.return_value
- if _is_instance_mock(ret) and not ret is mock:
- ret.reset_mock()
-
- funcopy.called = False
- funcopy.call_count = 0
- funcopy.call_args = None
- funcopy.call_args_list = _CallList()
- funcopy.method_calls = _CallList()
- funcopy.mock_calls = _CallList()
-
- funcopy.return_value = mock.return_value
- funcopy.side_effect = mock.side_effect
- funcopy._mock_children = mock._mock_children
-
- funcopy.assert_called_with = assert_called_with
- funcopy.assert_called_once_with = assert_called_once_with
- funcopy.assert_has_calls = assert_has_calls
- funcopy.assert_any_call = assert_any_call
- funcopy.reset_mock = reset_mock
-
- mock._mock_signature = funcopy
-
-
-def _is_magic(name):
- return '__%s__' % name[2:-2] == name
-
-
-class _SentinelObject(object):
- "A unique, named, sentinel object."
- def __init__(self, name):
- self.name = name
-
- def __repr__(self):
- return 'sentinel.%s' % self.name
-
-
-class _Sentinel(object):
- """Access attributes to return a named object, usable as a sentinel."""
- def __init__(self):
- self._sentinels = {}
-
- def __getattr__(self, name):
- if name == '__bases__':
- # Without this help(mock) raises an exception
- raise AttributeError
- return self._sentinels.setdefault(name, _SentinelObject(name))
-
-
-sentinel = _Sentinel()
-
-DEFAULT = sentinel.DEFAULT
-
-
-class OldStyleClass:
- pass
-ClassType = type(OldStyleClass)
-
-
-def _copy(value):
- if type(value) in (dict, list, tuple, set):
- return type(value)(value)
- return value
-
-
-ClassTypes = (type,)
-if not inPy3k:
- ClassTypes = (type, ClassType)
-
-_allowed_names = set(
- [
- 'return_value', '_mock_return_value', 'side_effect',
- '_mock_side_effect', '_mock_parent', '_mock_new_parent',
- '_mock_name', '_mock_new_name'
- ]
-)
-
-
-def _mock_signature_property(name):
- _allowed_names.add(name)
- _the_name = '_mock_' + name
- def _get(self, name=name, _the_name=_the_name):
- sig = self._mock_signature
- if sig is None:
- return getattr(self, _the_name)
- return getattr(sig, name)
- def _set(self, value, name=name, _the_name=_the_name):
- sig = self._mock_signature
- if sig is None:
- self.__dict__[_the_name] = value
- else:
- setattr(sig, name, value)
-
- return property(_get, _set)
-
-
-
-class _CallList(list):
-
- def __contains__(self, value):
- if not isinstance(value, list):
- return list.__contains__(self, value)
- len_value = len(value)
- len_self = len(self)
- if len_value > len_self:
- return False
-
- for i in range(0, len_self - len_value + 1):
- sub_list = self[i:i+len_value]
- if sub_list == value:
- return True
- return False
-
- def __repr__(self):
- return pprint.pformat(list(self))
-
-
-def _check_and_set_parent(parent, value, name, new_name):
- if not _is_instance_mock(value):
- return False
- if ((value._mock_name or value._mock_new_name) or
- (value._mock_parent is not None) or
- (value._mock_new_parent is not None)):
- return False
-
- _parent = parent
- while _parent is not None:
- # setting a mock (value) as a child or return value of itself
- # should not modify the mock
- if _parent is value:
- return False
- _parent = _parent._mock_new_parent
-
- if new_name:
- value._mock_new_parent = parent
- value._mock_new_name = new_name
- if name:
- value._mock_parent = parent
- value._mock_name = name
- return True
-
-
-
-class Base(object):
- _mock_return_value = DEFAULT
- _mock_side_effect = None
- def __init__(self, *args, **kwargs):
- pass
-
-
-
-class NonCallableMock(Base):
- """A non-callable version of `Mock`"""
-
- def __new__(cls, *args, **kw):
- # every instance has its own class
- # so we can create magic methods on the
- # class without stomping on other mocks
- new = type(cls.__name__, (cls,), {'__doc__': cls.__doc__})
- instance = object.__new__(new)
- return instance
-
-
- def __init__(
- self, spec=None, wraps=None, name=None, spec_set=None,
- parent=None, _spec_state=None, _new_name='', _new_parent=None,
- **kwargs
- ):
- if _new_parent is None:
- _new_parent = parent
-
- __dict__ = self.__dict__
- __dict__['_mock_parent'] = parent
- __dict__['_mock_name'] = name
- __dict__['_mock_new_name'] = _new_name
- __dict__['_mock_new_parent'] = _new_parent
-
- if spec_set is not None:
- spec = spec_set
- spec_set = True
-
- self._mock_add_spec(spec, spec_set)
-
- __dict__['_mock_children'] = {}
- __dict__['_mock_wraps'] = wraps
- __dict__['_mock_signature'] = None
-
- __dict__['_mock_called'] = False
- __dict__['_mock_call_args'] = None
- __dict__['_mock_call_count'] = 0
- __dict__['_mock_call_args_list'] = _CallList()
- __dict__['_mock_mock_calls'] = _CallList()
-
- __dict__['method_calls'] = _CallList()
-
- if kwargs:
- self.configure_mock(**kwargs)
-
- _super(NonCallableMock, self).__init__(
- spec, wraps, name, spec_set, parent,
- _spec_state
- )
-
-
- def attach_mock(self, mock, attribute):
- """
- Attach a mock as an attribute of this one, replacing its name and
- parent. Calls to the attached mock will be recorded in the
- `method_calls` and `mock_calls` attributes of this one."""
- mock._mock_parent = None
- mock._mock_new_parent = None
- mock._mock_name = ''
- mock._mock_new_name = None
-
- setattr(self, attribute, mock)
-
-
- def mock_add_spec(self, spec, spec_set=False):
- """Add a spec to a mock. `spec` can either be an object or a
- list of strings. Only attributes on the `spec` can be fetched as
- attributes from the mock.
-
- If `spec_set` is True then only attributes on the spec can be set."""
- self._mock_add_spec(spec, spec_set)
-
-
- def _mock_add_spec(self, spec, spec_set):
- _spec_class = None
-
- if spec is not None and not _is_list(spec):
- if isinstance(spec, ClassTypes):
- _spec_class = spec
- else:
- _spec_class = _get_class(spec)
-
- spec = dir(spec)
-
- __dict__ = self.__dict__
- __dict__['_spec_class'] = _spec_class
- __dict__['_spec_set'] = spec_set
- __dict__['_mock_methods'] = spec
-
-
- def __get_return_value(self):
- ret = self._mock_return_value
- if self._mock_signature is not None:
- ret = self._mock_signature.return_value
-
- if ret is DEFAULT:
- ret = self._get_child_mock(
- _new_parent=self, _new_name='()'
- )
- self.return_value = ret
- return ret
-
-
- def __set_return_value(self, value):
- if self._mock_signature is not None:
- self._mock_signature.return_value = value
- else:
- self._mock_return_value = value
- _check_and_set_parent(self, value, None, '()')
-
- __return_value_doc = "The value to be returned when the mock is called."
- return_value = property(__get_return_value, __set_return_value,
- __return_value_doc)
-
-
- @property
- def __class__(self):
- if self._spec_class is None:
- return type(self)
- return self._spec_class
-
- called = _mock_signature_property('called')
- call_count = _mock_signature_property('call_count')
- call_args = _mock_signature_property('call_args')
- call_args_list = _mock_signature_property('call_args_list')
- mock_calls = _mock_signature_property('mock_calls')
-
-
- def __get_side_effect(self):
- sig = self._mock_signature
- if sig is None:
- return self._mock_side_effect
- return sig.side_effect
-
- def __set_side_effect(self, value):
- value = _try_iter(value)
- sig = self._mock_signature
- if sig is None:
- self._mock_side_effect = value
- else:
- sig.side_effect = value
-
- side_effect = property(__get_side_effect, __set_side_effect)
-
-
- def reset_mock(self):
- "Restore the mock object to its initial state."
- self.called = False
- self.call_args = None
- self.call_count = 0
- self.mock_calls = _CallList()
- self.call_args_list = _CallList()
- self.method_calls = _CallList()
-
- for child in self._mock_children.values():
- child.reset_mock()
-
- ret = self._mock_return_value
- if _is_instance_mock(ret) and ret is not self:
- ret.reset_mock()
-
-
- def configure_mock(self, **kwargs):
- """Set attributes on the mock through keyword arguments.
-
- Attributes plus return values and side effects can be set on child
- mocks using standard dot notation and unpacking a dictionary in the
- method call:
-
- >>> attrs = {'method.return_value': 3, 'other.side_effect': KeyError}
- >>> mock.configure_mock(**attrs)"""
- for arg, val in sorted(kwargs.items(),
- # we sort on the number of dots so that
- # attributes are set before we set attributes on
- # attributes
- key=lambda entry: entry[0].count('.')):
- args = arg.split('.')
- final = args.pop()
- obj = self
- for entry in args:
- obj = getattr(obj, entry)
- setattr(obj, final, val)
-
-
- def __getattr__(self, name):
- if name == '_mock_methods':
- raise AttributeError(name)
- elif self._mock_methods is not None:
- if name not in self._mock_methods or name in _all_magics:
- raise AttributeError("Mock object has no attribute %r" % name)
- elif _is_magic(name):
- raise AttributeError(name)
-
- result = self._mock_children.get(name)
- if result is None:
- wraps = None
- if self._mock_wraps is not None:
- # XXXX should we get the attribute without triggering code
- # execution?
- wraps = getattr(self._mock_wraps, name)
-
- result = self._get_child_mock(
- parent=self, name=name, wraps=wraps, _new_name=name,
- _new_parent=self
- )
- self._mock_children[name] = result
-
- elif isinstance(result, _SpecState):
- result = create_autospec(
- result.spec, result.spec_set, result.instance,
- result.parent, result.name
- )
- self._mock_children[name] = result
-
- return result
-
-
- def __repr__(self):
- _name_list = [self._mock_new_name]
- _parent = self._mock_new_parent
- last = self
-
- dot = '.'
- if _name_list == ['()']:
- dot = ''
- seen = set()
- while _parent is not None:
- last = _parent
-
- _name_list.append(_parent._mock_new_name + dot)
- dot = '.'
- if _parent._mock_new_name == '()':
- dot = ''
-
- _parent = _parent._mock_new_parent
-
- # use ids here so as not to call __hash__ on the mocks
- if id(_parent) in seen:
- break
- seen.add(id(_parent))
-
- _name_list = list(reversed(_name_list))
- _first = last._mock_name or 'mock'
- if len(_name_list) > 1:
- if _name_list[1] not in ('()', '().'):
- _first += '.'
- _name_list[0] = _first
- name = ''.join(_name_list)
-
- name_string = ''
- if name not in ('mock', 'mock.'):
- name_string = ' name=%r' % name
-
- spec_string = ''
- if self._spec_class is not None:
- spec_string = ' spec=%r'
- if self._spec_set:
- spec_string = ' spec_set=%r'
- spec_string = spec_string % self._spec_class.__name__
- return "<%s%s%s id='%s'>" % (
- type(self).__name__,
- name_string,
- spec_string,
- id(self)
- )
-
-
- def __dir__(self):
- """Filter the output of `dir(mock)` to only useful members.
- XXXX
- """
- extras = self._mock_methods or []
- from_type = dir(type(self))
- from_dict = list(self.__dict__)
-
- if FILTER_DIR:
- from_type = [e for e in from_type if not e.startswith('_')]
- from_dict = [e for e in from_dict if not e.startswith('_') or
- _is_magic(e)]
- return sorted(set(extras + from_type + from_dict +
- list(self._mock_children)))
-
-
- def __setattr__(self, name, value):
- if name in _allowed_names:
- # property setters go through here
- return object.__setattr__(self, name, value)
- elif (self._spec_set and self._mock_methods is not None and
- name not in self._mock_methods and
- name not in self.__dict__):
- raise AttributeError("Mock object has no attribute '%s'" % name)
- elif name in _unsupported_magics:
- msg = 'Attempting to set unsupported magic method %r.' % name
- raise AttributeError(msg)
- elif name in _all_magics:
- if self._mock_methods is not None and name not in self._mock_methods:
- raise AttributeError("Mock object has no attribute '%s'" % name)
-
- if not _is_instance_mock(value):
- setattr(type(self), name, _get_method(name, value))
- original = value
- real = lambda *args, **kw: original(self, *args, **kw)
- value = mocksignature(value, real, skipfirst=True)
- else:
- # only set _new_name and not name so that mock_calls is tracked
- # but not method calls
- _check_and_set_parent(self, value, None, name)
- setattr(type(self), name, value)
- else:
- if _check_and_set_parent(self, value, name, name):
- self._mock_children[name] = value
- return object.__setattr__(self, name, value)
-
-
- def __delattr__(self, name):
- if name in _all_magics and name in type(self).__dict__:
- delattr(type(self), name)
- if name not in self.__dict__:
- # for magic methods that are still MagicProxy objects and
- # not set on the instance itself
- return
-
- return object.__delattr__(self, name)
-
-
- def _format_mock_call_signature(self, args, kwargs):
- name = self._mock_name or 'mock'
- return _format_call_signature(name, args, kwargs)
-
-
- def _format_mock_failure_message(self, args, kwargs):
- message = 'Expected call: %s\nActual call: %s'
- expected_string = self._format_mock_call_signature(args, kwargs)
- call_args = self.call_args
- if len(call_args) == 3:
- call_args = call_args[1:]
- actual_string = self._format_mock_call_signature(*call_args)
- return message % (expected_string, actual_string)
-
-
- def assert_called_with(_mock_self, *args, **kwargs):
- """assert that the mock was called with the specified arguments.
-
- Raises an AssertionError if the args and keyword args passed in are
- different to the last call to the mock."""
- self = _mock_self
- if self.call_args is None:
- expected = self._format_mock_call_signature(args, kwargs)
- raise AssertionError('Expected call: %s\nNot called' % (expected,))
-
- if self.call_args != (args, kwargs):
- msg = self._format_mock_failure_message(args, kwargs)
- raise AssertionError(msg)
-
-
- def assert_called_once_with(_mock_self, *args, **kwargs):
- """assert that the mock was called exactly once and with the specified
- arguments."""
- self = _mock_self
- if not self.call_count == 1:
- msg = ("Expected to be called once. Called %s times." %
- self.call_count)
- raise AssertionError(msg)
- return self.assert_called_with(*args, **kwargs)
-
-
- def assert_has_calls(self, calls, any_order=False):
- """assert the mock has been called with the specified calls.
- The `mock_calls` list is checked for the calls.
-
- If `any_order` is False (the default) then the calls must be
- sequential. There can be extra calls before or after the
- specified calls.
-
- If `any_order` is True then the calls can be in any order, but
- they must all appear in `mock_calls`."""
- if not any_order:
- if calls not in self.mock_calls:
- raise AssertionError(
- 'Calls not found.\nExpected: %r\n'
- 'Actual: %r' % (calls, self.mock_calls)
- )
- return
-
- all_calls = list(self.mock_calls)
-
- not_found = []
- for kall in calls:
- try:
- all_calls.remove(kall)
- except ValueError:
- not_found.append(kall)
- if not_found:
- raise AssertionError(
- '%r not all found in call list' % (tuple(not_found),)
- )
-
-
- def assert_any_call(self, *args, **kwargs):
- """assert the mock has been called with the specified arguments.
-
- The assert passes if the mock has *ever* been called, unlike
- `assert_called_with` and `assert_called_once_with` that only pass if
- the call is the most recent one."""
- kall = call(*args, **kwargs)
- if kall not in self.call_args_list:
- expected_string = self._format_mock_call_signature(args, kwargs)
- raise AssertionError(
- '%s call not found' % expected_string
- )
-
-
- def _get_child_mock(self, **kw):
- """Create the child mocks for attributes and return value.
- By default child mocks will be the same type as the parent.
- Subclasses of Mock may want to override this to customize the way
- child mocks are made.
-
- For non-callable mocks the callable variant will be used (rather than
- any custom subclass)."""
- _type = type(self)
- if not issubclass(_type, CallableMixin):
- if issubclass(_type, NonCallableMagicMock):
- klass = MagicMock
- elif issubclass(_type, NonCallableMock) :
- klass = Mock
- else:
- klass = _type.__mro__[1]
- return klass(**kw)
-
-
-
-def _try_iter(obj):
- if obj is None:
- return obj
- if _is_exception(obj):
- return obj
- if _callable(obj):
- return obj
- try:
- return iter(obj)
- except TypeError:
- # XXXX backwards compatibility
- # but this will blow up on first call - so maybe we should fail early?
- return obj
-
-
-
-class CallableMixin(Base):
-
- def __init__(self, spec=None, side_effect=None, return_value=DEFAULT,
- wraps=None, name=None, spec_set=None, parent=None,
- _spec_state=None, _new_name='', _new_parent=None, **kwargs):
- self.__dict__['_mock_return_value'] = return_value
-
- _super(CallableMixin, self).__init__(
- spec, wraps, name, spec_set, parent,
- _spec_state, _new_name, _new_parent, **kwargs
- )
-
- self.side_effect = side_effect
-
-
- def _mock_check_sig(self, *args, **kwargs):
- # stub method that can be replaced with one with a specific signature
- pass
-
-
- def __call__(_mock_self, *args, **kwargs):
- # can't use self in-case a function / method we are mocking uses self
- # in the signature
- _mock_self._mock_check_sig(*args, **kwargs)
- return _mock_self._mock_call(*args, **kwargs)
-
-
- def _mock_call(_mock_self, *args, **kwargs):
- self = _mock_self
- self.called = True
- self.call_count += 1
- self.call_args = _Call((args, kwargs), two=True)
- self.call_args_list.append(_Call((args, kwargs), two=True))
-
- _new_name = self._mock_new_name
- _new_parent = self._mock_new_parent
- self.mock_calls.append(_Call(('', args, kwargs)))
-
- seen = set()
- skip_next_dot = _new_name == '()'
- do_method_calls = self._mock_parent is not None
- name = self._mock_name
- while _new_parent is not None:
- this_mock_call = _Call((_new_name, args, kwargs))
- if _new_parent._mock_new_name:
- dot = '.'
- if skip_next_dot:
- dot = ''
-
- skip_next_dot = False
- if _new_parent._mock_new_name == '()':
- skip_next_dot = True
-
- _new_name = _new_parent._mock_new_name + dot + _new_name
-
- if do_method_calls:
- if _new_name == name:
- this_method_call = this_mock_call
- else:
- this_method_call = _Call((name, args, kwargs))
- _new_parent.method_calls.append(this_method_call)
-
- do_method_calls = _new_parent._mock_parent is not None
- if do_method_calls:
- name = _new_parent._mock_name + '.' + name
-
- _new_parent.mock_calls.append(this_mock_call)
- _new_parent = _new_parent._mock_new_parent
-
- # use ids here so as not to call __hash__ on the mocks
- _new_parent_id = id(_new_parent)
- if _new_parent_id in seen:
- break
- seen.add(_new_parent_id)
-
- ret_val = DEFAULT
- effect = self.side_effect
- if effect is not None:
- if _is_exception(effect):
- raise effect
-
- if not _callable(effect):
- return next(effect)
-
- ret_val = effect(*args, **kwargs)
- if ret_val is DEFAULT:
- ret_val = self.return_value
-
- if (self._mock_wraps is not None and
- self._mock_return_value is DEFAULT):
- return self._mock_wraps(*args, **kwargs)
- if ret_val is DEFAULT:
- ret_val = self.return_value
- return ret_val
-
-
-
-class Mock(CallableMixin, NonCallableMock):
- """
- Create a new `Mock` object. `Mock` takes several optional arguments
- that specify the behaviour of the Mock object:
-
- * `spec`: This can be either a list of strings or an existing object (a
- class or instance) that acts as the specification for the mock object. If
- you pass in an object then a list of strings is formed by calling dir on
- the object (excluding unsupported magic attributes and methods). Accessing
- any attribute not in this list will raise an `AttributeError`.
-
- If `spec` is an object (rather than a list of strings) then
- `mock.__class__` returns the class of the spec object. This allows mocks
- to pass `isinstance` tests.
-
- * `spec_set`: A stricter variant of `spec`. If used, attempting to *set*
- or get an attribute on the mock that isn't on the object passed as
- `spec_set` will raise an `AttributeError`.
-
- * `side_effect`: A function to be called whenever the Mock is called. See
- the `side_effect` attribute. Useful for raising exceptions or
- dynamically changing return values. The function is called with the same
- arguments as the mock, and unless it returns `DEFAULT`, the return
- value of this function is used as the return value.
-
- Alternatively `side_effect` can be an exception class or instance. In
- this case the exception will be raised when the mock is called.
-
- If `side_effect` is an iterable then each call to the mock will return
- the next value from the iterable.
-
- * `return_value`: The value returned when the mock is called. By default
- this is a new Mock (created on first access). See the
- `return_value` attribute.
-
- * `wraps`: Item for the mock object to wrap. If `wraps` is not None
- then calling the Mock will pass the call through to the wrapped object
- (returning the real result and ignoring `return_value`). Attribute
- access on the mock will return a Mock object that wraps the corresponding
- attribute of the wrapped object (so attempting to access an attribute that
- doesn't exist will raise an `AttributeError`).
-
- If the mock has an explicit `return_value` set then calls are not passed
- to the wrapped object and the `return_value` is returned instead.
-
- * `name`: If the mock has a name then it will be used in the repr of the
- mock. This can be useful for debugging. The name is propagated to child
- mocks.
-
- Mocks can also be called with arbitrary keyword arguments. These will be
- used to set attributes on the mock after it is created.
- """
-
-
-
-def _dot_lookup(thing, comp, import_path):
- try:
- return getattr(thing, comp)
- except AttributeError:
- __import__(import_path)
- return getattr(thing, comp)
-
-
-def _importer(target):
- components = target.split('.')
- import_path = components.pop(0)
- thing = __import__(import_path)
-
- for comp in components:
- import_path += ".%s" % comp
- thing = _dot_lookup(thing, comp, import_path)
- return thing
-
-
-def _is_started(patcher):
- # XXXX horrible
- return hasattr(patcher, 'is_local')
-
-
-class _patch(object):
-
- attribute_name = None
-
- def __init__(
- self, getter, attribute, new, spec, create,
- mocksignature, spec_set, autospec, new_callable, kwargs
- ):
- if new_callable is not None:
- if new is not DEFAULT:
- raise ValueError(
- "Cannot use 'new' and 'new_callable' together"
- )
- if autospec is not False:
- raise ValueError(
- "Cannot use 'autospec' and 'new_callable' together"
- )
-
- self.getter = getter
- self.attribute = attribute
- self.new = new
- self.new_callable = new_callable
- self.spec = spec
- self.create = create
- self.has_local = False
- self.mocksignature = mocksignature
- self.spec_set = spec_set
- self.autospec = autospec
- self.kwargs = kwargs
- self.additional_patchers = []
-
-
- def copy(self):
- patcher = _patch(
- self.getter, self.attribute, self.new, self.spec,
- self.create, self.mocksignature, self.spec_set,
- self.autospec, self.new_callable, self.kwargs
- )
- patcher.attribute_name = self.attribute_name
- patcher.additional_patchers = [
- p.copy() for p in self.additional_patchers
- ]
- return patcher
-
-
- def __call__(self, func):
- if isinstance(func, ClassTypes):
- return self.decorate_class(func)
- return self.decorate_callable(func)
-
-
- def decorate_class(self, klass):
- for attr in dir(klass):
- if not attr.startswith(patch.TEST_PREFIX):
- continue
-
- attr_value = getattr(klass, attr)
- if not hasattr(attr_value, "__call__"):
- continue
-
- patcher = self.copy()
- setattr(klass, attr, patcher(attr_value))
- return klass
-
-
- def decorate_callable(self, func):
- if hasattr(func, 'patchings'):
- func.patchings.append(self)
- return func
-
- @wraps(func)
- def patched(*args, **keywargs):
- # don't use a with here (backwards compatability with Python 2.4)
- extra_args = []
- entered_patchers = []
-
- # can't use try...except...finally because of Python 2.4
- # compatibility
- try:
- try:
- for patching in patched.patchings:
- arg = patching.__enter__()
- entered_patchers.append(patching)
- if patching.attribute_name is not None:
- keywargs.update(arg)
- elif patching.new is DEFAULT:
- extra_args.append(arg)
-
- args += tuple(extra_args)
- return func(*args, **keywargs)
- except:
- if (patching not in entered_patchers and
- _is_started(patching)):
- # the patcher may have been started, but an exception
- # raised whilst entering one of its additional_patchers
- entered_patchers.append(patching)
- # re-raise the exception
- raise
- finally:
- for patching in reversed(entered_patchers):
- patching.__exit__()
-
- patched.patchings = [self]
- if hasattr(func, 'func_code'):
- # not in Python 3
- patched.compat_co_firstlineno = getattr(
- func, "compat_co_firstlineno",
- func.func_code.co_firstlineno
- )
- return patched
-
-
- def get_original(self):
- target = self.getter()
- name = self.attribute
-
- original = DEFAULT
- local = False
-
- try:
- original = target.__dict__[name]
- except (AttributeError, KeyError):
- original = getattr(target, name, DEFAULT)
- else:
- local = True
-
- if not self.create and original is DEFAULT:
- raise AttributeError(
- "%s does not have the attribute %r" % (target, name)
- )
- return original, local
-
-
- def __enter__(self):
- """Perform the patch."""
- new, spec, spec_set = self.new, self.spec, self.spec_set
- autospec, kwargs = self.autospec, self.kwargs
- new_callable = self.new_callable
- self.target = self.getter()
-
- original, local = self.get_original()
-
- if new is DEFAULT and autospec is False:
- inherit = False
- if spec_set == True:
- spec_set = original
- elif spec == True:
- # set spec to the object we are replacing
- spec = original
-
- if (spec or spec_set) is not None:
- if isinstance(original, ClassTypes):
- # If we're patching out a class and there is a spec
- inherit = True
-
- Klass = MagicMock
- _kwargs = {}
- if new_callable is not None:
- Klass = new_callable
- elif (spec or spec_set) is not None:
- if not _callable(spec or spec_set):
- Klass = NonCallableMagicMock
-
- if spec is not None:
- _kwargs['spec'] = spec
- if spec_set is not None:
- _kwargs['spec_set'] = spec_set
-
- # add a name to mocks
- if (isinstance(Klass, type) and
- issubclass(Klass, NonCallableMock) and self.attribute):
- _kwargs['name'] = self.attribute
-
- _kwargs.update(kwargs)
- new = Klass(**_kwargs)
-
- if inherit and _is_instance_mock(new):
- # we can only tell if the instance should be callable if the
- # spec is not a list
- if (not _is_list(spec or spec_set) and not
- _instance_callable(spec or spec_set)):
- Klass = NonCallableMagicMock
-
- _kwargs.pop('name')
- new.return_value = Klass(_new_parent=new, _new_name='()',
- **_kwargs)
- elif autospec is not False:
- # spec is ignored, new *must* be default, spec_set is treated
- # as a boolean. Should we check spec is not None and that spec_set
- # is a bool? mocksignature should also not be used. Should we
- # check this?
- if new is not DEFAULT:
- raise TypeError(
- "autospec creates the mock for you. Can't specify "
- "autospec and new."
- )
- spec_set = bool(spec_set)
- if autospec is True:
- autospec = original
-
- new = create_autospec(autospec, spec_set=spec_set,
- _name=self.attribute, **kwargs)
- elif kwargs:
- # can't set keyword args when we aren't creating the mock
- # XXXX If new is a Mock we could call new.configure_mock(**kwargs)
- raise TypeError("Can't pass kwargs to a mock we aren't creating")
-
- new_attr = new
- if self.mocksignature:
- new_attr = mocksignature(original, new)
-
- self.temp_original = original
- self.is_local = local
- setattr(self.target, self.attribute, new_attr)
- if self.attribute_name is not None:
- extra_args = {}
- if self.new is DEFAULT:
- extra_args[self.attribute_name] = new
- for patching in self.additional_patchers:
- arg = patching.__enter__()
- if patching.new is DEFAULT:
- extra_args.update(arg)
- return extra_args
-
- return new
-
-
- def __exit__(self, *_):
- """Undo the patch."""
- if not _is_started(self):
- raise RuntimeError('stop called on unstarted patcher')
-
- if self.is_local and self.temp_original is not DEFAULT:
- setattr(self.target, self.attribute, self.temp_original)
- else:
- delattr(self.target, self.attribute)
- if not self.create and not hasattr(self.target, self.attribute):
- # needed for proxy objects like django settings
- setattr(self.target, self.attribute, self.temp_original)
-
- del self.temp_original
- del self.is_local
- del self.target
- for patcher in reversed(self.additional_patchers):
- if _is_started(patcher):
- patcher.__exit__()
-
- start = __enter__
- stop = __exit__
-
-
-
-def _get_target(target):
- try:
- target, attribute = target.rsplit('.', 1)
- except (TypeError, ValueError):
- raise TypeError("Need a valid target to patch. You supplied: %r" %
- (target,))
- getter = lambda: _importer(target)
- return getter, attribute
-
-
-def _patch_object(
- target, attribute, new=DEFAULT, spec=None,
- create=False, mocksignature=False, spec_set=None, autospec=False,
- new_callable=None, **kwargs
- ):
- """
- patch.object(target, attribute, new=DEFAULT, spec=None, create=False,
- mocksignature=False, spec_set=None, autospec=False,
- new_callable=None, **kwargs)
-
- patch the named member (`attribute`) on an object (`target`) with a mock
- object.
-
- `patch.object` can be used as a decorator, class decorator or a context
- manager. Arguments `new`, `spec`, `create`, `mocksignature`, `spec_set`,
- `autospec` and `new_callable` have the same meaning as for `patch`. Like
- `patch`, `patch.object` takes arbitrary keyword arguments for configuring
- the mock object it creates.
-
- When used as a class decorator `patch.object` honours `patch.TEST_PREFIX`
- for choosing which methods to wrap.
- """
- getter = lambda: target
- return _patch(
- getter, attribute, new, spec, create, mocksignature,
- spec_set, autospec, new_callable, kwargs
- )
-
-
-def _patch_multiple(target, spec=None, create=False,
- mocksignature=False, spec_set=None, autospec=False,
- new_callable=None, **kwargs
- ):
- """Perform multiple patches in a single call. It takes the object to be
- patched (either as an object or a string to fetch the object by importing)
- and keyword arguments for the patches::
-
- with patch.multiple(settings, FIRST_PATCH='one', SECOND_PATCH='two'):
- ...
-
- Use `DEFAULT` as the value if you want `patch.multiple` to create
- mocks for you. In this case the created mocks are passed into a decorated
- function by keyword, and a dictionary is returned when `patch.multiple` is
- used as a context manager.
-
- `patch.multiple` can be used as a decorator, class decorator or a context
- manager. The arguments `spec`, `spec_set`, `create`, `mocksignature`,
- `autospec` and `new_callable` have the same meaning as for `patch`. These
- arguments will be applied to *all* patches done by `patch.multiple`.
-
- When used as a class decorator `patch.multiple` honours `patch.TEST_PREFIX`
- for choosing which methods to wrap.
- """
- if type(target) in (unicode, str):
- getter = lambda: _importer(target)
- else:
- getter = lambda: target
-
- if not kwargs:
- raise ValueError(
- 'Must supply at least one keyword argument with patch.multiple'
- )
- # need to wrap in a list for python 3, where items is a view
- items = list(kwargs.items())
- attribute, new = items[0]
- patcher = _patch(
- getter, attribute, new, spec, create, mocksignature, spec_set,
- autospec, new_callable, {}
- )
- patcher.attribute_name = attribute
- for attribute, new in items[1:]:
- this_patcher = _patch(
- getter, attribute, new, spec, create, mocksignature, spec_set,
- autospec, new_callable, {}
- )
- this_patcher.attribute_name = attribute
- patcher.additional_patchers.append(this_patcher)
- return patcher
-
-
-def patch(
- target, new=DEFAULT, spec=None, create=False,
- mocksignature=False, spec_set=None, autospec=False,
- new_callable=None, **kwargs
- ):
- """
- `patch` acts as a function decorator, class decorator or a context
- manager. Inside the body of the function or with statement, the `target`
- (specified in the form `'package.module.ClassName'`) is patched
- with a `new` object. When the function/with statement exits the patch is
- undone.
-
- The `target` is imported and the specified attribute patched with the new
- object, so it must be importable from the environment you are calling the
- decorator from. The target is imported when the decorated function is
- executed, not at decoration time.
-
- If `new` is omitted, then a new `MagicMock` is created and passed in as an
- extra argument to the decorated function.
-
- The `spec` and `spec_set` keyword arguments are passed to the `MagicMock`
- if patch is creating one for you.
-
- In addition you can pass `spec=True` or `spec_set=True`, which causes
- patch to pass in the object being mocked as the spec/spec_set object.
-
- `new_callable` allows you to specify a different class, or callable object,
- that will be called to create the `new` object. By default `MagicMock` is
- used.
-
- A more powerful form of `spec` is `autospec`. If you set `autospec=True`
- then the mock with be created with a spec from the object being replaced.
- All attributes of the mock will also have the spec of the corresponding
- attribute of the object being replaced. Methods and functions being mocked
- will have their arguments checked and will raise a `TypeError` if they are
- called with the wrong signature (similar to `mocksignature`). For mocks
- replacing a class, their return value (the 'instance') will have the same
- spec as the class.
-
- Instead of `autospec=True` you can pass `autospec=some_object` to use an
- arbitrary object as the spec instead of the one being replaced.
-
- If `mocksignature` is True then the patch will be done with a function
- created by mocking the one being replaced. If the object being replaced is
- a class then the signature of `__init__` will be copied. If the object
- being replaced is a callable object then the signature of `__call__` will
- be copied.
-
- By default `patch` will fail to replace attributes that don't exist. If
- you pass in `create=True`, and the attribute doesn't exist, patch will
- create the attribute for you when the patched function is called, and
- delete it again afterwards. This is useful for writing tests against
- attributes that your production code creates at runtime. It is off by by
- default because it can be dangerous. With it switched on you can write
- passing tests against APIs that don't actually exist!
-
- Patch can be used as a `TestCase` class decorator. It works by
- decorating each test method in the class. This reduces the boilerplate
- code when your test methods share a common patchings set. `patch` finds
- tests by looking for method names that start with `patch.TEST_PREFIX`.
- By default this is `test`, which matches the way `unittest` finds tests.
- You can specify an alternative prefix by setting `patch.TEST_PREFIX`.
-
- Patch can be used as a context manager, with the with statement. Here the
- patching applies to the indented block after the with statement. If you
- use "as" then the patched object will be bound to the name after the
- "as"; very useful if `patch` is creating a mock object for you.
-
- `patch` takes arbitrary keyword arguments. These will be passed to
- the `Mock` (or `new_callable`) on construction.
-
- `patch.dict(...)`, `patch.multiple(...)` and `patch.object(...)` are
- available for alternate use-cases.
- """
- getter, attribute = _get_target(target)
- return _patch(
- getter, attribute, new, spec, create, mocksignature,
- spec_set, autospec, new_callable, kwargs
- )
-
-
-class _patch_dict(object):
- """
- Patch a dictionary, or dictionary like object, and restore the dictionary
- to its original state after the test.
-
- `in_dict` can be a dictionary or a mapping like container. If it is a
- mapping then it must at least support getting, setting and deleting items
- plus iterating over keys.
-
- `in_dict` can also be a string specifying the name of the dictionary, which
- will then be fetched by importing it.
-
- `values` can be a dictionary of values to set in the dictionary. `values`
- can also be an iterable of `(key, value)` pairs.
-
- If `clear` is True then the dictionary will be cleared before the new
- values are set.
-
- `patch.dict` can also be called with arbitrary keyword arguments to set
- values in the dictionary::
-
- with patch.dict('sys.modules', mymodule=Mock(), other_module=Mock()):
- ...
-
- `patch.dict` can be used as a context manager, decorator or class
- decorator. When used as a class decorator `patch.dict` honours
- `patch.TEST_PREFIX` for choosing which methods to wrap.
- """
-
- def __init__(self, in_dict, values=(), clear=False, **kwargs):
- if isinstance(in_dict, basestring):
- in_dict = _importer(in_dict)
- self.in_dict = in_dict
- # support any argument supported by dict(...) constructor
- self.values = dict(values)
- self.values.update(kwargs)
- self.clear = clear
- self._original = None
-
-
- def __call__(self, f):
- if isinstance(f, ClassTypes):
- return self.decorate_class(f)
- @wraps(f)
- def _inner(*args, **kw):
- self._patch_dict()
- try:
- return f(*args, **kw)
- finally:
- self._unpatch_dict()
-
- return _inner
-
-
- def decorate_class(self, klass):
- for attr in dir(klass):
- attr_value = getattr(klass, attr)
- if (attr.startswith(patch.TEST_PREFIX) and
- hasattr(attr_value, "__call__")):
- decorator = _patch_dict(self.in_dict, self.values, self.clear)
- decorated = decorator(attr_value)
- setattr(klass, attr, decorated)
- return klass
-
-
- def __enter__(self):
- """Patch the dict."""
- self._patch_dict()
-
-
- def _patch_dict(self):
- values = self.values
- in_dict = self.in_dict
- clear = self.clear
-
- try:
- original = in_dict.copy()
- except AttributeError:
- # dict like object with no copy method
- # must support iteration over keys
- original = {}
- for key in in_dict:
- original[key] = in_dict[key]
- self._original = original
-
- if clear:
- _clear_dict(in_dict)
-
- try:
- in_dict.update(values)
- except AttributeError:
- # dict like object with no update method
- for key in values:
- in_dict[key] = values[key]
-
-
- def _unpatch_dict(self):
- in_dict = self.in_dict
- original = self._original
-
- _clear_dict(in_dict)
-
- try:
- in_dict.update(original)
- except AttributeError:
- for key in original:
- in_dict[key] = original[key]
-
-
- def __exit__(self, *args):
- """Unpatch the dict."""
- self._unpatch_dict()
- return False
-
- start = __enter__
- stop = __exit__
-
-
-def _clear_dict(in_dict):
- try:
- in_dict.clear()
- except AttributeError:
- keys = list(in_dict)
- for key in keys:
- del in_dict[key]
-
-
-patch.object = _patch_object
-patch.dict = _patch_dict
-patch.multiple = _patch_multiple
-patch.TEST_PREFIX = 'test'
-
-magic_methods = (
- "lt le gt ge eq ne "
- "getitem setitem delitem "
- "len contains iter "
- "hash str sizeof "
- "enter exit "
- "divmod neg pos abs invert "
- "complex int float index "
- "trunc floor ceil "
-)
-
-numerics = "add sub mul div floordiv mod lshift rshift and xor or pow "
-inplace = ' '.join('i%s' % n for n in numerics.split())
-right = ' '.join('r%s' % n for n in numerics.split())
-extra = ''
-if inPy3k:
- extra = 'bool next '
-else:
- extra = 'unicode long nonzero oct hex truediv rtruediv '
-
-# not including __prepare__, __instancecheck__, __subclasscheck__
-# (as they are metaclass methods)
-# __del__ is not supported at all as it causes problems if it exists
-
-_non_defaults = set('__%s__' % method for method in [
- 'cmp', 'getslice', 'setslice', 'coerce', 'subclasses',
- 'format', 'get', 'set', 'delete', 'reversed',
- 'missing', 'reduce', 'reduce_ex', 'getinitargs',
- 'getnewargs', 'getstate', 'setstate', 'getformat',
- 'setformat', 'repr', 'dir'
-])
-
-
-def _get_method(name, func):
- "Turns a callable object (like a mock) into a real function"
- def method(self, *args, **kw):
- return func(self, *args, **kw)
- method.__name__ = name
- return method
-
-
-_magics = set(
- '__%s__' % method for method in
- ' '.join([magic_methods, numerics, inplace, right, extra]).split()
-)
-
-_all_magics = _magics | _non_defaults
-
-_unsupported_magics = set([
- '__getattr__', '__setattr__',
- '__init__', '__new__', '__prepare__'
- '__instancecheck__', '__subclasscheck__',
- '__del__'
-])
-
-_calculate_return_value = {
- '__hash__': lambda self: object.__hash__(self),
- '__str__': lambda self: object.__str__(self),
- '__sizeof__': lambda self: object.__sizeof__(self),
- '__unicode__': lambda self: unicode(object.__str__(self)),
-}
-
-_return_values = {
- '__int__': 1,
- '__contains__': False,
- '__len__': 0,
- '__exit__': False,
- '__complex__': 1j,
- '__float__': 1.0,
- '__bool__': True,
- '__nonzero__': True,
- '__oct__': '1',
- '__hex__': '0x1',
- '__long__': long(1),
- '__index__': 1,
-}
-
-
-def _get_eq(self):
- def __eq__(other):
- ret_val = self.__eq__._mock_return_value
- if ret_val is not DEFAULT:
- return ret_val
- return self is other
- return __eq__
-
-def _get_ne(self):
- def __ne__(other):
- if self.__ne__._mock_return_value is not DEFAULT:
- return DEFAULT
- return self is not other
- return __ne__
-
-def _get_iter(self):
- def __iter__():
- ret_val = self.__iter__._mock_return_value
- if ret_val is DEFAULT:
- return iter([])
- # if ret_val was already an iterator, then calling iter on it should
- # return the iterator unchanged
- return iter(ret_val)
- return __iter__
-
-_side_effect_methods = {
- '__eq__': _get_eq,
- '__ne__': _get_ne,
- '__iter__': _get_iter,
-}
-
-
-
-def _set_return_value(mock, method, name):
- fixed = _return_values.get(name, DEFAULT)
- if fixed is not DEFAULT:
- method.return_value = fixed
- return
-
- return_calulator = _calculate_return_value.get(name)
- if return_calulator is not None:
- try:
- return_value = return_calulator(mock)
- except AttributeError:
- # XXXX why do we return AttributeError here?
- # set it as a side_effect instead?
- return_value = AttributeError(name)
- method.return_value = return_value
- return
-
- side_effector = _side_effect_methods.get(name)
- if side_effector is not None:
- method.side_effect = side_effector(mock)
-
-
-
-class MagicMixin(object):
- def __init__(self, *args, **kw):
- _super(MagicMixin, self).__init__(*args, **kw)
- self._mock_set_magics()
-
-
- def _mock_set_magics(self):
- these_magics = _magics
-
- if self._mock_methods is not None:
- these_magics = _magics.intersection(self._mock_methods)
-
- remove_magics = set()
- remove_magics = _magics - these_magics
-
- for entry in remove_magics:
- if entry in type(self).__dict__:
- # remove unneeded magic methods
- delattr(self, entry)
-
- # don't overwrite existing attributes if called a second time
- these_magics = these_magics - set(type(self).__dict__)
-
- _type = type(self)
- for entry in these_magics:
- setattr(_type, entry, MagicProxy(entry, self))
-
-
-
-class NonCallableMagicMock(MagicMixin, NonCallableMock):
- """A version of `MagicMock` that isn't callable."""
- def mock_add_spec(self, spec, spec_set=False):
- """Add a spec to a mock. `spec` can either be an object or a
- list of strings. Only attributes on the `spec` can be fetched as
- attributes from the mock.
-
- If `spec_set` is True then only attributes on the spec can be set."""
- self._mock_add_spec(spec, spec_set)
- self._mock_set_magics()
-
-
-
-class MagicMock(MagicMixin, Mock):
- """
- MagicMock is a subclass of Mock with default implementations
- of most of the magic methods. You can use MagicMock without having to
- configure the magic methods yourself.
-
- If you use the `spec` or `spec_set` arguments then *only* magic
- methods that exist in the spec will be created.
-
- Attributes and the return value of a `MagicMock` will also be `MagicMocks`.
- """
- def mock_add_spec(self, spec, spec_set=False):
- """Add a spec to a mock. `spec` can either be an object or a
- list of strings. Only attributes on the `spec` can be fetched as
- attributes from the mock.
-
- If `spec_set` is True then only attributes on the spec can be set."""
- self._mock_add_spec(spec, spec_set)
- self._mock_set_magics()
-
-
-
-class MagicProxy(object):
- def __init__(self, name, parent):
- self.name = name
- self.parent = parent
-
- def __call__(self, *args, **kwargs):
- m = self.create_mock()
- return m(*args, **kwargs)
-
- def create_mock(self):
- entry = self.name
- parent = self.parent
- m = parent._get_child_mock(name=entry, _new_name=entry,
- _new_parent=parent)
- setattr(parent, entry, m)
- _set_return_value(parent, m, entry)
- return m
-
- def __get__(self, obj, _type=None):
- return self.create_mock()
-
-
-
-class _ANY(object):
- "A helper object that compares equal to everything."
-
- def __eq__(self, other):
- return True
-
- def __ne__(self, other):
- return False
-
- def __repr__(self):
- return ''
-
-ANY = _ANY()
-
-
-
-def _format_call_signature(name, args, kwargs):
- message = '%s(%%s)' % name
- formatted_args = ''
- args_string = ', '.join([repr(arg) for arg in args])
- kwargs_string = ', '.join([
- '%s=%r' % (key, value) for key, value in kwargs.items()
- ])
- if args_string:
- formatted_args = args_string
- if kwargs_string:
- if formatted_args:
- formatted_args += ', '
- formatted_args += kwargs_string
-
- return message % formatted_args
-
-
-
-class _Call(tuple):
- """
- A tuple for holding the results of a call to a mock, either in the form
- `(args, kwargs)` or `(name, args, kwargs)`.
-
- If args or kwargs are empty then a call tuple will compare equal to
- a tuple without those values. This makes comparisons less verbose::
-
- _Call(('name', (), {})) == ('name',)
- _Call(('name', (1,), {})) == ('name', (1,))
- _Call(((), {'a': 'b'})) == ({'a': 'b'},)
-
- The `_Call` object provides a useful shortcut for comparing with call::
-
- _Call(((1, 2), {'a': 3})) == call(1, 2, a=3)
- _Call(('foo', (1, 2), {'a': 3})) == call.foo(1, 2, a=3)
-
- If the _Call has no name then it will match any name.
- """
- def __new__(cls, value=(), name=None, parent=None, two=False,
- from_kall=True):
- name = ''
- args = ()
- kwargs = {}
- _len = len(value)
- if _len == 3:
- name, args, kwargs = value
- elif _len == 2:
- first, second = value
- if isinstance(first, basestring):
- name = first
- if isinstance(second, tuple):
- args = second
- else:
- kwargs = second
- else:
- args, kwargs = first, second
- elif _len == 1:
- value, = value
- if isinstance(value, basestring):
- name = value
- elif isinstance(value, tuple):
- args = value
- else:
- kwargs = value
-
- if two:
- return tuple.__new__(cls, (args, kwargs))
-
- return tuple.__new__(cls, (name, args, kwargs))
-
-
- def __init__(self, value=(), name=None, parent=None, two=False,
- from_kall=True):
- self.name = name
- self.parent = parent
- self.from_kall = from_kall
-
-
- def __eq__(self, other):
- if other is ANY:
- return True
- try:
- len_other = len(other)
- except TypeError:
- return False
-
- self_name = ''
- if len(self) == 2:
- self_args, self_kwargs = self
- else:
- self_name, self_args, self_kwargs = self
-
- other_name = ''
- if len_other == 0:
- other_args, other_kwargs = (), {}
- elif len_other == 3:
- other_name, other_args, other_kwargs = other
- elif len_other == 1:
- value, = other
- if isinstance(value, tuple):
- other_args = value
- other_kwargs = {}
- elif isinstance(value, basestring):
- other_name = value
- other_args, other_kwargs = (), {}
- else:
- other_args = ()
- other_kwargs = value
- else:
- # len 2
- # could be (name, args) or (name, kwargs) or (args, kwargs)
- first, second = other
- if isinstance(first, basestring):
- other_name = first
- if isinstance(second, tuple):
- other_args, other_kwargs = second, {}
- else:
- other_args, other_kwargs = (), second
- else:
- other_args, other_kwargs = first, second
-
- if self_name and other_name != self_name:
- return False
-
- # this order is important for ANY to work!
- return (other_args, other_kwargs) == (self_args, self_kwargs)
-
-
- def __ne__(self, other):
- return not self.__eq__(other)
-
-
- def __call__(self, *args, **kwargs):
- if self.name is None:
- return _Call(('', args, kwargs), name='()')
-
- name = self.name + '()'
- return _Call((self.name, args, kwargs), name=name, parent=self)
-
-
- def __getattr__(self, attr):
- if self.name is None:
- return _Call(name=attr, from_kall=False)
- name = '%s.%s' % (self.name, attr)
- return _Call(name=name, parent=self, from_kall=False)
-
-
- def __repr__(self):
- if not self.from_kall:
- name = self.name or 'call'
- if name.startswith('()'):
- name = 'call%s' % name
- return name
-
- if len(self) == 2:
- name = 'call'
- args, kwargs = self
- else:
- name, args, kwargs = self
- if not name:
- name = 'call'
- elif not name.startswith('()'):
- name = 'call.%s' % name
- else:
- name = 'call%s' % name
- return _format_call_signature(name, args, kwargs)
-
-
- def call_list(self):
- """For a call object that represents multiple calls, `call_list`
- returns a list of all the intermediate calls as well as the
- final call."""
- vals = []
- thing = self
- while thing is not None:
- if thing.from_kall:
- vals.append(thing)
- thing = thing.parent
- return _CallList(reversed(vals))
-
-
-call = _Call(from_kall=False)
-
-
-
-def create_autospec(spec, spec_set=False, instance=False, _parent=None,
- _name=None, **kwargs):
- """Create a mock object using another object as a spec. Attributes on the
- mock will use the corresponding attribute on the `spec` object as their
- spec.
-
- Functions or methods being mocked will have their arguments checked in a
- similar way to `mocksignature` to check that they are called with the
- correct signature.
-
- If `spec_set` is True then attempting to set attributes that don't exist
- on the spec object will raise an `AttributeError`.
-
- If a class is used as a spec then the return value of the mock (the
- instance of the class) will have the same spec. You can use a class as the
- spec for an instance object by passing `instance=True`. The returned mock
- will only be callable if instances of the mock are callable.
-
- `create_autospec` also takes arbitrary keyword arguments that are passed to
- the constructor of the created mock."""
- if _is_list(spec):
- # can't pass a list instance to the mock constructor as it will be
- # interpreted as a list of strings
- spec = type(spec)
-
- is_type = isinstance(spec, ClassTypes)
-
- _kwargs = {'spec': spec}
- if spec_set:
- _kwargs = {'spec_set': spec}
- elif spec is None:
- # None we mock with a normal mock without a spec
- _kwargs = {}
-
- _kwargs.update(kwargs)
-
- Klass = MagicMock
- if type(spec) in DescriptorTypes:
- # descriptors don't have a spec
- # because we don't know what type they return
- _kwargs = {}
- elif not _callable(spec):
- Klass = NonCallableMagicMock
- elif is_type and instance and not _instance_callable(spec):
- Klass = NonCallableMagicMock
-
- _new_name = _name
- if _parent is None:
- # for a top level object no _new_name should be set
- _new_name = ''
-
- mock = Klass(parent=_parent, _new_parent=_parent, _new_name=_new_name,
- name=_name, **_kwargs)
-
- if isinstance(spec, FunctionTypes):
- # should only happen at the top level because we don't
- # recurse for functions
- mock = _set_signature(mock, spec)
- else:
- _check_signature(spec, mock, is_type, instance)
-
- if _parent is not None and not instance:
- _parent._mock_children[_name] = mock
-
- if is_type and not instance and 'return_value' not in kwargs:
- # XXXX could give a name to the return_value mock?
- mock.return_value = create_autospec(spec, spec_set, instance=True,
- _name='()', _parent=mock)
-
- for entry in dir(spec):
- if _is_magic(entry):
- # MagicMock already does the useful magic methods for us
- continue
-
- if isinstance(spec, FunctionTypes) and entry in FunctionAttributes:
- # allow a mock to actually be a function from mocksignature
- continue
-
- # XXXX do we need a better way of getting attributes without
- # triggering code execution (?) Probably not - we need the actual
- # object to mock it so we would rather trigger a property than mock
- # the property descriptor. Likewise we want to mock out dynamically
- # provided attributes.
- # XXXX what about attributes that raise exceptions on being fetched
- # we could be resilient against it, or catch and propagate the
- # exception when the attribute is fetched from the mock
- original = getattr(spec, entry)
-
- kwargs = {'spec': original}
- if spec_set:
- kwargs = {'spec_set': original}
-
- if not isinstance(original, FunctionTypes):
- new = _SpecState(original, spec_set, mock, entry, instance)
- mock._mock_children[entry] = new
- else:
- parent = mock
- if isinstance(spec, FunctionTypes):
- parent = mock.mock
-
- new = MagicMock(parent=parent, name=entry, _new_name=entry,
- _new_parent=parent, **kwargs)
- mock._mock_children[entry] = new
- skipfirst = _must_skip(spec, entry, is_type)
- _check_signature(original, new, skipfirst=skipfirst)
-
- # so functions created with mocksignature become instance attributes,
- # *plus* their underlying mock exists in _mock_children of the parent
- # mock. Adding to _mock_children may be unnecessary where we are also
- # setting as an instance attribute?
- if isinstance(new, FunctionTypes):
- setattr(mock, entry, new)
-
- return mock
-
-
-def _must_skip(spec, entry, is_type):
- if not isinstance(spec, ClassTypes):
- if entry in getattr(spec, '__dict__', {}):
- # instance attribute - shouldn't skip
- return False
- # can't use type because of old style classes
- spec = spec.__class__
- if not hasattr(spec, '__mro__'):
- # old style class: can't have descriptors anyway
- return is_type
-
- for klass in spec.__mro__:
- result = klass.__dict__.get(entry, DEFAULT)
- if result is DEFAULT:
- continue
- if isinstance(result, (staticmethod, classmethod)):
- return False
- return is_type
-
- # shouldn't get here unless function is a dynamically provided attribute
- # XXXX untested behaviour
- return is_type
-
-
-def _get_class(obj):
- try:
- return obj.__class__
- except AttributeError:
- # in Python 2, _sre.SRE_Pattern objects have no __class__
- return type(obj)
-
-
-class _SpecState(object):
-
- def __init__(self, spec, spec_set=False, parent=None,
- name=None, ids=None, instance=False):
- self.spec = spec
- self.ids = ids
- self.spec_set = spec_set
- self.parent = parent
- self.instance = instance
- self.name = name
-
-
-FunctionTypes = (
- # python function
- type(create_autospec),
- # instance method
- type(ANY.__eq__),
- # unbound method
- type(_ANY.__eq__),
-)
-
-FunctionAttributes = set([
- 'func_closure',
- 'func_code',
- 'func_defaults',
- 'func_dict',
- 'func_doc',
- 'func_globals',
- 'func_name',
-])
diff --git a/script/__Lib/diffcalc-2.1/model/README.txt b/script/__Lib/diffcalc-2.1/model/README.txt
deleted file mode 100755
index 45d8fcb..0000000
--- a/script/__Lib/diffcalc-2.1/model/README.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Setting up the sixc vrml model to work via Epics pv's from b16's simulation running on the office network.
-
-
-1. Synoptic
-$ launcher --port 6064
-
-2. Shell
-export EPICS_CA_REPEATER_PORT=6065
-export EPICS_CA_SERVER_PORT=6064
-
-3. Vrml viewer
-export EPICS_CA_SERVER_PORT=6064
-dls-vrml-epics-viewer.py fivec.wrl fivec.wcfg
diff --git a/script/__Lib/diffcalc-2.1/model/fivec.fxw b/script/__Lib/diffcalc-2.1/model/fivec.fxw
deleted file mode 100755
index de9ae05..0000000
Binary files a/script/__Lib/diffcalc-2.1/model/fivec.fxw and /dev/null differ
diff --git a/script/__Lib/diffcalc-2.1/model/fivec.wcfg b/script/__Lib/diffcalc-2.1/model/fivec.wcfg
deleted file mode 100755
index 8f96e1e..0000000
--- a/script/__Lib/diffcalc-2.1/model/fivec.wcfg
+++ /dev/null
@@ -1,5 +0,0 @@
-dad_alpha_frame rotation pv["DIFFSIM:FIVEC:ALPHA.RBV"]
-dad_delta_frame rotation pv["DIFFSIM:FIVEC:DELTA.RBV"]
-dad_omega_frame rotation pv["DIFFSIM:FIVEC:OMEGA.RBV"]
-dad_chi_frame rotation pv["DIFFSIM:FIVEC:CHI.RBV"]
-dad_phi_frame rotation pv["DIFFSIM:FIVEC:PHI.RBV"]
\ No newline at end of file
diff --git a/script/__Lib/diffcalc-2.1/model/fivec.wrl b/script/__Lib/diffcalc-2.1/model/fivec.wrl
deleted file mode 100755
index 85f6fad..0000000
--- a/script/__Lib/diffcalc-2.1/model/fivec.wrl
+++ /dev/null
@@ -1,1011 +0,0 @@
-#VRML V2.0 utf8
-WorldInfo {
- title "fourc"
- info ["This Web3D Content was created with Flux Studio, a Web3D authoring tool"
- "www.mediamachines.com"
- "This Web3D Content was created with Flux Studio, a Web3D authoring tool"]
-}
-## Vizthumbnail Thumb_fivec_wrl5688291255594457.jpg
-DirectionalLight {
- intensity 1.000
- ambientIntensity 0.500
- direction -.621 -.23944 -.74634
- color 1 1 1
- on TRUE
-}
-DirectionalLight {
- intensity 1.000
- ambientIntensity 0.000
- direction -.01373 -.46642 -.88446
- color 1 1 1
- on TRUE
-}
-DEF lab_x Shape {
- appearance Appearance {
- material DEF Rust Material {
- ambientIntensity 0.200
- shininess 0.200
- diffuseColor .50196 .50196 .50196
- }
- }
- geometry DEF GeoCylinder15 Cylinder {
- height 60.000
- radius 0.020
- }
-}
-DEF dad_lab_z Transform {
- rotation 1 0 0 1.571
- children [
- DEF lab_z Shape {
- appearance Appearance {
- material USE Rust
- }
- geometry DEF GeoCylinder17 Cylinder {
- height 40.000
- radius 0.020
- }
- }
- ]
-}
-DEF dad_lab_beam Transform {
- translation 10 0 0
- rotation 0 0 1 1.571
- children [
- DEF lab_beam Shape {
- appearance Appearance {
- material DEF White Material {
- ambientIntensity 0.500
- shininess 0.100
- transparency 0.500
- diffuseColor 1 1 1
- emissiveColor 1 1 1
- }
- }
- geometry DEF GeoCylinder20 Cylinder {
- height 20.000
- radius 0.050
- }
- }
- ]
-}
-DEF dad_lab_beam0 Transform {
- translation 20 0 0
- rotation 0 0 1 1.571
- children [
- DEF lab_beam0 Shape {
- appearance Appearance {
- material DEF Shiny_Black Material {
- ambientIntensity 0.200
- shininess 0.100
- diffuseColor 1 1 1
- }
- }
- geometry DEF GeoCylinder22 Cylinder {
- height 4.000
- radius 0.200
- }
- }
- ]
-}
-DEF dad_Cone2 Transform {
- translation 17.5 0 0
- rotation 0 0 1 1.571
- children [
- DEF Cone2 Shape {
- appearance Appearance {
- material USE Shiny_Black
- }
- geometry DEF GeoCone2 Cone {
- height 1.500
- bottomRadius 0.500
- }
- }
- ]
-}
-DEF dad_lab_y Transform {
- rotation 0 0 -1 1.571
- children [
- DEF lab_y Shape {
- appearance Appearance {
- material USE Rust
- }
- geometry DEF GeoCylinder16 Cylinder {
- height 60.000
- radius 0.020
- }
- }
- ]
-}
-DEF dad_alpha_frame Transform {
- rotation 0 1 0 +.349
- children [
- DEF dad_alpha_base Transform {
- translation 0 -20.5 0
- children [
- DEF alpha_base Shape {
- appearance Appearance {
- material DEF Red Material {
- ambientIntensity 0.200
- shininess 0.200
- diffuseColor .50196 0 0
- }
- }
- geometry DEF GeoCylinder1 Cylinder {
- height 2.000
- radius 6.000
- }
- }
- ]
- }
- DEF dad_lab_post Transform {
- translation 0 -10 -11
- children [
- DEF alpha_post Shape {
- appearance Appearance {
- material USE Red
- }
- geometry DEF GeoBox1 Box {
- size 4 20 1
- }
- }
- ]
- }
- DEF dad_omega_frame Transform {
- rotation 0 0 1 -.349
- children [
- DEF dad_chi_frame Transform {
- rotation 1 0 0 -.785
- children [
- DEF dad_phi_frame Transform {
- rotation 0 0 1 -.349
- children [
- DEF dad_Cylinder7 Transform {
- translation 0 0 -4
- rotation 1 0 0 1.571
- children [
- DEF Cylinder7 Shape {
- appearance Appearance {
- material USE White
- }
- geometry DEF GeoCylinder7 Cylinder {
- height 2.000
- radius 1.000
- }
- }
- ]
- }
- DEF dad_Cylinder8 Transform {
- translation 0 0 -3.5
- rotation 1 0 0 1.571
- children [
- DEF Cylinder8 Shape {
- appearance Appearance {
- material USE White
- }
- geometry DEF GeoCylinder8 Cylinder {
- height 6.000
- radius 0.250
- }
- }
- ]
- }
- DEF Box3 Shape {
- appearance Appearance {
- material USE White
- }
- geometry DEF GeoBox3 Box {
- size 1 1 1
- }
- }
- DEF dad_Box11 Transform {
- translation 0 1 -4
- children [
- DEF Box11 Shape {
- appearance Appearance {
- material USE White
- }
- geometry DEF GeoBox11 Box {
- size .25 .5 2
- }
- }
- ]
- }
- DEF Box4 Shape {
- appearance Appearance {
- material DEF White_wire Material {
- emissiveColor 1 1 1
- }
- }
- geometry IndexedLineSet {
- coordIndex [
- 0 1 2 0
- -1 0 2 3
- 0 -1 1 5
- 6 1 -1 1
- 6 2 1 -1
- 2 6 7 2
- -1 2 7 3
- 2 -1 3 7
- 4 3 -1 3
- 4 0 3 -1
- 0 4 5 0
- -1 0 5 1
- 0 -1 6 5
- 4 6 -1 6
- 4 7 6 -1
- ]
- coord Coordinate {
- point [
- -.5 .5 -.5
- -.5 .5 .5
- .5 .5 .5
- .5 .5 -.5
- -.5 -.5 -.5
- -.5 -.5 .5
- .5 -.5 .5
- .5 -.5 -.5
- ]
- }
- }
- }
- ]
- }
- DEF dad_Box2 Transform {
- translation 0 0 -5.5
- children [
- DEF Box2 Shape {
- appearance Appearance {
- material DEF Purple Material {
- ambientIntensity 0.200
- shininess 0.200
- diffuseColor .9176 0 .874
- }
- }
- geometry DEF GeoBox2 Box {
- size 2.8 2.8 1.5
- }
- }
- ]
- }
- DEF dad_Box6 Transform {
- translation 0 1.25 -5.5
- children [
- DEF Box6 Shape {
- appearance Appearance {
- material USE Purple
- }
- geometry DEF GeoBox21 Box {
- size .25 1 1.5
- }
- }
- ]
- }
- ]
- }
- DEF dad_Cylinder2 Transform {
- rotation 0 0 1 1.571
- scale 1.1 1.5 1.1
- children [
- DEF Cylinder2 Shape {
- appearance Appearance {
- material DEF Green Material {
- ambientIntensity 0.200
- shininess 0.200
- diffuseColor .00784 .65098 .02353
- }
- }
- geometry DEF Cylinder2_Geo IndexedFaceSet {
- creaseAngle 0.524
- coordIndex [
- 49 50 48 -1
- 48 50 51 -1
- 48 51 47 -1
- 47 51 20 -1
- 47 20 21 -1
- 12 13 56 -1
- 56 13 14 -1
- 56 14 55 -1
- 55 14 15 -1
- 55 15 54 -1
- 54 15 16 -1
- 54 16 53 -1
- 53 16 17 -1
- 53 17 52 -1
- 52 17 18 -1
- 52 18 51 -1
- 51 18 19 -1
- 51 19 20 -1
- 5 6 62 -1
- 62 6 7 -1
- 62 7 61 -1
- 61 7 8 -1
- 61 8 60 -1
- 60 8 9 -1
- 60 9 59 -1
- 59 9 10 -1
- 59 10 58 -1
- 58 10 11 -1
- 58 11 57 -1
- 57 11 12 -1
- 57 12 56 -1
- 5 63 4 -1
- 4 63 64 -1
- 4 64 3 -1
- 3 64 1 -1
- 3 1 2 -1
- 2 1 35 -1
- 2 35 36 -1
- 28 41 27 -1
- 27 41 42 -1
- 27 42 26 -1
- 26 42 43 -1
- 26 43 25 -1
- 25 43 44 -1
- 25 44 24 -1
- 24 44 45 -1
- 24 45 23 -1
- 23 45 46 -1
- 23 46 22 -1
- 22 46 47 -1
- 22 47 21 -1
- 34 36 33 -1
- 33 36 37 -1
- 33 37 32 -1
- 32 37 38 -1
- 32 38 31 -1
- 31 38 39 -1
- 31 39 30 -1
- 30 39 40 -1
- 30 40 29 -1
- 29 40 41 -1
- 29 41 28 -1
- 1 64 0 -1
- 2 36 34 -1
- 63 5 62 -1
- 95 96 97 -1
- 97 96 65 -1
- 97 65 129 -1
- 129 65 66 -1
- 129 66 128 -1
- 128 66 67 -1
- 128 67 127 -1
- 127 67 126 -1
- 104 105 88 -1
- 88 105 106 -1
- 88 106 87 -1
- 87 106 107 -1
- 87 107 86 -1
- 86 107 108 -1
- 86 108 85 -1
- 85 108 109 -1
- 85 109 84 -1
- 84 109 110 -1
- 84 110 83 -1
- 83 110 111 -1
- 83 111 82 -1
- 82 111 112 -1
- 82 112 113 -1
- 98 99 93 -1
- 93 99 100 -1
- 93 100 92 -1
- 92 100 101 -1
- 92 101 91 -1
- 91 101 102 -1
- 91 102 90 -1
- 90 102 103 -1
- 90 103 89 -1
- 89 103 104 -1
- 89 104 88 -1
- 94 95 97 -1
- 94 97 98 -1
- 94 98 93 -1
- 81 82 78 -1
- 81 78 79 -1
- 81 79 80 -1
- 78 82 113 -1
- 78 113 114 -1
- 78 114 115 -1
- 78 115 77 -1
- 120 73 119 -1
- 119 73 74 -1
- 119 74 118 -1
- 118 74 75 -1
- 118 75 117 -1
- 117 75 76 -1
- 117 76 116 -1
- 116 76 77 -1
- 116 77 115 -1
- 126 68 125 -1
- 125 68 69 -1
- 125 69 124 -1
- 124 69 70 -1
- 124 70 123 -1
- 123 70 71 -1
- 123 71 122 -1
- 122 71 72 -1
- 122 72 121 -1
- 121 72 73 -1
- 121 73 120 -1
- 126 67 68 -1
- 0 64 65 -1
- 0 65 96 -1
- 64 63 66 -1
- 64 66 65 -1
- 63 62 67 -1
- 63 67 66 -1
- 62 61 68 -1
- 62 68 67 -1
- 61 60 69 -1
- 61 69 68 -1
- 60 59 70 -1
- 60 70 69 -1
- 59 58 71 -1
- 59 71 70 -1
- 58 57 72 -1
- 58 72 71 -1
- 57 56 73 -1
- 57 73 72 -1
- 56 55 74 -1
- 56 74 73 -1
- 55 54 75 -1
- 55 75 74 -1
- 54 53 76 -1
- 54 76 75 -1
- 53 52 77 -1
- 53 77 76 -1
- 52 51 78 -1
- 52 78 77 -1
- 51 50 79 -1
- 51 79 78 -1
- 50 49 80 -1
- 50 80 79 -1
- 49 48 81 -1
- 49 81 80 -1
- 48 47 82 -1
- 48 82 81 -1
- 47 46 83 -1
- 47 83 82 -1
- 46 45 84 -1
- 46 84 83 -1
- 45 44 85 -1
- 45 85 84 -1
- 44 43 86 -1
- 44 86 85 -1
- 43 42 87 -1
- 43 87 86 -1
- 42 41 88 -1
- 42 88 87 -1
- 41 40 89 -1
- 41 89 88 -1
- 40 39 90 -1
- 40 90 89 -1
- 39 38 91 -1
- 39 91 90 -1
- 38 37 92 -1
- 38 92 91 -1
- 37 36 93 -1
- 37 93 92 -1
- 36 35 94 -1
- 36 94 93 -1
- 35 1 95 -1
- 35 95 94 -1
- 1 0 96 -1
- 1 96 95 -1
- ]
- coord DEF Cylinder2_Coord Coordinate {
- point [
- 0 1 -6
- -1.17054 1 -5.88471
- -1.07212 1 -5.3899
- -1.05189 1 -5.39596
- .02145 1 -5.49809
- 1.09408 1 -5.38886
- 2.1248 1 -5.07248
- 3.07398 1 -4.56108
- 3.90517 1 -3.87434
- 4.5864 1 -3.03864
- 5.0915 1 -2.08609
- 5.40107 1 -1.0533
- 5.5032 1 .02003
- 5.39398 1 1.09267
- 5.07759 1 2.12338
- 4.5662 1 3.07257
- 3.87945 1 3.90375
- 3.04375 1 4.58498
- 2.0912 1 5.09009
- 1.05842 1 5.39966
- -.01492 1 5.50179
- -1.08755 1 5.39256
- -2.11827 1 5.07617
- -3.06746 1 4.56478
- -3.89864 1 3.87804
- -4.57987 1 3.04233
- -5.08498 1 2.08979
- -5.39454 1 1.057
- -5.49668 1 -.01633
- -5.38745 1 -1.08897
- -5.07106 1 -2.11968
- -4.55967 1 -3.06887
- -3.87292 1 -3.90005
- -3.03722 1 -4.58129
- -2.08467 1 -5.08639
- -2.2961 1 -5.54328
- -3.33342 1 -4.98882
- -4.24264 1 -4.24264
- -4.98882 1 -3.33342
- -5.54328 1 -2.2961
- -5.88471 1 -1.17054
- -6 1 -0
- -5.88471 1 1.17054
- -5.54328 1 2.2961
- -4.98882 1 3.33342
- -4.24264 1 4.24264
- -3.33342 1 4.98882
- -2.2961 1 5.54328
- -1.17054 1 5.88471
- -0 1 6
- 1.17054 1 5.88471
- 2.2961 1 5.54328
- 3.33342 1 4.98882
- 4.24264 1 4.24264
- 4.98882 1 3.33342
- 5.54328 1 2.2961
- 5.88471 1 1.17054
- 6 1 0
- 5.88471 1 -1.17054
- 5.54328 1 -2.2961
- 4.98882 1 -3.33342
- 4.24264 1 -4.24264
- 3.33342 1 -4.98882
- 2.2961 1 -5.54328
- 1.17054 1 -5.88471
- 1.17054 -1 -5.88471
- 2.2961 -1 -5.54328
- 3.33342 -1 -4.98882
- 4.24264 -1 -4.24264
- 4.98882 -1 -3.33342
- 5.54328 -1 -2.2961
- 5.88471 -1 -1.17054
- 6 -1 -0
- 5.88471 -1 1.17054
- 5.54328 -1 2.2961
- 4.98882 -1 3.33342
- 4.24264 -1 4.24264
- 3.33342 -1 4.98882
- 2.2961 -1 5.54328
- 1.17054 -1 5.88471
- -0 -1 6
- -1.17054 -1 5.88471
- -2.2961 -1 5.54328
- -3.33342 -1 4.98882
- -4.24264 -1 4.24264
- -4.98882 -1 3.33342
- -5.54328 -1 2.2961
- -5.88471 -1 1.17054
- -6 -1 -0
- -5.88471 -1 -1.17054
- -5.54328 -1 -2.2961
- -4.98882 -1 -3.33342
- -4.24264 -1 -4.24264
- -3.33342 -1 -4.98882
- -2.2961 -1 -5.54328
- -1.17054 -1 -5.88471
- 0 -1 -6
- 0 -1 -5.50037
- -1.05842 -1 -5.39966
- -2.0912 -1 -5.09009
- -3.04375 -1 -4.58498
- -3.87945 -1 -3.90375
- -4.5662 -1 -3.07257
- -5.07759 -1 -2.12338
- -5.39398 -1 -1.09267
- -5.5032 -1 -.02003
- -5.40107 -1 1.0533
- -5.0915 -1 2.08609
- -4.5864 -1 3.03864
- -3.90517 -1 3.87434
- -3.07398 -1 4.56108
- -2.1248 -1 5.07248
- -1.09408 -1 5.38886
- -.02145 -1 5.49809
- 1.05189 -1 5.39596
- 2.08467 -1 5.08639
- 3.03722 -1 4.58129
- 3.87292 -1 3.90005
- 4.55967 -1 3.06887
- 5.07106 -1 2.11968
- 5.38745 -1 1.08897
- 5.49668 -1 .01633
- 5.39454 -1 -1.057
- 5.08498 -1 -2.08979
- 4.57987 -1 -3.04233
- 3.89864 -1 -3.87804
- 3.06746 -1 -4.56478
- 2.11827 -1 -5.07617
- 1.08755 -1 -5.39256
- .01492 -1 -5.50179
- ]
- }
- }
- }
- ]
- }
- DEF dad_Cylinder3 Transform {
- rotation 0 0 1 1.571
- scale 1.1 1.5 1.1
- children [
- DEF Cylinder3 Shape {
- appearance Appearance {
- material USE Green
- }
- geometry DEF Cylinder3_Geo IndexedFaceSet {
- creaseAngle 0.524
- coordIndex [
- 0 1 2 -1
- 0 2 3 -1
- 4 5 1 -1
- 4 1 0 -1
- 6 7 5 -1
- 6 5 4 -1
- 8 9 7 -1
- 8 7 6 -1
- 10 11 9 -1
- 10 9 8 -1
- 12 13 11 -1
- 12 11 10 -1
- 14 15 13 -1
- 14 13 12 -1
- 16 17 15 -1
- 16 15 14 -1
- 18 19 17 -1
- 18 17 16 -1
- 20 21 19 -1
- 20 19 18 -1
- 22 23 21 -1
- 22 21 20 -1
- 24 25 23 -1
- 24 23 22 -1
- 26 27 25 -1
- 26 25 24 -1
- 28 29 27 -1
- 28 27 26 -1
- 30 31 29 -1
- 30 29 28 -1
- 32 33 31 -1
- 32 31 30 -1
- 34 35 33 -1
- 34 33 32 -1
- 36 37 35 -1
- 36 35 34 -1
- 38 39 37 -1
- 38 37 36 -1
- 40 41 39 -1
- 40 39 38 -1
- 42 43 41 -1
- 42 41 40 -1
- 44 45 43 -1
- 44 43 42 -1
- 46 47 45 -1
- 46 45 44 -1
- 48 49 47 -1
- 48 47 46 -1
- 50 51 49 -1
- 50 49 48 -1
- 52 53 51 -1
- 52 51 50 -1
- 54 55 53 -1
- 54 53 52 -1
- 56 57 55 -1
- 56 55 54 -1
- 58 59 57 -1
- 58 57 56 -1
- 60 61 59 -1
- 60 59 58 -1
- 62 63 61 -1
- 62 61 60 -1
- 3 2 63 -1
- 3 63 62 -1
- ]
- coord DEF Cylinder3_Coord Coordinate {
- point [
- 1.073 -1.00635 -5.39432
- 1.073 .99367 -5.39432
- 0 .98997 -5.5
- 0 -1.01006 -5.5
- 2.10476 -1.0024 -5.08134
- 2.10476 .99763 -5.08134
- 3.05564 -.99836 -4.57308
- 3.05564 1.00167 -4.57308
- 3.88909 -.99438 -3.88909
- 3.88909 1.00565 -3.88909
- 4.57308 -.99061 -3.05564
- 4.57308 1.00941 -3.05564
- 5.08134 -.98721 -2.10476
- 5.08134 1.01282 -2.10476
- 5.39432 -.9843 -1.073
- 5.39432 1.01573 -1.073
- 5.5 -.98199 -0
- 5.5 1.01803 -0
- 5.39432 -.98038 1.073
- 5.39432 1.01965 1.073
- 5.08134 -.97952 2.10476
- 5.08134 1.02051 2.10476
- 4.57308 -.97945 3.05564
- 4.57308 1.02058 3.05564
- 3.88909 -.98017 3.88909
- 3.88909 1.01986 3.88909
- 3.05564 -.98165 4.57308
- 3.05564 1.01838 4.57308
- 2.10476 -.98383 5.08134
- 2.10476 1.01619 5.08134
- 1.073 -.98664 5.39432
- 1.073 1.01338 5.39432
- -0 -.98997 5.5
- -0 1.01006 5.5
- -1.073 -.99367 5.39432
- -1.073 1.00635 5.39432
- -2.10476 -.99763 5.08134
- -2.10476 1.0024 5.08134
- -3.05564 -1.00167 4.57308
- -3.05564 .99836 4.57308
- -3.88909 -1.00565 3.88909
- -3.88909 .99438 3.88909
- -4.57308 -1.00941 3.05564
- -4.57308 .99061 3.05564
- -5.08134 -1.01282 2.10476
- -5.08134 .98721 2.10476
- -5.39432 -1.01573 1.073
- -5.39432 .9843 1.073
- -5.5 -1.01803 -0
- -5.5 .98199 -0
- -5.39432 -1.01965 -1.073
- -5.39432 .98038 -1.073
- -5.08134 -1.02051 -2.10476
- -5.08134 .97952 -2.10476
- -4.57308 -1.02058 -3.05564
- -4.57308 .97945 -3.05564
- -3.88909 -1.01986 -3.88909
- -3.88909 .98017 -3.88909
- -3.05564 -1.01838 -4.57308
- -3.05564 .98165 -4.57308
- -2.10476 -1.01619 -5.08134
- -2.10476 .98383 -5.08134
- -1.073 -1.01338 -5.39432
- -1.073 .98664 -5.39432
- ]
- }
- }
- }
- ]
- }
- DEF dad_Cylinder5 Transform {
- translation 0 0 -8.4
- rotation 1 0 0 1.571
- children [
- DEF Cylinder5 Shape {
- appearance Appearance {
- material USE Green
- }
- geometry DEF GeoCylinder5 Cylinder {
- height 4.250
- radius 2.000
- }
- }
- ]
- }
- DEF dad_Box10 Transform {
- translation 0 2 -8.4
- children [
- DEF Box10 Shape {
- appearance Appearance {
- material USE Green
- }
- geometry DEF GeoBox10 Box {
- size .25 1 4.25
- }
- }
- ]
- }
- ]
- }
- DEF dad_lab_posttop Transform {
- translation 0 0 -11
- rotation -1 0 0 1.571
- children [
- DEF alpha_posttop Shape {
- appearance Appearance {
- material USE Red
- }
- geometry DEF GeoCylinder6 Cylinder {
- height 1.000
- radius 2.000
- }
- }
- ]
- }
- DEF dad_alpha_arm Transform {
- translation 0 -20.5 -5
- children [
- DEF alpha_arm Shape {
- appearance Appearance {
- material USE Red
- }
- geometry DEF GeoBox7 Box {
- size 4 1 13
- }
- }
- ]
- }
- DEF dad_gamma_arm1 Transform {
- translation -6 -20.5 0
- children [
- DEF gamma_arm1 Shape {
- appearance Appearance {
- material USE Red
- }
- geometry DEF GeoBox18 Box {
- size 1 2 .25
- }
- }
- ]
- }
- DEF dad_Box12 Transform {
- translation 0 2 -11
- children [
- DEF Box12 Shape {
- appearance Appearance {
- material USE Red
- }
- geometry DEF GeoBox12 Box {
- size .25 1 1
- }
- }
- ]
- }
- DEF dad_delta_frame Transform {
- rotation 0 0 1 -.349
- children [
- DEF dad_delta_mount Transform {
- translation 0 0 -14.25
- rotation -1 0 0 1.571
- children [
- DEF delta_mount Shape {
- appearance Appearance {
- material DEF Yellow Material {
- ambientIntensity 0.200
- shininess 0.200
- diffuseColor .83529 .83529 0
- }
- }
- geometry DEF GeoCylinder2 Cylinder {
- height 5.500
- radius 2.000
- }
- }
- ]
- }
- DEF dad_delta_arm Transform {
- translation -10 0 -15
- children [
- DEF delta_arm Shape {
- appearance Appearance {
- material USE Yellow
- }
- geometry DEF GeoBox8 Box {
- size 20 3 1
- }
- }
- ]
- }
- DEF dad_delta_arm0 Transform {
- translation -20 0 -6.5
- children [
- DEF delta_arm0 Shape {
- appearance Appearance {
- material USE Yellow
- }
- geometry DEF GeoBox6 Box {
- size 1 3 18
- }
- }
- ]
- }
- DEF dad_Cylinder14 Transform {
- translation -18 0 0
- rotation 0 0 -1 1.571
- children [
- DEF Cylinder14 Shape {
- appearance Appearance {
- material USE Yellow
- }
- geometry DEF GeoCylinder14 Cylinder {
- height 3.000
- radius 1.000
- }
- }
- ]
- }
- DEF dad_detector_beam Transform {
- translation -10 0 0
- rotation 0 0 1 1.571
- children [
- DEF detector_beam Shape {
- appearance Appearance {
- material USE White
- }
- geometry DEF GeoCylinder21 Cylinder {
- height 20.000
- radius 0.050
- }
- }
- ]
- }
- DEF dad_Box13 Transform {
- translation 0 2 -14.25
- children [
- DEF Box13 Shape {
- appearance Appearance {
- material USE Yellow
- }
- geometry DEF GeoBox13 Box {
- size .25 1 5.5
- }
- }
- ]
- }
- ]
- }
- ]
-}
-DEF VP Viewpoint {
- description "VP"
- jump TRUE
- fieldOfView 1.165
- position 40 40 40
- orientation -.754 .657 -0 1.001
-}
-DEF dad_gamma_arm2 Transform {
- translation -9 -22.5 0
- children [
- DEF gamma_arm2 Shape {
- appearance Appearance {
- material DEF Black Material {
- ambientIntensity 0.200
- shininess 0.200
- diffuseColor .20784 .20784 .20784
- }
- }
- geometry DEF GeoBox19 Box {
- size 1 2 .25
- }
- }
- ]
-}
-DEF dad_gamma_base0 Transform {
- translation 0 -22.5 0
- rotation 0 1 0 .349
- children [
- DEF gamma_base0 Shape {
- appearance Appearance {
- material USE Black
- }
- geometry DEF GeoCylinder9 Cylinder {
- height 2.000
- radius 9.000
- }
- }
- ]
-}
-DEF dad_floor Transform {
- translation 0 -23.5 0
- children [
- DEF floor Shape {
- appearance Appearance {
- material USE Black
- }
- geometry DEF GeoBox16 Box {
- size 60 .2 40
- }
- }
- ]
-}
diff --git a/script/__Lib/diffcalc-2.1/model/sixc.fxw b/script/__Lib/diffcalc-2.1/model/sixc.fxw
deleted file mode 100755
index 51d97a4..0000000
Binary files a/script/__Lib/diffcalc-2.1/model/sixc.fxw and /dev/null differ
diff --git a/script/__Lib/diffcalc-2.1/model/sixc.wcfg b/script/__Lib/diffcalc-2.1/model/sixc.wcfg
deleted file mode 100755
index 2fa6961..0000000
--- a/script/__Lib/diffcalc-2.1/model/sixc.wcfg
+++ /dev/null
@@ -1,6 +0,0 @@
-dad_alpha_frame rotation pv["DIFFSIM:SIXC:ALPHA.RBV"]
-dad_delta_frame rotation pv["DIFFSIM:SIXC:DELTA.RBV"]
-dad_gamma_frame rotation pv["DIFFSIM:SIXC:GAMMA.RBV"]
-dad_omega_frame rotation pv["DIFFSIM:SIXC:OMEGA.RBV"]
-dad_chi_frame rotation pv["DIFFSIM:SIXC:CHI.RBV"]
-dad_phi_frame rotation pv["DIFFSIM:SIXC:PHI.RBV"]
diff --git a/script/__Lib/diffcalc-2.1/model/sixc.wrl b/script/__Lib/diffcalc-2.1/model/sixc.wrl
deleted file mode 100755
index 32ad769..0000000
--- a/script/__Lib/diffcalc-2.1/model/sixc.wrl
+++ /dev/null
@@ -1,1101 +0,0 @@
-#VRML V2.0 utf8
-WorldInfo {
- title "fourc"
- info ["This Web3D Content was created with Flux Studio, a Web3D authoring tool"
- "www.mediamachines.com"
- "This Web3D Content was created with Flux Studio, a Web3D authoring tool"]
-}
-## Vizthumbnail Thumb_fourc_wrl36454531255104963.jpg
-DirectionalLight {
- intensity 1.000
- ambientIntensity 0.500
- direction -.621 -.23944 -.74634
- color 1 1 1
- on TRUE
-}
-DirectionalLight {
- intensity 1.000
- ambientIntensity 0.000
- direction -.01373 -.46642 -.88446
- color 1 1 1
- on TRUE
-}
-DEF lab_x Shape {
- appearance Appearance {
- material DEF Rust Material {
- ambientIntensity 0.200
- shininess 0.200
- diffuseColor .50196 .50196 .50196
- }
- }
- geometry DEF GeoCylinder15 Cylinder {
- height 60.000
- radius 0.020
- }
-}
-DEF dad_lab_z Transform {
- rotation 1 0 0 1.571
- children [
- DEF lab_z Shape {
- appearance Appearance {
- material USE Rust
- }
- geometry DEF GeoCylinder17 Cylinder {
- height 40.000
- radius 0.020
- }
- }
- ]
-}
-DEF dad_lab_beam Transform {
- translation 10 0 0
- rotation 0 0 1 1.571
- children [
- DEF lab_beam Shape {
- appearance Appearance {
- material DEF White Material {
- ambientIntensity 0.500
- shininess 0.100
- transparency 0.500
- diffuseColor 1 1 1
- emissiveColor 1 1 1
- }
- }
- geometry DEF GeoCylinder20 Cylinder {
- height 20.000
- radius 0.050
- }
- }
- ]
-}
-DEF dad_lab_beam0 Transform {
- translation 20 0 0
- rotation 0 0 1 1.571
- children [
- DEF lab_beam0 Shape {
- appearance Appearance {
- material DEF Shiny_Black Material {
- ambientIntensity 0.200
- shininess 0.100
- diffuseColor 1 1 1
- }
- }
- geometry DEF GeoCylinder22 Cylinder {
- height 4.000
- radius 0.200
- }
- }
- ]
-}
-DEF dad_Cone2 Transform {
- translation 17.5 0 0
- rotation 0 0 1 1.571
- children [
- DEF Cone2 Shape {
- appearance Appearance {
- material USE Shiny_Black
- }
- geometry DEF GeoCone2 Cone {
- height 1.500
- bottomRadius 0.500
- }
- }
- ]
-}
-DEF dad_lab_y Transform {
- rotation 0 0 -1 1.571
- children [
- DEF lab_y Shape {
- appearance Appearance {
- material USE Rust
- }
- geometry DEF GeoCylinder16 Cylinder {
- height 60.000
- radius 0.020
- }
- }
- ]
-}
-DEF dad_alpha_frame Transform {
- rotation 0 1 0 .175
- children [
- DEF dad_alpha_base Transform {
- translation 0 -20.5 0
- children [
- DEF alpha_base Shape {
- appearance Appearance {
- material DEF Red Material {
- ambientIntensity 0.200
- shininess 0.200
- diffuseColor .50196 0 0
- }
- }
- geometry DEF GeoCylinder1 Cylinder {
- height 2.000
- radius 6.000
- }
- }
- ]
- }
- DEF dad_lab_post Transform {
- translation 0 -10 -11
- children [
- DEF alpha_post Shape {
- appearance Appearance {
- material USE Red
- }
- geometry DEF GeoBox1 Box {
- size 4 20 1
- }
- }
- ]
- }
- DEF dad_omega_frame Transform {
- rotation 0 0 1 -.175
- children [
- DEF dad_chi_frame Transform {
- rotation 1 0 0 -.785
- children [
- DEF dad_phi_frame Transform {
- rotation 0 0 1 -.349
- children [
- DEF dad_Cylinder7 Transform {
- translation 0 0 -4
- rotation 1 0 0 1.571
- children [
- DEF Cylinder7 Shape {
- appearance Appearance {
- material USE White
- }
- geometry DEF GeoCylinder7 Cylinder {
- height 2.000
- radius 1.000
- }
- }
- ]
- }
- DEF dad_Cylinder8 Transform {
- translation 0 0 -3.5
- rotation 1 0 0 1.571
- children [
- DEF Cylinder8 Shape {
- appearance Appearance {
- material USE White
- }
- geometry DEF GeoCylinder8 Cylinder {
- height 6.000
- radius 0.250
- }
- }
- ]
- }
- DEF Box3 Shape {
- appearance Appearance {
- material USE White
- }
- geometry DEF GeoBox3 Box {
- size 1 1 1
- }
- }
- DEF dad_Box11 Transform {
- translation 0 1 -4
- children [
- DEF Box11 Shape {
- appearance Appearance {
- material USE White
- }
- geometry DEF GeoBox11 Box {
- size .25 .5 2
- }
- }
- ]
- }
- DEF Box4 Shape {
- appearance Appearance {
- material DEF White_wire Material {
- emissiveColor 1 1 1
- }
- }
- geometry IndexedLineSet {
- coordIndex [
- 0 1 2 0
- -1 0 2 3
- 0 -1 1 5
- 6 1 -1 1
- 6 2 1 -1
- 2 6 7 2
- -1 2 7 3
- 2 -1 3 7
- 4 3 -1 3
- 4 0 3 -1
- 0 4 5 0
- -1 0 5 1
- 0 -1 6 5
- 4 6 -1 6
- 4 7 6 -1
- ]
- coord Coordinate {
- point [
- -.5 .5 -.5
- -.5 .5 .5
- .5 .5 .5
- .5 .5 -.5
- -.5 -.5 -.5
- -.5 -.5 .5
- .5 -.5 .5
- .5 -.5 -.5
- ]
- }
- }
- }
- ]
- }
- DEF dad_Box2 Transform {
- translation 0 0 -5.5
- children [
- DEF Box2 Shape {
- appearance Appearance {
- material DEF Purple Material {
- ambientIntensity 0.200
- shininess 0.200
- diffuseColor .9176 0 .874
- }
- }
- geometry DEF GeoBox2 Box {
- size 2.8 2.8 1.5
- }
- }
- ]
- }
- DEF dad_Box6 Transform {
- translation 0 1.25 -5.5
- children [
- DEF Box6 Shape {
- appearance Appearance {
- material USE Purple
- }
- geometry DEF GeoBox21 Box {
- size .25 1 1.5
- }
- }
- ]
- }
- ]
- }
- DEF dad_Cylinder2 Transform {
- rotation 0 0 1 1.571
- scale 1.1 1.5 1.1
- children [
- DEF Cylinder2 Shape {
- appearance Appearance {
- material DEF Green Material {
- ambientIntensity 0.200
- shininess 0.200
- diffuseColor .00784 .65098 .02353
- }
- }
- geometry DEF Cylinder2_Geo IndexedFaceSet {
- creaseAngle 0.524
- coordIndex [
- 49 50 48 -1
- 48 50 51 -1
- 48 51 47 -1
- 47 51 20 -1
- 47 20 21 -1
- 12 13 56 -1
- 56 13 14 -1
- 56 14 55 -1
- 55 14 15 -1
- 55 15 54 -1
- 54 15 16 -1
- 54 16 53 -1
- 53 16 17 -1
- 53 17 52 -1
- 52 17 18 -1
- 52 18 51 -1
- 51 18 19 -1
- 51 19 20 -1
- 5 6 62 -1
- 62 6 7 -1
- 62 7 61 -1
- 61 7 8 -1
- 61 8 60 -1
- 60 8 9 -1
- 60 9 59 -1
- 59 9 10 -1
- 59 10 58 -1
- 58 10 11 -1
- 58 11 57 -1
- 57 11 12 -1
- 57 12 56 -1
- 5 63 4 -1
- 4 63 64 -1
- 4 64 3 -1
- 3 64 1 -1
- 3 1 2 -1
- 2 1 35 -1
- 2 35 36 -1
- 28 41 27 -1
- 27 41 42 -1
- 27 42 26 -1
- 26 42 43 -1
- 26 43 25 -1
- 25 43 44 -1
- 25 44 24 -1
- 24 44 45 -1
- 24 45 23 -1
- 23 45 46 -1
- 23 46 22 -1
- 22 46 47 -1
- 22 47 21 -1
- 34 36 33 -1
- 33 36 37 -1
- 33 37 32 -1
- 32 37 38 -1
- 32 38 31 -1
- 31 38 39 -1
- 31 39 30 -1
- 30 39 40 -1
- 30 40 29 -1
- 29 40 41 -1
- 29 41 28 -1
- 1 64 0 -1
- 2 36 34 -1
- 63 5 62 -1
- 95 96 97 -1
- 97 96 65 -1
- 97 65 129 -1
- 129 65 66 -1
- 129 66 128 -1
- 128 66 67 -1
- 128 67 127 -1
- 127 67 126 -1
- 104 105 88 -1
- 88 105 106 -1
- 88 106 87 -1
- 87 106 107 -1
- 87 107 86 -1
- 86 107 108 -1
- 86 108 85 -1
- 85 108 109 -1
- 85 109 84 -1
- 84 109 110 -1
- 84 110 83 -1
- 83 110 111 -1
- 83 111 82 -1
- 82 111 112 -1
- 82 112 113 -1
- 98 99 93 -1
- 93 99 100 -1
- 93 100 92 -1
- 92 100 101 -1
- 92 101 91 -1
- 91 101 102 -1
- 91 102 90 -1
- 90 102 103 -1
- 90 103 89 -1
- 89 103 104 -1
- 89 104 88 -1
- 94 95 97 -1
- 94 97 98 -1
- 94 98 93 -1
- 81 82 78 -1
- 81 78 79 -1
- 81 79 80 -1
- 78 82 113 -1
- 78 113 114 -1
- 78 114 115 -1
- 78 115 77 -1
- 120 73 119 -1
- 119 73 74 -1
- 119 74 118 -1
- 118 74 75 -1
- 118 75 117 -1
- 117 75 76 -1
- 117 76 116 -1
- 116 76 77 -1
- 116 77 115 -1
- 126 68 125 -1
- 125 68 69 -1
- 125 69 124 -1
- 124 69 70 -1
- 124 70 123 -1
- 123 70 71 -1
- 123 71 122 -1
- 122 71 72 -1
- 122 72 121 -1
- 121 72 73 -1
- 121 73 120 -1
- 126 67 68 -1
- 0 64 65 -1
- 0 65 96 -1
- 64 63 66 -1
- 64 66 65 -1
- 63 62 67 -1
- 63 67 66 -1
- 62 61 68 -1
- 62 68 67 -1
- 61 60 69 -1
- 61 69 68 -1
- 60 59 70 -1
- 60 70 69 -1
- 59 58 71 -1
- 59 71 70 -1
- 58 57 72 -1
- 58 72 71 -1
- 57 56 73 -1
- 57 73 72 -1
- 56 55 74 -1
- 56 74 73 -1
- 55 54 75 -1
- 55 75 74 -1
- 54 53 76 -1
- 54 76 75 -1
- 53 52 77 -1
- 53 77 76 -1
- 52 51 78 -1
- 52 78 77 -1
- 51 50 79 -1
- 51 79 78 -1
- 50 49 80 -1
- 50 80 79 -1
- 49 48 81 -1
- 49 81 80 -1
- 48 47 82 -1
- 48 82 81 -1
- 47 46 83 -1
- 47 83 82 -1
- 46 45 84 -1
- 46 84 83 -1
- 45 44 85 -1
- 45 85 84 -1
- 44 43 86 -1
- 44 86 85 -1
- 43 42 87 -1
- 43 87 86 -1
- 42 41 88 -1
- 42 88 87 -1
- 41 40 89 -1
- 41 89 88 -1
- 40 39 90 -1
- 40 90 89 -1
- 39 38 91 -1
- 39 91 90 -1
- 38 37 92 -1
- 38 92 91 -1
- 37 36 93 -1
- 37 93 92 -1
- 36 35 94 -1
- 36 94 93 -1
- 35 1 95 -1
- 35 95 94 -1
- 1 0 96 -1
- 1 96 95 -1
- ]
- coord DEF Cylinder2_Coord Coordinate {
- point [
- 0 1 -6
- -1.17054 1 -5.88471
- -1.07212 1 -5.3899
- -1.05189 1 -5.39596
- .02145 1 -5.49809
- 1.09408 1 -5.38886
- 2.1248 1 -5.07248
- 3.07398 1 -4.56108
- 3.90517 1 -3.87434
- 4.5864 1 -3.03864
- 5.0915 1 -2.08609
- 5.40107 1 -1.0533
- 5.5032 1 .02003
- 5.39398 1 1.09267
- 5.07759 1 2.12338
- 4.5662 1 3.07257
- 3.87945 1 3.90375
- 3.04375 1 4.58498
- 2.0912 1 5.09009
- 1.05842 1 5.39966
- -.01492 1 5.50179
- -1.08755 1 5.39256
- -2.11827 1 5.07617
- -3.06746 1 4.56478
- -3.89864 1 3.87804
- -4.57987 1 3.04233
- -5.08498 1 2.08979
- -5.39454 1 1.057
- -5.49668 1 -.01633
- -5.38745 1 -1.08897
- -5.07106 1 -2.11968
- -4.55967 1 -3.06887
- -3.87292 1 -3.90005
- -3.03722 1 -4.58129
- -2.08467 1 -5.08639
- -2.2961 1 -5.54328
- -3.33342 1 -4.98882
- -4.24264 1 -4.24264
- -4.98882 1 -3.33342
- -5.54328 1 -2.2961
- -5.88471 1 -1.17054
- -6 1 -0
- -5.88471 1 1.17054
- -5.54328 1 2.2961
- -4.98882 1 3.33342
- -4.24264 1 4.24264
- -3.33342 1 4.98882
- -2.2961 1 5.54328
- -1.17054 1 5.88471
- -0 1 6
- 1.17054 1 5.88471
- 2.2961 1 5.54328
- 3.33342 1 4.98882
- 4.24264 1 4.24264
- 4.98882 1 3.33342
- 5.54328 1 2.2961
- 5.88471 1 1.17054
- 6 1 0
- 5.88471 1 -1.17054
- 5.54328 1 -2.2961
- 4.98882 1 -3.33342
- 4.24264 1 -4.24264
- 3.33342 1 -4.98882
- 2.2961 1 -5.54328
- 1.17054 1 -5.88471
- 1.17054 -1 -5.88471
- 2.2961 -1 -5.54328
- 3.33342 -1 -4.98882
- 4.24264 -1 -4.24264
- 4.98882 -1 -3.33342
- 5.54328 -1 -2.2961
- 5.88471 -1 -1.17054
- 6 -1 -0
- 5.88471 -1 1.17054
- 5.54328 -1 2.2961
- 4.98882 -1 3.33342
- 4.24264 -1 4.24264
- 3.33342 -1 4.98882
- 2.2961 -1 5.54328
- 1.17054 -1 5.88471
- -0 -1 6
- -1.17054 -1 5.88471
- -2.2961 -1 5.54328
- -3.33342 -1 4.98882
- -4.24264 -1 4.24264
- -4.98882 -1 3.33342
- -5.54328 -1 2.2961
- -5.88471 -1 1.17054
- -6 -1 -0
- -5.88471 -1 -1.17054
- -5.54328 -1 -2.2961
- -4.98882 -1 -3.33342
- -4.24264 -1 -4.24264
- -3.33342 -1 -4.98882
- -2.2961 -1 -5.54328
- -1.17054 -1 -5.88471
- 0 -1 -6
- 0 -1 -5.50037
- -1.05842 -1 -5.39966
- -2.0912 -1 -5.09009
- -3.04375 -1 -4.58498
- -3.87945 -1 -3.90375
- -4.5662 -1 -3.07257
- -5.07759 -1 -2.12338
- -5.39398 -1 -1.09267
- -5.5032 -1 -.02003
- -5.40107 -1 1.0533
- -5.0915 -1 2.08609
- -4.5864 -1 3.03864
- -3.90517 -1 3.87434
- -3.07398 -1 4.56108
- -2.1248 -1 5.07248
- -1.09408 -1 5.38886
- -.02145 -1 5.49809
- 1.05189 -1 5.39596
- 2.08467 -1 5.08639
- 3.03722 -1 4.58129
- 3.87292 -1 3.90005
- 4.55967 -1 3.06887
- 5.07106 -1 2.11968
- 5.38745 -1 1.08897
- 5.49668 -1 .01633
- 5.39454 -1 -1.057
- 5.08498 -1 -2.08979
- 4.57987 -1 -3.04233
- 3.89864 -1 -3.87804
- 3.06746 -1 -4.56478
- 2.11827 -1 -5.07617
- 1.08755 -1 -5.39256
- .01492 -1 -5.50179
- ]
- }
- }
- }
- ]
- }
- DEF dad_Cylinder3 Transform {
- rotation 0 0 1 1.571
- scale 1.1 1.5 1.1
- children [
- DEF Cylinder3 Shape {
- appearance Appearance {
- material USE Green
- }
- geometry DEF Cylinder3_Geo IndexedFaceSet {
- creaseAngle 0.524
- coordIndex [
- 0 1 2 -1
- 0 2 3 -1
- 4 5 1 -1
- 4 1 0 -1
- 6 7 5 -1
- 6 5 4 -1
- 8 9 7 -1
- 8 7 6 -1
- 10 11 9 -1
- 10 9 8 -1
- 12 13 11 -1
- 12 11 10 -1
- 14 15 13 -1
- 14 13 12 -1
- 16 17 15 -1
- 16 15 14 -1
- 18 19 17 -1
- 18 17 16 -1
- 20 21 19 -1
- 20 19 18 -1
- 22 23 21 -1
- 22 21 20 -1
- 24 25 23 -1
- 24 23 22 -1
- 26 27 25 -1
- 26 25 24 -1
- 28 29 27 -1
- 28 27 26 -1
- 30 31 29 -1
- 30 29 28 -1
- 32 33 31 -1
- 32 31 30 -1
- 34 35 33 -1
- 34 33 32 -1
- 36 37 35 -1
- 36 35 34 -1
- 38 39 37 -1
- 38 37 36 -1
- 40 41 39 -1
- 40 39 38 -1
- 42 43 41 -1
- 42 41 40 -1
- 44 45 43 -1
- 44 43 42 -1
- 46 47 45 -1
- 46 45 44 -1
- 48 49 47 -1
- 48 47 46 -1
- 50 51 49 -1
- 50 49 48 -1
- 52 53 51 -1
- 52 51 50 -1
- 54 55 53 -1
- 54 53 52 -1
- 56 57 55 -1
- 56 55 54 -1
- 58 59 57 -1
- 58 57 56 -1
- 60 61 59 -1
- 60 59 58 -1
- 62 63 61 -1
- 62 61 60 -1
- 3 2 63 -1
- 3 63 62 -1
- ]
- coord DEF Cylinder3_Coord Coordinate {
- point [
- 1.073 -1.00635 -5.39432
- 1.073 .99367 -5.39432
- 0 .98997 -5.5
- 0 -1.01006 -5.5
- 2.10476 -1.0024 -5.08134
- 2.10476 .99763 -5.08134
- 3.05564 -.99836 -4.57308
- 3.05564 1.00167 -4.57308
- 3.88909 -.99438 -3.88909
- 3.88909 1.00565 -3.88909
- 4.57308 -.99061 -3.05564
- 4.57308 1.00941 -3.05564
- 5.08134 -.98721 -2.10476
- 5.08134 1.01282 -2.10476
- 5.39432 -.9843 -1.073
- 5.39432 1.01573 -1.073
- 5.5 -.98199 -0
- 5.5 1.01803 -0
- 5.39432 -.98038 1.073
- 5.39432 1.01965 1.073
- 5.08134 -.97952 2.10476
- 5.08134 1.02051 2.10476
- 4.57308 -.97945 3.05564
- 4.57308 1.02058 3.05564
- 3.88909 -.98017 3.88909
- 3.88909 1.01986 3.88909
- 3.05564 -.98165 4.57308
- 3.05564 1.01838 4.57308
- 2.10476 -.98383 5.08134
- 2.10476 1.01619 5.08134
- 1.073 -.98664 5.39432
- 1.073 1.01338 5.39432
- -0 -.98997 5.5
- -0 1.01006 5.5
- -1.073 -.99367 5.39432
- -1.073 1.00635 5.39432
- -2.10476 -.99763 5.08134
- -2.10476 1.0024 5.08134
- -3.05564 -1.00167 4.57308
- -3.05564 .99836 4.57308
- -3.88909 -1.00565 3.88909
- -3.88909 .99438 3.88909
- -4.57308 -1.00941 3.05564
- -4.57308 .99061 3.05564
- -5.08134 -1.01282 2.10476
- -5.08134 .98721 2.10476
- -5.39432 -1.01573 1.073
- -5.39432 .9843 1.073
- -5.5 -1.01803 -0
- -5.5 .98199 -0
- -5.39432 -1.01965 -1.073
- -5.39432 .98038 -1.073
- -5.08134 -1.02051 -2.10476
- -5.08134 .97952 -2.10476
- -4.57308 -1.02058 -3.05564
- -4.57308 .97945 -3.05564
- -3.88909 -1.01986 -3.88909
- -3.88909 .98017 -3.88909
- -3.05564 -1.01838 -4.57308
- -3.05564 .98165 -4.57308
- -2.10476 -1.01619 -5.08134
- -2.10476 .98383 -5.08134
- -1.073 -1.01338 -5.39432
- -1.073 .98664 -5.39432
- ]
- }
- }
- }
- ]
- }
- DEF dad_Cylinder5 Transform {
- translation 0 0 -8.4
- rotation 1 0 0 1.571
- children [
- DEF Cylinder5 Shape {
- appearance Appearance {
- material USE Green
- }
- geometry DEF GeoCylinder5 Cylinder {
- height 4.250
- radius 2.000
- }
- }
- ]
- }
- DEF dad_Box10 Transform {
- translation 0 2 -8.4
- children [
- DEF Box10 Shape {
- appearance Appearance {
- material USE Green
- }
- geometry DEF GeoBox10 Box {
- size .25 1 4.25
- }
- }
- ]
- }
- ]
- }
- DEF dad_lab_posttop Transform {
- translation 0 0 -11
- rotation -1 0 0 1.571
- children [
- DEF alpha_posttop Shape {
- appearance Appearance {
- material USE Red
- }
- geometry DEF GeoCylinder6 Cylinder {
- height 1.000
- radius 2.000
- }
- }
- ]
- }
- DEF dad_alpha_arm Transform {
- translation 0 -20.5 -5
- children [
- DEF alpha_arm Shape {
- appearance Appearance {
- material USE Red
- }
- geometry DEF GeoBox7 Box {
- size 4 1 13
- }
- }
- ]
- }
- DEF dad_gamma_arm1 Transform {
- translation -6 -20.5 0
- children [
- DEF gamma_arm1 Shape {
- appearance Appearance {
- material USE Red
- }
- geometry DEF GeoBox18 Box {
- size 1 2 .25
- }
- }
- ]
- }
- DEF dad_Box12 Transform {
- translation 0 2 -11
- children [
- DEF Box12 Shape {
- appearance Appearance {
- material USE Red
- }
- geometry DEF GeoBox12 Box {
- size .25 1 1
- }
- }
- ]
- }
- ]
-}
-DEF dad_gamma_frame Transform {
- rotation 0 1 0 .349
- children [
- DEF dad_lab_posttop0 Transform {
- translation 0 0 -12.5
- rotation -1 0 0 1.571
- children [
- DEF gamma_posttop Shape {
- appearance Appearance {
- material DEF Blue Material {
- ambientIntensity 0.200
- shininess 0.200
- diffuseColor 0 0 .62745
- }
- }
- geometry DEF GeoCylinder4 Cylinder {
- height 1.000
- radius 2.000
- }
- }
- ]
- }
- DEF dad_lab_post0 Transform {
- translation 0 -11 -12.5
- children [
- DEF gamma_post Shape {
- appearance Appearance {
- material USE Blue
- }
- geometry DEF GeoBox5 Box {
- size 4 22 1
- }
- }
- ]
- }
- DEF dad_gamma_base Transform {
- translation 0 -22.5 0
- children [
- DEF gamma_base Shape {
- appearance Appearance {
- material USE Blue
- }
- geometry DEF GeoCylinder3 Cylinder {
- height 2.000
- radius 8.000
- }
- }
- ]
- }
- DEF dad_gamma_arm Transform {
- translation 0 -22.5 -6.5
- children [
- DEF gamma_arm Shape {
- appearance Appearance {
- material USE Blue
- }
- geometry DEF GeoBox4 Box {
- size 4 1 13
- }
- }
- ]
- }
- DEF dad_delta_frame Transform {
- rotation 0 0 1 -.524
- children [
- DEF dad_delta_mount Transform {
- translation 0 0 -15
- rotation -1 0 0 1.571
- children [
- DEF delta_mount Shape {
- appearance Appearance {
- material DEF Yellow Material {
- ambientIntensity 0.200
- shininess 0.200
- diffuseColor .83529 .83529 0
- }
- }
- geometry DEF GeoCylinder2 Cylinder {
- height 4.000
- radius 2.000
- }
- }
- ]
- }
- DEF dad_delta_arm Transform {
- translation -10 0 -15
- children [
- DEF delta_arm Shape {
- appearance Appearance {
- material USE Yellow
- }
- geometry DEF GeoBox8 Box {
- size 20 3 1
- }
- }
- ]
- }
- DEF dad_delta_arm0 Transform {
- translation -20 0 -6.5
- children [
- DEF delta_arm0 Shape {
- appearance Appearance {
- material USE Yellow
- }
- geometry DEF GeoBox6 Box {
- size 1 3 18
- }
- }
- ]
- }
- DEF dad_Cylinder14 Transform {
- translation -18 0 0
- rotation .577 -.577 .577 2.094
- children [
- DEF Cylinder14 Shape {
- appearance Appearance {
- material USE Yellow
- }
- geometry DEF GeoCylinder14 Cylinder {
- height 3.000
- radius 1.000
- }
- }
- ]
- }
- DEF dad_detector_beam Transform {
- translation -10 0 0
- rotation 0 0 1 1.571
- children [
- DEF detector_beam Shape {
- appearance Appearance {
- material USE White
- }
- geometry DEF GeoCylinder21 Cylinder {
- height 20.000
- radius 0.050
- }
- }
- ]
- }
- DEF dad_Box13 Transform {
- translation 0 2 -15
- children [
- DEF Box13 Shape {
- appearance Appearance {
- material USE Yellow
- }
- geometry DEF GeoBox13 Box {
- size .25 1 4
- }
- }
- ]
- }
- ]
- }
- DEF dad_gamma_arm0 Transform {
- translation -8 -22.5 0
- children [
- DEF gamma_arm0 Shape {
- appearance Appearance {
- material USE Blue
- }
- geometry DEF GeoBox17 Box {
- size 1 2 .25
- }
- }
- ]
- }
- DEF dad_Box14 Transform {
- translation 0 2 -12.5
- children [
- DEF Box14 Shape {
- appearance Appearance {
- material USE Blue
- }
- geometry DEF GeoBox14 Box {
- size .25 1 1
- }
- }
- ]
- }
- ]
-}
-DEF VP Viewpoint {
- description "VP"
- jump TRUE
- fieldOfView 1.165
- position 40 40 40
- orientation -.754 .657 -0 1.001
-}
-DEF dad_gamma_arm2 Transform {
- translation -9 -24.5 0
- children [
- DEF gamma_arm2 Shape {
- appearance Appearance {
- material DEF Black Material {
- ambientIntensity 0.200
- shininess 0.200
- diffuseColor .20784 .20784 .20784
- }
- }
- geometry DEF GeoBox19 Box {
- size 1 2 .25
- }
- }
- ]
-}
-DEF dad_gamma_base0 Transform {
- translation 0 -24.5 0
- rotation 0 1 0 .349
- children [
- DEF gamma_base0 Shape {
- appearance Appearance {
- material USE Black
- }
- geometry DEF GeoCylinder9 Cylinder {
- height 2.000
- radius 9.000
- }
- }
- ]
-}
-DEF dad_floor Transform {
- translation 0 -25.5 0
- children [
- DEF floor Shape {
- appearance Appearance {
- material USE Black
- }
- geometry DEF GeoBox16 Box {
- size 60 .2 40
- }
- }
- ]
-}
diff --git a/script/__Lib/diffcalc-2.1/model/sixc_horizontal.fxw b/script/__Lib/diffcalc-2.1/model/sixc_horizontal.fxw
deleted file mode 100755
index 9eea919..0000000
Binary files a/script/__Lib/diffcalc-2.1/model/sixc_horizontal.fxw and /dev/null differ
diff --git a/script/__Lib/diffcalc-2.1/model/sixc_horizontal.wrl b/script/__Lib/diffcalc-2.1/model/sixc_horizontal.wrl
deleted file mode 100755
index 3ec9d25..0000000
--- a/script/__Lib/diffcalc-2.1/model/sixc_horizontal.wrl
+++ /dev/null
@@ -1,1106 +0,0 @@
-#VRML V2.0 utf8
-WorldInfo {
- title "fourc"
- info ["This Web3D Content was created with Flux Studio, a Web3D authoring tool"
- "www.mediamachines.com"
- "This Web3D Content was created with Flux Studio, a Web3D authoring tool"]
-}
-## Vizthumbnail Thumb_sixc_horizontal_wrl8844311285236111.jpg
-DEF dad_GROUND_ROTATED Transform {
- rotation 1 0 0 1.571
- children [
- DirectionalLight {
- intensity 1.000
- ambientIntensity 0.500
- direction -.621 -.23944 -.74634
- color 1 1 1
- on TRUE
- }
- DirectionalLight {
- intensity 1.000
- ambientIntensity 0.000
- direction -.01373 -.46642 -.88446
- color 1 1 1
- on TRUE
- }
- DEF lab_x Shape {
- appearance Appearance {
- material DEF Rust Material {
- ambientIntensity 0.200
- shininess 0.200
- diffuseColor .50196 .50196 .50196
- }
- }
- geometry DEF GeoCylinder15 Cylinder {
- height 60.000
- radius 0.020
- }
- }
- DEF dad_lab_z Transform {
- rotation 1 0 0 1.571
- children [
- DEF lab_z Shape {
- appearance Appearance {
- material USE Rust
- }
- geometry DEF GeoCylinder17 Cylinder {
- height 40.000
- radius 0.020
- }
- }
- ]
- }
- DEF dad_lab_beam Transform {
- translation 10 0 0
- rotation 0 0 1 1.571
- children [
- DEF lab_beam Shape {
- appearance Appearance {
- material DEF White Material {
- ambientIntensity 0.500
- shininess 0.100
- transparency 0.500
- diffuseColor 1 1 1
- emissiveColor 1 1 1
- }
- }
- geometry DEF GeoCylinder20 Cylinder {
- height 20.000
- radius 0.050
- }
- }
- ]
- }
- DEF dad_lab_beam0 Transform {
- translation 20 0 0
- rotation 0 0 1 1.571
- children [
- DEF lab_beam0 Shape {
- appearance Appearance {
- material DEF Shiny_Black Material {
- ambientIntensity 0.200
- shininess 0.100
- diffuseColor 1 1 1
- }
- }
- geometry DEF GeoCylinder22 Cylinder {
- height 4.000
- radius 0.200
- }
- }
- ]
- }
- DEF dad_Cone2 Transform {
- translation 17.5 0 0
- rotation 0 0 1 1.571
- children [
- DEF Cone2 Shape {
- appearance Appearance {
- material USE Shiny_Black
- }
- geometry DEF GeoCone2 Cone {
- height 1.500
- bottomRadius 0.500
- }
- }
- ]
- }
- DEF dad_lab_y Transform {
- rotation 0 0 -1 1.571
- children [
- DEF lab_y Shape {
- appearance Appearance {
- material USE Rust
- }
- geometry DEF GeoCylinder16 Cylinder {
- height 60.000
- radius 0.020
- }
- }
- ]
- }
- DEF dad_alpha_frame Transform {
- rotation 0 1 0 .175
- children [
- DEF dad_alpha_base Transform {
- translation 0 -20.5 0
- children [
- DEF alpha_base Shape {
- appearance Appearance {
- material DEF Red Material {
- ambientIntensity 0.200
- shininess 0.200
- diffuseColor .50196 0 0
- }
- }
- geometry DEF GeoCylinder1 Cylinder {
- height 2.000
- radius 6.000
- }
- }
- ]
- }
- DEF dad_lab_post Transform {
- translation 0 -10 -11
- children [
- DEF alpha_post Shape {
- appearance Appearance {
- material USE Red
- }
- geometry DEF GeoBox1 Box {
- size 4 20 1
- }
- }
- ]
- }
- DEF dad_omega_frame Transform {
- rotation 0 0 1 -.175
- children [
- DEF dad_chi_frame Transform {
- rotation 1 0 0 -.785
- children [
- DEF dad_phi_frame Transform {
- rotation 0 0 1 -.349
- children [
- DEF dad_Cylinder7 Transform {
- translation 0 0 -4
- rotation 1 0 0 1.571
- children [
- DEF Cylinder7 Shape {
- appearance Appearance {
- material USE White
- }
- geometry DEF GeoCylinder7 Cylinder {
- height 2.000
- radius 1.000
- }
- }
- ]
- }
- DEF dad_Cylinder8 Transform {
- translation 0 0 -3.5
- rotation 1 0 0 1.571
- children [
- DEF Cylinder8 Shape {
- appearance Appearance {
- material USE White
- }
- geometry DEF GeoCylinder8 Cylinder {
- height 6.000
- radius 0.250
- }
- }
- ]
- }
- DEF Box3 Shape {
- appearance Appearance {
- material USE White
- }
- geometry DEF GeoBox3 Box {
- size 1 1 1
- }
- }
- DEF dad_Box11 Transform {
- translation 0 1 -4
- children [
- DEF Box11 Shape {
- appearance Appearance {
- material USE White
- }
- geometry DEF GeoBox11 Box {
- size .25 .5 2
- }
- }
- ]
- }
- DEF Box4 Shape {
- appearance Appearance {
- material DEF White_wire Material {
- emissiveColor 1 1 1
- }
- }
- geometry IndexedLineSet {
- coordIndex [
- 0 1 2 0
- -1 0 2 3
- 0 -1 1 5
- 6 1 -1 1
- 6 2 1 -1
- 2 6 7 2
- -1 2 7 3
- 2 -1 3 7
- 4 3 -1 3
- 4 0 3 -1
- 0 4 5 0
- -1 0 5 1
- 0 -1 6 5
- 4 6 -1 6
- 4 7 6 -1
- ]
- coord Coordinate {
- point [
- -.5 .5 -.5
- -.5 .5 .5
- .5 .5 .5
- .5 .5 -.5
- -.5 -.5 -.5
- -.5 -.5 .5
- .5 -.5 .5
- .5 -.5 -.5
- ]
- }
- }
- }
- ]
- }
- DEF dad_Box2 Transform {
- translation 0 0 -5.5
- children [
- DEF Box2 Shape {
- appearance Appearance {
- material DEF Purple Material {
- ambientIntensity 0.200
- shininess 0.200
- diffuseColor .9176 0 .874
- }
- }
- geometry DEF GeoBox2 Box {
- size 2.8 2.8 1.5
- }
- }
- ]
- }
- DEF dad_Box6 Transform {
- translation 0 1.25 -5.5
- children [
- DEF Box6 Shape {
- appearance Appearance {
- material USE Purple
- }
- geometry DEF GeoBox21 Box {
- size .25 1 1.5
- }
- }
- ]
- }
- ]
- }
- DEF dad_Cylinder2 Transform {
- rotation 0 0 1 1.571
- scale 1.1 1.5 1.1
- children [
- DEF Cylinder2 Shape {
- appearance Appearance {
- material DEF Green Material {
- ambientIntensity 0.200
- shininess 0.200
- diffuseColor .00784 .65098 .02353
- }
- }
- geometry DEF Cylinder2_Geo IndexedFaceSet {
- creaseAngle 0.524
- coordIndex [
- 49 50 48 -1
- 48 50 51 -1
- 48 51 47 -1
- 47 51 20 -1
- 47 20 21 -1
- 12 13 56 -1
- 56 13 14 -1
- 56 14 55 -1
- 55 14 15 -1
- 55 15 54 -1
- 54 15 16 -1
- 54 16 53 -1
- 53 16 17 -1
- 53 17 52 -1
- 52 17 18 -1
- 52 18 51 -1
- 51 18 19 -1
- 51 19 20 -1
- 5 6 62 -1
- 62 6 7 -1
- 62 7 61 -1
- 61 7 8 -1
- 61 8 60 -1
- 60 8 9 -1
- 60 9 59 -1
- 59 9 10 -1
- 59 10 58 -1
- 58 10 11 -1
- 58 11 57 -1
- 57 11 12 -1
- 57 12 56 -1
- 5 63 4 -1
- 4 63 64 -1
- 4 64 3 -1
- 3 64 1 -1
- 3 1 2 -1
- 2 1 35 -1
- 2 35 36 -1
- 28 41 27 -1
- 27 41 42 -1
- 27 42 26 -1
- 26 42 43 -1
- 26 43 25 -1
- 25 43 44 -1
- 25 44 24 -1
- 24 44 45 -1
- 24 45 23 -1
- 23 45 46 -1
- 23 46 22 -1
- 22 46 47 -1
- 22 47 21 -1
- 34 36 33 -1
- 33 36 37 -1
- 33 37 32 -1
- 32 37 38 -1
- 32 38 31 -1
- 31 38 39 -1
- 31 39 30 -1
- 30 39 40 -1
- 30 40 29 -1
- 29 40 41 -1
- 29 41 28 -1
- 1 64 0 -1
- 2 36 34 -1
- 63 5 62 -1
- 95 96 97 -1
- 97 96 65 -1
- 97 65 129 -1
- 129 65 66 -1
- 129 66 128 -1
- 128 66 67 -1
- 128 67 127 -1
- 127 67 126 -1
- 104 105 88 -1
- 88 105 106 -1
- 88 106 87 -1
- 87 106 107 -1
- 87 107 86 -1
- 86 107 108 -1
- 86 108 85 -1
- 85 108 109 -1
- 85 109 84 -1
- 84 109 110 -1
- 84 110 83 -1
- 83 110 111 -1
- 83 111 82 -1
- 82 111 112 -1
- 82 112 113 -1
- 98 99 93 -1
- 93 99 100 -1
- 93 100 92 -1
- 92 100 101 -1
- 92 101 91 -1
- 91 101 102 -1
- 91 102 90 -1
- 90 102 103 -1
- 90 103 89 -1
- 89 103 104 -1
- 89 104 88 -1
- 94 95 97 -1
- 94 97 98 -1
- 94 98 93 -1
- 81 82 78 -1
- 81 78 79 -1
- 81 79 80 -1
- 78 82 113 -1
- 78 113 114 -1
- 78 114 115 -1
- 78 115 77 -1
- 120 73 119 -1
- 119 73 74 -1
- 119 74 118 -1
- 118 74 75 -1
- 118 75 117 -1
- 117 75 76 -1
- 117 76 116 -1
- 116 76 77 -1
- 116 77 115 -1
- 126 68 125 -1
- 125 68 69 -1
- 125 69 124 -1
- 124 69 70 -1
- 124 70 123 -1
- 123 70 71 -1
- 123 71 122 -1
- 122 71 72 -1
- 122 72 121 -1
- 121 72 73 -1
- 121 73 120 -1
- 126 67 68 -1
- 0 64 65 -1
- 0 65 96 -1
- 64 63 66 -1
- 64 66 65 -1
- 63 62 67 -1
- 63 67 66 -1
- 62 61 68 -1
- 62 68 67 -1
- 61 60 69 -1
- 61 69 68 -1
- 60 59 70 -1
- 60 70 69 -1
- 59 58 71 -1
- 59 71 70 -1
- 58 57 72 -1
- 58 72 71 -1
- 57 56 73 -1
- 57 73 72 -1
- 56 55 74 -1
- 56 74 73 -1
- 55 54 75 -1
- 55 75 74 -1
- 54 53 76 -1
- 54 76 75 -1
- 53 52 77 -1
- 53 77 76 -1
- 52 51 78 -1
- 52 78 77 -1
- 51 50 79 -1
- 51 79 78 -1
- 50 49 80 -1
- 50 80 79 -1
- 49 48 81 -1
- 49 81 80 -1
- 48 47 82 -1
- 48 82 81 -1
- 47 46 83 -1
- 47 83 82 -1
- 46 45 84 -1
- 46 84 83 -1
- 45 44 85 -1
- 45 85 84 -1
- 44 43 86 -1
- 44 86 85 -1
- 43 42 87 -1
- 43 87 86 -1
- 42 41 88 -1
- 42 88 87 -1
- 41 40 89 -1
- 41 89 88 -1
- 40 39 90 -1
- 40 90 89 -1
- 39 38 91 -1
- 39 91 90 -1
- 38 37 92 -1
- 38 92 91 -1
- 37 36 93 -1
- 37 93 92 -1
- 36 35 94 -1
- 36 94 93 -1
- 35 1 95 -1
- 35 95 94 -1
- 1 0 96 -1
- 1 96 95 -1
- ]
- coord DEF Cylinder2_Coord Coordinate {
- point [
- 0 1 -6
- -1.17054 1 -5.88471
- -1.07212 1 -5.3899
- -1.05189 1 -5.39596
- .02145 1 -5.49809
- 1.09408 1 -5.38886
- 2.1248 1 -5.07248
- 3.07398 1 -4.56108
- 3.90517 1 -3.87434
- 4.5864 1 -3.03864
- 5.0915 1 -2.08609
- 5.40107 1 -1.0533
- 5.5032 1 .02003
- 5.39398 1 1.09267
- 5.07759 1 2.12338
- 4.5662 1 3.07257
- 3.87945 1 3.90375
- 3.04375 1 4.58498
- 2.0912 1 5.09009
- 1.05842 1 5.39966
- -.01492 1 5.50179
- -1.08755 1 5.39256
- -2.11827 1 5.07617
- -3.06746 1 4.56478
- -3.89864 1 3.87804
- -4.57987 1 3.04233
- -5.08498 1 2.08979
- -5.39454 1 1.057
- -5.49668 1 -.01633
- -5.38745 1 -1.08897
- -5.07106 1 -2.11968
- -4.55967 1 -3.06887
- -3.87292 1 -3.90005
- -3.03722 1 -4.58129
- -2.08467 1 -5.08639
- -2.2961 1 -5.54328
- -3.33342 1 -4.98882
- -4.24264 1 -4.24264
- -4.98882 1 -3.33342
- -5.54328 1 -2.2961
- -5.88471 1 -1.17054
- -6 1 -0
- -5.88471 1 1.17054
- -5.54328 1 2.2961
- -4.98882 1 3.33342
- -4.24264 1 4.24264
- -3.33342 1 4.98882
- -2.2961 1 5.54328
- -1.17054 1 5.88471
- -0 1 6
- 1.17054 1 5.88471
- 2.2961 1 5.54328
- 3.33342 1 4.98882
- 4.24264 1 4.24264
- 4.98882 1 3.33342
- 5.54328 1 2.2961
- 5.88471 1 1.17054
- 6 1 0
- 5.88471 1 -1.17054
- 5.54328 1 -2.2961
- 4.98882 1 -3.33342
- 4.24264 1 -4.24264
- 3.33342 1 -4.98882
- 2.2961 1 -5.54328
- 1.17054 1 -5.88471
- 1.17054 -1 -5.88471
- 2.2961 -1 -5.54328
- 3.33342 -1 -4.98882
- 4.24264 -1 -4.24264
- 4.98882 -1 -3.33342
- 5.54328 -1 -2.2961
- 5.88471 -1 -1.17054
- 6 -1 -0
- 5.88471 -1 1.17054
- 5.54328 -1 2.2961
- 4.98882 -1 3.33342
- 4.24264 -1 4.24264
- 3.33342 -1 4.98882
- 2.2961 -1 5.54328
- 1.17054 -1 5.88471
- -0 -1 6
- -1.17054 -1 5.88471
- -2.2961 -1 5.54328
- -3.33342 -1 4.98882
- -4.24264 -1 4.24264
- -4.98882 -1 3.33342
- -5.54328 -1 2.2961
- -5.88471 -1 1.17054
- -6 -1 -0
- -5.88471 -1 -1.17054
- -5.54328 -1 -2.2961
- -4.98882 -1 -3.33342
- -4.24264 -1 -4.24264
- -3.33342 -1 -4.98882
- -2.2961 -1 -5.54328
- -1.17054 -1 -5.88471
- 0 -1 -6
- 0 -1 -5.50037
- -1.05842 -1 -5.39966
- -2.0912 -1 -5.09009
- -3.04375 -1 -4.58498
- -3.87945 -1 -3.90375
- -4.5662 -1 -3.07257
- -5.07759 -1 -2.12338
- -5.39398 -1 -1.09267
- -5.5032 -1 -.02003
- -5.40107 -1 1.0533
- -5.0915 -1 2.08609
- -4.5864 -1 3.03864
- -3.90517 -1 3.87434
- -3.07398 -1 4.56108
- -2.1248 -1 5.07248
- -1.09408 -1 5.38886
- -.02145 -1 5.49809
- 1.05189 -1 5.39596
- 2.08467 -1 5.08639
- 3.03722 -1 4.58129
- 3.87292 -1 3.90005
- 4.55967 -1 3.06887
- 5.07106 -1 2.11968
- 5.38745 -1 1.08897
- 5.49668 -1 .01633
- 5.39454 -1 -1.057
- 5.08498 -1 -2.08979
- 4.57987 -1 -3.04233
- 3.89864 -1 -3.87804
- 3.06746 -1 -4.56478
- 2.11827 -1 -5.07617
- 1.08755 -1 -5.39256
- .01492 -1 -5.50179
- ]
- }
- }
- }
- ]
- }
- DEF dad_Cylinder3 Transform {
- rotation 0 0 1 1.571
- scale 1.1 1.5 1.1
- children [
- DEF Cylinder3 Shape {
- appearance Appearance {
- material USE Green
- }
- geometry DEF Cylinder3_Geo IndexedFaceSet {
- creaseAngle 0.524
- coordIndex [
- 0 1 2 -1
- 0 2 3 -1
- 4 5 1 -1
- 4 1 0 -1
- 6 7 5 -1
- 6 5 4 -1
- 8 9 7 -1
- 8 7 6 -1
- 10 11 9 -1
- 10 9 8 -1
- 12 13 11 -1
- 12 11 10 -1
- 14 15 13 -1
- 14 13 12 -1
- 16 17 15 -1
- 16 15 14 -1
- 18 19 17 -1
- 18 17 16 -1
- 20 21 19 -1
- 20 19 18 -1
- 22 23 21 -1
- 22 21 20 -1
- 24 25 23 -1
- 24 23 22 -1
- 26 27 25 -1
- 26 25 24 -1
- 28 29 27 -1
- 28 27 26 -1
- 30 31 29 -1
- 30 29 28 -1
- 32 33 31 -1
- 32 31 30 -1
- 34 35 33 -1
- 34 33 32 -1
- 36 37 35 -1
- 36 35 34 -1
- 38 39 37 -1
- 38 37 36 -1
- 40 41 39 -1
- 40 39 38 -1
- 42 43 41 -1
- 42 41 40 -1
- 44 45 43 -1
- 44 43 42 -1
- 46 47 45 -1
- 46 45 44 -1
- 48 49 47 -1
- 48 47 46 -1
- 50 51 49 -1
- 50 49 48 -1
- 52 53 51 -1
- 52 51 50 -1
- 54 55 53 -1
- 54 53 52 -1
- 56 57 55 -1
- 56 55 54 -1
- 58 59 57 -1
- 58 57 56 -1
- 60 61 59 -1
- 60 59 58 -1
- 62 63 61 -1
- 62 61 60 -1
- 3 2 63 -1
- 3 63 62 -1
- ]
- coord DEF Cylinder3_Coord Coordinate {
- point [
- 1.073 -1.00635 -5.39432
- 1.073 .99367 -5.39432
- 0 .98997 -5.5
- 0 -1.01006 -5.5
- 2.10476 -1.0024 -5.08134
- 2.10476 .99763 -5.08134
- 3.05564 -.99836 -4.57308
- 3.05564 1.00167 -4.57308
- 3.88909 -.99438 -3.88909
- 3.88909 1.00565 -3.88909
- 4.57308 -.99061 -3.05564
- 4.57308 1.00941 -3.05564
- 5.08134 -.98721 -2.10476
- 5.08134 1.01282 -2.10476
- 5.39432 -.9843 -1.073
- 5.39432 1.01573 -1.073
- 5.5 -.98199 -0
- 5.5 1.01803 -0
- 5.39432 -.98038 1.073
- 5.39432 1.01965 1.073
- 5.08134 -.97952 2.10476
- 5.08134 1.02051 2.10476
- 4.57308 -.97945 3.05564
- 4.57308 1.02058 3.05564
- 3.88909 -.98017 3.88909
- 3.88909 1.01986 3.88909
- 3.05564 -.98165 4.57308
- 3.05564 1.01838 4.57308
- 2.10476 -.98383 5.08134
- 2.10476 1.01619 5.08134
- 1.073 -.98664 5.39432
- 1.073 1.01338 5.39432
- -0 -.98997 5.5
- -0 1.01006 5.5
- -1.073 -.99367 5.39432
- -1.073 1.00635 5.39432
- -2.10476 -.99763 5.08134
- -2.10476 1.0024 5.08134
- -3.05564 -1.00167 4.57308
- -3.05564 .99836 4.57308
- -3.88909 -1.00565 3.88909
- -3.88909 .99438 3.88909
- -4.57308 -1.00941 3.05564
- -4.57308 .99061 3.05564
- -5.08134 -1.01282 2.10476
- -5.08134 .98721 2.10476
- -5.39432 -1.01573 1.073
- -5.39432 .9843 1.073
- -5.5 -1.01803 -0
- -5.5 .98199 -0
- -5.39432 -1.01965 -1.073
- -5.39432 .98038 -1.073
- -5.08134 -1.02051 -2.10476
- -5.08134 .97952 -2.10476
- -4.57308 -1.02058 -3.05564
- -4.57308 .97945 -3.05564
- -3.88909 -1.01986 -3.88909
- -3.88909 .98017 -3.88909
- -3.05564 -1.01838 -4.57308
- -3.05564 .98165 -4.57308
- -2.10476 -1.01619 -5.08134
- -2.10476 .98383 -5.08134
- -1.073 -1.01338 -5.39432
- -1.073 .98664 -5.39432
- ]
- }
- }
- }
- ]
- }
- DEF dad_Box10 Transform {
- translation 0 2 -8.4
- children [
- DEF Box10 Shape {
- appearance Appearance {
- material USE Green
- }
- geometry DEF GeoBox10 Box {
- size .25 1 4.25
- }
- }
- ]
- }
- DEF dad_Cylinder5 Transform {
- translation 0 0 -8.4
- rotation 1 0 0 1.571
- children [
- DEF Cylinder5 Shape {
- appearance Appearance {
- material USE Green
- }
- geometry DEF GeoCylinder5 Cylinder {
- height 4.250
- radius 2.000
- }
- }
- ]
- }
- ]
- }
- DEF dad_lab_posttop Transform {
- translation 0 0 -11
- rotation -1 0 0 1.571
- children [
- DEF alpha_posttop Shape {
- appearance Appearance {
- material USE Red
- }
- geometry DEF GeoCylinder6 Cylinder {
- height 1.000
- radius 2.000
- }
- }
- ]
- }
- DEF dad_alpha_arm Transform {
- translation 0 -20.5 -5
- children [
- DEF alpha_arm Shape {
- appearance Appearance {
- material USE Red
- }
- geometry DEF GeoBox7 Box {
- size 4 1 13
- }
- }
- ]
- }
- DEF dad_gamma_arm1 Transform {
- translation -6 -20.5 0
- children [
- DEF gamma_arm1 Shape {
- appearance Appearance {
- material USE Red
- }
- geometry DEF GeoBox18 Box {
- size 1 2 .25
- }
- }
- ]
- }
- DEF dad_Box12 Transform {
- translation 0 2 -11
- children [
- DEF Box12 Shape {
- appearance Appearance {
- material USE Red
- }
- geometry DEF GeoBox12 Box {
- size .25 1 1
- }
- }
- ]
- }
- ]
- }
- DEF dad_gamma_frame Transform {
- rotation 0 1 0 .349
- children [
- DEF dad_lab_posttop0 Transform {
- translation 0 0 -12.5
- rotation -1 0 0 1.571
- children [
- DEF gamma_posttop Shape {
- appearance Appearance {
- material DEF Blue Material {
- ambientIntensity 0.200
- shininess 0.200
- diffuseColor 0 0 .62745
- }
- }
- geometry DEF GeoCylinder4 Cylinder {
- height 1.000
- radius 2.000
- }
- }
- ]
- }
- DEF dad_lab_post0 Transform {
- translation 0 -11 -12.5
- children [
- DEF gamma_post Shape {
- appearance Appearance {
- material USE Blue
- }
- geometry DEF GeoBox5 Box {
- size 4 22 1
- }
- }
- ]
- }
- DEF dad_gamma_base Transform {
- translation 0 -22.5 0
- children [
- DEF gamma_base Shape {
- appearance Appearance {
- material USE Blue
- }
- geometry DEF GeoCylinder3 Cylinder {
- height 2.000
- radius 8.000
- }
- }
- ]
- }
- DEF dad_gamma_arm Transform {
- translation 0 -22.5 -6.5
- children [
- DEF gamma_arm Shape {
- appearance Appearance {
- material USE Blue
- }
- geometry DEF GeoBox4 Box {
- size 4 1 13
- }
- }
- ]
- }
- DEF dad_delta_frame Transform {
- rotation 0 0 1 -.524
- children [
- DEF dad_delta_mount Transform {
- translation 0 0 -15
- rotation -1 0 0 1.571
- children [
- DEF delta_mount Shape {
- appearance Appearance {
- material DEF Yellow Material {
- ambientIntensity 0.200
- shininess 0.200
- diffuseColor .83529 .83529 0
- }
- }
- geometry DEF GeoCylinder2 Cylinder {
- height 4.000
- radius 2.000
- }
- }
- ]
- }
- DEF dad_delta_arm Transform {
- translation -10 0 -15
- children [
- DEF delta_arm Shape {
- appearance Appearance {
- material USE Yellow
- }
- geometry DEF GeoBox8 Box {
- size 20 3 1
- }
- }
- ]
- }
- DEF dad_delta_arm0 Transform {
- translation -20 0 -6.5
- children [
- DEF delta_arm0 Shape {
- appearance Appearance {
- material USE Yellow
- }
- geometry DEF GeoBox6 Box {
- size 1 3 18
- }
- }
- ]
- }
- DEF dad_Cylinder14 Transform {
- translation -18 0 0
- rotation .577 -.577 .577 2.094
- children [
- DEF Cylinder14 Shape {
- appearance Appearance {
- material USE Yellow
- }
- geometry DEF GeoCylinder14 Cylinder {
- height 3.000
- radius 1.000
- }
- }
- ]
- }
- DEF dad_detector_beam Transform {
- translation -10 0 0
- rotation 0 0 1 1.571
- children [
- DEF detector_beam Shape {
- appearance Appearance {
- material USE White
- }
- geometry DEF GeoCylinder21 Cylinder {
- height 20.000
- radius 0.050
- }
- }
- ]
- }
- DEF dad_Box13 Transform {
- translation 0 2 -15
- children [
- DEF Box13 Shape {
- appearance Appearance {
- material USE Yellow
- }
- geometry DEF GeoBox13 Box {
- size .25 1 4
- }
- }
- ]
- }
- ]
- }
- DEF dad_gamma_arm0 Transform {
- translation -8 -22.5 0
- children [
- DEF gamma_arm0 Shape {
- appearance Appearance {
- material USE Blue
- }
- geometry DEF GeoBox17 Box {
- size 1 2 .25
- }
- }
- ]
- }
- DEF dad_Box14 Transform {
- translation 0 2 -12.5
- children [
- DEF Box14 Shape {
- appearance Appearance {
- material USE Blue
- }
- geometry DEF GeoBox14 Box {
- size .25 1 1
- }
- }
- ]
- }
- ]
- }
- DEF dad_gamma_arm2 Transform {
- translation -9 -24.5 0
- children [
- DEF gamma_arm2 Shape {
- appearance Appearance {
- material DEF Black Material {
- ambientIntensity 0.200
- shininess 0.200
- diffuseColor .20784 .20784 .20784
- }
- }
- geometry DEF GeoBox19 Box {
- size 1 2 .25
- }
- }
- ]
- }
- DEF dad_gamma_base0 Transform {
- translation 0 -24.5 0
- rotation 0 1 0 .349
- children [
- DEF gamma_base0 Shape {
- appearance Appearance {
- material USE Black
- }
- geometry DEF GeoCylinder9 Cylinder {
- height 2.000
- radius 9.000
- }
- }
- ]
- }
- DEF dad_floor Transform {
- translation 0 -25.5 0
- children [
- DEF floor Shape {
- appearance Appearance {
- material USE Black
- }
- geometry DEF GeoBox16 Box {
- size 60 .2 40
- }
- }
- ]
- }
- DEF VP Viewpoint {
- description "VP"
- jump TRUE
- fieldOfView 1.165
- position 40 40 40
- orientation -.754 .657 -0 1.001
- }
- ]
-}
diff --git a/script/__Lib/diffcalc-2.1/model/vrml_animator.py b/script/__Lib/diffcalc-2.1/model/vrml_animator.py
deleted file mode 100755
index d283469..0000000
--- a/script/__Lib/diffcalc-2.1/model/vrml_animator.py
+++ /dev/null
@@ -1,134 +0,0 @@
-###
-# Copyright 2008-2011 Diamond Light Source Ltd.
-# This file is part of Diffcalc.
-#
-# Diffcalc is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Diffcalc is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Diffcalc. If not, see .
-###
-
-import sys
-import time
-import threading
-from math import pi
-import socket
-
-from pivy.coin import *
-from pivy.sogui import *
-
-
-PORT = 4567
-TORAD = pi / 180
-
-
-def connect_to_socket(host, port):
- print "Connecting to %s on port %d" % (host, port)
- connection = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
- print "Connected"
- connection.connect((host, port))
- socketfile = connection.makefile('rw', 0)
- return socketfile
-
-
-def serve_socket_connection(port):
- print ("Serving connection on all interfaces on %s port %d" %
- (socket.gethostname(), port))
- sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
- sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
- sock.bind((socket.gethostname(), port))
- sock.listen(1)
- time.sleep(1)
- (connection, addr) = sock.accept()
- print 'Connected from ', addr, ' accepted'
- socket_file = connection.makefile('rw', 0) # no buffering
- return socket_file
-
-
-def node_name(anglename):
- return 'dad_' + anglename + '_frame'
-
-
-class SceneUpdatingThread(threading.Thread):
-
- def __init__(self, scene, axisnames):
- threading.Thread.__init__(self)
- self.scene = scene
-
- # Infer rotation axes based on initial orientation
- self.rotation_axes = {}
- self.axies_nodes = {}
- for axisname in axisnames:
- node = self.scene.getByName(node_name(axisname))
- self.axies_nodes[axisname] = node
- value = node.rotation.getValue()
- self.rotation_axes[axisname] = value.getAxisAngle()[0]
-
- def run(self):
- socket_file = serve_socket_connection(PORT)
-
- while True:
- msg = socket_file.readline()
- if msg == '':
- print '***Socket closed'
- socket_file = serve_socket_connection(PORT)
- continue
- print msg.strip()
- d = eval(msg.strip()) # msg should be a dictionary representation
- for axisname in d:
- self.set_axis_rotation(axisname, d[axisname])
-
- def set_axis_rotation(self, anglename, degrees):
- nodename = node_name(anglename)
- angle = degrees * TORAD
- while angle < 0:
- angle = 2 * pi + angle
- node = self.scene.getByName(nodename)
- getattr(node, 'rotation').setValue(
- self.rotation_axes[anglename], angle)
-
-
-class Animator(object):
-
- def __init__(self, filename, axisnames):
- print "filename : " + filename
- print " axes : " + ' '.join(axisnames)
- # Create viewer
- self.myWindow = SoGui.init(sys.argv[0]) # @UndefinedVariable
- if self.myWindow is None: sys.exit(1)
- viewer = SoGuiExaminerViewer(self.myWindow) # @UndefinedVariable
- # load file into scene
- so_input = SoInput() # @UndefinedVariable
- so_input.openFile(filename)
- self.scene = SoDB.readAll(so_input) # @UndefinedVariable
- # Add scene to viewer
- viewer.setSceneGraph(self.scene)
- viewer.setTitle(' '.join(axisnames))
- viewer.show()
-
- self.start_update_scene_thread(axisnames)
-
- def start_update_scene_thread(self, axisnames):
- t = SceneUpdatingThread(self.scene, axisnames)
- t.setDaemon(True)
- t.start()
-
- def show(self):
- SoGui.show(self.myWindow) # @UndefinedVariable
- SoGui.mainLoop() # @UndefinedVariable
-
-def main():
- animator = Animator(sys.argv[1], sys.argv[2:])
- animator.show()
-
-if __name__ == "__main__":
- main()
-
diff --git a/script/__Lib/diffcalc-2.1/numjy/__init__.py b/script/__Lib/diffcalc-2.1/numjy/__init__.py
deleted file mode 100755
index 273b233..0000000
--- a/script/__Lib/diffcalc-2.1/numjy/__init__.py
+++ /dev/null
@@ -1,36 +0,0 @@
-###
-# Copyright 2008-2011 Diamond Light Source Ltd.
-# This file is part of Diffcalc.
-#
-# Diffcalc is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Diffcalc is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Diffcalc. If not, see .
-###
-
-try:
- import Jama
- from numjy import linalg
- from numjy.jama_matrix_wrapper import matrix
- JAMA = True
-except ImportError:
- JAMA = False
-
-
-def hstack(list_of_column_matrices):
- if not Jama:
- raise Exception('Jama not available, use numpy directly')
- ncol = len(list_of_column_matrices)
- nrow = list_of_column_matrices[0].shape[0]
- m = Jama.Matrix(nrow, ncol)
- for c, column_matrix in enumerate(list_of_column_matrices):
- m.setMatrix(0, nrow - 1, c, c, column_matrix.m)
- return matrix(m)
diff --git a/script/__Lib/diffcalc-2.1/numjy/jama_matrix_wrapper.py b/script/__Lib/diffcalc-2.1/numjy/jama_matrix_wrapper.py
deleted file mode 100755
index d5e7645..0000000
--- a/script/__Lib/diffcalc-2.1/numjy/jama_matrix_wrapper.py
+++ /dev/null
@@ -1,120 +0,0 @@
-###
-# Copyright 2008-2011 Diamond Light Source Ltd.
-# This file is part of Diffcalc.
-#
-# Diffcalc is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Diffcalc is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Diffcalc. If not, see .
-###
-
-import Jama
-
-
-class matrix(object):
-
- def __init__(self, a):
- if isinstance(a, Jama.Matrix):
- self.m = a
- elif isinstance(a, basestring):
- l = []
- for row in a.strip().split(';'):
- l.append([float(element)
- for element in row.replace(',', ' ').split()])
- self.m = Jama.Matrix(l)
- elif isinstance(a, matrix):
- self.m = Jama.Matrix(a.m)
- elif isinstance(a, (list, tuple)):
- if isinstance(a[0], (list, tuple)):
- # a is a list of lists (not rigorous test!)
- self.m = Jama.Matrix(a)
- else:
- # a is a row vector
- self.m = Jama.Matrix([a])
- else:
- # give it a go
- self.m = Jama.Matrix(a)
-
- def __eq__(self, other):
- nrow, ncol = self.shape
- b = matrix(Jama.Matrix(nrow, ncol))
- for i in range(nrow):
- for j in range(ncol):
- b[i, j] = self[i, j] == other[i, j]
- return b
-
- @property
- def shape(self):
- return self.m.getRowDimension(), self.m.getColumnDimension()
-
- def __len__(self):
- return self.m.getRowDimension()
-
- def all(self): # @ReservedAssignment
- for row in self.m.array:
- if not all(row):
- return False
- return True
-
- def tolist(self):
- l = []
- nrow, ncol = self.shape
- for i in range(nrow):
- row = []
- for j in range(ncol):
- row.append(self[i, j])
- l.append(row)
- return l
-
- def sum(self): # @ReservedAssignment
- return sum(sum(row) for row in self.m.array)
-
- @property
- def I(self):
- return matrix(self.m.inverse())
-
- @property
- def T(self):
- return matrix(self.m.transpose())
-
- def _scaler(self, scaler):
- return Jama.Matrix(self.shape[0], self.shape[1], scaler)
-
- def __add__(self, other):
- v = other.m if isinstance(other, matrix) else self._scaler(other)
- return matrix(self.m.plus(v))
-
- def __sub__(self, other):
- v = other.m if isinstance(other, matrix) else self._scaler(other)
- return matrix(self.m.minus(v))
-
- def __mul__(self, other):
- return matrix(self.m.times(other.m if isinstance(other, matrix) else
- other))
-
- def __div__(self, other):
- # dividend = other.I if isinstance(other, matrix) else 1. /float(other)
- return self.__mul__(1. / float(other))
-
- def __getitem__(self, key):
- i, j = key
- return self.m.get(i, j)
-
- def __setitem__(self, key, value):
- i, j = key
- self.m.set(i, j, value)
-
- def __str__(self):
- insides = [' '.join([str(el) for el in row]) for row in self.tolist()]
- return '[[' + ']\n ['.join(insides) + ']]'
-
- def __repr__(self):
- return 'matrix(' + '\n '.join(self.__str__().split('\n')) + ')'
diff --git a/script/__Lib/diffcalc-2.1/numjy/linalg.py b/script/__Lib/diffcalc-2.1/numjy/linalg.py
deleted file mode 100755
index 218d824..0000000
--- a/script/__Lib/diffcalc-2.1/numjy/linalg.py
+++ /dev/null
@@ -1,20 +0,0 @@
-###
-# Copyright 2008-2011 Diamond Light Source Ltd.
-# This file is part of Diffcalc.
-#
-# Diffcalc is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Diffcalc is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Diffcalc. If not, see .
-###
-
-def norm(mat):
- return mat.m.normF()
diff --git a/script/__Lib/diffcalc-2.1/setup.py b/script/__Lib/diffcalc-2.1/setup.py
deleted file mode 100755
index 0d549da..0000000
--- a/script/__Lib/diffcalc-2.1/setup.py
+++ /dev/null
@@ -1,31 +0,0 @@
-from setuptools import setup, find_packages
-
-setup(
- name='diffcalc',
- version='2.1',
-
- description='A diffraction condition calculator for X-ray or neutron diffractometer control.',
- long_description=open('README.rst').read(),
- url='https://github.com/DiamondLightSource/diffcalc',
-
- author='Rob Walton',
- author_email='rob.walton@diamond.ac.uk',
-
- license='GNU',
-
- packages=find_packages(exclude=['docs']),
-
- install_requires=[
- 'numpy',
- 'ipython',
- 'pytest',
- 'pytest-xdist',
- 'nose'
- ],
-
- entry_points={
- 'console_scripts': [
- 'diffcalc=diffcmd.diffcalc_launcher:main',
- ],
- },
-)
\ No newline at end of file
diff --git a/script/__Lib/diffcalc-2.1/simplejson/__init__.py b/script/__Lib/diffcalc-2.1/simplejson/__init__.py
deleted file mode 100755
index fe2bd5a..0000000
--- a/script/__Lib/diffcalc-2.1/simplejson/__init__.py
+++ /dev/null
@@ -1,510 +0,0 @@
-r"""JSON (JavaScript Object Notation) is a subset of
-JavaScript syntax (ECMA-262 3rd edition) used as a lightweight data
-interchange format.
-
-:mod:`simplejson` exposes an API familiar to users of the standard library
-:mod:`marshal` and :mod:`pickle` modules. It is the externally maintained
-version of the :mod:`json` library contained in Python 2.6, but maintains
-compatibility with Python 2.4 and Python 2.5 and (currently) has
-significant performance advantages, even without using the optional C
-extension for speedups.
-
-Encoding basic Python object hierarchies::
-
- >>> import simplejson as json
- >>> json.dumps(['foo', {'bar': ('baz', None, 1.0, 2)}])
- '["foo", {"bar": ["baz", null, 1.0, 2]}]'
- >>> print json.dumps("\"foo\bar")
- "\"foo\bar"
- >>> print json.dumps(u'\u1234')
- "\u1234"
- >>> print json.dumps('\\')
- "\\"
- >>> print json.dumps({"c": 0, "b": 0, "a": 0}, sort_keys=True)
- {"a": 0, "b": 0, "c": 0}
- >>> from StringIO import StringIO
- >>> io = StringIO()
- >>> json.dump(['streaming API'], io)
- >>> io.getvalue()
- '["streaming API"]'
-
-Compact encoding::
-
- >>> import simplejson as json
- >>> json.dumps([1,2,3,{'4': 5, '6': 7}], separators=(',',':'))
- '[1,2,3,{"4":5,"6":7}]'
-
-Pretty printing::
-
- >>> import simplejson as json
- >>> s = json.dumps({'4': 5, '6': 7}, sort_keys=True, indent=' ')
- >>> print '\n'.join([l.rstrip() for l in s.splitlines()])
- {
- "4": 5,
- "6": 7
- }
-
-Decoding JSON::
-
- >>> import simplejson as json
- >>> obj = [u'foo', {u'bar': [u'baz', None, 1.0, 2]}]
- >>> json.loads('["foo", {"bar":["baz", null, 1.0, 2]}]') == obj
- True
- >>> json.loads('"\\"foo\\bar"') == u'"foo\x08ar'
- True
- >>> from StringIO import StringIO
- >>> io = StringIO('["streaming API"]')
- >>> json.load(io)[0] == 'streaming API'
- True
-
-Specializing JSON object decoding::
-
- >>> import simplejson as json
- >>> def as_complex(dct):
- ... if '__complex__' in dct:
- ... return complex(dct['real'], dct['imag'])
- ... return dct
- ...
- >>> json.loads('{"__complex__": true, "real": 1, "imag": 2}',
- ... object_hook=as_complex)
- (1+2j)
- >>> from decimal import Decimal
- >>> json.loads('1.1', parse_float=Decimal) == Decimal('1.1')
- True
-
-Specializing JSON object encoding::
-
- >>> import simplejson as json
- >>> def encode_complex(obj):
- ... if isinstance(obj, complex):
- ... return [obj.real, obj.imag]
- ... raise TypeError(repr(o) + " is not JSON serializable")
- ...
- >>> json.dumps(2 + 1j, default=encode_complex)
- '[2.0, 1.0]'
- >>> json.JSONEncoder(default=encode_complex).encode(2 + 1j)
- '[2.0, 1.0]'
- >>> ''.join(json.JSONEncoder(default=encode_complex).iterencode(2 + 1j))
- '[2.0, 1.0]'
-
-
-Using simplejson.tool from the shell to validate and pretty-print::
-
- $ echo '{"json":"obj"}' | python -m simplejson.tool
- {
- "json": "obj"
- }
- $ echo '{ 1.2:3.4}' | python -m simplejson.tool
- Expecting property name: line 1 column 2 (char 2)
-"""
-__version__ = '2.6.2'
-__all__ = [
- 'dump', 'dumps', 'load', 'loads',
- 'JSONDecoder', 'JSONDecodeError', 'JSONEncoder',
- 'OrderedDict', 'simple_first',
-]
-
-__author__ = 'Bob Ippolito '
-
-from decimal import Decimal
-
-from decoder import JSONDecoder, JSONDecodeError
-from encoder import JSONEncoder, JSONEncoderForHTML
-def _import_OrderedDict():
- import collections
- try:
- return collections.OrderedDict
- except AttributeError:
- import ordered_dict
- return ordered_dict.OrderedDict
-OrderedDict = _import_OrderedDict()
-
-def _import_c_make_encoder():
- try:
- from simplejson._speedups import make_encoder
- return make_encoder
- except ImportError:
- return None
-
-_default_encoder = JSONEncoder(
- skipkeys=False,
- ensure_ascii=True,
- check_circular=True,
- allow_nan=True,
- indent=None,
- separators=None,
- encoding='utf-8',
- default=None,
- use_decimal=True,
- namedtuple_as_object=True,
- tuple_as_array=True,
- bigint_as_string=False,
- item_sort_key=None,
-)
-
-def dump(obj, fp, skipkeys=False, ensure_ascii=True, check_circular=True,
- allow_nan=True, cls=None, indent=None, separators=None,
- encoding='utf-8', default=None, use_decimal=True,
- namedtuple_as_object=True, tuple_as_array=True,
- bigint_as_string=False, sort_keys=False, item_sort_key=None,
- **kw):
- """Serialize ``obj`` as a JSON formatted stream to ``fp`` (a
- ``.write()``-supporting file-like object).
-
- If ``skipkeys`` is true then ``dict`` keys that are not basic types
- (``str``, ``unicode``, ``int``, ``long``, ``float``, ``bool``, ``None``)
- will be skipped instead of raising a ``TypeError``.
-
- If ``ensure_ascii`` is false, then the some chunks written to ``fp``
- may be ``unicode`` instances, subject to normal Python ``str`` to
- ``unicode`` coercion rules. Unless ``fp.write()`` explicitly
- understands ``unicode`` (as in ``codecs.getwriter()``) this is likely
- to cause an error.
-
- If ``check_circular`` is false, then the circular reference check
- for container types will be skipped and a circular reference will
- result in an ``OverflowError`` (or worse).
-
- If ``allow_nan`` is false, then it will be a ``ValueError`` to
- serialize out of range ``float`` values (``nan``, ``inf``, ``-inf``)
- in strict compliance of the JSON specification, instead of using the
- JavaScript equivalents (``NaN``, ``Infinity``, ``-Infinity``).
-
- If *indent* is a string, then JSON array elements and object members
- will be pretty-printed with a newline followed by that string repeated
- for each level of nesting. ``None`` (the default) selects the most compact
- representation without any newlines. For backwards compatibility with
- versions of simplejson earlier than 2.1.0, an integer is also accepted
- and is converted to a string with that many spaces.
-
- If ``separators`` is an ``(item_separator, dict_separator)`` tuple
- then it will be used instead of the default ``(', ', ': ')`` separators.
- ``(',', ':')`` is the most compact JSON representation.
-
- ``encoding`` is the character encoding for str instances, default is UTF-8.
-
- ``default(obj)`` is a function that should return a serializable version
- of obj or raise TypeError. The default simply raises TypeError.
-
- If *use_decimal* is true (default: ``True``) then decimal.Decimal
- will be natively serialized to JSON with full precision.
-
- If *namedtuple_as_object* is true (default: ``True``),
- :class:`tuple` subclasses with ``_asdict()`` methods will be encoded
- as JSON objects.
-
- If *tuple_as_array* is true (default: ``True``),
- :class:`tuple` (and subclasses) will be encoded as JSON arrays.
-
- If *bigint_as_string* is true (default: ``False``), ints 2**53 and higher
- or lower than -2**53 will be encoded as strings. This is to avoid the
- rounding that happens in Javascript otherwise. Note that this is still a
- lossy operation that will not round-trip correctly and should be used
- sparingly.
-
- If specified, *item_sort_key* is a callable used to sort the items in
- each dictionary. This is useful if you want to sort items other than
- in alphabetical order by key. This option takes precedence over
- *sort_keys*.
-
- If *sort_keys* is true (default: ``False``), the output of dictionaries
- will be sorted by item.
-
- To use a custom ``JSONEncoder`` subclass (e.g. one that overrides the
- ``.default()`` method to serialize additional types), specify it with
- the ``cls`` kwarg.
-
- """
- # cached encoder
- if (not skipkeys and ensure_ascii and
- check_circular and allow_nan and
- cls is None and indent is None and separators is None and
- encoding == 'utf-8' and default is None and use_decimal
- and namedtuple_as_object and tuple_as_array
- and not bigint_as_string and not item_sort_key and not kw):
- iterable = _default_encoder.iterencode(obj)
- else:
- if cls is None:
- cls = JSONEncoder
- iterable = cls(skipkeys=skipkeys, ensure_ascii=ensure_ascii,
- check_circular=check_circular, allow_nan=allow_nan, indent=indent,
- separators=separators, encoding=encoding,
- default=default, use_decimal=use_decimal,
- namedtuple_as_object=namedtuple_as_object,
- tuple_as_array=tuple_as_array,
- bigint_as_string=bigint_as_string,
- sort_keys=sort_keys,
- item_sort_key=item_sort_key,
- **kw).iterencode(obj)
- # could accelerate with writelines in some versions of Python, at
- # a debuggability cost
- for chunk in iterable:
- fp.write(chunk)
-
-
-def dumps(obj, skipkeys=False, ensure_ascii=True, check_circular=True,
- allow_nan=True, cls=None, indent=None, separators=None,
- encoding='utf-8', default=None, use_decimal=True,
- namedtuple_as_object=True, tuple_as_array=True,
- bigint_as_string=False, sort_keys=False, item_sort_key=None,
- **kw):
- """Serialize ``obj`` to a JSON formatted ``str``.
-
- If ``skipkeys`` is false then ``dict`` keys that are not basic types
- (``str``, ``unicode``, ``int``, ``long``, ``float``, ``bool``, ``None``)
- will be skipped instead of raising a ``TypeError``.
-
- If ``ensure_ascii`` is false, then the return value will be a
- ``unicode`` instance subject to normal Python ``str`` to ``unicode``
- coercion rules instead of being escaped to an ASCII ``str``.
-
- If ``check_circular`` is false, then the circular reference check
- for container types will be skipped and a circular reference will
- result in an ``OverflowError`` (or worse).
-
- If ``allow_nan`` is false, then it will be a ``ValueError`` to
- serialize out of range ``float`` values (``nan``, ``inf``, ``-inf``) in
- strict compliance of the JSON specification, instead of using the
- JavaScript equivalents (``NaN``, ``Infinity``, ``-Infinity``).
-
- If ``indent`` is a string, then JSON array elements and object members
- will be pretty-printed with a newline followed by that string repeated
- for each level of nesting. ``None`` (the default) selects the most compact
- representation without any newlines. For backwards compatibility with
- versions of simplejson earlier than 2.1.0, an integer is also accepted
- and is converted to a string with that many spaces.
-
- If ``separators`` is an ``(item_separator, dict_separator)`` tuple
- then it will be used instead of the default ``(', ', ': ')`` separators.
- ``(',', ':')`` is the most compact JSON representation.
-
- ``encoding`` is the character encoding for str instances, default is UTF-8.
-
- ``default(obj)`` is a function that should return a serializable version
- of obj or raise TypeError. The default simply raises TypeError.
-
- If *use_decimal* is true (default: ``True``) then decimal.Decimal
- will be natively serialized to JSON with full precision.
-
- If *namedtuple_as_object* is true (default: ``True``),
- :class:`tuple` subclasses with ``_asdict()`` methods will be encoded
- as JSON objects.
-
- If *tuple_as_array* is true (default: ``True``),
- :class:`tuple` (and subclasses) will be encoded as JSON arrays.
-
- If *bigint_as_string* is true (not the default), ints 2**53 and higher
- or lower than -2**53 will be encoded as strings. This is to avoid the
- rounding that happens in Javascript otherwise.
-
- If specified, *item_sort_key* is a callable used to sort the items in
- each dictionary. This is useful if you want to sort items other than
- in alphabetical order by key. This option takes precendence over
- *sort_keys*.
-
- If *sort_keys* is true (default: ``False``), the output of dictionaries
- will be sorted by item.
-
- To use a custom ``JSONEncoder`` subclass (e.g. one that overrides the
- ``.default()`` method to serialize additional types), specify it with
- the ``cls`` kwarg.
-
- """
- # cached encoder
- if (not skipkeys and ensure_ascii and
- check_circular and allow_nan and
- cls is None and indent is None and separators is None and
- encoding == 'utf-8' and default is None and use_decimal
- and namedtuple_as_object and tuple_as_array
- and not bigint_as_string and not sort_keys
- and not item_sort_key and not kw):
- return _default_encoder.encode(obj)
- if cls is None:
- cls = JSONEncoder
- return cls(
- skipkeys=skipkeys, ensure_ascii=ensure_ascii,
- check_circular=check_circular, allow_nan=allow_nan, indent=indent,
- separators=separators, encoding=encoding, default=default,
- use_decimal=use_decimal,
- namedtuple_as_object=namedtuple_as_object,
- tuple_as_array=tuple_as_array,
- bigint_as_string=bigint_as_string,
- sort_keys=sort_keys,
- item_sort_key=item_sort_key,
- **kw).encode(obj)
-
-
-_default_decoder = JSONDecoder(encoding=None, object_hook=None,
- object_pairs_hook=None)
-
-
-def load(fp, encoding=None, cls=None, object_hook=None, parse_float=None,
- parse_int=None, parse_constant=None, object_pairs_hook=None,
- use_decimal=False, namedtuple_as_object=True, tuple_as_array=True,
- **kw):
- """Deserialize ``fp`` (a ``.read()``-supporting file-like object containing
- a JSON document) to a Python object.
-
- *encoding* determines the encoding used to interpret any
- :class:`str` objects decoded by this instance (``'utf-8'`` by
- default). It has no effect when decoding :class:`unicode` objects.
-
- Note that currently only encodings that are a superset of ASCII work,
- strings of other encodings should be passed in as :class:`unicode`.
-
- *object_hook*, if specified, will be called with the result of every
- JSON object decoded and its return value will be used in place of the
- given :class:`dict`. This can be used to provide custom
- deserializations (e.g. to support JSON-RPC class hinting).
-
- *object_pairs_hook* is an optional function that will be called with
- the result of any object literal decode with an ordered list of pairs.
- The return value of *object_pairs_hook* will be used instead of the
- :class:`dict`. This feature can be used to implement custom decoders
- that rely on the order that the key and value pairs are decoded (for
- example, :func:`collections.OrderedDict` will remember the order of
- insertion). If *object_hook* is also defined, the *object_pairs_hook*
- takes priority.
-
- *parse_float*, if specified, will be called with the string of every
- JSON float to be decoded. By default, this is equivalent to
- ``float(num_str)``. This can be used to use another datatype or parser
- for JSON floats (e.g. :class:`decimal.Decimal`).
-
- *parse_int*, if specified, will be called with the string of every
- JSON int to be decoded. By default, this is equivalent to
- ``int(num_str)``. This can be used to use another datatype or parser
- for JSON integers (e.g. :class:`float`).
-
- *parse_constant*, if specified, will be called with one of the
- following strings: ``'-Infinity'``, ``'Infinity'``, ``'NaN'``. This
- can be used to raise an exception if invalid JSON numbers are
- encountered.
-
- If *use_decimal* is true (default: ``False``) then it implies
- parse_float=decimal.Decimal for parity with ``dump``.
-
- To use a custom ``JSONDecoder`` subclass, specify it with the ``cls``
- kwarg.
-
- """
- return loads(fp.read(),
- encoding=encoding, cls=cls, object_hook=object_hook,
- parse_float=parse_float, parse_int=parse_int,
- parse_constant=parse_constant, object_pairs_hook=object_pairs_hook,
- use_decimal=use_decimal, **kw)
-
-
-def loads(s, encoding=None, cls=None, object_hook=None, parse_float=None,
- parse_int=None, parse_constant=None, object_pairs_hook=None,
- use_decimal=False, **kw):
- """Deserialize ``s`` (a ``str`` or ``unicode`` instance containing a JSON
- document) to a Python object.
-
- *encoding* determines the encoding used to interpret any
- :class:`str` objects decoded by this instance (``'utf-8'`` by
- default). It has no effect when decoding :class:`unicode` objects.
-
- Note that currently only encodings that are a superset of ASCII work,
- strings of other encodings should be passed in as :class:`unicode`.
-
- *object_hook*, if specified, will be called with the result of every
- JSON object decoded and its return value will be used in place of the
- given :class:`dict`. This can be used to provide custom
- deserializations (e.g. to support JSON-RPC class hinting).
-
- *object_pairs_hook* is an optional function that will be called with
- the result of any object literal decode with an ordered list of pairs.
- The return value of *object_pairs_hook* will be used instead of the
- :class:`dict`. This feature can be used to implement custom decoders
- that rely on the order that the key and value pairs are decoded (for
- example, :func:`collections.OrderedDict` will remember the order of
- insertion). If *object_hook* is also defined, the *object_pairs_hook*
- takes priority.
-
- *parse_float*, if specified, will be called with the string of every
- JSON float to be decoded. By default, this is equivalent to
- ``float(num_str)``. This can be used to use another datatype or parser
- for JSON floats (e.g. :class:`decimal.Decimal`).
-
- *parse_int*, if specified, will be called with the string of every
- JSON int to be decoded. By default, this is equivalent to
- ``int(num_str)``. This can be used to use another datatype or parser
- for JSON integers (e.g. :class:`float`).
-
- *parse_constant*, if specified, will be called with one of the
- following strings: ``'-Infinity'``, ``'Infinity'``, ``'NaN'``. This
- can be used to raise an exception if invalid JSON numbers are
- encountered.
-
- If *use_decimal* is true (default: ``False``) then it implies
- parse_float=decimal.Decimal for parity with ``dump``.
-
- To use a custom ``JSONDecoder`` subclass, specify it with the ``cls``
- kwarg.
-
- """
- if (cls is None and encoding is None and object_hook is None and
- parse_int is None and parse_float is None and
- parse_constant is None and object_pairs_hook is None
- and not use_decimal and not kw):
- return _default_decoder.decode(s)
- if cls is None:
- cls = JSONDecoder
- if object_hook is not None:
- kw['object_hook'] = object_hook
- if object_pairs_hook is not None:
- kw['object_pairs_hook'] = object_pairs_hook
- if parse_float is not None:
- kw['parse_float'] = parse_float
- if parse_int is not None:
- kw['parse_int'] = parse_int
- if parse_constant is not None:
- kw['parse_constant'] = parse_constant
- if use_decimal:
- if parse_float is not None:
- raise TypeError("use_decimal=True implies parse_float=Decimal")
- kw['parse_float'] = Decimal
- return cls(encoding=encoding, **kw).decode(s)
-
-
-def _toggle_speedups(enabled):
- import simplejson.decoder as dec
- import simplejson.encoder as enc
- import simplejson.scanner as scan
- c_make_encoder = _import_c_make_encoder()
- if enabled:
- dec.scanstring = dec.c_scanstring or dec.py_scanstring
- enc.c_make_encoder = c_make_encoder
- enc.encode_basestring_ascii = (enc.c_encode_basestring_ascii or
- enc.py_encode_basestring_ascii)
- scan.make_scanner = scan.c_make_scanner or scan.py_make_scanner
- else:
- dec.scanstring = dec.py_scanstring
- enc.c_make_encoder = None
- enc.encode_basestring_ascii = enc.py_encode_basestring_ascii
- scan.make_scanner = scan.py_make_scanner
- dec.make_scanner = scan.make_scanner
- global _default_decoder
- _default_decoder = JSONDecoder(
- encoding=None,
- object_hook=None,
- object_pairs_hook=None,
- )
- global _default_encoder
- _default_encoder = JSONEncoder(
- skipkeys=False,
- ensure_ascii=True,
- check_circular=True,
- allow_nan=True,
- indent=None,
- separators=None,
- encoding='utf-8',
- default=None,
- )
-
-def simple_first(kv):
- """Helper function to pass to item_sort_key to sort simple
- elements to the top, then container elements.
- """
- return (isinstance(kv[1], (list, dict, tuple)), kv[0])
diff --git a/script/__Lib/diffcalc-2.1/simplejson/_speedups.c b/script/__Lib/diffcalc-2.1/simplejson/_speedups.c
deleted file mode 100755
index be68b2d..0000000
--- a/script/__Lib/diffcalc-2.1/simplejson/_speedups.c
+++ /dev/null
@@ -1,2745 +0,0 @@
-#include "Python.h"
-#include "structmember.h"
-#if PY_VERSION_HEX < 0x02070000 && !defined(PyOS_string_to_double)
-#define PyOS_string_to_double json_PyOS_string_to_double
-static double
-json_PyOS_string_to_double(const char *s, char **endptr, PyObject *overflow_exception);
-static double
-json_PyOS_string_to_double(const char *s, char **endptr, PyObject *overflow_exception) {
- double x;
- assert(endptr == NULL);
- assert(overflow_exception == NULL);
- PyFPE_START_PROTECT("json_PyOS_string_to_double", return -1.0;)
- x = PyOS_ascii_atof(s);
- PyFPE_END_PROTECT(x)
- return x;
-}
-#endif
-#if PY_VERSION_HEX < 0x02060000 && !defined(Py_TYPE)
-#define Py_TYPE(ob) (((PyObject*)(ob))->ob_type)
-#endif
-#if PY_VERSION_HEX < 0x02060000 && !defined(Py_SIZE)
-#define Py_SIZE(ob) (((PyVarObject*)(ob))->ob_size)
-#endif
-#if PY_VERSION_HEX < 0x02050000 && !defined(PY_SSIZE_T_MIN)
-typedef int Py_ssize_t;
-#define PY_SSIZE_T_MAX INT_MAX
-#define PY_SSIZE_T_MIN INT_MIN
-#define PyInt_FromSsize_t PyInt_FromLong
-#define PyInt_AsSsize_t PyInt_AsLong
-#endif
-#ifndef Py_IS_FINITE
-#define Py_IS_FINITE(X) (!Py_IS_INFINITY(X) && !Py_IS_NAN(X))
-#endif
-
-#ifdef __GNUC__
-#define UNUSED __attribute__((__unused__))
-#else
-#define UNUSED
-#endif
-
-#define DEFAULT_ENCODING "utf-8"
-
-#define PyScanner_Check(op) PyObject_TypeCheck(op, &PyScannerType)
-#define PyScanner_CheckExact(op) (Py_TYPE(op) == &PyScannerType)
-#define PyEncoder_Check(op) PyObject_TypeCheck(op, &PyEncoderType)
-#define PyEncoder_CheckExact(op) (Py_TYPE(op) == &PyEncoderType)
-
-static PyTypeObject PyScannerType;
-static PyTypeObject PyEncoderType;
-
-typedef struct _PyScannerObject {
- PyObject_HEAD
- PyObject *encoding;
- PyObject *strict;
- PyObject *object_hook;
- PyObject *pairs_hook;
- PyObject *parse_float;
- PyObject *parse_int;
- PyObject *parse_constant;
- PyObject *memo;
-} PyScannerObject;
-
-static PyMemberDef scanner_members[] = {
- {"encoding", T_OBJECT, offsetof(PyScannerObject, encoding), READONLY, "encoding"},
- {"strict", T_OBJECT, offsetof(PyScannerObject, strict), READONLY, "strict"},
- {"object_hook", T_OBJECT, offsetof(PyScannerObject, object_hook), READONLY, "object_hook"},
- {"object_pairs_hook", T_OBJECT, offsetof(PyScannerObject, pairs_hook), READONLY, "object_pairs_hook"},
- {"parse_float", T_OBJECT, offsetof(PyScannerObject, parse_float), READONLY, "parse_float"},
- {"parse_int", T_OBJECT, offsetof(PyScannerObject, parse_int), READONLY, "parse_int"},
- {"parse_constant", T_OBJECT, offsetof(PyScannerObject, parse_constant), READONLY, "parse_constant"},
- {NULL}
-};
-
-typedef struct _PyEncoderObject {
- PyObject_HEAD
- PyObject *markers;
- PyObject *defaultfn;
- PyObject *encoder;
- PyObject *indent;
- PyObject *key_separator;
- PyObject *item_separator;
- PyObject *sort_keys;
- PyObject *skipkeys;
- PyObject *key_memo;
- PyObject *Decimal;
- int fast_encode;
- int allow_nan;
- int use_decimal;
- int namedtuple_as_object;
- int tuple_as_array;
- int bigint_as_string;
- PyObject *item_sort_key;
-} PyEncoderObject;
-
-static PyMemberDef encoder_members[] = {
- {"markers", T_OBJECT, offsetof(PyEncoderObject, markers), READONLY, "markers"},
- {"default", T_OBJECT, offsetof(PyEncoderObject, defaultfn), READONLY, "default"},
- {"encoder", T_OBJECT, offsetof(PyEncoderObject, encoder), READONLY, "encoder"},
- {"indent", T_OBJECT, offsetof(PyEncoderObject, indent), READONLY, "indent"},
- {"key_separator", T_OBJECT, offsetof(PyEncoderObject, key_separator), READONLY, "key_separator"},
- {"item_separator", T_OBJECT, offsetof(PyEncoderObject, item_separator), READONLY, "item_separator"},
- {"sort_keys", T_OBJECT, offsetof(PyEncoderObject, sort_keys), READONLY, "sort_keys"},
- {"skipkeys", T_OBJECT, offsetof(PyEncoderObject, skipkeys), READONLY, "skipkeys"},
- {"key_memo", T_OBJECT, offsetof(PyEncoderObject, key_memo), READONLY, "key_memo"},
- {"item_sort_key", T_OBJECT, offsetof(PyEncoderObject, item_sort_key), READONLY, "item_sort_key"},
- {NULL}
-};
-
-static PyObject *
-maybe_quote_bigint(PyObject *encoded, PyObject *obj);
-
-static Py_ssize_t
-ascii_escape_char(Py_UNICODE c, char *output, Py_ssize_t chars);
-static PyObject *
-ascii_escape_unicode(PyObject *pystr);
-static PyObject *
-ascii_escape_str(PyObject *pystr);
-static PyObject *
-py_encode_basestring_ascii(PyObject* self UNUSED, PyObject *pystr);
-void init_speedups(void);
-static PyObject *
-scan_once_str(PyScannerObject *s, PyObject *pystr, Py_ssize_t idx, Py_ssize_t *next_idx_ptr);
-static PyObject *
-scan_once_unicode(PyScannerObject *s, PyObject *pystr, Py_ssize_t idx, Py_ssize_t *next_idx_ptr);
-static PyObject *
-_build_rval_index_tuple(PyObject *rval, Py_ssize_t idx);
-static PyObject *
-scanner_new(PyTypeObject *type, PyObject *args, PyObject *kwds);
-static int
-scanner_init(PyObject *self, PyObject *args, PyObject *kwds);
-static void
-scanner_dealloc(PyObject *self);
-static int
-scanner_clear(PyObject *self);
-static PyObject *
-encoder_new(PyTypeObject *type, PyObject *args, PyObject *kwds);
-static int
-encoder_init(PyObject *self, PyObject *args, PyObject *kwds);
-static void
-encoder_dealloc(PyObject *self);
-static int
-encoder_clear(PyObject *self);
-static int
-encoder_listencode_list(PyEncoderObject *s, PyObject *rval, PyObject *seq, Py_ssize_t indent_level);
-static int
-encoder_listencode_obj(PyEncoderObject *s, PyObject *rval, PyObject *obj, Py_ssize_t indent_level);
-static int
-encoder_listencode_dict(PyEncoderObject *s, PyObject *rval, PyObject *dct, Py_ssize_t indent_level);
-static PyObject *
-_encoded_const(PyObject *obj);
-static void
-raise_errmsg(char *msg, PyObject *s, Py_ssize_t end);
-static PyObject *
-encoder_encode_string(PyEncoderObject *s, PyObject *obj);
-static int
-_convertPyInt_AsSsize_t(PyObject *o, Py_ssize_t *size_ptr);
-static PyObject *
-_convertPyInt_FromSsize_t(Py_ssize_t *size_ptr);
-static PyObject *
-encoder_encode_float(PyEncoderObject *s, PyObject *obj);
-static int
-_is_namedtuple(PyObject *obj);
-
-#define S_CHAR(c) (c >= ' ' && c <= '~' && c != '\\' && c != '"')
-#define IS_WHITESPACE(c) (((c) == ' ') || ((c) == '\t') || ((c) == '\n') || ((c) == '\r'))
-
-#define MIN_EXPANSION 6
-#ifdef Py_UNICODE_WIDE
-#define MAX_EXPANSION (2 * MIN_EXPANSION)
-#else
-#define MAX_EXPANSION MIN_EXPANSION
-#endif
-
-static PyObject *
-maybe_quote_bigint(PyObject *encoded, PyObject *obj)
-{
- static PyObject *big_long = NULL;
- static PyObject *small_long = NULL;
- if (big_long == NULL) {
- big_long = PyLong_FromLongLong(1LL << 53);
- if (big_long == NULL) {
- Py_DECREF(encoded);
- return NULL;
- }
- }
- if (small_long == NULL) {
- small_long = PyLong_FromLongLong(-1LL << 53);
- if (small_long == NULL) {
- Py_DECREF(encoded);
- return NULL;
- }
- }
- if (PyObject_RichCompareBool(obj, big_long, Py_GE) ||
- PyObject_RichCompareBool(obj, small_long, Py_LE)) {
- PyObject* quoted = PyString_FromFormat("\"%s\"",
- PyString_AsString(encoded));
- Py_DECREF(encoded);
- encoded = quoted;
- }
- return encoded;
-}
-
-static int
-_is_namedtuple(PyObject *obj)
-{
- int rval = 0;
- PyObject *_asdict = PyObject_GetAttrString(obj, "_asdict");
- if (_asdict == NULL) {
- PyErr_Clear();
- return 0;
- }
- rval = PyCallable_Check(_asdict);
- Py_DECREF(_asdict);
- return rval;
-}
-
-static int
-_convertPyInt_AsSsize_t(PyObject *o, Py_ssize_t *size_ptr)
-{
- /* PyObject to Py_ssize_t converter */
- *size_ptr = PyInt_AsSsize_t(o);
- if (*size_ptr == -1 && PyErr_Occurred())
- return 0;
- return 1;
-}
-
-static PyObject *
-_convertPyInt_FromSsize_t(Py_ssize_t *size_ptr)
-{
- /* Py_ssize_t to PyObject converter */
- return PyInt_FromSsize_t(*size_ptr);
-}
-
-static Py_ssize_t
-ascii_escape_char(Py_UNICODE c, char *output, Py_ssize_t chars)
-{
- /* Escape unicode code point c to ASCII escape sequences
- in char *output. output must have at least 12 bytes unused to
- accommodate an escaped surrogate pair "\uXXXX\uXXXX" */
- output[chars++] = '\\';
- switch (c) {
- case '\\': output[chars++] = (char)c; break;
- case '"': output[chars++] = (char)c; break;
- case '\b': output[chars++] = 'b'; break;
- case '\f': output[chars++] = 'f'; break;
- case '\n': output[chars++] = 'n'; break;
- case '\r': output[chars++] = 'r'; break;
- case '\t': output[chars++] = 't'; break;
- default:
-#ifdef Py_UNICODE_WIDE
- if (c >= 0x10000) {
- /* UTF-16 surrogate pair */
- Py_UNICODE v = c - 0x10000;
- c = 0xd800 | ((v >> 10) & 0x3ff);
- output[chars++] = 'u';
- output[chars++] = "0123456789abcdef"[(c >> 12) & 0xf];
- output[chars++] = "0123456789abcdef"[(c >> 8) & 0xf];
- output[chars++] = "0123456789abcdef"[(c >> 4) & 0xf];
- output[chars++] = "0123456789abcdef"[(c ) & 0xf];
- c = 0xdc00 | (v & 0x3ff);
- output[chars++] = '\\';
- }
-#endif
- output[chars++] = 'u';
- output[chars++] = "0123456789abcdef"[(c >> 12) & 0xf];
- output[chars++] = "0123456789abcdef"[(c >> 8) & 0xf];
- output[chars++] = "0123456789abcdef"[(c >> 4) & 0xf];
- output[chars++] = "0123456789abcdef"[(c ) & 0xf];
- }
- return chars;
-}
-
-static PyObject *
-ascii_escape_unicode(PyObject *pystr)
-{
- /* Take a PyUnicode pystr and return a new ASCII-only escaped PyString */
- Py_ssize_t i;
- Py_ssize_t input_chars;
- Py_ssize_t output_size;
- Py_ssize_t max_output_size;
- Py_ssize_t chars;
- PyObject *rval;
- char *output;
- Py_UNICODE *input_unicode;
-
- input_chars = PyUnicode_GET_SIZE(pystr);
- input_unicode = PyUnicode_AS_UNICODE(pystr);
-
- /* One char input can be up to 6 chars output, estimate 4 of these */
- output_size = 2 + (MIN_EXPANSION * 4) + input_chars;
- max_output_size = 2 + (input_chars * MAX_EXPANSION);
- rval = PyString_FromStringAndSize(NULL, output_size);
- if (rval == NULL) {
- return NULL;
- }
- output = PyString_AS_STRING(rval);
- chars = 0;
- output[chars++] = '"';
- for (i = 0; i < input_chars; i++) {
- Py_UNICODE c = input_unicode[i];
- if (S_CHAR(c)) {
- output[chars++] = (char)c;
- }
- else {
- chars = ascii_escape_char(c, output, chars);
- }
- if (output_size - chars < (1 + MAX_EXPANSION)) {
- /* There's more than four, so let's resize by a lot */
- Py_ssize_t new_output_size = output_size * 2;
- /* This is an upper bound */
- if (new_output_size > max_output_size) {
- new_output_size = max_output_size;
- }
- /* Make sure that the output size changed before resizing */
- if (new_output_size != output_size) {
- output_size = new_output_size;
- if (_PyString_Resize(&rval, output_size) == -1) {
- return NULL;
- }
- output = PyString_AS_STRING(rval);
- }
- }
- }
- output[chars++] = '"';
- if (_PyString_Resize(&rval, chars) == -1) {
- return NULL;
- }
- return rval;
-}
-
-static PyObject *
-ascii_escape_str(PyObject *pystr)
-{
- /* Take a PyString pystr and return a new ASCII-only escaped PyString */
- Py_ssize_t i;
- Py_ssize_t input_chars;
- Py_ssize_t output_size;
- Py_ssize_t chars;
- PyObject *rval;
- char *output;
- char *input_str;
-
- input_chars = PyString_GET_SIZE(pystr);
- input_str = PyString_AS_STRING(pystr);
-
- /* Fast path for a string that's already ASCII */
- for (i = 0; i < input_chars; i++) {
- Py_UNICODE c = (Py_UNICODE)(unsigned char)input_str[i];
- if (!S_CHAR(c)) {
- /* If we have to escape something, scan the string for unicode */
- Py_ssize_t j;
- for (j = i; j < input_chars; j++) {
- c = (Py_UNICODE)(unsigned char)input_str[j];
- if (c > 0x7f) {
- /* We hit a non-ASCII character, bail to unicode mode */
- PyObject *uni;
- uni = PyUnicode_DecodeUTF8(input_str, input_chars, "strict");
- if (uni == NULL) {
- return NULL;
- }
- rval = ascii_escape_unicode(uni);
- Py_DECREF(uni);
- return rval;
- }
- }
- break;
- }
- }
-
- if (i == input_chars) {
- /* Input is already ASCII */
- output_size = 2 + input_chars;
- }
- else {
- /* One char input can be up to 6 chars output, estimate 4 of these */
- output_size = 2 + (MIN_EXPANSION * 4) + input_chars;
- }
- rval = PyString_FromStringAndSize(NULL, output_size);
- if (rval == NULL) {
- return NULL;
- }
- output = PyString_AS_STRING(rval);
- output[0] = '"';
-
- /* We know that everything up to i is ASCII already */
- chars = i + 1;
- memcpy(&output[1], input_str, i);
-
- for (; i < input_chars; i++) {
- Py_UNICODE c = (Py_UNICODE)(unsigned char)input_str[i];
- if (S_CHAR(c)) {
- output[chars++] = (char)c;
- }
- else {
- chars = ascii_escape_char(c, output, chars);
- }
- /* An ASCII char can't possibly expand to a surrogate! */
- if (output_size - chars < (1 + MIN_EXPANSION)) {
- /* There's more than four, so let's resize by a lot */
- output_size *= 2;
- if (output_size > 2 + (input_chars * MIN_EXPANSION)) {
- output_size = 2 + (input_chars * MIN_EXPANSION);
- }
- if (_PyString_Resize(&rval, output_size) == -1) {
- return NULL;
- }
- output = PyString_AS_STRING(rval);
- }
- }
- output[chars++] = '"';
- if (_PyString_Resize(&rval, chars) == -1) {
- return NULL;
- }
- return rval;
-}
-
-static void
-raise_errmsg(char *msg, PyObject *s, Py_ssize_t end)
-{
- /* Use the Python function simplejson.decoder.errmsg to raise a nice
- looking ValueError exception */
- static PyObject *JSONDecodeError = NULL;
- PyObject *exc;
- if (JSONDecodeError == NULL) {
- PyObject *decoder = PyImport_ImportModule("simplejson.decoder");
- if (decoder == NULL)
- return;
- JSONDecodeError = PyObject_GetAttrString(decoder, "JSONDecodeError");
- Py_DECREF(decoder);
- if (JSONDecodeError == NULL)
- return;
- }
- exc = PyObject_CallFunction(JSONDecodeError, "(zOO&)", msg, s, _convertPyInt_FromSsize_t, &end);
- if (exc) {
- PyErr_SetObject(JSONDecodeError, exc);
- Py_DECREF(exc);
- }
-}
-
-static PyObject *
-join_list_unicode(PyObject *lst)
-{
- /* return u''.join(lst) */
- static PyObject *joinfn = NULL;
- if (joinfn == NULL) {
- PyObject *ustr = PyUnicode_FromUnicode(NULL, 0);
- if (ustr == NULL)
- return NULL;
-
- joinfn = PyObject_GetAttrString(ustr, "join");
- Py_DECREF(ustr);
- if (joinfn == NULL)
- return NULL;
- }
- return PyObject_CallFunctionObjArgs(joinfn, lst, NULL);
-}
-
-static PyObject *
-join_list_string(PyObject *lst)
-{
- /* return ''.join(lst) */
- static PyObject *joinfn = NULL;
- if (joinfn == NULL) {
- PyObject *ustr = PyString_FromStringAndSize(NULL, 0);
- if (ustr == NULL)
- return NULL;
-
- joinfn = PyObject_GetAttrString(ustr, "join");
- Py_DECREF(ustr);
- if (joinfn == NULL)
- return NULL;
- }
- return PyObject_CallFunctionObjArgs(joinfn, lst, NULL);
-}
-
-static PyObject *
-_build_rval_index_tuple(PyObject *rval, Py_ssize_t idx) {
- /* return (rval, idx) tuple, stealing reference to rval */
- PyObject *tpl;
- PyObject *pyidx;
- /*
- steal a reference to rval, returns (rval, idx)
- */
- if (rval == NULL) {
- return NULL;
- }
- pyidx = PyInt_FromSsize_t(idx);
- if (pyidx == NULL) {
- Py_DECREF(rval);
- return NULL;
- }
- tpl = PyTuple_New(2);
- if (tpl == NULL) {
- Py_DECREF(pyidx);
- Py_DECREF(rval);
- return NULL;
- }
- PyTuple_SET_ITEM(tpl, 0, rval);
- PyTuple_SET_ITEM(tpl, 1, pyidx);
- return tpl;
-}
-
-#define APPEND_OLD_CHUNK \
- if (chunk != NULL) { \
- if (chunks == NULL) { \
- chunks = PyList_New(0); \
- if (chunks == NULL) { \
- goto bail; \
- } \
- } \
- if (PyList_Append(chunks, chunk)) { \
- goto bail; \
- } \
- Py_CLEAR(chunk); \
- }
-
-static PyObject *
-scanstring_str(PyObject *pystr, Py_ssize_t end, char *encoding, int strict, Py_ssize_t *next_end_ptr)
-{
- /* Read the JSON string from PyString pystr.
- end is the index of the first character after the quote.
- encoding is the encoding of pystr (must be an ASCII superset)
- if strict is zero then literal control characters are allowed
- *next_end_ptr is a return-by-reference index of the character
- after the end quote
-
- Return value is a new PyString (if ASCII-only) or PyUnicode
- */
- PyObject *rval;
- Py_ssize_t len = PyString_GET_SIZE(pystr);
- Py_ssize_t begin = end - 1;
- Py_ssize_t next = begin;
- int has_unicode = 0;
- char *buf = PyString_AS_STRING(pystr);
- PyObject *chunks = NULL;
- PyObject *chunk = NULL;
-
- if (len == end) {
- raise_errmsg("Unterminated string starting at", pystr, begin);
- }
- else if (end < 0 || len < end) {
- PyErr_SetString(PyExc_ValueError, "end is out of bounds");
- goto bail;
- }
- while (1) {
- /* Find the end of the string or the next escape */
- Py_UNICODE c = 0;
- for (next = end; next < len; next++) {
- c = (unsigned char)buf[next];
- if (c == '"' || c == '\\') {
- break;
- }
- else if (strict && c <= 0x1f) {
- raise_errmsg("Invalid control character at", pystr, next);
- goto bail;
- }
- else if (c > 0x7f) {
- has_unicode = 1;
- }
- }
- if (!(c == '"' || c == '\\')) {
- raise_errmsg("Unterminated string starting at", pystr, begin);
- goto bail;
- }
- /* Pick up this chunk if it's not zero length */
- if (next != end) {
- PyObject *strchunk;
- APPEND_OLD_CHUNK
- strchunk = PyString_FromStringAndSize(&buf[end], next - end);
- if (strchunk == NULL) {
- goto bail;
- }
- if (has_unicode) {
- chunk = PyUnicode_FromEncodedObject(strchunk, encoding, NULL);
- Py_DECREF(strchunk);
- if (chunk == NULL) {
- goto bail;
- }
- }
- else {
- chunk = strchunk;
- }
- }
- next++;
- if (c == '"') {
- end = next;
- break;
- }
- if (next == len) {
- raise_errmsg("Unterminated string starting at", pystr, begin);
- goto bail;
- }
- c = buf[next];
- if (c != 'u') {
- /* Non-unicode backslash escapes */
- end = next + 1;
- switch (c) {
- case '"': break;
- case '\\': break;
- case '/': break;
- case 'b': c = '\b'; break;
- case 'f': c = '\f'; break;
- case 'n': c = '\n'; break;
- case 'r': c = '\r'; break;
- case 't': c = '\t'; break;
- default: c = 0;
- }
- if (c == 0) {
- raise_errmsg("Invalid \\escape", pystr, end - 2);
- goto bail;
- }
- }
- else {
- c = 0;
- next++;
- end = next + 4;
- if (end >= len) {
- raise_errmsg("Invalid \\uXXXX escape", pystr, next - 1);
- goto bail;
- }
- /* Decode 4 hex digits */
- for (; next < end; next++) {
- Py_UNICODE digit = buf[next];
- c <<= 4;
- switch (digit) {
- case '0': case '1': case '2': case '3': case '4':
- case '5': case '6': case '7': case '8': case '9':
- c |= (digit - '0'); break;
- case 'a': case 'b': case 'c': case 'd': case 'e':
- case 'f':
- c |= (digit - 'a' + 10); break;
- case 'A': case 'B': case 'C': case 'D': case 'E':
- case 'F':
- c |= (digit - 'A' + 10); break;
- default:
- raise_errmsg("Invalid \\uXXXX escape", pystr, end - 5);
- goto bail;
- }
- }
-#ifdef Py_UNICODE_WIDE
- /* Surrogate pair */
- if ((c & 0xfc00) == 0xd800) {
- Py_UNICODE c2 = 0;
- if (end + 6 >= len) {
- raise_errmsg("Unpaired high surrogate", pystr, end - 5);
- goto bail;
- }
- if (buf[next++] != '\\' || buf[next++] != 'u') {
- raise_errmsg("Unpaired high surrogate", pystr, end - 5);
- goto bail;
- }
- end += 6;
- /* Decode 4 hex digits */
- for (; next < end; next++) {
- c2 <<= 4;
- Py_UNICODE digit = buf[next];
- switch (digit) {
- case '0': case '1': case '2': case '3': case '4':
- case '5': case '6': case '7': case '8': case '9':
- c2 |= (digit - '0'); break;
- case 'a': case 'b': case 'c': case 'd': case 'e':
- case 'f':
- c2 |= (digit - 'a' + 10); break;
- case 'A': case 'B': case 'C': case 'D': case 'E':
- case 'F':
- c2 |= (digit - 'A' + 10); break;
- default:
- raise_errmsg("Invalid \\uXXXX escape", pystr, end - 5);
- goto bail;
- }
- }
- if ((c2 & 0xfc00) != 0xdc00) {
- raise_errmsg("Unpaired high surrogate", pystr, end - 5);
- goto bail;
- }
- c = 0x10000 + (((c - 0xd800) << 10) | (c2 - 0xdc00));
- }
- else if ((c & 0xfc00) == 0xdc00) {
- raise_errmsg("Unpaired low surrogate", pystr, end - 5);
- goto bail;
- }
-#endif
- }
- if (c > 0x7f) {
- has_unicode = 1;
- }
- APPEND_OLD_CHUNK
- if (has_unicode) {
- chunk = PyUnicode_FromUnicode(&c, 1);
- if (chunk == NULL) {
- goto bail;
- }
- }
- else {
- char c_char = Py_CHARMASK(c);
- chunk = PyString_FromStringAndSize(&c_char, 1);
- if (chunk == NULL) {
- goto bail;
- }
- }
- }
-
- if (chunks == NULL) {
- if (chunk != NULL)
- rval = chunk;
- else
- rval = PyString_FromStringAndSize("", 0);
- }
- else {
- APPEND_OLD_CHUNK
- rval = join_list_string(chunks);
- if (rval == NULL) {
- goto bail;
- }
- Py_CLEAR(chunks);
- }
-
- *next_end_ptr = end;
- return rval;
-bail:
- *next_end_ptr = -1;
- Py_XDECREF(chunk);
- Py_XDECREF(chunks);
- return NULL;
-}
-
-
-static PyObject *
-scanstring_unicode(PyObject *pystr, Py_ssize_t end, int strict, Py_ssize_t *next_end_ptr)
-{
- /* Read the JSON string from PyUnicode pystr.
- end is the index of the first character after the quote.
- if strict is zero then literal control characters are allowed
- *next_end_ptr is a return-by-reference index of the character
- after the end quote
-
- Return value is a new PyUnicode
- */
- PyObject *rval;
- Py_ssize_t len = PyUnicode_GET_SIZE(pystr);
- Py_ssize_t begin = end - 1;
- Py_ssize_t next = begin;
- const Py_UNICODE *buf = PyUnicode_AS_UNICODE(pystr);
- PyObject *chunks = NULL;
- PyObject *chunk = NULL;
-
- if (len == end) {
- raise_errmsg("Unterminated string starting at", pystr, begin);
- }
- else if (end < 0 || len < end) {
- PyErr_SetString(PyExc_ValueError, "end is out of bounds");
- goto bail;
- }
- while (1) {
- /* Find the end of the string or the next escape */
- Py_UNICODE c = 0;
- for (next = end; next < len; next++) {
- c = buf[next];
- if (c == '"' || c == '\\') {
- break;
- }
- else if (strict && c <= 0x1f) {
- raise_errmsg("Invalid control character at", pystr, next);
- goto bail;
- }
- }
- if (!(c == '"' || c == '\\')) {
- raise_errmsg("Unterminated string starting at", pystr, begin);
- goto bail;
- }
- /* Pick up this chunk if it's not zero length */
- if (next != end) {
- APPEND_OLD_CHUNK
- chunk = PyUnicode_FromUnicode(&buf[end], next - end);
- if (chunk == NULL) {
- goto bail;
- }
- }
- next++;
- if (c == '"') {
- end = next;
- break;
- }
- if (next == len) {
- raise_errmsg("Unterminated string starting at", pystr, begin);
- goto bail;
- }
- c = buf[next];
- if (c != 'u') {
- /* Non-unicode backslash escapes */
- end = next + 1;
- switch (c) {
- case '"': break;
- case '\\': break;
- case '/': break;
- case 'b': c = '\b'; break;
- case 'f': c = '\f'; break;
- case 'n': c = '\n'; break;
- case 'r': c = '\r'; break;
- case 't': c = '\t'; break;
- default: c = 0;
- }
- if (c == 0) {
- raise_errmsg("Invalid \\escape", pystr, end - 2);
- goto bail;
- }
- }
- else {
- c = 0;
- next++;
- end = next + 4;
- if (end >= len) {
- raise_errmsg("Invalid \\uXXXX escape", pystr, next - 1);
- goto bail;
- }
- /* Decode 4 hex digits */
- for (; next < end; next++) {
- Py_UNICODE digit = buf[next];
- c <<= 4;
- switch (digit) {
- case '0': case '1': case '2': case '3': case '4':
- case '5': case '6': case '7': case '8': case '9':
- c |= (digit - '0'); break;
- case 'a': case 'b': case 'c': case 'd': case 'e':
- case 'f':
- c |= (digit - 'a' + 10); break;
- case 'A': case 'B': case 'C': case 'D': case 'E':
- case 'F':
- c |= (digit - 'A' + 10); break;
- default:
- raise_errmsg("Invalid \\uXXXX escape", pystr, end - 5);
- goto bail;
- }
- }
-#ifdef Py_UNICODE_WIDE
- /* Surrogate pair */
- if ((c & 0xfc00) == 0xd800) {
- Py_UNICODE c2 = 0;
- if (end + 6 >= len) {
- raise_errmsg("Unpaired high surrogate", pystr, end - 5);
- goto bail;
- }
- if (buf[next++] != '\\' || buf[next++] != 'u') {
- raise_errmsg("Unpaired high surrogate", pystr, end - 5);
- goto bail;
- }
- end += 6;
- /* Decode 4 hex digits */
- for (; next < end; next++) {
- c2 <<= 4;
- Py_UNICODE digit = buf[next];
- switch (digit) {
- case '0': case '1': case '2': case '3': case '4':
- case '5': case '6': case '7': case '8': case '9':
- c2 |= (digit - '0'); break;
- case 'a': case 'b': case 'c': case 'd': case 'e':
- case 'f':
- c2 |= (digit - 'a' + 10); break;
- case 'A': case 'B': case 'C': case 'D': case 'E':
- case 'F':
- c2 |= (digit - 'A' + 10); break;
- default:
- raise_errmsg("Invalid \\uXXXX escape", pystr, end - 5);
- goto bail;
- }
- }
- if ((c2 & 0xfc00) != 0xdc00) {
- raise_errmsg("Unpaired high surrogate", pystr, end - 5);
- goto bail;
- }
- c = 0x10000 + (((c - 0xd800) << 10) | (c2 - 0xdc00));
- }
- else if ((c & 0xfc00) == 0xdc00) {
- raise_errmsg("Unpaired low surrogate", pystr, end - 5);
- goto bail;
- }
-#endif
- }
- APPEND_OLD_CHUNK
- chunk = PyUnicode_FromUnicode(&c, 1);
- if (chunk == NULL) {
- goto bail;
- }
- }
-
- if (chunks == NULL) {
- if (chunk != NULL)
- rval = chunk;
- else
- rval = PyUnicode_FromUnicode(NULL, 0);
- }
- else {
- APPEND_OLD_CHUNK
- rval = join_list_unicode(chunks);
- if (rval == NULL) {
- goto bail;
- }
- Py_CLEAR(chunks);
- }
- *next_end_ptr = end;
- return rval;
-bail:
- *next_end_ptr = -1;
- Py_XDECREF(chunk);
- Py_XDECREF(chunks);
- return NULL;
-}
-
-PyDoc_STRVAR(pydoc_scanstring,
- "scanstring(basestring, end, encoding, strict=True) -> (str, end)\n"
- "\n"
- "Scan the string s for a JSON string. End is the index of the\n"
- "character in s after the quote that started the JSON string.\n"
- "Unescapes all valid JSON string escape sequences and raises ValueError\n"
- "on attempt to decode an invalid string. If strict is False then literal\n"
- "control characters are allowed in the string.\n"
- "\n"
- "Returns a tuple of the decoded string and the index of the character in s\n"
- "after the end quote."
-);
-
-static PyObject *
-py_scanstring(PyObject* self UNUSED, PyObject *args)
-{
- PyObject *pystr;
- PyObject *rval;
- Py_ssize_t end;
- Py_ssize_t next_end = -1;
- char *encoding = NULL;
- int strict = 1;
- if (!PyArg_ParseTuple(args, "OO&|zi:scanstring", &pystr, _convertPyInt_AsSsize_t, &end, &encoding, &strict)) {
- return NULL;
- }
- if (encoding == NULL) {
- encoding = DEFAULT_ENCODING;
- }
- if (PyString_Check(pystr)) {
- rval = scanstring_str(pystr, end, encoding, strict, &next_end);
- }
- else if (PyUnicode_Check(pystr)) {
- rval = scanstring_unicode(pystr, end, strict, &next_end);
- }
- else {
- PyErr_Format(PyExc_TypeError,
- "first argument must be a string, not %.80s",
- Py_TYPE(pystr)->tp_name);
- return NULL;
- }
- return _build_rval_index_tuple(rval, next_end);
-}
-
-PyDoc_STRVAR(pydoc_encode_basestring_ascii,
- "encode_basestring_ascii(basestring) -> str\n"
- "\n"
- "Return an ASCII-only JSON representation of a Python string"
-);
-
-static PyObject *
-py_encode_basestring_ascii(PyObject* self UNUSED, PyObject *pystr)
-{
- /* Return an ASCII-only JSON representation of a Python string */
- /* METH_O */
- if (PyString_Check(pystr)) {
- return ascii_escape_str(pystr);
- }
- else if (PyUnicode_Check(pystr)) {
- return ascii_escape_unicode(pystr);
- }
- else {
- PyErr_Format(PyExc_TypeError,
- "first argument must be a string, not %.80s",
- Py_TYPE(pystr)->tp_name);
- return NULL;
- }
-}
-
-static void
-scanner_dealloc(PyObject *self)
-{
- /* Deallocate scanner object */
- scanner_clear(self);
- Py_TYPE(self)->tp_free(self);
-}
-
-static int
-scanner_traverse(PyObject *self, visitproc visit, void *arg)
-{
- PyScannerObject *s;
- assert(PyScanner_Check(self));
- s = (PyScannerObject *)self;
- Py_VISIT(s->encoding);
- Py_VISIT(s->strict);
- Py_VISIT(s->object_hook);
- Py_VISIT(s->pairs_hook);
- Py_VISIT(s->parse_float);
- Py_VISIT(s->parse_int);
- Py_VISIT(s->parse_constant);
- Py_VISIT(s->memo);
- return 0;
-}
-
-static int
-scanner_clear(PyObject *self)
-{
- PyScannerObject *s;
- assert(PyScanner_Check(self));
- s = (PyScannerObject *)self;
- Py_CLEAR(s->encoding);
- Py_CLEAR(s->strict);
- Py_CLEAR(s->object_hook);
- Py_CLEAR(s->pairs_hook);
- Py_CLEAR(s->parse_float);
- Py_CLEAR(s->parse_int);
- Py_CLEAR(s->parse_constant);
- Py_CLEAR(s->memo);
- return 0;
-}
-
-static PyObject *
-_parse_object_str(PyScannerObject *s, PyObject *pystr, Py_ssize_t idx, Py_ssize_t *next_idx_ptr) {
- /* Read a JSON object from PyString pystr.
- idx is the index of the first character after the opening curly brace.
- *next_idx_ptr is a return-by-reference index to the first character after
- the closing curly brace.
-
- Returns a new PyObject (usually a dict, but object_hook or
- object_pairs_hook can change that)
- */
- char *str = PyString_AS_STRING(pystr);
- Py_ssize_t end_idx = PyString_GET_SIZE(pystr) - 1;
- PyObject *rval = NULL;
- PyObject *pairs = NULL;
- PyObject *item;
- PyObject *key = NULL;
- PyObject *val = NULL;
- char *encoding = PyString_AS_STRING(s->encoding);
- int strict = PyObject_IsTrue(s->strict);
- int has_pairs_hook = (s->pairs_hook != Py_None);
- Py_ssize_t next_idx;
- if (has_pairs_hook) {
- pairs = PyList_New(0);
- if (pairs == NULL)
- return NULL;
- }
- else {
- rval = PyDict_New();
- if (rval == NULL)
- return NULL;
- }
-
- /* skip whitespace after { */
- while (idx <= end_idx && IS_WHITESPACE(str[idx])) idx++;
-
- /* only loop if the object is non-empty */
- if (idx <= end_idx && str[idx] != '}') {
- while (idx <= end_idx) {
- PyObject *memokey;
-
- /* read key */
- if (str[idx] != '"') {
- raise_errmsg(
- "Expecting property name enclosed in double quotes",
- pystr, idx);
- goto bail;
- }
- key = scanstring_str(pystr, idx + 1, encoding, strict, &next_idx);
- if (key == NULL)
- goto bail;
- memokey = PyDict_GetItem(s->memo, key);
- if (memokey != NULL) {
- Py_INCREF(memokey);
- Py_DECREF(key);
- key = memokey;
- }
- else {
- if (PyDict_SetItem(s->memo, key, key) < 0)
- goto bail;
- }
- idx = next_idx;
-
- /* skip whitespace between key and : delimiter, read :, skip whitespace */
- while (idx <= end_idx && IS_WHITESPACE(str[idx])) idx++;
- if (idx > end_idx || str[idx] != ':') {
- raise_errmsg("Expecting ':' delimiter", pystr, idx);
- goto bail;
- }
- idx++;
- while (idx <= end_idx && IS_WHITESPACE(str[idx])) idx++;
-
- /* read any JSON data type */
- val = scan_once_str(s, pystr, idx, &next_idx);
- if (val == NULL)
- goto bail;
-
- if (has_pairs_hook) {
- item = PyTuple_Pack(2, key, val);
- if (item == NULL)
- goto bail;
- Py_CLEAR(key);
- Py_CLEAR(val);
- if (PyList_Append(pairs, item) == -1) {
- Py_DECREF(item);
- goto bail;
- }
- Py_DECREF(item);
- }
- else {
- if (PyDict_SetItem(rval, key, val) < 0)
- goto bail;
- Py_CLEAR(key);
- Py_CLEAR(val);
- }
- idx = next_idx;
-
- /* skip whitespace before } or , */
- while (idx <= end_idx && IS_WHITESPACE(str[idx])) idx++;
-
- /* bail if the object is closed or we didn't get the , delimiter */
- if (idx > end_idx) break;
- if (str[idx] == '}') {
- break;
- }
- else if (str[idx] != ',') {
- raise_errmsg("Expecting ',' delimiter", pystr, idx);
- goto bail;
- }
- idx++;
-
- /* skip whitespace after , delimiter */
- while (idx <= end_idx && IS_WHITESPACE(str[idx])) idx++;
- }
- }
- /* verify that idx < end_idx, str[idx] should be '}' */
- if (idx > end_idx || str[idx] != '}') {
- raise_errmsg("Expecting object", pystr, end_idx);
- goto bail;
- }
-
- /* if pairs_hook is not None: rval = object_pairs_hook(pairs) */
- if (s->pairs_hook != Py_None) {
- val = PyObject_CallFunctionObjArgs(s->pairs_hook, pairs, NULL);
- if (val == NULL)
- goto bail;
- Py_DECREF(pairs);
- *next_idx_ptr = idx + 1;
- return val;
- }
-
- /* if object_hook is not None: rval = object_hook(rval) */
- if (s->object_hook != Py_None) {
- val = PyObject_CallFunctionObjArgs(s->object_hook, rval, NULL);
- if (val == NULL)
- goto bail;
- Py_DECREF(rval);
- rval = val;
- val = NULL;
- }
- *next_idx_ptr = idx + 1;
- return rval;
-bail:
- Py_XDECREF(rval);
- Py_XDECREF(key);
- Py_XDECREF(val);
- Py_XDECREF(pairs);
- return NULL;
-}
-
-static PyObject *
-_parse_object_unicode(PyScannerObject *s, PyObject *pystr, Py_ssize_t idx, Py_ssize_t *next_idx_ptr) {
- /* Read a JSON object from PyUnicode pystr.
- idx is the index of the first character after the opening curly brace.
- *next_idx_ptr is a return-by-reference index to the first character after
- the closing curly brace.
-
- Returns a new PyObject (usually a dict, but object_hook can change that)
- */
- Py_UNICODE *str = PyUnicode_AS_UNICODE(pystr);
- Py_ssize_t end_idx = PyUnicode_GET_SIZE(pystr) - 1;
- PyObject *rval = NULL;
- PyObject *pairs = NULL;
- PyObject *item;
- PyObject *key = NULL;
- PyObject *val = NULL;
- int strict = PyObject_IsTrue(s->strict);
- int has_pairs_hook = (s->pairs_hook != Py_None);
- Py_ssize_t next_idx;
-
- if (has_pairs_hook) {
- pairs = PyList_New(0);
- if (pairs == NULL)
- return NULL;
- }
- else {
- rval = PyDict_New();
- if (rval == NULL)
- return NULL;
- }
-
- /* skip whitespace after { */
- while (idx <= end_idx && IS_WHITESPACE(str[idx])) idx++;
-
- /* only loop if the object is non-empty */
- if (idx <= end_idx && str[idx] != '}') {
- while (idx <= end_idx) {
- PyObject *memokey;
-
- /* read key */
- if (str[idx] != '"') {
- raise_errmsg(
- "Expecting property name enclosed in double quotes",
- pystr, idx);
- goto bail;
- }
- key = scanstring_unicode(pystr, idx + 1, strict, &next_idx);
- if (key == NULL)
- goto bail;
- memokey = PyDict_GetItem(s->memo, key);
- if (memokey != NULL) {
- Py_INCREF(memokey);
- Py_DECREF(key);
- key = memokey;
- }
- else {
- if (PyDict_SetItem(s->memo, key, key) < 0)
- goto bail;
- }
- idx = next_idx;
-
- /* skip whitespace between key and : delimiter, read :, skip
- whitespace */
- while (idx <= end_idx && IS_WHITESPACE(str[idx])) idx++;
- if (idx > end_idx || str[idx] != ':') {
- raise_errmsg("Expecting ':' delimiter", pystr, idx);
- goto bail;
- }
- idx++;
- while (idx <= end_idx && IS_WHITESPACE(str[idx])) idx++;
-
- /* read any JSON term */
- val = scan_once_unicode(s, pystr, idx, &next_idx);
- if (val == NULL)
- goto bail;
-
- if (has_pairs_hook) {
- item = PyTuple_Pack(2, key, val);
- if (item == NULL)
- goto bail;
- Py_CLEAR(key);
- Py_CLEAR(val);
- if (PyList_Append(pairs, item) == -1) {
- Py_DECREF(item);
- goto bail;
- }
- Py_DECREF(item);
- }
- else {
- if (PyDict_SetItem(rval, key, val) < 0)
- goto bail;
- Py_CLEAR(key);
- Py_CLEAR(val);
- }
- idx = next_idx;
-
- /* skip whitespace before } or , */
- while (idx <= end_idx && IS_WHITESPACE(str[idx])) idx++;
-
- /* bail if the object is closed or we didn't get the ,
- delimiter */
- if (idx > end_idx) break;
- if (str[idx] == '}') {
- break;
- }
- else if (str[idx] != ',') {
- raise_errmsg("Expecting ',' delimiter", pystr, idx);
- goto bail;
- }
- idx++;
-
- /* skip whitespace after , delimiter */
- while (idx <= end_idx && IS_WHITESPACE(str[idx])) idx++;
- }
- }
-
- /* verify that idx < end_idx, str[idx] should be '}' */
- if (idx > end_idx || str[idx] != '}') {
- raise_errmsg("Expecting object", pystr, end_idx);
- goto bail;
- }
-
- /* if pairs_hook is not None: rval = object_pairs_hook(pairs) */
- if (s->pairs_hook != Py_None) {
- val = PyObject_CallFunctionObjArgs(s->pairs_hook, pairs, NULL);
- if (val == NULL)
- goto bail;
- Py_DECREF(pairs);
- *next_idx_ptr = idx + 1;
- return val;
- }
-
- /* if object_hook is not None: rval = object_hook(rval) */
- if (s->object_hook != Py_None) {
- val = PyObject_CallFunctionObjArgs(s->object_hook, rval, NULL);
- if (val == NULL)
- goto bail;
- Py_DECREF(rval);
- rval = val;
- val = NULL;
- }
- *next_idx_ptr = idx + 1;
- return rval;
-bail:
- Py_XDECREF(rval);
- Py_XDECREF(key);
- Py_XDECREF(val);
- Py_XDECREF(pairs);
- return NULL;
-}
-
-static PyObject *
-_parse_array_str(PyScannerObject *s, PyObject *pystr, Py_ssize_t idx, Py_ssize_t *next_idx_ptr) {
- /* Read a JSON array from PyString pystr.
- idx is the index of the first character after the opening brace.
- *next_idx_ptr is a return-by-reference index to the first character after
- the closing brace.
-
- Returns a new PyList
- */
- char *str = PyString_AS_STRING(pystr);
- Py_ssize_t end_idx = PyString_GET_SIZE(pystr) - 1;
- PyObject *val = NULL;
- PyObject *rval = PyList_New(0);
- Py_ssize_t next_idx;
- if (rval == NULL)
- return NULL;
-
- /* skip whitespace after [ */
- while (idx <= end_idx && IS_WHITESPACE(str[idx])) idx++;
-
- /* only loop if the array is non-empty */
- if (idx <= end_idx && str[idx] != ']') {
- while (idx <= end_idx) {
-
- /* read any JSON term and de-tuplefy the (rval, idx) */
- val = scan_once_str(s, pystr, idx, &next_idx);
- if (val == NULL) {
- if (PyErr_ExceptionMatches(PyExc_StopIteration)) {
- PyErr_Clear();
- raise_errmsg("Expecting object", pystr, idx);
- }
- goto bail;
- }
-
- if (PyList_Append(rval, val) == -1)
- goto bail;
-
- Py_CLEAR(val);
- idx = next_idx;
-
- /* skip whitespace between term and , */
- while (idx <= end_idx && IS_WHITESPACE(str[idx])) idx++;
-
- /* bail if the array is closed or we didn't get the , delimiter */
- if (idx > end_idx) break;
- if (str[idx] == ']') {
- break;
- }
- else if (str[idx] != ',') {
- raise_errmsg("Expecting ',' delimiter", pystr, idx);
- goto bail;
- }
- idx++;
-
- /* skip whitespace after , */
- while (idx <= end_idx && IS_WHITESPACE(str[idx])) idx++;
- }
- }
-
- /* verify that idx < end_idx, str[idx] should be ']' */
- if (idx > end_idx || str[idx] != ']') {
- raise_errmsg("Expecting object", pystr, end_idx);
- goto bail;
- }
- *next_idx_ptr = idx + 1;
- return rval;
-bail:
- Py_XDECREF(val);
- Py_DECREF(rval);
- return NULL;
-}
-
-static PyObject *
-_parse_array_unicode(PyScannerObject *s, PyObject *pystr, Py_ssize_t idx, Py_ssize_t *next_idx_ptr) {
- /* Read a JSON array from PyString pystr.
- idx is the index of the first character after the opening brace.
- *next_idx_ptr is a return-by-reference index to the first character after
- the closing brace.
-
- Returns a new PyList
- */
- Py_UNICODE *str = PyUnicode_AS_UNICODE(pystr);
- Py_ssize_t end_idx = PyUnicode_GET_SIZE(pystr) - 1;
- PyObject *val = NULL;
- PyObject *rval = PyList_New(0);
- Py_ssize_t next_idx;
- if (rval == NULL)
- return NULL;
-
- /* skip whitespace after [ */
- while (idx <= end_idx && IS_WHITESPACE(str[idx])) idx++;
-
- /* only loop if the array is non-empty */
- if (idx <= end_idx && str[idx] != ']') {
- while (idx <= end_idx) {
-
- /* read any JSON term */
- val = scan_once_unicode(s, pystr, idx, &next_idx);
- if (val == NULL) {
- if (PyErr_ExceptionMatches(PyExc_StopIteration)) {
- PyErr_Clear();
- raise_errmsg("Expecting object", pystr, idx);
- }
- goto bail;
- }
-
- if (PyList_Append(rval, val) == -1)
- goto bail;
-
- Py_CLEAR(val);
- idx = next_idx;
-
- /* skip whitespace between term and , */
- while (idx <= end_idx && IS_WHITESPACE(str[idx])) idx++;
-
- /* bail if the array is closed or we didn't get the , delimiter */
- if (idx > end_idx) break;
- if (str[idx] == ']') {
- break;
- }
- else if (str[idx] != ',') {
- raise_errmsg("Expecting ',' delimiter", pystr, idx);
- goto bail;
- }
- idx++;
-
- /* skip whitespace after , */
- while (idx <= end_idx && IS_WHITESPACE(str[idx])) idx++;
- }
- }
-
- /* verify that idx < end_idx, str[idx] should be ']' */
- if (idx > end_idx || str[idx] != ']') {
- raise_errmsg("Expecting object", pystr, end_idx);
- goto bail;
- }
- *next_idx_ptr = idx + 1;
- return rval;
-bail:
- Py_XDECREF(val);
- Py_DECREF(rval);
- return NULL;
-}
-
-static PyObject *
-_parse_constant(PyScannerObject *s, char *constant, Py_ssize_t idx, Py_ssize_t *next_idx_ptr) {
- /* Read a JSON constant from PyString pystr.
- constant is the constant string that was found
- ("NaN", "Infinity", "-Infinity").
- idx is the index of the first character of the constant
- *next_idx_ptr is a return-by-reference index to the first character after
- the constant.
-
- Returns the result of parse_constant
- */
- PyObject *cstr;
- PyObject *rval;
- /* constant is "NaN", "Infinity", or "-Infinity" */
- cstr = PyString_InternFromString(constant);
- if (cstr == NULL)
- return NULL;
-
- /* rval = parse_constant(constant) */
- rval = PyObject_CallFunctionObjArgs(s->parse_constant, cstr, NULL);
- idx += PyString_GET_SIZE(cstr);
- Py_DECREF(cstr);
- *next_idx_ptr = idx;
- return rval;
-}
-
-static PyObject *
-_match_number_str(PyScannerObject *s, PyObject *pystr, Py_ssize_t start, Py_ssize_t *next_idx_ptr) {
- /* Read a JSON number from PyString pystr.
- idx is the index of the first character of the number
- *next_idx_ptr is a return-by-reference index to the first character after
- the number.
-
- Returns a new PyObject representation of that number:
- PyInt, PyLong, or PyFloat.
- May return other types if parse_int or parse_float are set
- */
- char *str = PyString_AS_STRING(pystr);
- Py_ssize_t end_idx = PyString_GET_SIZE(pystr) - 1;
- Py_ssize_t idx = start;
- int is_float = 0;
- PyObject *rval;
- PyObject *numstr;
-
- /* read a sign if it's there, make sure it's not the end of the string */
- if (str[idx] == '-') {
- idx++;
- if (idx > end_idx) {
- PyErr_SetNone(PyExc_StopIteration);
- return NULL;
- }
- }
-
- /* read as many integer digits as we find as long as it doesn't start with 0 */
- if (str[idx] >= '1' && str[idx] <= '9') {
- idx++;
- while (idx <= end_idx && str[idx] >= '0' && str[idx] <= '9') idx++;
- }
- /* if it starts with 0 we only expect one integer digit */
- else if (str[idx] == '0') {
- idx++;
- }
- /* no integer digits, error */
- else {
- PyErr_SetNone(PyExc_StopIteration);
- return NULL;
- }
-
- /* if the next char is '.' followed by a digit then read all float digits */
- if (idx < end_idx && str[idx] == '.' && str[idx + 1] >= '0' && str[idx + 1] <= '9') {
- is_float = 1;
- idx += 2;
- while (idx <= end_idx && str[idx] >= '0' && str[idx] <= '9') idx++;
- }
-
- /* if the next char is 'e' or 'E' then maybe read the exponent (or backtrack) */
- if (idx < end_idx && (str[idx] == 'e' || str[idx] == 'E')) {
-
- /* save the index of the 'e' or 'E' just in case we need to backtrack */
- Py_ssize_t e_start = idx;
- idx++;
-
- /* read an exponent sign if present */
- if (idx < end_idx && (str[idx] == '-' || str[idx] == '+')) idx++;
-
- /* read all digits */
- while (idx <= end_idx && str[idx] >= '0' && str[idx] <= '9') idx++;
-
- /* if we got a digit, then parse as float. if not, backtrack */
- if (str[idx - 1] >= '0' && str[idx - 1] <= '9') {
- is_float = 1;
- }
- else {
- idx = e_start;
- }
- }
-
- /* copy the section we determined to be a number */
- numstr = PyString_FromStringAndSize(&str[start], idx - start);
- if (numstr == NULL)
- return NULL;
- if (is_float) {
- /* parse as a float using a fast path if available, otherwise call user defined method */
- if (s->parse_float != (PyObject *)&PyFloat_Type) {
- rval = PyObject_CallFunctionObjArgs(s->parse_float, numstr, NULL);
- }
- else {
- /* rval = PyFloat_FromDouble(PyOS_ascii_atof(PyString_AS_STRING(numstr))); */
- double d = PyOS_string_to_double(PyString_AS_STRING(numstr),
- NULL, NULL);
- if (d == -1.0 && PyErr_Occurred())
- return NULL;
- rval = PyFloat_FromDouble(d);
- }
- }
- else {
- /* parse as an int using a fast path if available, otherwise call user defined method */
- if (s->parse_int != (PyObject *)&PyInt_Type) {
- rval = PyObject_CallFunctionObjArgs(s->parse_int, numstr, NULL);
- }
- else {
- rval = PyInt_FromString(PyString_AS_STRING(numstr), NULL, 10);
- }
- }
- Py_DECREF(numstr);
- *next_idx_ptr = idx;
- return rval;
-}
-
-static PyObject *
-_match_number_unicode(PyScannerObject *s, PyObject *pystr, Py_ssize_t start, Py_ssize_t *next_idx_ptr) {
- /* Read a JSON number from PyUnicode pystr.
- idx is the index of the first character of the number
- *next_idx_ptr is a return-by-reference index to the first character after
- the number.
-
- Returns a new PyObject representation of that number:
- PyInt, PyLong, or PyFloat.
- May return other types if parse_int or parse_float are set
- */
- Py_UNICODE *str = PyUnicode_AS_UNICODE(pystr);
- Py_ssize_t end_idx = PyUnicode_GET_SIZE(pystr) - 1;
- Py_ssize_t idx = start;
- int is_float = 0;
- PyObject *rval;
- PyObject *numstr;
-
- /* read a sign if it's there, make sure it's not the end of the string */
- if (str[idx] == '-') {
- idx++;
- if (idx > end_idx) {
- PyErr_SetNone(PyExc_StopIteration);
- return NULL;
- }
- }
-
- /* read as many integer digits as we find as long as it doesn't start with 0 */
- if (str[idx] >= '1' && str[idx] <= '9') {
- idx++;
- while (idx <= end_idx && str[idx] >= '0' && str[idx] <= '9') idx++;
- }
- /* if it starts with 0 we only expect one integer digit */
- else if (str[idx] == '0') {
- idx++;
- }
- /* no integer digits, error */
- else {
- PyErr_SetNone(PyExc_StopIteration);
- return NULL;
- }
-
- /* if the next char is '.' followed by a digit then read all float digits */
- if (idx < end_idx && str[idx] == '.' && str[idx + 1] >= '0' && str[idx + 1] <= '9') {
- is_float = 1;
- idx += 2;
- while (idx <= end_idx && str[idx] >= '0' && str[idx] <= '9') idx++;
- }
-
- /* if the next char is 'e' or 'E' then maybe read the exponent (or backtrack) */
- if (idx < end_idx && (str[idx] == 'e' || str[idx] == 'E')) {
- Py_ssize_t e_start = idx;
- idx++;
-
- /* read an exponent sign if present */
- if (idx < end_idx && (str[idx] == '-' || str[idx] == '+')) idx++;
-
- /* read all digits */
- while (idx <= end_idx && str[idx] >= '0' && str[idx] <= '9') idx++;
-
- /* if we got a digit, then parse as float. if not, backtrack */
- if (str[idx - 1] >= '0' && str[idx - 1] <= '9') {
- is_float = 1;
- }
- else {
- idx = e_start;
- }
- }
-
- /* copy the section we determined to be a number */
- numstr = PyUnicode_FromUnicode(&str[start], idx - start);
- if (numstr == NULL)
- return NULL;
- if (is_float) {
- /* parse as a float using a fast path if available, otherwise call user defined method */
- if (s->parse_float != (PyObject *)&PyFloat_Type) {
- rval = PyObject_CallFunctionObjArgs(s->parse_float, numstr, NULL);
- }
- else {
- rval = PyFloat_FromString(numstr, NULL);
- }
- }
- else {
- /* no fast path for unicode -> int, just call */
- rval = PyObject_CallFunctionObjArgs(s->parse_int, numstr, NULL);
- }
- Py_DECREF(numstr);
- *next_idx_ptr = idx;
- return rval;
-}
-
-static PyObject *
-scan_once_str(PyScannerObject *s, PyObject *pystr, Py_ssize_t idx, Py_ssize_t *next_idx_ptr)
-{
- /* Read one JSON term (of any kind) from PyString pystr.
- idx is the index of the first character of the term
- *next_idx_ptr is a return-by-reference index to the first character after
- the number.
-
- Returns a new PyObject representation of the term.
- */
- char *str = PyString_AS_STRING(pystr);
- Py_ssize_t length = PyString_GET_SIZE(pystr);
- PyObject *rval = NULL;
- int fallthrough = 0;
- if (idx >= length) {
- PyErr_SetNone(PyExc_StopIteration);
- return NULL;
- }
- if (Py_EnterRecursiveCall(" while decoding a JSON document"))
- return NULL;
- switch (str[idx]) {
- case '"':
- /* string */
- rval = scanstring_str(pystr, idx + 1,
- PyString_AS_STRING(s->encoding),
- PyObject_IsTrue(s->strict),
- next_idx_ptr);
- break;
- case '{':
- /* object */
- rval = _parse_object_str(s, pystr, idx + 1, next_idx_ptr);
- break;
- case '[':
- /* array */
- rval = _parse_array_str(s, pystr, idx + 1, next_idx_ptr);
- break;
- case 'n':
- /* null */
- if ((idx + 3 < length) && str[idx + 1] == 'u' && str[idx + 2] == 'l' && str[idx + 3] == 'l') {
- Py_INCREF(Py_None);
- *next_idx_ptr = idx + 4;
- rval = Py_None;
- }
- else
- fallthrough = 1;
- break;
- case 't':
- /* true */
- if ((idx + 3 < length) && str[idx + 1] == 'r' && str[idx + 2] == 'u' && str[idx + 3] == 'e') {
- Py_INCREF(Py_True);
- *next_idx_ptr = idx + 4;
- rval = Py_True;
- }
- else
- fallthrough = 1;
- break;
- case 'f':
- /* false */
- if ((idx + 4 < length) && str[idx + 1] == 'a' && str[idx + 2] == 'l' && str[idx + 3] == 's' && str[idx + 4] == 'e') {
- Py_INCREF(Py_False);
- *next_idx_ptr = idx + 5;
- rval = Py_False;
- }
- else
- fallthrough = 1;
- break;
- case 'N':
- /* NaN */
- if ((idx + 2 < length) && str[idx + 1] == 'a' && str[idx + 2] == 'N') {
- rval = _parse_constant(s, "NaN", idx, next_idx_ptr);
- }
- else
- fallthrough = 1;
- break;
- case 'I':
- /* Infinity */
- if ((idx + 7 < length) && str[idx + 1] == 'n' && str[idx + 2] == 'f' && str[idx + 3] == 'i' && str[idx + 4] == 'n' && str[idx + 5] == 'i' && str[idx + 6] == 't' && str[idx + 7] == 'y') {
- rval = _parse_constant(s, "Infinity", idx, next_idx_ptr);
- }
- else
- fallthrough = 1;
- break;
- case '-':
- /* -Infinity */
- if ((idx + 8 < length) && str[idx + 1] == 'I' && str[idx + 2] == 'n' && str[idx + 3] == 'f' && str[idx + 4] == 'i' && str[idx + 5] == 'n' && str[idx + 6] == 'i' && str[idx + 7] == 't' && str[idx + 8] == 'y') {
- rval = _parse_constant(s, "-Infinity", idx, next_idx_ptr);
- }
- else
- fallthrough = 1;
- break;
- default:
- fallthrough = 1;
- }
- /* Didn't find a string, object, array, or named constant. Look for a number. */
- if (fallthrough)
- rval = _match_number_str(s, pystr, idx, next_idx_ptr);
- Py_LeaveRecursiveCall();
- return rval;
-}
-
-static PyObject *
-scan_once_unicode(PyScannerObject *s, PyObject *pystr, Py_ssize_t idx, Py_ssize_t *next_idx_ptr)
-{
- /* Read one JSON term (of any kind) from PyUnicode pystr.
- idx is the index of the first character of the term
- *next_idx_ptr is a return-by-reference index to the first character after
- the number.
-
- Returns a new PyObject representation of the term.
- */
- Py_UNICODE *str = PyUnicode_AS_UNICODE(pystr);
- Py_ssize_t length = PyUnicode_GET_SIZE(pystr);
- PyObject *rval = NULL;
- int fallthrough = 0;
- if (idx >= length) {
- PyErr_SetNone(PyExc_StopIteration);
- return NULL;
- }
- if (Py_EnterRecursiveCall(" while decoding a JSON document"))
- return NULL;
- switch (str[idx]) {
- case '"':
- /* string */
- rval = scanstring_unicode(pystr, idx + 1,
- PyObject_IsTrue(s->strict),
- next_idx_ptr);
- break;
- case '{':
- /* object */
- rval = _parse_object_unicode(s, pystr, idx + 1, next_idx_ptr);
- break;
- case '[':
- /* array */
- rval = _parse_array_unicode(s, pystr, idx + 1, next_idx_ptr);
- break;
- case 'n':
- /* null */
- if ((idx + 3 < length) && str[idx + 1] == 'u' && str[idx + 2] == 'l' && str[idx + 3] == 'l') {
- Py_INCREF(Py_None);
- *next_idx_ptr = idx + 4;
- rval = Py_None;
- }
- else
- fallthrough = 1;
- break;
- case 't':
- /* true */
- if ((idx + 3 < length) && str[idx + 1] == 'r' && str[idx + 2] == 'u' && str[idx + 3] == 'e') {
- Py_INCREF(Py_True);
- *next_idx_ptr = idx + 4;
- rval = Py_True;
- }
- else
- fallthrough = 1;
- break;
- case 'f':
- /* false */
- if ((idx + 4 < length) && str[idx + 1] == 'a' && str[idx + 2] == 'l' && str[idx + 3] == 's' && str[idx + 4] == 'e') {
- Py_INCREF(Py_False);
- *next_idx_ptr = idx + 5;
- rval = Py_False;
- }
- else
- fallthrough = 1;
- break;
- case 'N':
- /* NaN */
- if ((idx + 2 < length) && str[idx + 1] == 'a' && str[idx + 2] == 'N') {
- rval = _parse_constant(s, "NaN", idx, next_idx_ptr);
- }
- else
- fallthrough = 1;
- break;
- case 'I':
- /* Infinity */
- if ((idx + 7 < length) && str[idx + 1] == 'n' && str[idx + 2] == 'f' && str[idx + 3] == 'i' && str[idx + 4] == 'n' && str[idx + 5] == 'i' && str[idx + 6] == 't' && str[idx + 7] == 'y') {
- rval = _parse_constant(s, "Infinity", idx, next_idx_ptr);
- }
- else
- fallthrough = 1;
- break;
- case '-':
- /* -Infinity */
- if ((idx + 8 < length) && str[idx + 1] == 'I' && str[idx + 2] == 'n' && str[idx + 3] == 'f' && str[idx + 4] == 'i' && str[idx + 5] == 'n' && str[idx + 6] == 'i' && str[idx + 7] == 't' && str[idx + 8] == 'y') {
- rval = _parse_constant(s, "-Infinity", idx, next_idx_ptr);
- }
- else
- fallthrough = 1;
- break;
- default:
- fallthrough = 1;
- }
- /* Didn't find a string, object, array, or named constant. Look for a number. */
- if (fallthrough)
- rval = _match_number_unicode(s, pystr, idx, next_idx_ptr);
- Py_LeaveRecursiveCall();
- return rval;
-}
-
-static PyObject *
-scanner_call(PyObject *self, PyObject *args, PyObject *kwds)
-{
- /* Python callable interface to scan_once_{str,unicode} */
- PyObject *pystr;
- PyObject *rval;
- Py_ssize_t idx;
- Py_ssize_t next_idx = -1;
- static char *kwlist[] = {"string", "idx", NULL};
- PyScannerObject *s;
- assert(PyScanner_Check(self));
- s = (PyScannerObject *)self;
- if (!PyArg_ParseTupleAndKeywords(args, kwds, "OO&:scan_once", kwlist, &pystr, _convertPyInt_AsSsize_t, &idx))
- return NULL;
-
- if (PyString_Check(pystr)) {
- rval = scan_once_str(s, pystr, idx, &next_idx);
- }
- else if (PyUnicode_Check(pystr)) {
- rval = scan_once_unicode(s, pystr, idx, &next_idx);
- }
- else {
- PyErr_Format(PyExc_TypeError,
- "first argument must be a string, not %.80s",
- Py_TYPE(pystr)->tp_name);
- return NULL;
- }
- PyDict_Clear(s->memo);
- return _build_rval_index_tuple(rval, next_idx);
-}
-
-static PyObject *
-scanner_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
-{
- PyScannerObject *s;
- s = (PyScannerObject *)type->tp_alloc(type, 0);
- if (s != NULL) {
- s->encoding = NULL;
- s->strict = NULL;
- s->object_hook = NULL;
- s->pairs_hook = NULL;
- s->parse_float = NULL;
- s->parse_int = NULL;
- s->parse_constant = NULL;
- }
- return (PyObject *)s;
-}
-
-static int
-scanner_init(PyObject *self, PyObject *args, PyObject *kwds)
-{
- /* Initialize Scanner object */
- PyObject *ctx;
- static char *kwlist[] = {"context", NULL};
- PyScannerObject *s;
-
- assert(PyScanner_Check(self));
- s = (PyScannerObject *)self;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwds, "O:make_scanner", kwlist, &ctx))
- return -1;
-
- if (s->memo == NULL) {
- s->memo = PyDict_New();
- if (s->memo == NULL)
- goto bail;
- }
-
- /* PyString_AS_STRING is used on encoding */
- s->encoding = PyObject_GetAttrString(ctx, "encoding");
- if (s->encoding == NULL)
- goto bail;
- if (s->encoding == Py_None) {
- Py_DECREF(Py_None);
- s->encoding = PyString_InternFromString(DEFAULT_ENCODING);
- }
- else if (PyUnicode_Check(s->encoding)) {
- PyObject *tmp = PyUnicode_AsEncodedString(s->encoding, NULL, NULL);
- Py_DECREF(s->encoding);
- s->encoding = tmp;
- }
- if (s->encoding == NULL || !PyString_Check(s->encoding))
- goto bail;
-
- /* All of these will fail "gracefully" so we don't need to verify them */
- s->strict = PyObject_GetAttrString(ctx, "strict");
- if (s->strict == NULL)
- goto bail;
- s->object_hook = PyObject_GetAttrString(ctx, "object_hook");
- if (s->object_hook == NULL)
- goto bail;
- s->pairs_hook = PyObject_GetAttrString(ctx, "object_pairs_hook");
- if (s->pairs_hook == NULL)
- goto bail;
- s->parse_float = PyObject_GetAttrString(ctx, "parse_float");
- if (s->parse_float == NULL)
- goto bail;
- s->parse_int = PyObject_GetAttrString(ctx, "parse_int");
- if (s->parse_int == NULL)
- goto bail;
- s->parse_constant = PyObject_GetAttrString(ctx, "parse_constant");
- if (s->parse_constant == NULL)
- goto bail;
-
- return 0;
-
-bail:
- Py_CLEAR(s->encoding);
- Py_CLEAR(s->strict);
- Py_CLEAR(s->object_hook);
- Py_CLEAR(s->pairs_hook);
- Py_CLEAR(s->parse_float);
- Py_CLEAR(s->parse_int);
- Py_CLEAR(s->parse_constant);
- return -1;
-}
-
-PyDoc_STRVAR(scanner_doc, "JSON scanner object");
-
-static
-PyTypeObject PyScannerType = {
- PyObject_HEAD_INIT(NULL)
- 0, /* tp_internal */
- "simplejson._speedups.Scanner", /* tp_name */
- sizeof(PyScannerObject), /* tp_basicsize */
- 0, /* tp_itemsize */
- scanner_dealloc, /* tp_dealloc */
- 0, /* tp_print */
- 0, /* tp_getattr */
- 0, /* tp_setattr */
- 0, /* tp_compare */
- 0, /* tp_repr */
- 0, /* tp_as_number */
- 0, /* tp_as_sequence */
- 0, /* tp_as_mapping */
- 0, /* tp_hash */
- scanner_call, /* tp_call */
- 0, /* tp_str */
- 0,/* PyObject_GenericGetAttr, */ /* tp_getattro */
- 0,/* PyObject_GenericSetAttr, */ /* tp_setattro */
- 0, /* tp_as_buffer */
- Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /* tp_flags */
- scanner_doc, /* tp_doc */
- scanner_traverse, /* tp_traverse */
- scanner_clear, /* tp_clear */
- 0, /* tp_richcompare */
- 0, /* tp_weaklistoffset */
- 0, /* tp_iter */
- 0, /* tp_iternext */
- 0, /* tp_methods */
- scanner_members, /* tp_members */
- 0, /* tp_getset */
- 0, /* tp_base */
- 0, /* tp_dict */
- 0, /* tp_descr_get */
- 0, /* tp_descr_set */
- 0, /* tp_dictoffset */
- scanner_init, /* tp_init */
- 0,/* PyType_GenericAlloc, */ /* tp_alloc */
- scanner_new, /* tp_new */
- 0,/* PyObject_GC_Del, */ /* tp_free */
-};
-
-static PyObject *
-encoder_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
-{
- PyEncoderObject *s;
- s = (PyEncoderObject *)type->tp_alloc(type, 0);
- if (s != NULL) {
- s->markers = NULL;
- s->defaultfn = NULL;
- s->encoder = NULL;
- s->indent = NULL;
- s->key_separator = NULL;
- s->item_separator = NULL;
- s->sort_keys = NULL;
- s->skipkeys = NULL;
- s->key_memo = NULL;
- s->item_sort_key = NULL;
- s->Decimal = NULL;
- }
- return (PyObject *)s;
-}
-
-static int
-encoder_init(PyObject *self, PyObject *args, PyObject *kwds)
-{
- /* initialize Encoder object */
- static char *kwlist[] = {"markers", "default", "encoder", "indent", "key_separator", "item_separator", "sort_keys", "skipkeys", "allow_nan", "key_memo", "use_decimal", "namedtuple_as_object", "tuple_as_array", "bigint_as_string", "item_sort_key", "Decimal", NULL};
-
- PyEncoderObject *s;
- PyObject *markers, *defaultfn, *encoder, *indent, *key_separator;
- PyObject *item_separator, *sort_keys, *skipkeys, *allow_nan, *key_memo;
- PyObject *use_decimal, *namedtuple_as_object, *tuple_as_array;
- PyObject *bigint_as_string, *item_sort_key, *Decimal;
-
- assert(PyEncoder_Check(self));
- s = (PyEncoderObject *)self;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwds, "OOOOOOOOOOOOOOOO:make_encoder", kwlist,
- &markers, &defaultfn, &encoder, &indent, &key_separator, &item_separator,
- &sort_keys, &skipkeys, &allow_nan, &key_memo, &use_decimal,
- &namedtuple_as_object, &tuple_as_array, &bigint_as_string,
- &item_sort_key, &Decimal))
- return -1;
-
- s->markers = markers;
- s->defaultfn = defaultfn;
- s->encoder = encoder;
- s->indent = indent;
- s->key_separator = key_separator;
- s->item_separator = item_separator;
- s->sort_keys = sort_keys;
- s->skipkeys = skipkeys;
- s->key_memo = key_memo;
- s->fast_encode = (PyCFunction_Check(s->encoder) && PyCFunction_GetFunction(s->encoder) == (PyCFunction)py_encode_basestring_ascii);
- s->allow_nan = PyObject_IsTrue(allow_nan);
- s->use_decimal = PyObject_IsTrue(use_decimal);
- s->namedtuple_as_object = PyObject_IsTrue(namedtuple_as_object);
- s->tuple_as_array = PyObject_IsTrue(tuple_as_array);
- s->bigint_as_string = PyObject_IsTrue(bigint_as_string);
- s->item_sort_key = item_sort_key;
- s->Decimal = Decimal;
-
- Py_INCREF(s->markers);
- Py_INCREF(s->defaultfn);
- Py_INCREF(s->encoder);
- Py_INCREF(s->indent);
- Py_INCREF(s->key_separator);
- Py_INCREF(s->item_separator);
- Py_INCREF(s->sort_keys);
- Py_INCREF(s->skipkeys);
- Py_INCREF(s->key_memo);
- Py_INCREF(s->item_sort_key);
- Py_INCREF(s->Decimal);
- return 0;
-}
-
-static PyObject *
-encoder_call(PyObject *self, PyObject *args, PyObject *kwds)
-{
- /* Python callable interface to encode_listencode_obj */
- static char *kwlist[] = {"obj", "_current_indent_level", NULL};
- PyObject *obj;
- PyObject *rval;
- Py_ssize_t indent_level;
- PyEncoderObject *s;
- assert(PyEncoder_Check(self));
- s = (PyEncoderObject *)self;
- if (!PyArg_ParseTupleAndKeywords(args, kwds, "OO&:_iterencode", kwlist,
- &obj, _convertPyInt_AsSsize_t, &indent_level))
- return NULL;
- rval = PyList_New(0);
- if (rval == NULL)
- return NULL;
- if (encoder_listencode_obj(s, rval, obj, indent_level)) {
- Py_DECREF(rval);
- return NULL;
- }
- return rval;
-}
-
-static PyObject *
-_encoded_const(PyObject *obj)
-{
- /* Return the JSON string representation of None, True, False */
- if (obj == Py_None) {
- static PyObject *s_null = NULL;
- if (s_null == NULL) {
- s_null = PyString_InternFromString("null");
- }
- Py_INCREF(s_null);
- return s_null;
- }
- else if (obj == Py_True) {
- static PyObject *s_true = NULL;
- if (s_true == NULL) {
- s_true = PyString_InternFromString("true");
- }
- Py_INCREF(s_true);
- return s_true;
- }
- else if (obj == Py_False) {
- static PyObject *s_false = NULL;
- if (s_false == NULL) {
- s_false = PyString_InternFromString("false");
- }
- Py_INCREF(s_false);
- return s_false;
- }
- else {
- PyErr_SetString(PyExc_ValueError, "not a const");
- return NULL;
- }
-}
-
-static PyObject *
-encoder_encode_float(PyEncoderObject *s, PyObject *obj)
-{
- /* Return the JSON representation of a PyFloat */
- double i = PyFloat_AS_DOUBLE(obj);
- if (!Py_IS_FINITE(i)) {
- if (!s->allow_nan) {
- PyErr_SetString(PyExc_ValueError, "Out of range float values are not JSON compliant");
- return NULL;
- }
- if (i > 0) {
- return PyString_FromString("Infinity");
- }
- else if (i < 0) {
- return PyString_FromString("-Infinity");
- }
- else {
- return PyString_FromString("NaN");
- }
- }
- /* Use a better float format here? */
- return PyObject_Repr(obj);
-}
-
-static PyObject *
-encoder_encode_string(PyEncoderObject *s, PyObject *obj)
-{
- /* Return the JSON representation of a string */
- if (s->fast_encode)
- return py_encode_basestring_ascii(NULL, obj);
- else
- return PyObject_CallFunctionObjArgs(s->encoder, obj, NULL);
-}
-
-static int
-_steal_list_append(PyObject *lst, PyObject *stolen)
-{
- /* Append stolen and then decrement its reference count */
- int rval = PyList_Append(lst, stolen);
- Py_DECREF(stolen);
- return rval;
-}
-
-static int
-encoder_listencode_obj(PyEncoderObject *s, PyObject *rval, PyObject *obj, Py_ssize_t indent_level)
-{
- /* Encode Python object obj to a JSON term, rval is a PyList */
- int rv = -1;
- if (Py_EnterRecursiveCall(" while encoding a JSON document"))
- return rv;
- do {
- if (obj == Py_None || obj == Py_True || obj == Py_False) {
- PyObject *cstr = _encoded_const(obj);
- if (cstr != NULL)
- rv = _steal_list_append(rval, cstr);
- }
- else if (PyString_Check(obj) || PyUnicode_Check(obj))
- {
- PyObject *encoded = encoder_encode_string(s, obj);
- if (encoded != NULL)
- rv = _steal_list_append(rval, encoded);
- }
- else if (PyInt_Check(obj) || PyLong_Check(obj)) {
- PyObject *encoded = PyObject_Str(obj);
- if (encoded != NULL) {
- if (s->bigint_as_string) {
- encoded = maybe_quote_bigint(encoded, obj);
- if (encoded == NULL)
- break;
- }
- rv = _steal_list_append(rval, encoded);
- }
- }
- else if (PyFloat_Check(obj)) {
- PyObject *encoded = encoder_encode_float(s, obj);
- if (encoded != NULL)
- rv = _steal_list_append(rval, encoded);
- }
- else if (s->namedtuple_as_object && _is_namedtuple(obj)) {
- PyObject *newobj = PyObject_CallMethod(obj, "_asdict", NULL);
- if (newobj != NULL) {
- rv = encoder_listencode_dict(s, rval, newobj, indent_level);
- Py_DECREF(newobj);
- }
- }
- else if (PyList_Check(obj) || (s->tuple_as_array && PyTuple_Check(obj))) {
- rv = encoder_listencode_list(s, rval, obj, indent_level);
- }
- else if (PyDict_Check(obj)) {
- rv = encoder_listencode_dict(s, rval, obj, indent_level);
- }
- else if (s->use_decimal && PyObject_TypeCheck(obj, s->Decimal)) {
- PyObject *encoded = PyObject_Str(obj);
- if (encoded != NULL)
- rv = _steal_list_append(rval, encoded);
- }
- else {
- PyObject *ident = NULL;
- PyObject *newobj;
- if (s->markers != Py_None) {
- int has_key;
- ident = PyLong_FromVoidPtr(obj);
- if (ident == NULL)
- break;
- has_key = PyDict_Contains(s->markers, ident);
- if (has_key) {
- if (has_key != -1)
- PyErr_SetString(PyExc_ValueError, "Circular reference detected");
- Py_DECREF(ident);
- break;
- }
- if (PyDict_SetItem(s->markers, ident, obj)) {
- Py_DECREF(ident);
- break;
- }
- }
- newobj = PyObject_CallFunctionObjArgs(s->defaultfn, obj, NULL);
- if (newobj == NULL) {
- Py_XDECREF(ident);
- break;
- }
- rv = encoder_listencode_obj(s, rval, newobj, indent_level);
- Py_DECREF(newobj);
- if (rv) {
- Py_XDECREF(ident);
- rv = -1;
- }
- else if (ident != NULL) {
- if (PyDict_DelItem(s->markers, ident)) {
- Py_XDECREF(ident);
- rv = -1;
- }
- Py_XDECREF(ident);
- }
- }
- } while (0);
- Py_LeaveRecursiveCall();
- return rv;
-}
-
-static int
-encoder_listencode_dict(PyEncoderObject *s, PyObject *rval, PyObject *dct, Py_ssize_t indent_level)
-{
- /* Encode Python dict dct a JSON term, rval is a PyList */
- static PyObject *open_dict = NULL;
- static PyObject *close_dict = NULL;
- static PyObject *empty_dict = NULL;
- static PyObject *iteritems = NULL;
- PyObject *kstr = NULL;
- PyObject *ident = NULL;
- PyObject *iter = NULL;
- PyObject *item = NULL;
- PyObject *items = NULL;
- PyObject *encoded = NULL;
- int skipkeys;
- Py_ssize_t idx;
-
- if (open_dict == NULL || close_dict == NULL || empty_dict == NULL || iteritems == NULL) {
- open_dict = PyString_InternFromString("{");
- close_dict = PyString_InternFromString("}");
- empty_dict = PyString_InternFromString("{}");
- iteritems = PyString_InternFromString("iteritems");
- if (open_dict == NULL || close_dict == NULL || empty_dict == NULL || iteritems == NULL)
- return -1;
- }
- if (PyDict_Size(dct) == 0)
- return PyList_Append(rval, empty_dict);
-
- if (s->markers != Py_None) {
- int has_key;
- ident = PyLong_FromVoidPtr(dct);
- if (ident == NULL)
- goto bail;
- has_key = PyDict_Contains(s->markers, ident);
- if (has_key) {
- if (has_key != -1)
- PyErr_SetString(PyExc_ValueError, "Circular reference detected");
- goto bail;
- }
- if (PyDict_SetItem(s->markers, ident, dct)) {
- goto bail;
- }
- }
-
- if (PyList_Append(rval, open_dict))
- goto bail;
-
- if (s->indent != Py_None) {
- /* TODO: DOES NOT RUN */
- indent_level += 1;
- /*
- newline_indent = '\n' + (_indent * _current_indent_level)
- separator = _item_separator + newline_indent
- buf += newline_indent
- */
- }
-
- if (PyCallable_Check(s->item_sort_key)) {
- if (PyDict_CheckExact(dct))
- items = PyDict_Items(dct);
- else
- items = PyMapping_Items(dct);
- PyObject_CallMethod(items, "sort", "OO", Py_None, s->item_sort_key);
- }
- else if (PyObject_IsTrue(s->sort_keys)) {
- /* First sort the keys then replace them with (key, value) tuples. */
- Py_ssize_t i, nitems;
- if (PyDict_CheckExact(dct))
- items = PyDict_Keys(dct);
- else
- items = PyMapping_Keys(dct);
- if (items == NULL)
- goto bail;
- if (!PyList_Check(items)) {
- PyErr_SetString(PyExc_ValueError, "keys must return list");
- goto bail;
- }
- if (PyList_Sort(items) < 0)
- goto bail;
- nitems = PyList_GET_SIZE(items);
- for (i = 0; i < nitems; i++) {
- PyObject *key, *value;
- key = PyList_GET_ITEM(items, i);
- value = PyDict_GetItem(dct, key);
- item = PyTuple_Pack(2, key, value);
- if (item == NULL)
- goto bail;
- PyList_SET_ITEM(items, i, item);
- Py_DECREF(key);
- }
- }
- else {
- if (PyDict_CheckExact(dct))
- items = PyDict_Items(dct);
- else
- items = PyMapping_Items(dct);
- }
- if (items == NULL)
- goto bail;
- iter = PyObject_GetIter(items);
- Py_DECREF(items);
- if (iter == NULL)
- goto bail;
-
- skipkeys = PyObject_IsTrue(s->skipkeys);
- idx = 0;
- while ((item = PyIter_Next(iter))) {
- PyObject *encoded, *key, *value;
- if (!PyTuple_Check(item) || Py_SIZE(item) != 2) {
- PyErr_SetString(PyExc_ValueError, "items must return 2-tuples");
- goto bail;
- }
- key = PyTuple_GET_ITEM(item, 0);
- if (key == NULL)
- goto bail;
- value = PyTuple_GET_ITEM(item, 1);
- if (value == NULL)
- goto bail;
-
- encoded = PyDict_GetItem(s->key_memo, key);
- if (encoded != NULL) {
- Py_INCREF(encoded);
- }
- else if (PyString_Check(key) || PyUnicode_Check(key)) {
- Py_INCREF(key);
- kstr = key;
- }
- else if (PyFloat_Check(key)) {
- kstr = encoder_encode_float(s, key);
- if (kstr == NULL)
- goto bail;
- }
- else if (key == Py_True || key == Py_False || key == Py_None) {
- /* This must come before the PyInt_Check because
- True and False are also 1 and 0.*/
- kstr = _encoded_const(key);
- if (kstr == NULL)
- goto bail;
- }
- else if (PyInt_Check(key) || PyLong_Check(key)) {
- kstr = PyObject_Str(key);
- if (kstr == NULL)
- goto bail;
- }
- else if (skipkeys) {
- Py_DECREF(item);
- continue;
- }
- else {
- /* TODO: include repr of key */
- PyErr_SetString(PyExc_TypeError, "keys must be a string");
- goto bail;
- }
-
- if (idx) {
- if (PyList_Append(rval, s->item_separator))
- goto bail;
- }
-
- if (encoded == NULL) {
- encoded = encoder_encode_string(s, kstr);
- Py_CLEAR(kstr);
- if (encoded == NULL)
- goto bail;
- if (PyDict_SetItem(s->key_memo, key, encoded))
- goto bail;
- }
- if (PyList_Append(rval, encoded)) {
- goto bail;
- }
- Py_CLEAR(encoded);
- if (PyList_Append(rval, s->key_separator))
- goto bail;
- if (encoder_listencode_obj(s, rval, value, indent_level))
- goto bail;
- Py_CLEAR(item);
- idx += 1;
- }
- Py_CLEAR(iter);
- if (PyErr_Occurred())
- goto bail;
- if (ident != NULL) {
- if (PyDict_DelItem(s->markers, ident))
- goto bail;
- Py_CLEAR(ident);
- }
- if (s->indent != Py_None) {
- /* TODO: DOES NOT RUN */
- indent_level -= 1;
- /*
- yield '\n' + (_indent * _current_indent_level)
- */
- }
- if (PyList_Append(rval, close_dict))
- goto bail;
- return 0;
-
-bail:
- Py_XDECREF(encoded);
- Py_XDECREF(items);
- Py_XDECREF(iter);
- Py_XDECREF(kstr);
- Py_XDECREF(ident);
- return -1;
-}
-
-
-static int
-encoder_listencode_list(PyEncoderObject *s, PyObject *rval, PyObject *seq, Py_ssize_t indent_level)
-{
- /* Encode Python list seq to a JSON term, rval is a PyList */
- static PyObject *open_array = NULL;
- static PyObject *close_array = NULL;
- static PyObject *empty_array = NULL;
- PyObject *ident = NULL;
- PyObject *iter = NULL;
- PyObject *obj = NULL;
- int is_true;
- int i = 0;
-
- if (open_array == NULL || close_array == NULL || empty_array == NULL) {
- open_array = PyString_InternFromString("[");
- close_array = PyString_InternFromString("]");
- empty_array = PyString_InternFromString("[]");
- if (open_array == NULL || close_array == NULL || empty_array == NULL)
- return -1;
- }
- ident = NULL;
- is_true = PyObject_IsTrue(seq);
- if (is_true == -1)
- return -1;
- else if (is_true == 0)
- return PyList_Append(rval, empty_array);
-
- if (s->markers != Py_None) {
- int has_key;
- ident = PyLong_FromVoidPtr(seq);
- if (ident == NULL)
- goto bail;
- has_key = PyDict_Contains(s->markers, ident);
- if (has_key) {
- if (has_key != -1)
- PyErr_SetString(PyExc_ValueError, "Circular reference detected");
- goto bail;
- }
- if (PyDict_SetItem(s->markers, ident, seq)) {
- goto bail;
- }
- }
-
- iter = PyObject_GetIter(seq);
- if (iter == NULL)
- goto bail;
-
- if (PyList_Append(rval, open_array))
- goto bail;
- if (s->indent != Py_None) {
- /* TODO: DOES NOT RUN */
- indent_level += 1;
- /*
- newline_indent = '\n' + (_indent * _current_indent_level)
- separator = _item_separator + newline_indent
- buf += newline_indent
- */
- }
- while ((obj = PyIter_Next(iter))) {
- if (i) {
- if (PyList_Append(rval, s->item_separator))
- goto bail;
- }
- if (encoder_listencode_obj(s, rval, obj, indent_level))
- goto bail;
- i++;
- Py_CLEAR(obj);
- }
- Py_CLEAR(iter);
- if (PyErr_Occurred())
- goto bail;
- if (ident != NULL) {
- if (PyDict_DelItem(s->markers, ident))
- goto bail;
- Py_CLEAR(ident);
- }
- if (s->indent != Py_None) {
- /* TODO: DOES NOT RUN */
- indent_level -= 1;
- /*
- yield '\n' + (_indent * _current_indent_level)
- */
- }
- if (PyList_Append(rval, close_array))
- goto bail;
- return 0;
-
-bail:
- Py_XDECREF(obj);
- Py_XDECREF(iter);
- Py_XDECREF(ident);
- return -1;
-}
-
-static void
-encoder_dealloc(PyObject *self)
-{
- /* Deallocate Encoder */
- encoder_clear(self);
- Py_TYPE(self)->tp_free(self);
-}
-
-static int
-encoder_traverse(PyObject *self, visitproc visit, void *arg)
-{
- PyEncoderObject *s;
- assert(PyEncoder_Check(self));
- s = (PyEncoderObject *)self;
- Py_VISIT(s->markers);
- Py_VISIT(s->defaultfn);
- Py_VISIT(s->encoder);
- Py_VISIT(s->indent);
- Py_VISIT(s->key_separator);
- Py_VISIT(s->item_separator);
- Py_VISIT(s->sort_keys);
- Py_VISIT(s->skipkeys);
- Py_VISIT(s->key_memo);
- Py_VISIT(s->item_sort_key);
- return 0;
-}
-
-static int
-encoder_clear(PyObject *self)
-{
- /* Deallocate Encoder */
- PyEncoderObject *s;
- assert(PyEncoder_Check(self));
- s = (PyEncoderObject *)self;
- Py_CLEAR(s->markers);
- Py_CLEAR(s->defaultfn);
- Py_CLEAR(s->encoder);
- Py_CLEAR(s->indent);
- Py_CLEAR(s->key_separator);
- Py_CLEAR(s->item_separator);
- Py_CLEAR(s->sort_keys);
- Py_CLEAR(s->skipkeys);
- Py_CLEAR(s->key_memo);
- Py_CLEAR(s->item_sort_key);
- Py_CLEAR(s->Decimal);
- return 0;
-}
-
-PyDoc_STRVAR(encoder_doc, "_iterencode(obj, _current_indent_level) -> iterable");
-
-static
-PyTypeObject PyEncoderType = {
- PyObject_HEAD_INIT(NULL)
- 0, /* tp_internal */
- "simplejson._speedups.Encoder", /* tp_name */
- sizeof(PyEncoderObject), /* tp_basicsize */
- 0, /* tp_itemsize */
- encoder_dealloc, /* tp_dealloc */
- 0, /* tp_print */
- 0, /* tp_getattr */
- 0, /* tp_setattr */
- 0, /* tp_compare */
- 0, /* tp_repr */
- 0, /* tp_as_number */
- 0, /* tp_as_sequence */
- 0, /* tp_as_mapping */
- 0, /* tp_hash */
- encoder_call, /* tp_call */
- 0, /* tp_str */
- 0, /* tp_getattro */
- 0, /* tp_setattro */
- 0, /* tp_as_buffer */
- Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /* tp_flags */
- encoder_doc, /* tp_doc */
- encoder_traverse, /* tp_traverse */
- encoder_clear, /* tp_clear */
- 0, /* tp_richcompare */
- 0, /* tp_weaklistoffset */
- 0, /* tp_iter */
- 0, /* tp_iternext */
- 0, /* tp_methods */
- encoder_members, /* tp_members */
- 0, /* tp_getset */
- 0, /* tp_base */
- 0, /* tp_dict */
- 0, /* tp_descr_get */
- 0, /* tp_descr_set */
- 0, /* tp_dictoffset */
- encoder_init, /* tp_init */
- 0, /* tp_alloc */
- encoder_new, /* tp_new */
- 0, /* tp_free */
-};
-
-static PyMethodDef speedups_methods[] = {
- {"encode_basestring_ascii",
- (PyCFunction)py_encode_basestring_ascii,
- METH_O,
- pydoc_encode_basestring_ascii},
- {"scanstring",
- (PyCFunction)py_scanstring,
- METH_VARARGS,
- pydoc_scanstring},
- {NULL, NULL, 0, NULL}
-};
-
-PyDoc_STRVAR(module_doc,
-"simplejson speedups\n");
-
-void
-init_speedups(void)
-{
- PyObject *m;
- PyScannerType.tp_new = PyType_GenericNew;
- if (PyType_Ready(&PyScannerType) < 0)
- return;
- PyEncoderType.tp_new = PyType_GenericNew;
- if (PyType_Ready(&PyEncoderType) < 0)
- return;
-
-
- m = Py_InitModule3("_speedups", speedups_methods, module_doc);
- Py_INCREF((PyObject*)&PyScannerType);
- PyModule_AddObject(m, "make_scanner", (PyObject*)&PyScannerType);
- Py_INCREF((PyObject*)&PyEncoderType);
- PyModule_AddObject(m, "make_encoder", (PyObject*)&PyEncoderType);
-}
diff --git a/script/__Lib/diffcalc-2.1/simplejson/decoder.py b/script/__Lib/diffcalc-2.1/simplejson/decoder.py
deleted file mode 100755
index 1c1526c..0000000
--- a/script/__Lib/diffcalc-2.1/simplejson/decoder.py
+++ /dev/null
@@ -1,427 +0,0 @@
-"""Implementation of JSONDecoder
-"""
-import re
-import sys
-import struct
-
-from simplejson.scanner import make_scanner
-def _import_c_scanstring():
- try:
- from simplejson._speedups import scanstring
- return scanstring
- except ImportError:
- return None
-c_scanstring = _import_c_scanstring()
-
-__all__ = ['JSONDecoder']
-
-FLAGS = re.VERBOSE | re.MULTILINE | re.DOTALL
-
-def _floatconstants():
- _BYTES = '7FF80000000000007FF0000000000000'.decode('hex')
- # The struct module in Python 2.4 would get frexp() out of range here
- # when an endian is specified in the format string. Fixed in Python 2.5+
- if sys.byteorder != 'big':
- _BYTES = _BYTES[:8][::-1] + _BYTES[8:][::-1]
- nan, inf = struct.unpack('dd', _BYTES)
- return nan, inf, -inf
-
-NaN, PosInf, NegInf = _floatconstants()
-
-
-class JSONDecodeError(ValueError):
- """Subclass of ValueError with the following additional properties:
-
- msg: The unformatted error message
- doc: The JSON document being parsed
- pos: The start index of doc where parsing failed
- end: The end index of doc where parsing failed (may be None)
- lineno: The line corresponding to pos
- colno: The column corresponding to pos
- endlineno: The line corresponding to end (may be None)
- endcolno: The column corresponding to end (may be None)
-
- """
- def __init__(self, msg, doc, pos, end=None):
- ValueError.__init__(self, errmsg(msg, doc, pos, end=end))
- self.msg = msg
- self.doc = doc
- self.pos = pos
- self.end = end
- self.lineno, self.colno = linecol(doc, pos)
- if end is not None:
- self.endlineno, self.endcolno = linecol(doc, end)
- else:
- self.endlineno, self.endcolno = None, None
-
-
-def linecol(doc, pos):
- lineno = doc.count('\n', 0, pos) + 1
- if lineno == 1:
- colno = pos
- else:
- colno = pos - doc.rindex('\n', 0, pos)
- return lineno, colno
-
-
-def errmsg(msg, doc, pos, end=None):
- # Note that this function is called from _speedups
- lineno, colno = linecol(doc, pos)
- if end is None:
- #fmt = '{0}: line {1} column {2} (char {3})'
- #return fmt.format(msg, lineno, colno, pos)
- fmt = '%s: line %d column %d (char %d)'
- return fmt % (msg, lineno, colno, pos)
- endlineno, endcolno = linecol(doc, end)
- #fmt = '{0}: line {1} column {2} - line {3} column {4} (char {5} - {6})'
- #return fmt.format(msg, lineno, colno, endlineno, endcolno, pos, end)
- fmt = '%s: line %d column %d - line %d column %d (char %d - %d)'
- return fmt % (msg, lineno, colno, endlineno, endcolno, pos, end)
-
-
-_CONSTANTS = {
- '-Infinity': NegInf,
- 'Infinity': PosInf,
- 'NaN': NaN,
-}
-
-STRINGCHUNK = re.compile(r'(.*?)(["\\\x00-\x1f])', FLAGS)
-BACKSLASH = {
- '"': u'"', '\\': u'\\', '/': u'/',
- 'b': u'\b', 'f': u'\f', 'n': u'\n', 'r': u'\r', 't': u'\t',
-}
-
-DEFAULT_ENCODING = "utf-8"
-
-def py_scanstring(s, end, encoding=None, strict=True,
- _b=BACKSLASH, _m=STRINGCHUNK.match):
- """Scan the string s for a JSON string. End is the index of the
- character in s after the quote that started the JSON string.
- Unescapes all valid JSON string escape sequences and raises ValueError
- on attempt to decode an invalid string. If strict is False then literal
- control characters are allowed in the string.
-
- Returns a tuple of the decoded string and the index of the character in s
- after the end quote."""
- if encoding is None:
- encoding = DEFAULT_ENCODING
- chunks = []
- _append = chunks.append
- begin = end - 1
- while 1:
- chunk = _m(s, end)
- if chunk is None:
- raise JSONDecodeError(
- "Unterminated string starting at", s, begin)
- end = chunk.end()
- content, terminator = chunk.groups()
- # Content is contains zero or more unescaped string characters
- if content:
- if not isinstance(content, unicode):
- content = unicode(content, encoding)
- _append(content)
- # Terminator is the end of string, a literal control character,
- # or a backslash denoting that an escape sequence follows
- if terminator == '"':
- break
- elif terminator != '\\':
- if strict:
- msg = "Invalid control character %r at" % (terminator,)
- #msg = "Invalid control character {0!r} at".format(terminator)
- raise JSONDecodeError(msg, s, end)
- else:
- _append(terminator)
- continue
- try:
- esc = s[end]
- except IndexError:
- raise JSONDecodeError(
- "Unterminated string starting at", s, begin)
- # If not a unicode escape sequence, must be in the lookup table
- if esc != 'u':
- try:
- char = _b[esc]
- except KeyError:
- msg = "Invalid \\escape: " + repr(esc)
- raise JSONDecodeError(msg, s, end)
- end += 1
- else:
- # Unicode escape sequence
- esc = s[end + 1:end + 5]
- next_end = end + 5
- if len(esc) != 4:
- msg = "Invalid \\uXXXX escape"
- raise JSONDecodeError(msg, s, end)
- uni = int(esc, 16)
- # Check for surrogate pair on UCS-4 systems
- if 0xd800 <= uni <= 0xdbff and sys.maxunicode > 65535:
- msg = "Invalid \\uXXXX\\uXXXX surrogate pair"
- if not s[end + 5:end + 7] == '\\u':
- raise JSONDecodeError(msg, s, end)
- esc2 = s[end + 7:end + 11]
- if len(esc2) != 4:
- raise JSONDecodeError(msg, s, end)
- uni2 = int(esc2, 16)
- uni = 0x10000 + (((uni - 0xd800) << 10) | (uni2 - 0xdc00))
- next_end += 6
- char = unichr(uni)
- end = next_end
- # Append the unescaped character
- _append(char)
- return u''.join(chunks), end
-
-
-# Use speedup if available
-scanstring = c_scanstring or py_scanstring
-
-WHITESPACE = re.compile(r'[ \t\n\r]*', FLAGS)
-WHITESPACE_STR = ' \t\n\r'
-
-def JSONObject((s, end), encoding, strict, scan_once, object_hook,
- object_pairs_hook, memo=None,
- _w=WHITESPACE.match, _ws=WHITESPACE_STR):
- # Backwards compatibility
- if memo is None:
- memo = {}
- memo_get = memo.setdefault
- pairs = []
- # Use a slice to prevent IndexError from being raised, the following
- # check will raise a more specific ValueError if the string is empty
- nextchar = s[end:end + 1]
- # Normally we expect nextchar == '"'
- if nextchar != '"':
- if nextchar in _ws:
- end = _w(s, end).end()
- nextchar = s[end:end + 1]
- # Trivial empty object
- if nextchar == '}':
- if object_pairs_hook is not None:
- result = object_pairs_hook(pairs)
- return result, end + 1
- pairs = {}
- if object_hook is not None:
- pairs = object_hook(pairs)
- return pairs, end + 1
- elif nextchar != '"':
- raise JSONDecodeError(
- "Expecting property name enclosed in double quotes",
- s, end)
- end += 1
- while True:
- key, end = scanstring(s, end, encoding, strict)
- key = memo_get(key, key)
-
- # To skip some function call overhead we optimize the fast paths where
- # the JSON key separator is ": " or just ":".
- if s[end:end + 1] != ':':
- end = _w(s, end).end()
- if s[end:end + 1] != ':':
- raise JSONDecodeError("Expecting ':' delimiter", s, end)
-
- end += 1
-
- try:
- if s[end] in _ws:
- end += 1
- if s[end] in _ws:
- end = _w(s, end + 1).end()
- except IndexError:
- pass
-
- try:
- value, end = scan_once(s, end)
- except StopIteration:
- raise JSONDecodeError("Expecting object", s, end)
- pairs.append((key, value))
-
- try:
- nextchar = s[end]
- if nextchar in _ws:
- end = _w(s, end + 1).end()
- nextchar = s[end]
- except IndexError:
- nextchar = ''
- end += 1
-
- if nextchar == '}':
- break
- elif nextchar != ',':
- raise JSONDecodeError("Expecting ',' delimiter", s, end - 1)
-
- try:
- nextchar = s[end]
- if nextchar in _ws:
- end += 1
- nextchar = s[end]
- if nextchar in _ws:
- end = _w(s, end + 1).end()
- nextchar = s[end]
- except IndexError:
- nextchar = ''
-
- end += 1
- if nextchar != '"':
- raise JSONDecodeError(
- "Expecting property name enclosed in double quotes",
- s, end - 1)
-
- if object_pairs_hook is not None:
- result = object_pairs_hook(pairs)
- return result, end
- pairs = dict(pairs)
- if object_hook is not None:
- pairs = object_hook(pairs)
- return pairs, end
-
-def JSONArray((s, end), scan_once, _w=WHITESPACE.match, _ws=WHITESPACE_STR):
- values = []
- nextchar = s[end:end + 1]
- if nextchar in _ws:
- end = _w(s, end + 1).end()
- nextchar = s[end:end + 1]
- # Look-ahead for trivial empty array
- if nextchar == ']':
- return values, end + 1
- _append = values.append
- while True:
- try:
- value, end = scan_once(s, end)
- except StopIteration:
- raise JSONDecodeError("Expecting object", s, end)
- _append(value)
- nextchar = s[end:end + 1]
- if nextchar in _ws:
- end = _w(s, end + 1).end()
- nextchar = s[end:end + 1]
- end += 1
- if nextchar == ']':
- break
- elif nextchar != ',':
- raise JSONDecodeError("Expecting ',' delimiter", s, end)
-
- try:
- if s[end] in _ws:
- end += 1
- if s[end] in _ws:
- end = _w(s, end + 1).end()
- except IndexError:
- pass
-
- return values, end
-
-class JSONDecoder(object):
- """Simple JSON decoder
-
- Performs the following translations in decoding by default:
-
- +---------------+-------------------+
- | JSON | Python |
- +===============+===================+
- | object | dict |
- +---------------+-------------------+
- | array | list |
- +---------------+-------------------+
- | string | unicode |
- +---------------+-------------------+
- | number (int) | int, long |
- +---------------+-------------------+
- | number (real) | float |
- +---------------+-------------------+
- | true | True |
- +---------------+-------------------+
- | false | False |
- +---------------+-------------------+
- | null | None |
- +---------------+-------------------+
-
- It also understands ``NaN``, ``Infinity``, and ``-Infinity`` as
- their corresponding ``float`` values, which is outside the JSON spec.
-
- """
-
- def __init__(self, encoding=None, object_hook=None, parse_float=None,
- parse_int=None, parse_constant=None, strict=True,
- object_pairs_hook=None):
- """
- *encoding* determines the encoding used to interpret any
- :class:`str` objects decoded by this instance (``'utf-8'`` by
- default). It has no effect when decoding :class:`unicode` objects.
-
- Note that currently only encodings that are a superset of ASCII work,
- strings of other encodings should be passed in as :class:`unicode`.
-
- *object_hook*, if specified, will be called with the result of every
- JSON object decoded and its return value will be used in place of the
- given :class:`dict`. This can be used to provide custom
- deserializations (e.g. to support JSON-RPC class hinting).
-
- *object_pairs_hook* is an optional function that will be called with
- the result of any object literal decode with an ordered list of pairs.
- The return value of *object_pairs_hook* will be used instead of the
- :class:`dict`. This feature can be used to implement custom decoders
- that rely on the order that the key and value pairs are decoded (for
- example, :func:`collections.OrderedDict` will remember the order of
- insertion). If *object_hook* is also defined, the *object_pairs_hook*
- takes priority.
-
- *parse_float*, if specified, will be called with the string of every
- JSON float to be decoded. By default, this is equivalent to
- ``float(num_str)``. This can be used to use another datatype or parser
- for JSON floats (e.g. :class:`decimal.Decimal`).
-
- *parse_int*, if specified, will be called with the string of every
- JSON int to be decoded. By default, this is equivalent to
- ``int(num_str)``. This can be used to use another datatype or parser
- for JSON integers (e.g. :class:`float`).
-
- *parse_constant*, if specified, will be called with one of the
- following strings: ``'-Infinity'``, ``'Infinity'``, ``'NaN'``. This
- can be used to raise an exception if invalid JSON numbers are
- encountered.
-
- *strict* controls the parser's behavior when it encounters an
- invalid control character in a string. The default setting of
- ``True`` means that unescaped control characters are parse errors, if
- ``False`` then control characters will be allowed in strings.
-
- """
- self.encoding = encoding
- self.object_hook = object_hook
- self.object_pairs_hook = object_pairs_hook
- self.parse_float = parse_float or float
- self.parse_int = parse_int or int
- self.parse_constant = parse_constant or _CONSTANTS.__getitem__
- self.strict = strict
- self.parse_object = JSONObject
- self.parse_array = JSONArray
- self.parse_string = scanstring
- self.memo = {}
- self.scan_once = make_scanner(self)
-
- def decode(self, s, _w=WHITESPACE.match):
- """Return the Python representation of ``s`` (a ``str`` or ``unicode``
- instance containing a JSON document)
-
- """
- obj, end = self.raw_decode(s)
- end = _w(s, end).end()
- if end != len(s):
- raise JSONDecodeError("Extra data", s, end, len(s))
- return obj
-
- def raw_decode(self, s, idx=0, _w=WHITESPACE.match):
- """Decode a JSON document from ``s`` (a ``str`` or ``unicode``
- beginning with a JSON document) and return a 2-tuple of the Python
- representation and the index in ``s`` where the document ended.
- Optionally, ``idx`` can be used to specify an offset in ``s`` where
- the JSON document begins.
-
- This can be used to decode a JSON document from a string that may
- have extraneous data at the end.
-
- """
- try:
- obj, end = self.scan_once(s, idx=_w(s, idx).end())
- except StopIteration:
- raise JSONDecodeError("No JSON object could be decoded", s, idx)
- return obj, end
diff --git a/script/__Lib/diffcalc-2.1/simplejson/encoder.py b/script/__Lib/diffcalc-2.1/simplejson/encoder.py
deleted file mode 100755
index 6b4a6a4..0000000
--- a/script/__Lib/diffcalc-2.1/simplejson/encoder.py
+++ /dev/null
@@ -1,567 +0,0 @@
-"""Implementation of JSONEncoder
-"""
-import re
-from decimal import Decimal
-
-def _import_speedups():
- try:
- from simplejson import _speedups
- return _speedups.encode_basestring_ascii, _speedups.make_encoder
- except ImportError:
- return None, None
-c_encode_basestring_ascii, c_make_encoder = _import_speedups()
-
-from simplejson.decoder import PosInf
-
-ESCAPE = re.compile(ur'[\x00-\x1f\\"\b\f\n\r\t\u2028\u2029]')
-ESCAPE_ASCII = re.compile(r'([\\"]|[^\ -~])')
-HAS_UTF8 = re.compile(r'[\x80-\xff]')
-ESCAPE_DCT = {
- '\\': '\\\\',
- '"': '\\"',
- '\b': '\\b',
- '\f': '\\f',
- '\n': '\\n',
- '\r': '\\r',
- '\t': '\\t',
- u'\u2028': '\\u2028',
- u'\u2029': '\\u2029',
-}
-for i in range(0x20):
- #ESCAPE_DCT.setdefault(chr(i), '\\u{0:04x}'.format(i))
- ESCAPE_DCT.setdefault(chr(i), '\\u%04x' % (i,))
-
-FLOAT_REPR = repr
-
-def encode_basestring(s):
- """Return a JSON representation of a Python string
-
- """
- if isinstance(s, str) and HAS_UTF8.search(s) is not None:
- s = s.decode('utf-8')
- def replace(match):
- return ESCAPE_DCT[match.group(0)]
- return u'"' + ESCAPE.sub(replace, s) + u'"'
-
-
-def py_encode_basestring_ascii(s):
- """Return an ASCII-only JSON representation of a Python string
-
- """
- if isinstance(s, str) and HAS_UTF8.search(s) is not None:
- s = s.decode('utf-8')
- def replace(match):
- s = match.group(0)
- try:
- return ESCAPE_DCT[s]
- except KeyError:
- n = ord(s)
- if n < 0x10000:
- #return '\\u{0:04x}'.format(n)
- return '\\u%04x' % (n,)
- else:
- # surrogate pair
- n -= 0x10000
- s1 = 0xd800 | ((n >> 10) & 0x3ff)
- s2 = 0xdc00 | (n & 0x3ff)
- #return '\\u{0:04x}\\u{1:04x}'.format(s1, s2)
- return '\\u%04x\\u%04x' % (s1, s2)
- return '"' + str(ESCAPE_ASCII.sub(replace, s)) + '"'
-
-
-encode_basestring_ascii = (
- c_encode_basestring_ascii or py_encode_basestring_ascii)
-
-class JSONEncoder(object):
- """Extensible JSON encoder for Python data structures.
-
- Supports the following objects and types by default:
-
- +-------------------+---------------+
- | Python | JSON |
- +===================+===============+
- | dict, namedtuple | object |
- +-------------------+---------------+
- | list, tuple | array |
- +-------------------+---------------+
- | str, unicode | string |
- +-------------------+---------------+
- | int, long, float | number |
- +-------------------+---------------+
- | True | true |
- +-------------------+---------------+
- | False | false |
- +-------------------+---------------+
- | None | null |
- +-------------------+---------------+
-
- To extend this to recognize other objects, subclass and implement a
- ``.default()`` method with another method that returns a serializable
- object for ``o`` if possible, otherwise it should call the superclass
- implementation (to raise ``TypeError``).
-
- """
- item_separator = ', '
- key_separator = ': '
- def __init__(self, skipkeys=False, ensure_ascii=True,
- check_circular=True, allow_nan=True, sort_keys=False,
- indent=None, separators=None, encoding='utf-8', default=None,
- use_decimal=True, namedtuple_as_object=True,
- tuple_as_array=True, bigint_as_string=False,
- item_sort_key=None):
- """Constructor for JSONEncoder, with sensible defaults.
-
- If skipkeys is false, then it is a TypeError to attempt
- encoding of keys that are not str, int, long, float or None. If
- skipkeys is True, such items are simply skipped.
-
- If ensure_ascii is true, the output is guaranteed to be str
- objects with all incoming unicode characters escaped. If
- ensure_ascii is false, the output will be unicode object.
-
- If check_circular is true, then lists, dicts, and custom encoded
- objects will be checked for circular references during encoding to
- prevent an infinite recursion (which would cause an OverflowError).
- Otherwise, no such check takes place.
-
- If allow_nan is true, then NaN, Infinity, and -Infinity will be
- encoded as such. This behavior is not JSON specification compliant,
- but is consistent with most JavaScript based encoders and decoders.
- Otherwise, it will be a ValueError to encode such floats.
-
- If sort_keys is true, then the output of dictionaries will be
- sorted by key; this is useful for regression tests to ensure
- that JSON serializations can be compared on a day-to-day basis.
-
- If indent is a string, then JSON array elements and object members
- will be pretty-printed with a newline followed by that string repeated
- for each level of nesting. ``None`` (the default) selects the most compact
- representation without any newlines. For backwards compatibility with
- versions of simplejson earlier than 2.1.0, an integer is also accepted
- and is converted to a string with that many spaces.
-
- If specified, separators should be a (item_separator, key_separator)
- tuple. The default is (', ', ': '). To get the most compact JSON
- representation you should specify (',', ':') to eliminate whitespace.
-
- If specified, default is a function that gets called for objects
- that can't otherwise be serialized. It should return a JSON encodable
- version of the object or raise a ``TypeError``.
-
- If encoding is not None, then all input strings will be
- transformed into unicode using that encoding prior to JSON-encoding.
- The default is UTF-8.
-
- If use_decimal is true (not the default), ``decimal.Decimal`` will
- be supported directly by the encoder. For the inverse, decode JSON
- with ``parse_float=decimal.Decimal``.
-
- If namedtuple_as_object is true (the default), objects with
- ``_asdict()`` methods will be encoded as JSON objects.
-
- If tuple_as_array is true (the default), tuple (and subclasses) will
- be encoded as JSON arrays.
-
- If bigint_as_string is true (not the default), ints 2**53 and higher
- or lower than -2**53 will be encoded as strings. This is to avoid the
- rounding that happens in Javascript otherwise.
-
- If specified, item_sort_key is a callable used to sort the items in
- each dictionary. This is useful if you want to sort items other than
- in alphabetical order by key.
- """
-
- self.skipkeys = skipkeys
- self.ensure_ascii = ensure_ascii
- self.check_circular = check_circular
- self.allow_nan = allow_nan
- self.sort_keys = sort_keys
- self.use_decimal = use_decimal
- self.namedtuple_as_object = namedtuple_as_object
- self.tuple_as_array = tuple_as_array
- self.bigint_as_string = bigint_as_string
- self.item_sort_key = item_sort_key
- if indent is not None and not isinstance(indent, basestring):
- indent = indent * ' '
- self.indent = indent
- if separators is not None:
- self.item_separator, self.key_separator = separators
- elif indent is not None:
- self.item_separator = ','
- if default is not None:
- self.default = default
- self.encoding = encoding
-
- def default(self, o):
- """Implement this method in a subclass such that it returns
- a serializable object for ``o``, or calls the base implementation
- (to raise a ``TypeError``).
-
- For example, to support arbitrary iterators, you could
- implement default like this::
-
- def default(self, o):
- try:
- iterable = iter(o)
- except TypeError:
- pass
- else:
- return list(iterable)
- return JSONEncoder.default(self, o)
-
- """
- raise TypeError(repr(o) + " is not JSON serializable")
-
- def encode(self, o):
- """Return a JSON string representation of a Python data structure.
-
- >>> from simplejson import JSONEncoder
- >>> JSONEncoder().encode({"foo": ["bar", "baz"]})
- '{"foo": ["bar", "baz"]}'
-
- """
- # This is for extremely simple cases and benchmarks.
- if isinstance(o, basestring):
- if isinstance(o, str):
- _encoding = self.encoding
- if (_encoding is not None
- and not (_encoding == 'utf-8')):
- o = o.decode(_encoding)
- if self.ensure_ascii:
- return encode_basestring_ascii(o)
- else:
- return encode_basestring(o)
- # This doesn't pass the iterator directly to ''.join() because the
- # exceptions aren't as detailed. The list call should be roughly
- # equivalent to the PySequence_Fast that ''.join() would do.
- chunks = self.iterencode(o, _one_shot=True)
- if not isinstance(chunks, (list, tuple)):
- chunks = list(chunks)
- if self.ensure_ascii:
- return ''.join(chunks)
- else:
- return u''.join(chunks)
-
- def iterencode(self, o, _one_shot=False):
- """Encode the given object and yield each string
- representation as available.
-
- For example::
-
- for chunk in JSONEncoder().iterencode(bigobject):
- mysocket.write(chunk)
-
- """
- if self.check_circular:
- markers = {}
- else:
- markers = None
- if self.ensure_ascii:
- _encoder = encode_basestring_ascii
- else:
- _encoder = encode_basestring
- if self.encoding != 'utf-8':
- def _encoder(o, _orig_encoder=_encoder, _encoding=self.encoding):
- if isinstance(o, str):
- o = o.decode(_encoding)
- return _orig_encoder(o)
-
- def floatstr(o, allow_nan=self.allow_nan,
- _repr=FLOAT_REPR, _inf=PosInf, _neginf=-PosInf):
- # Check for specials. Note that this type of test is processor
- # and/or platform-specific, so do tests which don't depend on
- # the internals.
-
- if o != o:
- text = 'NaN'
- elif o == _inf:
- text = 'Infinity'
- elif o == _neginf:
- text = '-Infinity'
- else:
- return _repr(o)
-
- if not allow_nan:
- raise ValueError(
- "Out of range float values are not JSON compliant: " +
- repr(o))
-
- return text
-
-
- key_memo = {}
- if (_one_shot and c_make_encoder is not None
- and self.indent is None):
- _iterencode = c_make_encoder(
- markers, self.default, _encoder, self.indent,
- self.key_separator, self.item_separator, self.sort_keys,
- self.skipkeys, self.allow_nan, key_memo, self.use_decimal,
- self.namedtuple_as_object, self.tuple_as_array,
- self.bigint_as_string, self.item_sort_key,
- Decimal)
- else:
- _iterencode = _make_iterencode(
- markers, self.default, _encoder, self.indent, floatstr,
- self.key_separator, self.item_separator, self.sort_keys,
- self.skipkeys, _one_shot, self.use_decimal,
- self.namedtuple_as_object, self.tuple_as_array,
- self.bigint_as_string, self.item_sort_key,
- Decimal=Decimal)
- try:
- return _iterencode(o, 0)
- finally:
- key_memo.clear()
-
-
-class JSONEncoderForHTML(JSONEncoder):
- """An encoder that produces JSON safe to embed in HTML.
-
- To embed JSON content in, say, a script tag on a web page, the
- characters &, < and > should be escaped. They cannot be escaped
- with the usual entities (e.g. &) because they are not expanded
- within