Fix to allow new initialization of AliReconstruction (C.H.Christinsen)

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

diff --git a/FMD/AliFMDCalibSampleRate.cxx b/FMD/AliFMDCalibSampleRate.cxx
index 5ab5e77fa13d27933ccb1e8106a8c3e7766eea31..cc3868574370c73834600f0824a7bcf57b9789ff 100644 (file)
--- a/FMD/AliFMDCalibSampleRate.cxx
+++ b/FMD/AliFMDCalibSampleRate.cxx
@@ -26,12 +26,28 @@
 // this value will be the same for all detectors.  This value must be
 // retrived from DCS or the like. 
 //
+// IMPORTANT:  The member function WriteToFile writes out the entries
+// in the format 
+//
+//     det,ring,id,rate
+//
+// Here, id is a number from 0 to 1, which represents the division in
+// half-rings.  The mapping is as follows: 
+//
+//  Inner rings:              Outer Rings
+//    id   Sectors   Board     id   Sectors   Board 
+//   ----+---------+-------   ----+---------+-------
+//     0 |  0 -  9 |  0x10     0  |  0 - 19 |  0x11
+//     1 | 10 - 19 |  0x0      1  | 20 - 39 |  0x1
+//
+// The same mapping is used in the ReadFromFile member function
+//
 #include "AliFMDCalibSampleRate.h"     // ALIFMDCALIBGAIN_H
 // #include "AliFMDParameters.h"           // ALIFMDPARAMETERS_H
 // #include <AliLog.h>
 #include "TString.h"
 #include "AliFMDDebug.h" // Better debug macros
-#include "iostream"
+#include <iostream>
 
 //____________________________________________________________________
 ClassImp(AliFMDCalibSampleRate)
@@ -73,6 +89,8 @@ AliFMDCalibSampleRate::Set(UShort_t det, Char_t ring,
   UInt_t nSec  = (ring == 'I' ? 10 : 20);
   UInt_t board = sector / nSec;
   fRates(det, ring, board, 0) = rate;
+  AliFMDDebug(15, ("Setting sample rate for FMD%d%c[%2d,0] (board %d): %d", 
+                  det, ring, sector, board, rate));
   
 }
 
@@ -82,28 +100,33 @@ AliFMDCalibSampleRate::Rate(UShort_t det, Char_t ring,
                            UShort_t sec, UShort_t) const
 {
   // Get the sample rate 
-  UInt_t nSec  = (ring == 'I' ? 10 : 20);
-  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) / 2;
+      
+      for(UShort_t board = 0; board < 2;  board++)  {
+       UShort_t sector = board*nsec;
+       outFile << det                       << ','
+               << ring                      << ','
+               << board                     << ','
+               << Rate(det,ring,sector)     << "\n";
          
 
       }
@@ -114,7 +137,7 @@ AliFMDCalibSampleRate::WriteToFile(ofstream &outFile)
 }
 //____________________________________________________________________
 void 
-AliFMDCalibSampleRate::ReadFromFile(ifstream &inFile)
+AliFMDCalibSampleRate::ReadFromFile(std::istream &inFile)
 {
   TString line;
   Bool_t readData=kFALSE;
@@ -127,7 +150,7 @@ AliFMDCalibSampleRate::ReadFromFile(ifstream &inFile)
     
   }
   
-  UShort_t det, sec;
+  UShort_t det, board;
   Char_t ring;
   UShort_t sampleRate;
   Int_t thisline = inFile.tellg();
@@ -144,11 +167,12 @@ 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' ? 20 : 40)/2;
+    UShort_t sector = board*nSec;
+    Set(det,ring,sector,0,sampleRate);
     
     
   }