X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STEER%2FAliMergeCombi.cxx;h=a6787982dce380fe02f3fccacbdf30f0d02912fb;hb=6a6ba9a28ffe11bc1d7cb69b44013fee8864d725;hp=2a3cd2aa312b84d60c6404ce1c12a8ea90c3e01f;hpb=05118fd59ab840b539ed5f958c74ed06bf2cf5fd;p=u%2Fmrichter%2FAliRoot.git

diff --git a/STEER/AliMergeCombi.cxx b/STEER/AliMergeCombi.cxx
index 2a3cd2aa312..a6787982dce 100644
--- a/STEER/AliMergeCombi.cxx
+++ b/STEER/AliMergeCombi.cxx
@@ -13,53 +13,60 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$Log$
-*/
+/* $Id$ */
 
-////////////////////////////////////////////////////////////////////////
-//
+//----------------------------------------------------------------------
 // AliMergeCombi.cxx
-//
-// returns combinations of input event numbers
-//
-////////////////////////////////////////////////////////////////////////
+// class to
+// return combinations of input event numbers
+//----------------------------------------------------------------------
 
 #include "AliMergeCombi.h"
 
 ClassImp(AliMergeCombi)
 
-AliMergeCombi::AliMergeCombi()
+//_______________________________________________________________________
+AliMergeCombi::AliMergeCombi():
+  fDim(1),
+  fSperb(1),
+  fCounter(0)
 {
-// default ctor
-
+  //
+  // default ctor
+  //
 }
 
-////////////////////////////////////////////////////////////////////////
-AliMergeCombi::AliMergeCombi(Int_t dim, Int_t sperb)
+//_______________________________________________________________________
+AliMergeCombi::AliMergeCombi(Int_t dim, Int_t sperb):
+  fDim(dim),
+  fSperb(sperb),
+  fCounter(0)
 {
-// default ctor
-  fDim = dim;
-  fSperb = sperb;
-  fLastDelta = new Int_t[fDim];
-  for (Int_t i=0; i<fDim; i++) fLastDelta[i] = -1;
+  //
+  // Standard ctor
+  //
 }
 
-////////////////////////////////////////////////////////////////////////
+//_______________________________________________________________________
 AliMergeCombi::~AliMergeCombi()
 {
-// default dtor
-  if (fLastDelta) {
-    delete fLastDelta;
-    fLastDelta = 0;
-  }
+  // default dtor
 }
 
-////////////////////////////////////////////////////////////////////////
-Bool_t AliMergeCombi::Combination(Int_t evNumber[], Int_t delta[])
+//_______________________________________________________________________
+Bool_t AliMergeCombi::Combination(Int_t /* evNumber */ [], Int_t delta[])
 {
-   for (Int_t i=0; i<fDim; i++) fLastDelta[i] = delta[i] = 1;
-   return kTRUE;
+  //
+  // Combination method
+  //
+  delta[0] = 1;
+  for (Int_t i=1; i<fDim; i++) {
+    if (fCounter%fSperb == 0) {
+      delta[i] = 1;
+    } else {
+      delta[i] = 0;
+    }
+    fCounter++;
+  }      
+  return kTRUE;
 }
-
-////////////////////////////////////////////////////////////////////////