Changeset 16 for pixelmap

Timestamp:

03/23/09 15:38:22 (16 years ago)

Author:

qweitzel

Message:

bug fixed in pixelmap, verbose mode added

Location:

pixelmap

Files:

• Pixel.cc (modified) (1 diff)
• PixelMap.cc (modified) (16 diffs)
• PixelMap.h (modified) (2 diffs)

pixelmap/Pixel.cc

@@ -10 +10 @@
       _HVboard(HVboard), _HVchain(HVchain), _HVchannel(HVchannel) {
 
-    //check here whether values make sense and eventually give error messages
+    //???check here whether values make sense and eventually give error messages???
 
 }

pixelmap/PixelMap.cc

@@ -6 +6 @@
 #include <cctype>
 
-PixelMap::PixelMap() {
+PixelMap::PixelMap(bool verbose) {
 
     pixelmap.clear();
-    ReadPixelMap(pixelmap, false);
+    ReadPixelMap(pixelmap, verbose);
 
 }
@@ -26 +26 @@
     std::ifstream infile(filename.c_str(), std::fstream::in);
 
-    std::cout<<"Reading mapping file: "<<filename<<std::endl<<std::endl;
-
-    if (!infile.good()) {
-        std::cerr<<"ERROR in PixelMap::ReadPixelMap: File "<<filename<<" cannot be found."<<std::endl;
+    if (verbose) {
+        std::cout<<"Reading mapping file: "<<filename<<std::endl<<std::endl;    
+        if (!infile.good()) {
+            std::cerr<<"ERROR in PixelMap::ReadPixelMap: File "<<filename<<" cannot be found."<<std::endl;
+        }
     }
 
@@ -73 +74 @@
                 }
 
-                if (verbose) {
-                    std::cout << "Formated pixel name: " << name2 << std::endl;
-                }
+                //if (verbose) {
+                //  std::cout << "Formated pixel name: " << name2 << std::endl;
+                //}
 
                 if( (count1 > 4) && (count1 < 7) && (count2 == 2) ) {
@@ -99 +100 @@
                 else {
 
-                    std::cout << "ERROR in PixelMap::ReadPixelMap: Wrong pixel name: " << name2 << " -> pixel not initialized" << std::endl;
+                    if (verbose) {
+                        std::cout << "ERROR in PixelMap::ReadPixelMap: Wrong pixel name: " << name2 << " -> pixel not initialized" << std::endl;
+                    }
 
                 }
@@ -108 +111 @@
 
                 if(verbose){
-
                     std::cout << "Skipping empty line" << std::endl;
-
                 }
 
@@ -119 +120 @@
     }
 
-    if(verbose){
-        for( std::map<const std::string, Pixel*>::iterator iter = pixelmap.begin(); iter != pixelmap.end(); ++iter ) {
-            std::cout << std::endl << (*iter).first << std::endl << "-----------" << std::endl << *((*iter).second);
-        }
-    }
-
-    std::cout << pixelmap.size() << " pixels found" << std::endl << std::endl;
+    if (verbose) {
+        std::cout << std::endl << pixelmap.size() << " pixels found" << std::endl << std::endl;
+    }
 
     infile.close();
@@ -141 +138 @@
 }
 
-std::string PixelMap::DRS_to_Pixel(unsigned int DRSboard, unsigned int DRSchip, unsigned int DRSchannel) {
+std::string PixelMap::DRS_to_Pixel(unsigned int DRSboard, unsigned int DRSchip, unsigned int DRSchannel, bool verbose) {
 
     std::string pixelname = "";
@@ -158 +155 @@
 
     if(pixelname == ""){
-
-        std::cout << "ERROR in PixelMap::DRS_to_Pixel: No pixel with DRS board, chip, channel = "
-                  << DRSboard << ", "
-                  << DRSchip << ", "
-                  << DRSchannel << " found in pixelmap" << std::endl;
         
+        if (verbose) {
+            std::cout << "ERROR in PixelMap::DRS_to_Pixel: No pixel with DRS board, chip, channel = "
+                      << DRSboard << ", "
+                      << DRSchip << ", "
+                      << DRSchannel << " found in pixelmap" << std::endl;
+        }       
+
     }
 
@@ -170 +169 @@
 }
 
-std::string PixelMap::HV_to_Pixel(unsigned int HVboard, unsigned int HVchain, unsigned int HVchannel) {
+std::string PixelMap::HV_to_Pixel(unsigned int HVboard, unsigned int HVchain, unsigned int HVchannel, bool verbose) {
 
     std::string pixelname = "";
@@ -188 +187 @@
     if(pixelname == ""){
 
-        std::cout << "ERROR in PixelMap::HV_to_Pixel: No pixel with HV board, chain, channel = "
-                  << HVboard << ", "
-                  << HVchain << ", "
-                  << HVchannel << " found in pixelmap" << std::endl;
-        
+        if (verbose) {
+            std::cout << "ERROR in PixelMap::HV_to_Pixel: No pixel with HV board, chain, channel = "
+                      << HVboard << ", "
+                      << HVchain << ", "
+                      << HVchannel << " found in pixelmap" << std::endl;
+        }       
+
     }
 
@@ -199 +200 @@
 }
 
-unsigned int PixelMap::Pixel_to_DRSboard(std::string pixelname) {
+unsigned int PixelMap::Pixel_to_DRSboard(std::string pixelname, bool verbose) {
 
     unsigned int DRSboard = 999999999;
 
-    if(pixelmap[pixelname] != NULL) {
-
-        DRSboard = pixelmap[pixelname]->GetPixelDRSboard();
-
-    }
-
-    else {
-
-        std::cout << "ERROR in PixelMap::Pixel_to_DRSboard: No pixel with name = "
-                  << pixelname << " found in pixelmap" << std::endl;
+    for( std::map<const std::string, Pixel*>::iterator iter = pixelmap.begin(); iter != pixelmap.end(); ++iter ) {
+
+        if( ((*iter).first) == pixelname ){
+            DRSboard = ((*iter).second)->GetPixelDRSboard();
+        }
+
+    }
+
+    if (DRSboard == 999999999) {
+
+        if (verbose) {
+            std::cout << "ERROR in PixelMap::Pixel_to_DRSboard: No pixel with name = "
+                      << pixelname << " found in pixelmap" << std::endl;
+        }
 
     }
@@ -220 +225 @@
 }
 
-unsigned int PixelMap::Pixel_to_DRSchip(std::string pixelname) {
+unsigned int PixelMap::Pixel_to_DRSchip(std::string pixelname, bool verbose) {
 
     unsigned int DRSchip = 999999999;
 
-    if(pixelmap[pixelname] != NULL) {
-
-        DRSchip = pixelmap[pixelname]->GetPixelDRSchip();
-
-    }
-
-    else {
-
-        std::cout << "ERROR in PixelMap::Pixel_to_DRSchip: No pixel with name = "
-                  << pixelname << " found in pixelmap" << std::endl;
+    for( std::map<const std::string, Pixel*>::iterator iter = pixelmap.begin(); iter != pixelmap.end(); ++iter ) {
+
+        if( ((*iter).first) == pixelname ){
+            DRSchip = ((*iter).second)->GetPixelDRSchip();
+        }
+
+    }
+
+    if (DRSchip == 999999999) {
+
+        if (verbose) {
+            std::cout << "ERROR in PixelMap::Pixel_to_DRSchip: No pixel with name = "
+                      << pixelname << " found in pixelmap" << std::endl;
+        }
 
     }
@@ -241 +250 @@
 }
 
-unsigned int PixelMap::Pixel_to_DRSchannel(std::string pixelname) {
+unsigned int PixelMap::Pixel_to_DRSchannel(std::string pixelname, bool verbose) {
 
     unsigned int DRSchannel = 999999999;
 
-    if(pixelmap[pixelname] != NULL) {
-
-        DRSchannel = pixelmap[pixelname]->GetPixelDRSchannel();
-
-    }
-
-    else {
-
-        std::cout << "ERROR in PixelMap::Pixel_to_DRSchannel: No pixel with name = "
-                  << pixelname << " found in pixelmap" << std::endl;
+    for( std::map<const std::string, Pixel*>::iterator iter = pixelmap.begin(); iter != pixelmap.end(); ++iter ) {
+
+        if( ((*iter).first) == pixelname ){
+            DRSchannel = ((*iter).second)->GetPixelDRSchannel();
+        }
+
+    }
+    
+    if (DRSchannel == 999999999) {
+
+        if (verbose) {
+            std::cout << "ERROR in PixelMap::Pixel_to_DRSchannel: No pixel with name = "
+                      << pixelname << " found in pixelmap" << std::endl;
+        }
 
     }
@@ -262 +275 @@
 }
 
-unsigned int PixelMap::Pixel_to_HVboard(std::string pixelname) {
+unsigned int PixelMap::Pixel_to_HVboard(std::string pixelname, bool verbose) {
 
     unsigned int HVboard = 999999999;
 
-    if(pixelmap[pixelname] != NULL) {
-
-        HVboard = pixelmap[pixelname]->GetPixelHVboard();
-
-    }
-
-    else {
-
-        std::cout << "ERROR in PixelMap::Pixel_to_HVboard: No pixel with name = "
-                  << pixelname << " found in pixelmap" << std::endl;
+    for( std::map<const std::string, Pixel*>::iterator iter = pixelmap.begin(); iter != pixelmap.end(); ++iter ) {
+
+        if( ((*iter).first) == pixelname ){
+            HVboard = ((*iter).second)->GetPixelHVboard();
+        }
+
+    }
+
+    if (HVboard == 999999999) {
+
+        if (verbose) {
+            std::cout << "ERROR in PixelMap::Pixel_to_HVboard: No pixel with name = "
+                      << pixelname << " found in pixelmap" << std::endl;
+        }
 
     }
@@ -283 +300 @@
 }
 
-unsigned int PixelMap::Pixel_to_HVchain(std::string pixelname) {
+unsigned int PixelMap::Pixel_to_HVchain(std::string pixelname, bool verbose) {
 
     unsigned int HVchain = 999999999;
 
-    if(pixelmap[pixelname] != NULL) {
-
-        HVchain = pixelmap[pixelname]->GetPixelHVchain();
-
-    }
-
-    else {
-
-        std::cout << "ERROR in PixelMap::Pixel_to_HVchain: No pixel with name = "
-                  << pixelname << " found in pixelmap" << std::endl;
+    for( std::map<const std::string, Pixel*>::iterator iter = pixelmap.begin(); iter != pixelmap.end(); ++iter ) {
+
+        if( ((*iter).first) == pixelname ){
+            HVchain = ((*iter).second)->GetPixelHVchain();
+        }
+
+    }
+
+    if (HVchain == 999999999) {
+
+        if (verbose) {
+            std::cout << "ERROR in PixelMap::Pixel_to_HVchain: No pixel with name = "
+                      << pixelname << " found in pixelmap" << std::endl;
+        }
 
     }
@@ -304 +325 @@
 }
 
-unsigned int PixelMap::Pixel_to_HVchannel(std::string pixelname) {
+unsigned int PixelMap::Pixel_to_HVchannel(std::string pixelname, bool verbose) {
 
     unsigned int HVchannel = 999999999;
 
-    if(pixelmap[pixelname] != NULL) {
-
-        HVchannel = pixelmap[pixelname]->GetPixelHVchannel();
-
-    }
-
-    else {
-
-        std::cout << "ERROR in PixelMap::Pixel_to_HVchannel: No pixel with name = "
-                  << pixelname << " found in pixelmap" << std::endl;
-
-    }
+    for( std::map<const std::string, Pixel*>::iterator iter = pixelmap.begin(); iter != pixelmap.end(); ++iter ) {
+
+        if( ((*iter).first) == pixelname ){
+            HVchannel = ((*iter).second)->GetPixelHVchannel();
+        }
+
+    }
+
+    if (HVchannel == 999999999) {
+
+        if (verbose) {
+            std::cout << "ERROR in PixelMap::Pixel_to_HVchannel: No pixel with name = "
+                      << pixelname << " found in pixelmap" << std::endl;
+        }
+
+   }
 
     return HVchannel;

pixelmap/PixelMap.h

@@ -13 +13 @@
 public:
     
-    PixelMap();
+    PixelMap(bool verbose=false);
     ~PixelMap();
     
@@ -21 +21 @@
     void Print();
 
-    std::string DRS_to_Pixel(unsigned int DRSboard, unsigned int DRSchip, unsigned int DRSchannel);
-    std::string HV_to_Pixel(unsigned int HVboard, unsigned int HVchain, unsigned int HVchannel);
+    std::string DRS_to_Pixel(unsigned int DRSboard, unsigned int DRSchip, unsigned int DRSchannel, bool verbose=false);
+    std::string HV_to_Pixel(unsigned int HVboard, unsigned int HVchain, unsigned int HVchannel, bool verbose=false);
     
-    unsigned int Pixel_to_DRSboard(std::string pixelname);
-    unsigned int Pixel_to_DRSchip(std::string pixelname);
-    unsigned int Pixel_to_DRSchannel(std::string pixelname);
+    unsigned int Pixel_to_DRSboard(std::string pixelname, bool verbose=false);
+    unsigned int Pixel_to_DRSchip(std::string pixelname, bool verbose=false);
+    unsigned int Pixel_to_DRSchannel(std::string pixelname, bool verbose=false);
 
-    unsigned int Pixel_to_HVboard(std::string pixelname);
-    unsigned int Pixel_to_HVchain(std::string pixelname);
-    unsigned int Pixel_to_HVchannel(std::string pixelname);
+    unsigned int Pixel_to_HVboard(std::string pixelname, bool verbose=false);
+    unsigned int Pixel_to_HVchain(std::string pixelname, bool verbose=false);
+    unsigned int Pixel_to_HVchannel(std::string pixelname, bool verbose=false);
 
 };