Mercurial > public > sccdocs / changeset

--- a/docs/data_processing/introduction.rst	Wed Mar 12 11:02:18 2014 +0200
+++ b/docs/data_processing/introduction.rst	Wed Mar 12 11:43:36 2014 +0200
@@ -41,7 +41,7 @@
 selection of categories for the measurement are optional.
 
 When the file is uploaded, it is checked if it conforms to the needed
-netcdf format. The check guarantees that the mandatory variables are present
+netCDF format. The check guarantees that the mandatory variables are present
 in the file and that they have the correct format. Note that the check is not 
 exhaustive, in the sense it does not guarantee that the file is able to be 
 correctly processed; the aim of this check is to detect as early as possible
@@ -59,7 +59,7 @@
    files should follow a specified format, described in :ref:`netcdf_file`. In 
    brief, a sounding file should have a name rs_YYYYMMDDccNN.nc, a overlap file 
    a name ov_YYYYMMDDccNN.nc, and a lidar ratio file a name lr_YYYYMMDDccNN.nc, 
-   where YYYY is a year, MM is the month, DD is the day, cc is the earlinet 
+   where YYYY is a year, MM is the month, DD is the day, cc is the EARLINET 
    station call sign and NN is a number.
 
 #. **The ancillary files should be uploaded on the server**. The uploading can be

--- a/docs/data_processing/uploading_measurements.rst	Wed Mar 12 11:02:18 2014 +0200
+++ b/docs/data_processing/uploading_measurements.rst	Wed Mar 12 11:43:36 2014 +0200
@@ -22,7 +22,7 @@
     
 Sounding file (Optional)
    In this optional field you can submit a sounding file that will be used
-   by your measurements in the processing. The file needs to follow the netcdf
+   by your measurements in the processing. The file needs to follow the netCDF
    file format specified in the pdf file found in the :ref:`netcdf_file` section. 
    The file you submit will not be  necessarily connected with the 
    submitted measurement; which sounding file will be used in the processing of 
@@ -31,7 +31,7 @@
    
 Overlap file (Optional)
    In this optional field you can submit a overlap file that will be used
-   by your measurements in the processing. The file needs to follow the netcdf
+   by your measurements in the processing. The file needs to follow the netCDF
    file format specified in the pdf file found in the :ref:`netcdf_file` section. 
    The file you submit will not be  necessarily connected with the 
    submitted measurement; which overlap file will be used in the processing of 
@@ -40,7 +40,7 @@
    
 Lidar ratio file (Optional)
    In this optional field you can submit a lidar ratio file that will be used
-   by your measurements in the processing. The file needs to follow the netcdf
+   by your measurements in the processing. The file needs to follow the netCDF
    file format specified in the pdf file found in the :ref:`netcdf_file` section. 
    The file you submit will not be  necessarily connected with the 
    submitted measurement; which lidar ratio file will be used in the processing 
@@ -53,11 +53,6 @@
    section of the site. You can select multiple categories by holding down the 
    "Control" key (PC) or "Command" key (MAC) while selecting.
 
-
-Form Validation
----------------
-
-
 .. note::
    
    Uploading the measurement file can take considerable time, depending on 
@@ -74,3 +69,56 @@
    IE 9- 
       No progress bar is available (as far as we know).
 
+
+Form Validation
+---------------
+
+The data you submit in the form are check in two stages.
+
+Before you submit the form
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Before you submit the form the following checks are performed:
+
+* All the necessary fields (i.e. "system" and "data file") need to be submitted.
+
+* The ancillary file names have to be in the appropriate format described 
+  in :ref:`netcdf_file`. In brief, a sounding file should have a name 
+  rs_YYYYMMDDccNN.nc, a overlap file a name ov_YYYYMMDDccNN.nc, and a lidar ratio 
+  file a name lr_YYYYMMDDccNN.nc, where YYYY is a year, MM is the month, DD is 
+  the day, cc is the EARLINET station call sign and NN is a number. 
+
+
+After you submit the form
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+After you submit the form:
+
+* The uploaded **data file** needs to have a unique name.
+
+* The **measurement id** defined in the file should *not* exist in the SCC.
+
+* All channels declared in the measurement file should correspond to declared
+  channels in the SCC.
+
+* The submitted measurement file should have the correct netCDF format. All 
+  mandatory variables and attributes should be present in the file. All 
+  variables and attributes should have the correct type (float, integer, etc).
+  This check is not exhaustive, and it is possible that some errors are **not** 
+  detected. For example "conditionally" mandatory variables are not checked 
+  (as, for example "LR_Input", that is mandatory if elastic backscatter retrievals
+  have to be done). 
+
+If ancillary files are submitted
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Additionally, if ancillary files are also uploaded, the following checks are 
+performed:
+
+* The submitted measurement file should have the correct netCDF format. All 
+  mandatory variables and attributes should be present in the file. All 
+  variables and attributes should have the correct type (float, integer, etc).
+
+* A file with the same filename should not exist in the SCC or, if it exists, 
+  it should have status "Missing" or "Error". If a file with the same filename
+  exists, and its status is "OK" the submitted file is regected.