initial edits to WP4

NEWPROPOSAL/FULLPROP.tex

@@ -1467,6 +1467,10 @@ Also machine-dependent error correction?\e
     to a form which can be executed on that machine model.
 %\BREM{      Develop a specification system for the operations and constraints of a hardware system, in order to specify how to transform a ``logical'' \azx term to a procedure to realise that transformation on a specific machine.}
       }
+        \WPtask[\label{task:error}]{Error correction for target devices 
+    (M15--M30; Responsible: \partnerref{partner:loria}; Involved: \partnerref{partner:grenoble},\partnerref{partner:oxford},\partnerref{partner:gdansk})}{%
+    Develop specific small-scale and optimised error-correction and/or mitigation techniques for ion trap and spin qubit devices. Using the annotations extracted for the devices, and protocols developed in task \ref{task:ECC}, minimise qubit overheads and match codes to the specific error models of the Oxford and Grenoble devices.
+      }
 %%
     \WPtask[\label{task:opt-machine}]{Model-guided optimisation 
       (M21--M36; Responsible: \partnerref{partner:gdansk}; Involved: \partnerref{partner:grenoble},\partnerref{partner:loria},\partnerref{partner:oxford})}{%
@@ -1479,20 +1483,15 @@ Also machine-dependent error correction?\e
     
   \end{WPtasks}
   \begin{WPdeliverables}
-  \WPdeliverable{M24}{Deliverable}
-  \WPdeliverable{M24}{Deliverable}
-  \WPdeliverable{M30}{General purpose layout engine}
-  \WPdeliverable{M36}{Optimising \dzxc, suitable for compiling to Grenoble and/or Oxford architecture}    
-  \WPdeliverable[\label{del:backendapiBIS}]{M36}{API for back-end
-    modules, including specification language for architectures.}
+  \WPdeliverable{M19}{Initial device-specific annotations for Grenoble and Oxford machines}
+  \WPdeliverable{M24}{Initial optimised error correction techniques for ion traps and spin qubits}
+  \WPdeliverable{M28}{Back-end module for Oxford ion traps}
+    \WPdeliverable{M30}{Back-end module for Grenoble spin qubits}
+  \WPdeliverable{M36}{Fully optimising \dzxc with compilation to Grenoble and/or Oxford architecture}    
   \end{WPdeliverables}
 \end{WP}
-\TODOb{Should D4.5 be the same as D1.6? Does not correspond to a task
-  in WP4}
 
-\REM{\emph{Leader:} Kissinger.
-\emph{Others:} Abramsky, de Beaudrap, Duncan, Jeandel, Perdrix, 
-Staton, Carette.} 
+
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % WP admin and comms