Bump version, refresh schema and doc files

docs/list_of_procs.rst

@@ -19,6 +19,7 @@
  "**insert_position**", "OUT p_id int(11) unsigned, p_posX long, p_posY long, p_posZ long, p_scale long", "Inserts information into the Position table.
  Returns Record ID in p_id."
  "**insert_processing_scaling**", "OUT p_id integer unsigned, p_parentId integer unsigned, p_Type1 enum('overall','innerShell','outerShell'), p_Comments1 varchar(255), p_ResolutionLimitLow1 float , p_ResolutionLimitHigh1 float , p_rMerge1 float , p_rMeasWithinIPlusIMinus1 float , p_rMeasAllIPlusIMinus1 float, p_rPimWithinIPlusIMinus1 float, p_rPimAllIPlusIMinus1 float, p_fractionalPartialBias1 float, p_nTotalObservations1 integer, p_nTotalUniqueObservations1 integer, p_meanIOverSigI1 float, p_completeness1 float, p_multiplicity1 float, p_anomalous1 boolean, p_anomalousCompleteness1 float, p_anomalousMultiplicity1 float, p_ccHalf1 float, p_ccAnomalous1 float, p_Type2 enum('overall','innerShell','outerShell'), p_Comments2 varchar(255), p_ResolutionLimitLow2 float, p_ResolutionLimitHigh2 float, p_rMerge2 float, p_rMeasWithinIPlusIMinus2 float, p_rMeasAllIPlusIMinus2 float, p_rPimWithinIPlusIMinus2 float, p_rPimAllIPlusIMinus2 float, p_fractionalPartialBias2 float, p_nTotalObservations2 integer, p_nTotalUniqueObservations2 integer, p_meanIOverSigI2 float, p_completeness2 float, p_multiplicity2 float, p_anomalous2 boolean, p_anomalousCompleteness2 float, p_anomalousMultiplicity2 float, p_ccHalf2 float, p_ccAnomalous2 float, p_Type3 enum('overall','innerShell','outerShell'), p_Comments3 varchar(255), p_ResolutionLimitLow3 float, p_ResolutionLimitHigh3 float, p_rMerge3 float, p_rMeasWithinIPlusIMinus3 float, p_rMeasAllIPlusIMinus3 float, p_rPimWithinIPlusIMinus3 float, p_rPimAllIPlusIMinus3 float, p_fractionalPartialBias3 float, p_nTotalObservations3 integer, p_nTotalUniqueObservations3 integer, p_meanIOverSigI3 float, p_completeness3 float, p_multiplicity3 float, p_anomalous3 boolean, p_anomalousCompleteness3 float, p_anomalousMultiplicity3 float, p_ccHalf3 float, p_ccAnomalous3 float", "Inserts 1 row in AutoProcScaling, 3 rows in AutoProcScalingStati"
+ "**insert_processing_scaling_v2**", "OUT p_id integer unsigned, p_parentId integer unsigned, p_Type1 enum('overall','innerShell','outerShell'), p_Comments1 varchar(255), p_ResolutionLimitLow1 float , p_ResolutionLimitHigh1 float , p_rMerge1 float , p_rMeasWithinIPlusIMinus1 float , p_rMeasAllIPlusIMinus1 float, p_rPimWithinIPlusIMinus1 float, p_rPimAllIPlusIMinus1 float, p_fractionalPartialBias1 float, p_nTotalObservations1 integer, p_nTotalUniqueObservations1 integer, p_meanIOverSigI1 float, p_resIOverSigI21 float, p_completeness1 float, p_multiplicity1 float, p_anomalous1 boolean, p_anomalousCompleteness1 float, p_anomalousMultiplicity1 float, p_ccHalf1 float, p_ccAnomalous1 float, p_Type2 enum('overall','innerShell','outerShell'), p_Comments2 varchar(255), p_ResolutionLimitLow2 float, p_ResolutionLimitHigh2 float, p_rMerge2 float, p_rMeasWithinIPlusIMinus2 float, p_rMeasAllIPlusIMinus2 float, p_rPimWithinIPlusIMinus2 float, p_rPimAllIPlusIMinus2 float, p_fractionalPartialBias2 float, p_nTotalObservations2 integer, p_nTotalUniqueObservations2 integer, p_meanIOverSigI2 float, p_resIOverSigI22 float, p_completeness2 float, p_multiplicity2 float, p_anomalous2 boolean, p_anomalousCompleteness2 float, p_anomalousMultiplicity2 float, p_ccHalf2 float, p_ccAnomalous2 float, p_Type3 enum('overall','innerShell','outerShell'), p_Comments3 varchar(255), p_ResolutionLimitLow3 float, p_ResolutionLimitHigh3 float, p_rMerge3 float, p_rMeasWithinIPlusIMinus3 float, p_rMeasAllIPlusIMinus3 float, p_rPimWithinIPlusIMinus3 float, p_rPimAllIPlusIMinus3 float, p_fractionalPartialBias3 float, p_nTotalObservations3 integer, p_nTotalUniqueObservations3 integer, p_meanIOverSigI3 float, p_resIOverSigI23 float, p_completeness3 float, p_multiplicity3 float, p_anomalous3 boolean, p_anomalousCompleteness3 float, p_anomalousMultiplicity3 float, p_ccHalf3 float, p_ccAnomalous3 float", "Inserts 1 row in AutoProcScaling, 3 rows in AutoProcScalingStatistics. Returns: autoProcScalingId value in p_id"
  "**insert_quality_indicators**", "OUT p_id int(11) unsigned, p_dataCollectionId int(11) unsigned, p_autoProcProgramId int(10) unsigned, p_imageNumber mediumint(8) unsigned, p_spotTotal int(10), p_inResTotal int(10), p_goodBraggCandidates int(10), p_iceRings int(10), p_method1Res float, p_method2Res float, p_maxUnitCell float, p_pctSaturationTop50Peaks float, p_inResolutionOvrlSpots int(10), p_binPopCutOffMethod2Res float, p_totalIntegratedSignal double, p_driftFactor float", "Inserts a row into the image quality indicators table"
  "**insert_sample_image_auto_score**", "OUT p_id int(11) unsigned, p_imageFullPath varchar(255), p_schemaName varchar(25), p_scoreClass varchar(15), p_probability float", "Insert a row with the auto scored probability for a given sample image using a certain class and schema. Returns the ID in p_id."
  "**insert_screening**", "OUT p_id int(11) unsigned, p_dcgId int(11) unsigned, p_dcId int(11) unsigned, p_programVersion varchar(45), p_shortComments varchar(20), p_comments varchar(255)", "Insert a row with info about a screening. Returns the ID in p_id"
@@ -246,7 +247,9 @@
  "**upsert_sample_image**", "INOUT p_id int(11) unsigned, p_sampleId int(11) unsigned, p_containerInspectionId int(11) unsigned, p_micronsPerPixelX float, p_micronsPerPixelY float, p_imageFullPath varchar(255), p_comments varchar(255)", "If p_id is not provided, inserts new row and returns ID in p_id. Otherwise updates existing row."
  "**upsert_sample_image_analysis**", "INOUT p_id int(11) unsigned, p_containerBarcode varchar(45), p_sampleLocation varchar(45), p_oavSnapshotBefore varchar(255), p_oavSnapshotAfter varchar(255), p_deltaX int, p_deltaY int, p_goodnessOfFit float, p_scaleFactor float, p_resultCode varchar(15), p_matchStartTS timestamp, p_matchEndTS timestamp", "Insert or update info about the sample image analysis for the mo"
  "**upsert_sample_image_auto_score**", "p_imageFullPath varchar(255), p_schemaName varchar(25), p_scoreClass varchar(15), p_probability float", "Insert or update a row with the auto scored probability for a given sample image with a certain class and schema. Returns nothing."
- "**upsert_session_for_proposal_code_number**", "INOUT p_id int(11) unsigned, p_proposalCode varchar(3), p_proposalNumber int(11), p_visitNumber int(10) unsigned, p_beamLineSetupId int(10) unsigned, p_startDate datetime, p_endDate datetime, p_beamlineName varchar(45), p_title varchar(255), p_beamlineOperator varchar(45), p_nbShifts int(10) unsigned, p_scheduled tinyint(1), p_usedFlag tinyint(1), p_comments varchar(255), p_externalPkId int(11) unsigned, p_externalPkUUID varchar(32)", "Inserts or updates a session for a proposal with given code and"
+ "**upsert_session_for_proposal_code_number**", "INOUT p_id int(11) unsigned, p_proposalCode varchar(3), p_proposalNumber int(11), p_visitNumber int(10) unsigned, p_beamLineSetupId int(10) unsigned, p_startDate datetime, p_endDate datetime, p_beamlineName varchar(45), p_title varchar(255), p_beamlineOperator varchar(45), p_nbShifts int(10) unsigned, p_scheduled tinyint(1), p_usedFlag tinyint(1), p_comments varchar(255), p_externalPkId int(11) unsigned, p_externalPkUUID varchar(32)", "Inserts or updates a session for a proposal with given code and number.
+ Mandatory columns: p_id OR (p_proposalCode and p_proposalNumber)
+ Returns: Record ID in p_id."
  "**upsert_session_has_person**", "p_sessionId int(10) unsigned, p_personId int(10) unsigned, p_role varchar(100), p_remote tinyint(1)", "Inserts or updates info about a session - person association (p_sessionId, p_personId).
  Mandatory columns:
  For insert: p_sessionId, p_personId

docs/list_of_tables_and_columns.rst

@@ -89,7 +89,6 @@
  ``processingEnvironment``,varchar,"Cpus, Nodes,..."
  ``recordTimeStamp``,datetime,"Creation or last update date/time"
  ``processingJobId``,int,""
- ``dataCollectionId``,int,""
  **AutoProcProgramAttachment**,table,""
  ``autoProcProgramAttachmentId``,int,"Primary key (auto-incremented)"
  ``autoProcProgramId``,int,"Related autoProcProgram item"
@@ -133,6 +132,7 @@
  ``anomalous``,tinyint,"boolean type:0 noanoum - 1 anoum"
  ``ccHalf``,float,"information from XDS"
  ``ccAnomalous``,float,""
+ ``resIOverSigI2``,float,"Resolution where I/Sigma(I) equals 2"
  **AutoProcScaling_has_Int**,table,""
  ``autoProcScaling_has_IntId``,int,"Primary key (auto-incremented)"
  ``autoProcScalingId``,int,"AutoProcScaling item"
@@ -409,6 +409,10 @@
  ``blSampleId``,int,""
  ``energyScanId``,int,""
  ``blSampleHasEnergyScanId``,int,""
+ **BLSample_has_Positioner**,table,""
+ ``blSampleHasPositioner``,int,""
+ ``blSampleId``,int,""
+ ``positionerId``,int,""
  **BLSession**,table,""
  ``sessionId``,int,""
  ``beamLineSetupId``,int,""
@@ -456,6 +460,10 @@
  ``recordTimeStamp``,timestamp,"Creation or last update date/time"
  ``source``,enum,""
  ``type``,varchar,"The type of subsample, i.e. roi (region), poi (point), loi (line)"
+ **BLSubSample_has_Positioner**,table,""
+ ``blSubSampleHasPositioner``,int,""
+ ``blSubSampleId``,int,""
+ ``positionerId``,int,""
  **Buffer**,table,""
  ``bufferId``,int,""
  ``BLSESSIONID``,int,""
@@ -1497,6 +1505,10 @@
  ``X``,double,""
  ``Y``,double,""
  ``Z``,double,""
+ **Positioner**,table,"An arbitrary positioner and its value, could be e.g. a motor. Allows for instance to store some positions with a sample or subsample"
+ ``positionerId``,int,""
+ ``positioner``,varchar,""
+ ``value``,float,""
  **PreparePhasingData**,table,""
  ``preparePhasingDataId``,int,"Primary key (auto-incremented)"
  ``phasingAnalysisId``,int,"Related phasing analysis item"
@@ -1752,6 +1764,7 @@
  ``diffractionPlanId``,int,"references DiffractionPlan"
  ``dataCollectionGroupId``,int,""
  ``xmlSampleInformation``,longblob,""
+ ``autoProcProgramId``,int,""
  **ScreeningInput**,table,""
  ``screeningInputId``,int,""
  ``screeningId``,int,""