bug fix

[u/mrichter/AliRoot.git] / FMD / AliFMDCalibSampleRate.cxx

diff --git a/FMD/AliFMDCalibSampleRate.cxx b/FMD/AliFMDCalibSampleRate.cxx
index 85a8631d1d45c9c5d7aa337525dafd6e3c9b1ad5..32ad46c3dc75c78150747aa5ac0a664969700ddc 100644 (file)
--- a/FMD/AliFMDCalibSampleRate.cxx
+++ b/FMD/AliFMDCalibSampleRate.cxx
@@ -31,6 +31,7 @@
 // #include <AliLog.h>
 #include "TString.h"
 #include "AliFMDDebug.h" // Better debug macros
+#include <iostream>
 
 //____________________________________________________________________
 ClassImp(AliFMDCalibSampleRate)
@@ -69,9 +70,10 @@ AliFMDCalibSampleRate::Set(UShort_t det, Char_t ring,
                           UShort_t sector, UShort_t, UShort_t rate)
 {
   // Set values.  Strip argument is ignored 
-  UInt_t nSec  = (ring == 'I' ? 20 : 40);
+  UInt_t nSec  = (ring == 'I' ? 10 : 20);
   UInt_t board = sector / nSec;
   fRates(det, ring, board, 0) = rate;
+  
 }
 
 //____________________________________________________________________
@@ -80,28 +82,32 @@ AliFMDCalibSampleRate::Rate(UShort_t det, Char_t ring,
                            UShort_t sec, UShort_t) const
 {
   // Get the sample rate 
-  UInt_t nSec  = (ring == 'I' ? 20 : 40);
-  UInt_t board = sec / nSec;
-  AliFMDDebug(10, ("Getting sample rate for FMD%d%c[%2d,0] (board %d)", 
-                   det, ring, sec, board));
-  return fRates(det, ring, board, 0);
+  UInt_t   nSec  = (ring == 'I' ? 10 : 20);
+  UInt_t   board = sec / nSec;
+  UShort_t ret   = fRates(det, ring, board, 0);
+  AliFMDDebug(15, ("Getting sample rate for FMD%d%c[%2d,0] (board %d): %d", 
+                  det, ring, sec, board, ret));
+  return ret;
 }
 //____________________________________________________________________
 void 
-AliFMDCalibSampleRate::WriteToFile(ofstream &outFile)
+AliFMDCalibSampleRate::WriteToFile(std::ostream &outFile, Bool_t* detectors)
 {
   outFile.write("# SampleRate \n",14);
   for(Int_t det=1;det<=3;det++) {
+    if (detectors && !detectors[det-1]) { 
+      continue;
+    }
     UShort_t FirstRing = (det == 1 ? 1 : 0);
     for (UShort_t ir = FirstRing; ir < 2; ir++) {
       Char_t   ring = (ir == 0 ? 'O' : 'I');
-      UShort_t nsec = (ir == 0 ? 40  : 20);
-      UShort_t nstr = (ir == 0 ? 256 : 512);
-      for(UShort_t sec =0; sec < nsec;  sec++)  {
-       outFile << det                   << ','
-               << ring                  << ','
-               << sec                   << ','
-               << Rate(det,ring,sec)    << "\n";
+      // UShort_t nsec = (ir == 0 ? 40  : 20);
+      
+      for(UShort_t board = 0; board < 2;  board++)  {
+       outFile << det                     << ','
+               << ring                    << ','
+               << board                   << ','
+               << Rate(det,ring,board)    << "\n";
          
 
       }
@@ -112,7 +118,7 @@ AliFMDCalibSampleRate::WriteToFile(ofstream &outFile)
 }
 //____________________________________________________________________
 void 
-AliFMDCalibSampleRate::ReadFromFile(ifstream &inFile)
+AliFMDCalibSampleRate::ReadFromFile(std::istream &inFile)
 {
   TString line;
   Bool_t readData=kFALSE;
@@ -125,15 +131,15 @@ AliFMDCalibSampleRate::ReadFromFile(ifstream &inFile)
     
   }
   
-  UShort_t det, sec;
+  UShort_t det, board;
   Char_t ring;
   UShort_t sampleRate;
   Int_t thisline = inFile.tellg();
   Char_t c[3];
   
-  while(line.ReadLine(inFile) && readData ) {
+  while( readData ) {
     thisline = inFile.tellg();
-    thisline = thisline--;
+    line.ReadLine(inFile);
     if(line.Contains("# ",TString::kIgnoreCase)) {
       readData = kFALSE;
       continue;
@@ -142,11 +148,14 @@ AliFMDCalibSampleRate::ReadFromFile(ifstream &inFile)
     inFile.seekg(thisline);
     inFile     >> det          >> c[0]
               >> ring         >> c[1]
-              >> sec          >> c[2]
+              >> board        >> c[2]
               >> sampleRate;
     
-    Set(det,ring,sec,0,sampleRate);
-
+    UInt_t nSec  = (ring == 'I' ? 10 : 20);
+    UShort_t sector = board*nSec;
+    Set(det,ring,sector,0,sampleRate);
+    
+    
   }
   
   inFile.seekg(0);