Changeset 5926 for trunk/MagicSoft

Timestamp:

01/21/05 11:39:23 (20 years ago)

Author:

domingo

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mtemp/mifae/library/MFindDisp.cc (modified) (11 diffs)

trunk/MagicSoft/Mars/mtemp/mifae/library/MFindDisp.cc

@@ -203 +203 @@
 
     // objects of MDispCalc where the first part of the matrices mapping is defined
-    fDispCalcTrain = new MDispCalc("DispTrain");
-    fDispCalcTest  = new MDispCalc("DispTest");
+    fDispCalcTrain = new MDispCalc("DispTrain","MDispParameters");
+    fDispCalcTest  = new MDispCalc("DispTest","MDispParametersTest");
 
     // objects of MHDisp where the second part of the matrices mapping is defined
@@ -844 +844 @@
     // create container for the Disp parameters
     // and set them to their initial values
-    MDispParameters dispparams;
+    MDispParameters *dispparams = fDispCalcTrain->GetDispParameters();
 
     // take initial values from file parDispInit
@@ -850 +850 @@
     {
       TFile inparam(parDispInit);
-      dispparams.Read("MDispParameters");
+      dispparams->Read("MDispParameters");
       inparam.Close();
       *fLog << "MFindDisp::FindParams; initial values of parameters are taken from file "
@@ -863 +863 @@
         *fLog << "MFindDisp::FindParams; initial values of parameters are taken from 'params'"
               << endl;
-        dispparams.SetParameters(params);
+        dispparams->SetParameters(params);
       }
       if (steps.GetSize()  != 0)
@@ -869 +869 @@
         *fLog << "MFindDisp::FindParams; initial step sizes are taken from 'steps'"
               << endl;
-        dispparams.SetStepsizes(steps);
+        dispparams->SetStepsizes(steps);
       }
     }
@@ -885 +885 @@
     
     parlistfcn.AddToList(&tasklistfcn);
-    parlistfcn.AddToList(&dispparams);
+    parlistfcn.AddToList(dispparams);
     parlistfcn.AddToList(fHDispTrain);
     parlistfcn.AddToList(fCam);
@@ -925 +925 @@
 
     // get initial values of parameters 
-    fVinit = dispparams.GetParameters();
-    fStep  = dispparams.GetStepsizes();
+    fVinit = dispparams->GetParameters();
+    fStep  = dispparams->GetStepsizes();
 
     TString name[fVinit.GetSize()];
@@ -992 +992 @@
     
     TFile outparam(fFilenameParam, "RECREATE"); 
-    dispparams.Write();
+    dispparams->Write();
     outparam.Close();
 
@@ -998 +998 @@
               << fFilenameParam << "' :" << endl;
 
-    const TArrayD &check = dispparams.GetParameters();
+    const TArrayD &check = dispparams->GetParameters();
     for (Int_t i=0; i<check.GetSize(); i++)
         *fLog << check[i] << ",  ";
@@ -1064 +1064 @@
     MTaskList tasklist2;
 
-    MDispParameters dispparams;
-    dispparams.SetParameters(dispPar);
+    MDispParameters *dispparams = fDispCalcTest->GetDispParameters();
+    dispparams->SetParameters(dispPar);
 
     MMatrixLoop loopcalc(fMatrixTestCalc);
@@ -1107 +1107 @@
 
     parlist2.AddToList(&tasklist2);
-    parlist2.AddToList(&dispparams);
+    parlist2.AddToList(dispparams);
     parlist2.AddToList(&hdisp1);
     parlist2.AddToList(&hdisp2);