]> git.uio.no Git - u/mrichter/AliRoot.git/commitdiff
git://git.uio.no / u / mrichter / AliRoot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1fdb1c5)
Coding rule violations corrected
authormorsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 18 Apr 2006 14:14:52 +0000 (14:14 +0000)
committermorsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 18 Apr 2006 14:14:52 +0000 (14:14 +0000)
STRUCT/AliFieldReader.cxx patch | blob | blame | history
STRUCT/AliFieldReader.h patch | blob | blame | history

diff --git a/STRUCT/AliFieldReader.cxx b/STRUCT/AliFieldReader.cxx
index adf100996bbcbcb0f24a265e1354329df23ea4c6..2e1879dda597d749e5d8f8958d52d1d22122feff 100644 (file)
--- a/STRUCT/AliFieldReader.cxx
+++ b/STRUCT/AliFieldReader.cxx
@@ -34,6 +34,9 @@ ClassImp(AliFieldReader)
 //_______________________________________________________________________
 AliFieldReader::AliFieldReader()
 {
+//
+//  Constructor
+//
     SetCatalogueName();
     SetZStart();
     SetPolarity();
@@ -53,6 +56,9 @@ AliFieldReader::~AliFieldReader()
 //_______________________________________________________________________
 void AliFieldReader::Init()
 {   
+//
+// Initialize the reader
+//
     // Calculated map
     fField = new AliMagFMaps("Maps","Maps", 2, 1., 10., 2);
     // Catalogue
@@ -67,8 +73,9 @@ void AliFieldReader::Init()
 
 void AliFieldReader::ReadMap()
 {   
-    // html
-    
+//
+// Read the measured dipole field map 
+//    
     
     Float_t zA[450], bxzA[200], byzA[200], bzzA[200], bxzcA[200], byzcA[200], bzzcA[200];
     Float_t yA[450], bxyA[200], byyA[200], bzyA[200], bxycA[200], byycA[200], bzycA[200];
@@ -386,6 +393,9 @@ void AliFieldReader::ReadMap()
 }
 
 void AliFieldReader::ReadMapSolenoid(){
+//
+//  Read map for solenoid measurement
+// 
     Float_t phiA[450], bzPhiA[200], brPhiA[200], btPhiA[200], bbPhiA[200];
     Float_t bzcPhiA[200], brcPhiA[200], btcPhiA[200], bbcPhiA[200];    
     Char_t sLine[255];
@@ -658,6 +668,9 @@ void AliFieldReader::ReadMapSolenoid(){
 
 void AliFieldReader::MakeHtmlHeaderMain(FILE* file)
 {
+//
+//  Write the header of the heml output
+//
     fprintf(file,"<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n");
     fprintf(file, "<html>\n");
     fprintf(file, "<head>\n");
@@ -681,6 +694,9 @@ void AliFieldReader::MakeHtmlHeaderMain(FILE* file)
 
 void  AliFieldReader::MakeHtmlHeaderPict(FILE* file)
 {
+//
+//  Write header for picture
+//
     fprintf(file,"<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n");
     fprintf(file, "<html>\n");
     fprintf(file, "<head>\n");
@@ -693,6 +709,9 @@ void  AliFieldReader::MakeHtmlHeaderPict(FILE* file)
 
 void AliFieldReader:: MakeHtmlPict(FILE* chtml, char* pictFile)
 {
+//
+//  Write html for including picture
+//
     fprintf(chtml, "<img src=\"./%s\" alt=\"%s\" style=\"width: 1196px; height: 772px;\">\n", 
            pictFile, pictFile);
     
@@ -725,6 +744,9 @@ void AliFieldReader::MakeHtmlTableEntry(FILE* htmlmain, char* fileName, char* ht
 
 void  AliFieldReader::MakeHtmlTrailor(FILE* htmlmain)
 {
+//
+//  Write the html trailor
+//
     fprintf(htmlmain, "</tbody>\n");
     fprintf(htmlmain, "</table>\n");   
     fprintf(htmlmain, "</body>\n");
@@ -734,6 +756,9 @@ void  AliFieldReader::MakeHtmlTrailor(FILE* htmlmain)
 
 void AliFieldReader::ReadRegisterMap()
 {
+//
+//  Read the register map
+//
     FILE* regmap = fopen("register.map", "r");
     Int_t ireg;
     for (ireg = 0; ireg < 200; ireg++) {
@@ -763,6 +788,9 @@ void AliFieldReader::ReadRegisterMap()
 
 void AliFieldReader::ReadRegisterMapSolenoid()
 {
+//
+//  Read the register map
+//
     FILE* regmap = fopen("register.map", "r");
     Int_t ireg;
     
diff --git a/STRUCT/AliFieldReader.h b/STRUCT/AliFieldReader.h
index 389ca6787c79f32a2bfdafff396dcb28367f1b63..3ff95cffac0c98ee87a0b6a95b443daa775dbe73 100644 (file)
--- a/STRUCT/AliFieldReader.h
+++ b/STRUCT/AliFieldReader.h
@@ -29,26 +29,26 @@ class AliFieldReader : public TObject
     virtual void SetStepSize(Float_t dz = 0.08) {fStepSize = dz;}
     virtual void SetZStart(Float_t zstart = 1383.) {fZStart = zstart;}    
     virtual void SetPolarity(Float_t pol = 1.) {fPolarity = pol;}
- private:
-    void MakeHtmlHeaderMain(FILE*);
-    void MakeHtmlHeaderPict(FILE*);
-    void MakeHtmlPict(FILE*, char*);
+ protected:
+    void MakeHtmlHeaderMain(FILE* file);
+    void MakeHtmlHeaderPict(FILE* file);
+    void MakeHtmlPict(FILE* file, char* name);
     void MakeHtmlTableEntry(FILE* htmlmain, char* fileName, char* htmlFile, Float_t x, Float_t y, Int_t i, Float_t bdl, Int_t ifile);
-    void MakeHtmlTrailor(FILE*);
+    void MakeHtmlTrailor(FILE* file);
     void ReadRegisterMap();
     void ReadRegisterMapSolenoid();
  protected:
-    AliMagFMaps* fField;
-    TNtuple*     fMap;
-    FILE*        fCatalogue;
-    FILE*        fHtmlMain;
-    Int_t        fRegMap[200][3];
-    Float_t      fStepSize;
-    Float_t      fZStart;
-    Float_t      fDd;
-    Float_t      fDz;
-    Float_t      fPolarity;
-    char*        fCatalogueName;
+    AliMagFMaps* fField;           // Pointer to calculated map
+    TNtuple*     fMap;             // Pointer to measured map
+    FILE*        fCatalogue;       // Pointer to file catalogue
+    FILE*        fHtmlMain;        // Pointer to the html output file
+    Int_t        fRegMap[200][3];  // Mapping between addresses and physical location 
+    Float_t      fStepSize;        // Step size in z 
+    Float_t      fZStart;          // Starting position in z
+    Float_t      fDd;              // Distance between sensors
+    Float_t      fDz;              // Distance between sensor planes  
+    Float_t      fPolarity;        // Polarity of the field
+    char*        fCatalogueName;   // Name of the catalogue
     ClassDef(AliFieldReader,1) 
 };