Minor correction after moving name of Logging to ExtendedLogging

diff --git a/src/daComposant/daCore/AssimilationStudy.py b/src/daComposant/daCore/AssimilationStudy.py
index d6e27596de18fd3a9e5f4f6eba4d1fa969e069ad..112d75af782c88fe6b511aec1353e072ac175fbd 100644 (file)
--- a/src/daComposant/daCore/AssimilationStudy.py
+++ b/src/daComposant/daCore/AssimilationStudy.py
@@ -1,6 +1,6 @@
 #-*-coding:iso-8859-1-*-
 #
-# Copyright (C) 2008-2013 EDF R&D
+# Copyright (C) 2008-2014 EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -31,8 +31,11 @@ __author__ = "Jean-Philippe ARGAUD"
 
 import os, sys
 import numpy
-import Logging ; Logging.Logging() # A importer en premier
-import scipy.optimize
+import ExtendedLogging ; ExtendedLogging.ExtendedLogging() # A importer en premier
+try:
+    import scipy.optimize
+except:
+    pass
 import Persistence
 from BasicObjects import Operator, Covariance
 from PlatformInfo import uniq

diff --git a/src/daSalome/daYacsIntegration/daStudy.py b/src/daSalome/daYacsIntegration/daStudy.py
index bee61c775f7d936e0310c1cdd91f098a4f58122c..355646c429e64f340dd5b0a63c97581d6888dd2a 100644 (file)
--- a/src/daSalome/daYacsIntegration/daStudy.py
+++ b/src/daSalome/daYacsIntegration/daStudy.py
@@ -21,7 +21,7 @@
 # Author: Jean-Philippe Argaud, jean-philippe.argaud@edf.fr, EDF R&D
 
 from daCore.AssimilationStudy import AssimilationStudy
-from daCore import Logging
+#from daCore import Logging
 import logging
 
 class daError(Exception):