Changeset 2813 in Sophya for trunk/SophyaPI/PIext/piafitting.cc

Timestamp:

Jun 29, 2005, 10:18:39 AM (20 years ago)

Author:

ansari

Message:

Correction pb dead-lock ds piafitting.cc avec GenResidus GenFunction (pb AddObj() depuis boucle d'evts) - Reza 29/06/2005

File:

• trunk/SophyaPI/PIext/piafitting.cc (modified) (6 diffs)

trunk/SophyaPI/PIext/piafitting.cc

@@ -496 +496 @@
 {
 mNObj = "";
-NamedObjMgr omg;
-AnyDataObj* mobj = omg.GetObj(obj);
+AnyDataObj* mobj = mApp->ObjMgr()->GetObj(obj);
 if(mobj == NULL)
   {cout<<"PIAFitter::DecodeObject Error , Pas d'objet de nom "<<obj<<endl;
@@ -541 +540 @@
 mNVar = mNData = 0;
 
-NamedObjMgr omg;
-mAdObj = omg.GetObjAdapter(mNObj); // Ne pas deleter
+mAdObj = mApp->ObjMgr()->GetObjAdapter(mNObj); // Ne pas deleter
 if(mAdObj == NULL) {
   cout<<"PIAFitter::DecodeObject Error , ObjAdapter==NULL for "<<mNObj<<endl;
@@ -871 +869 @@
 if(!mFit) return;
 
-NamedObjMgr omg;
 string nomresfun = "__dummy__";
 
@@ -877 +874 @@
   nomresfun = mNObj + "_res";
   AnyDataObj* ob = mAdObj->FitResidusObj(*mFit);
-  if(ob) omg.AddObj(ob,nomresfun);
+  if(ob) mApp->ObjMgr()->AddObj(ob,nomresfun);
 }
 
@@ -883 +880 @@
   nomresfun = mNObj + "_fun";
   AnyDataObj* ob = mAdObj->FitFunctionObj(*mFit);
-  if(ob) omg.AddObj(ob,nomresfun);
+  if(ob) mApp->ObjMgr()->AddObj(ob,nomresfun);
 }
 
@@ -1466 +1463 @@
 
 // L'objet existe t-il encore?
-NamedObjMgr omg;
-if(omg.GetObj(mFitter->mNObj) == NULL) {
+if(mDap->ObjMgr()->GetObj(mFitter->mNObj) == NULL) {
   cout<<"PIAFitterWind::Process Error , Pas d'objet de nom "
       <<mFitter->mNObj<<endl;