--- PamCut/CollectionActions/Histo2DActions/TofDedxVsBetaHistoAction/TofDedxVsBetaHistoAction.cpp	2012/01/03 08:45:27	1.1.2.2
+++ PamCut/CollectionActions/Histo2DActions/TofDedxVsBetaHistoAction/TofDedxVsBetaHistoAction.cpp	2010/08/12 15:11:33	1.2
@@ -11,62 +11,49 @@
 
 TofDedxVsBetaHistoAction::TofDedxVsBetaHistoAction(const char *actionName, unsigned int layers, bool standAlone,
     TString outFileBase, TString mode, bool outRoot, bool outText, TString title) :
-    Histo2DAction<Int_t>(actionName, title, outFileBase, mode, outRoot, outText), _layers(layers), _nLayers(0), _badEvents(
-        0), _standAlone(standAlone) {
+  Histo2DAction<Int_t> (actionName, title, outFileBase, mode, outRoot, outText), _layers(layers), _nLayers(0),
+      _badEvents(0), _standAlone(standAlone) {
 
-  bool buildTitle = false;
   if (title == "") {
-    buildTitle = true;
     title = "TOF dE/dx (";
   }
   if ((_layers & S11) == S11) {
-    if (buildTitle)
-      title += "S11";
+    title += "S11";
     _nLayers++;
   }
   if ((_layers & S12) == S12) {
-    if (buildTitle) {
-      if (_nLayers > 0)
-        title += ",";
-      title += "S12";
-    }
+    if (_nLayers > 0)
+      title += ",";
+    title += "S12";
     _nLayers++;
   }
   if ((_layers & S21) == S21) {
-    if (buildTitle) {
-      if (_nLayers > 0)
-        title += ",";
-      title += "S21";
-    }
+    if (_nLayers > 0)
+      title += ",";
+    title += "S21";
     _nLayers++;
   }
   if ((_layers & S22) == S22) {
-    if (buildTitle) {
-      if (_nLayers > 0)
-        title += ",";
-      title += "S22";
-    }
+    if (_nLayers > 0)
+      title += ",";
+    title += "S22";
     _nLayers++;
   }
   if ((_layers & S31) == S31) {
-    if (buildTitle) {
-      if (_nLayers > 0)
-        title += ",";
-      title += "S31";
-    }
+    if (_nLayers > 0)
+      title += ",";
+    title += "S31";
     _nLayers++;
   }
   if ((_layers & S32) == S32) {
-    if (buildTitle) {
-      if (_nLayers > 0)
-        title += ",";
-      title += "S32";
-    }
+    if (_nLayers > 0)
+      title += ",";
+    title += "S32";
     _nLayers++;
   }
-  if (buildTitle)
-    title += ") Vs Beta";
+  title += ") Vs Beta";
 
+  cout << _layers << "  " << _nLayers << endl;
   SetTitle(title);
 
 }
@@ -78,64 +65,62 @@
   static unsigned int badLayers;
 
   static int trkSeqNo;
-  static int idx;
   if (_standAlone)
-    trkSeqNo = -1;
+    trkSeqNo = 0;
   else
-    trkSeqNo = event->GetTrack(0)->GetTrkTrack()->GetSeqNo();
-
-  for (int i = 0; i < event->GetToFLevel2()->ntrk(); i++) {
-    if (event->GetToFLevel2()->GetToFTrkVar(i)->trkseqno == trkSeqNo)
-      idx = i;
-  }
+    for (int i = 0; i < event->GetToFLevel2()->ntrk(); i++) {
+      if (event->GetToFLevel2()->GetToFTrkVar(i)->trkseqno == event->GetTrack(0)->GetTrkTrack()->GetSeqNo())
+        trkSeqNo = i;
+    }
 
   dEdx = 0.;
   badLayers = 0;
   if ((_layers & S11) == S11) {
-    dEdxLayer = event->GetToFLevel2()->GetdEdx(idx, 0, 100);
+    dEdxLayer = event->GetToFLevel2()->GetdEdx(trkSeqNo, 0, 100);
     if (dEdxLayer > 0. && dEdxLayer < 4090)
       dEdx += dEdxLayer;
     else
       badLayers++;
   }
   if ((_layers & S12) == S12) {
-    dEdxLayer = event->GetToFLevel2()->GetdEdx(idx, 1, 100);
+    dEdxLayer = event->GetToFLevel2()->GetdEdx(trkSeqNo, 1, 100);
     if (dEdxLayer > 0. && dEdxLayer < 4090)
       dEdx += dEdxLayer;
     else
       badLayers++;
   }
   if ((_layers & S21) == S21) {
-    dEdxLayer = event->GetToFLevel2()->GetdEdx(idx, 2, 100);
+    dEdxLayer = event->GetToFLevel2()->GetdEdx(trkSeqNo, 2, 100);
     if (dEdxLayer > 0. && dEdxLayer < 4090)
       dEdx += dEdxLayer;
     else
       badLayers++;
   }
   if ((_layers & S22) == S22) {
-    dEdxLayer = event->GetToFLevel2()->GetdEdx(idx, 3, 100);
+    dEdxLayer = event->GetToFLevel2()->GetdEdx(trkSeqNo, 3, 100);
     if (dEdxLayer > 0. && dEdxLayer < 4090)
       dEdx += dEdxLayer;
     else
       badLayers++;
   }
   if ((_layers & S31) == S31) {
-    dEdxLayer = event->GetToFLevel2()->GetdEdx(idx, 4, 100);
+    dEdxLayer = event->GetToFLevel2()->GetdEdx(trkSeqNo, 4, 100);
     if (dEdxLayer > 0. && dEdxLayer < 4090)
       dEdx += dEdxLayer;
     else
       badLayers++;
   }
   if ((_layers & S32) == S32) {
-    dEdxLayer = event->GetToFLevel2()->GetdEdx(idx, 5, 100);
+    dEdxLayer = event->GetToFLevel2()->GetdEdx(trkSeqNo, 5, 100);
     if (dEdxLayer > 0. && dEdxLayer < 4090)
       dEdx += dEdxLayer;
     else
       badLayers++;
   }
   if (badLayers == 0) {
-    dEdx /= _nLayers - badLayers;
-    Fill(event->GetToFLevel2()->GetToFTrkVar(idx)->beta[12], dEdx);
+    dEdx /= _nLayers;
+    cout << _nLayers << "  " << dEdx << endl;
+    Fill(event->GetToFLevel2()->GetToFTrkVar(trkSeqNo)->beta[12], dEdx);
   }
   else
     _badEvents++;