Suppression ancien fichier catalogue

diff --git a/src/daEficas/ADAO_Cata_V0.py b/src/daEficas/ADAO_Cata_V0.py
deleted file mode 100644 (file)
index 807ac4a..0000000
--- a/src/daEficas/ADAO_Cata_V0.py
+++ /dev/null
@@ -1,85 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# --------------------------------------------------
-# debut entete
-# --------------------------------------------------
-
-import Accas
-from Accas import *
-
-JdC = JDC_CATA (code = 'ADAO',
-                execmodul = None,
-                regles = ( AU_MOINS_UN ('ASSIM_STUDY')),
-               )
-
-def F_VECTOR(statut) : return FACT(statut = statut,
-                                   FROM = SIMP(statut = "o", typ = "TXM", into=("String")),
-                                   DATA = SIMP(statut = "o", typ = "TXM"),
-                                  )
-
-def F_MATRIX(statut) : return FACT(statut = statut,
-                                   FROM = SIMP(statut = "o", typ = "TXM", into=("String")),
-                                   DATA = SIMP(statut = "o", typ = "TXM"),
-                                  )
-
-def F_BACKGROUND(statut) : return FACT(statut=statut,
-                                       regles = ( UN_PARMI ("VECTOR")),
-                                       VECTOR = F_VECTOR("o"),
-                                      )
-
-def F_BACKGROUND_ERROR(statut) : return FACT(statut=statut,
-                                             regles = ( UN_PARMI ("MATRIX")),
-                                             MATRIX = F_MATRIX("o"),
-                                            )
-
-def F_OBSERVATION(statut) : return FACT(statut=statut,
-                                        regles = ( UN_PARMI ("VECTOR")),
-                                        VECTOR = F_VECTOR("o"),
-                                       )
-
-def F_OBSERVATION_ERROR(statut) : return FACT(statut=statut,
-                                              regles = ( UN_PARMI ("MATRIX")),
-                                              MATRIX = F_MATRIX("o"),
-                                             )
-
-def F_OBSERVATION_OPERATOR(statut) : return FACT(statut=statut,
-                                                 regles = ( UN_PARMI ("MATRIX", "FUNCTION")),
-                                                 MATRIX = F_MATRIX("f"),
-                                                 FUNCTION = F_VECTOR("f"),
-                                                )
-
-def F_ANALYSIS(statut) : return FACT(statut = statut,
-                                     FROM = SIMP(statut = "o", typ = "TXM", into=("String", "File")),
-                                     STRING_DATA = BLOC ( condition = " FROM in ( 'String', ) ",
-
-                                                  STRING = SIMP(statut = "o", typ = "TXM"),
-                                                 ),
-                                     FILE_DATA = BLOC ( condition = " FROM in ( 'File', ) ",
-
-                                                  FILE = SIMP(statut = "o", typ = "Fichier"),
-                                                 ),
-                                    )
-
-
-ASSIM_STUDY = PROC(nom="ASSIM_STUDY",
-                   op=None,
-                   repetable = "n",
-                   STUDY_NAME = SIMP(statut="o", typ = "TXM"),
-                   ALGORITHM  = FACT(statut='o',
-                                     regles = ( UN_PARMI ("Blue", "ENSEMBLEBLUE"),),
-
-                                     Blue = FACT(regles = ( ENSEMBLE ("Background", "BackgroundError", 
-                                                                      "Observation", "ObservationError",
-                                                                      "ObservationOperator")),
-                                                 Background = F_BACKGROUND("o"),
-                                                 BackgroundError = F_BACKGROUND_ERROR("o"),
-                                                 Observation = F_OBSERVATION("o"),
-                                                 ObservationError = F_OBSERVATION_ERROR("o"),
-                                                 ObservationOperator = F_OBSERVATION_OPERATOR("o"),
-                                                 Analysis = F_ANALYSIS("f"),
-                                                ),
-                                     ENSEMBLEBLUE = FACT(BACKGROUND = F_BACKGROUND("o"),
-                                                        ),
-                                    ),
-                  )
-

diff --git a/src/daEficas/Makefile.am b/src/daEficas/Makefile.am
index f68a6d4a6d42c80c1eff69935d158ff1bf2dd80f..c9a80903f51c5b2233b8b1b5c0e3053152557bf7 100644 (file)
--- a/src/daEficas/Makefile.am
+++ b/src/daEficas/Makefile.am
@@ -29,4 +29,4 @@ mypkgpython_PYTHON = \
                     prefs_ADAO.py \
                     prefs.py
 
-EXTRA_DIST = prefs_ADAO.py.in ADAO_Cata_V0.py
+EXTRA_DIST = prefs_ADAO.py.in