Changeset 8484 for trunk/MagicSoft/Mars/mbase

Timestamp:

05/10/07 13:16:56 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MMath.cc (modified) (2 diffs)
• MStatusArray.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/MMath.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MMath.cc,v 1.30 2006-10-30 12:46:12 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MMath.cc,v 1.31 2007-05-10 12:14:54 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -196 +196 @@
         arr[i] = TMath::Abs(a[i]-med);
 
-    // FIXME: GausProb() is a workaround. It should be taken into account in Median!
-    //return TMath::Median(n, arr);
-    
-    // Sort distribution
-    Long64_t idx[n];
-    TMath::SortImp(n, arr, idx, kTRUE);
-
-    // Define where to divide
-    const Int_t div = TMath::Nint(n*prob);
+    // Define where to divide (floor because the highest possible is n-1)
+    const Int_t div = TMath::FloorNint(n*prob);
 
     // Calculate result
-    Double_t dev = TMath::KOrdStat(n, arr, div, idx);
+    Double_t dev = TMath::KOrdStat(n, arr, div);
     if (n%2 == 0)
     {
-        dev += TMath::KOrdStat(n, arr, div-1, idx);
+        dev += TMath::KOrdStat(n, arr, div-1);
         dev /= 2;
     }

trunk/MagicSoft/Mars/mbase/MStatusArray.cc

@@ -93 +93 @@
 TObject *MStatusArray::FindObjectInPad(TVirtualPad *pad, const char *object, TClass *cls) const
 {
-    TObject *o = pad->FindObject(object);
-    if (o && o->InheritsFrom(cls))
-        return o;
+    TObject *o = NULL;//pad->FindObject(object);
+//    if (o && o->InheritsFrom(cls))
+//        return o;
 
     TIter Next(pad->GetListOfPrimitives());
     while ((o=Next()))
     {
+        if (o->GetName()==(TString)object && o->InheritsFrom(cls))
+            return o;
+
         if (o==pad || !o->InheritsFrom(TVirtualPad::Class()))
             continue;
 
         if ((o = FindObjectInPad((TVirtualPad*)o, object, cls)))
-            if (o->InheritsFrom(cls))
-                return o;
+            return o;
+//            if (o->InheritsFrom(cls))
+//                return o;
     }
     return 0;