Changeset 12

Timestamp:

03/10/09 10:34:17 (16 years ago)

Author:

qweitzel

Message:

update of pixelmap class, whitespaces now ignored in pixelname, initialization of default pixel constructor changed

Files:

• pixelmap/Pixel.cc (modified) (1 diff)
• pixelmap/PixelMap.cc (modified) (6 diffs)
• tools/pixelmap_test/PixelMap.txt (modified) (2 diffs)

pixelmap/Pixel.cc

@@ -2 +2 @@
 #include <iostream>
 
-Pixel::Pixel() : _DRSboard(-1), _DRSchip(-1), _DRSchannel(-1),
-                 _HVboard(-1), _HVchain(-1), _HVchannel(-1) { }
+Pixel::Pixel() : _DRSboard(999999999), _DRSchip(999999999), _DRSchannel(999999999),
+                 _HVboard(999999999), _HVchain(999999999), _HVchannel(999999999) { }
 
 Pixel::Pixel(unsigned int DRSboard, unsigned int DRSchip, unsigned int DRSchannel,

pixelmap/PixelMap.cc

@@ -4 +4 @@
 #include <cstring>
 #include <cstdlib>
+#include <cctype>
 
 PixelMap::PixelMap() {
@@ -27 +28 @@
     std::cout<<"Reading mapping file: "<<filename<<std::endl<<std::endl;
 
-    if (!infile.good()){
+    if (!infile.good()) {
         std::cerr<<"ERROR in PixelMap::ReadPixelMap: File "<<filename<<" cannot be found."<<std::endl;
     }
@@ -33 +34 @@
     while (infile.good()) {
         
-        char line[256];
-
-        infile.getline(line, 256);
-
-        if(line[0] == '#') {
-            if(verbose) {
+        char line[1024];
+
+        infile.getline(line, 1024);
+
+        if (line[0] == '#') {
+            if (verbose) {
                 std::cout << "Ignoring comment: " << line << std::endl;
             }
@@ -45 +46 @@
         else {
             
-            if(strlen(line)!=0){
+            if (strlen(line)!=0) {
                 
                 char delim[] = ":";
-                char *name = NULL;
+                char *name = NULL; //unformated name before : tokens
+                char name2[256] = ""; //formated name without whitespaces
                 char *rest = NULL;
                 
                 name = strtok(line, delim);
 
-                if(strlen(name) > 4){
+                unsigned int count1 = 0; //count non-whitespace characters in name
+                unsigned int count2 = 0; //count number of - in name
+
+                for (unsigned int i = 0; i < strlen(name); i++) {
+
+                    if ( !(isspace(name[i])) ) {
+
+                        name2[count1] = name[i];
+                        count1+=1;
+
+                        if ( (name[i] == 45) ) {
+                            count2+=1;
+                        }
+
+                    }
+
+                }
+
+                if (verbose) {
+                    std::cout << "Formated pixel name: " << name2 << std::endl;
+                }
+
+                if( (count1 > 4) && (count1 < 7) && (count2 == 2) ) {
 
                     rest = strtok(NULL, delim);
@@ -66 +90 @@
                         unsigned int HVchannel = (unsigned int)strtod(rest, &rest);
 
-                        pixelmap[name] = new Pixel(DRSboard, DRSchip, DRSchannel,
-                                                   HVboard, HVchain, HVchannel);
+                        pixelmap[name2] = new Pixel(DRSboard, DRSchip, DRSchannel,
+                                                    HVboard, HVchain, HVchannel);
 
                     }
@@ -75 +99 @@
                 else {
 
-                    std::cout << "ERROR in PixelMap::ReadPixelMap: Wrong pixel name: " << name << "-> pixel not initialized" << std::endl;
+                    std::cout << "ERROR in PixelMap::ReadPixelMap: Wrong pixel name: " << name2 << " -> pixel not initialized" << std::endl;
+
+                }
+
+            } 
+
+            else {
+
+                if(verbose){
+
+                    std::cout << "Skipping empty line" << std::endl;
 
                 }

tools/pixelmap_test/PixelMap.txt

@@ -9 +9 @@
 # to be edited if DRS or HV channels change
 #
-# !!! do NOT edit the pixel name (x-x-x) !!!
+# Format for pixel names is (x-x-x), to be followed by : delimiter
 #
 # gAPD arrangement within pixel is NOT defined here
@@ -15 +15 @@
 # =====================================================================
 #
-# allowed field separators: space, tab, comma in arbitrary combination
+# allowed field separators: space and tab in arbitrary combination
 #
 # empty lines allowed
 #
-# lines starting with # considered as comment
+# lines _starting_ with # considered as comment (first character!)
 #
 # =====================================================================