Updated materials in geometry (M. Sitta)

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

diff --git a/FMD/AliFMDCalibStripRange.cxx b/FMD/AliFMDCalibStripRange.cxx
index 26bb42245209e618f73781da16df3f4577d7fe71..124b5aab69fbe35fe6e83fe6ab9c1652df43114d 100644 (file)
--- a/FMD/AliFMDCalibStripRange.cxx
+++ b/FMD/AliFMDCalibStripRange.cxx
@@ -26,7 +26,23 @@
 // strips, and dead areas can be handled off-line. 
 // This information comes from DCS or the like.
 //
-#include "iostream"
+// IMPORTANT:  The member function WriteToFile writes out the entries
+// in the format 
+//
+//     det,ring,id,min,max
+//
+// 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 <iostream>
 #include "AliFMDCalibStripRange.h"     // ALIFMDCALIBGAIN_H
 #include "TString.h"
 // #include "AliFMDParameters.h"           // ALIFMDPARAMETERS_H
@@ -98,19 +114,24 @@ AliFMDCalibStripRange::Max(UShort_t det, Char_t ring,
 }
 //____________________________________________________________________
 void 
-AliFMDCalibStripRange::WriteToFile(ofstream &outFile)
+AliFMDCalibStripRange::WriteToFile(std::ostream &outFile, Bool_t* detectors)
 {
   outFile.write("# StripRange \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');
+      UInt_t   nSec = (ring == 'I' ? 10 : 20);
       for(UShort_t board =0; board < 2;  board++)  {
+       UShort_t sector = board*nSec;
        outFile << det                     << ','
                << ring                    << ','
                << board                   << ','
-               << Min(det,ring,board)     << ','
-               << Max(det,ring,board)     << "\n";
+               << Min(det,ring,sector)    << ','
+               << Max(det,ring,sector)    << "\n";
          
 
       }
@@ -121,7 +142,7 @@ AliFMDCalibStripRange::WriteToFile(ofstream &outFile)
 }
 //____________________________________________________________________
 void 
-AliFMDCalibStripRange::ReadFromFile(ifstream &inFile)
+AliFMDCalibStripRange::ReadFromFile(std::istream &inFile)
 {
   TString line;
   Bool_t readData=kFALSE;
@@ -160,7 +181,7 @@ AliFMDCalibStripRange::ReadFromFile(ifstream &inFile)
     UInt_t nSec  = (ring == 'I' ? 10 : 20);
     UShort_t sector = board*nSec;
     Set(det,ring,sector,0,min,max);
-    std::cout<<det<<"  "<<board<<"   "<<min<<"   "<<max<<std::endl;
+   
   }
   
   inFile.seekg(0);