Changeset 5923 for trunk/MagicSoft/Mars

Timestamp:

01/21/05 11:10:38 (20 years ago)

Author:

domingo

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mtemp/mifae/library

Files:

• MDispCalc.cc (modified) (2 diffs)
• MHDisp.cc (modified) (1 diff)

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

@@ -82 +82 @@
     fTitle = title ? title : "Class to calculate Disp";
 
+    // object of MDispParamteres that will hold the Disp parameters
+    fDispParameters = new MDispParameters(fDispParametersName);
+    // initialize the size of the Disp parameters and parameters stepsizes arrays
+    fDispParameters->GetParameters().Set(nPars);
+    fDispParameters->GetStepsizes().Set(nPars);
+    // set Disp parameters to their default values
+    fDispParameters->InitParameters();
+
     fMatrix = NULL;
 
     // initialize mapping array dimension to the number of columns of fMatrix
     fMap.Set(kTotVar);
+}
+
+
+// --------------------------------------------------------------------------
+//
+// Default destructor.
+//
+MDispCalc::~MDispCalc()
+{
+    delete fDispParameters;
 }
 
@@ -114 +132 @@
         return kFALSE;
     }
-
-    fDispParameters = (MDispParameters*)pList->FindObject(fDispParametersName, "MDispParameters");
-    if (!fDispParameters)
-    {
-        *fLog << err << fDispParametersName << " [MDispParameters] not found... aborting." << endl;
-        return kFALSE;
-    }
-    fDispParameters->GetParameters().Set(nPars);
-    fDispParameters->GetStepsizes().Set(nPars);
 
 

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

@@ -265 +265 @@
     // if fMatrix exists, skip preprocessing and just read events from matrix;
     // if doesn't exist, read variables values from containers, so look for them
-    cout << "MHDisp::SetupFill:  fMatrix = " << fMatrix << endl; 
-
     if (fMatrix)
       return kTRUE;