Index: /pixelmap/PixelMap.cc
===================================================================
--- /pixelmap/PixelMap.cc	(revision 17)
+++ /pixelmap/PixelMap.cc	(revision 18)
@@ -6,8 +6,8 @@
 #include <cctype>
 
-PixelMap::PixelMap(bool verbose) {
+PixelMap::PixelMap(std::string file, bool verbose) {
 
     pixelmap.clear();
-    ReadPixelMap(pixelmap, verbose);
+    ReadPixelMap(pixelmap, file, verbose);
 
 }
@@ -21,13 +21,13 @@
 }
 
-void PixelMap::ReadPixelMap(std::map<std::string, Pixel*>& pixelmap, bool verbose) {
-
-    std::string filename("PixelMap.txt");
-    std::ifstream infile(filename.c_str(), std::fstream::in);
+void PixelMap::ReadPixelMap(std::map<std::string, Pixel*>& pixelmap, std::string file, bool verbose) {
+
+    //std::string filename("PixelMap.txt");
+    std::ifstream infile(file.c_str(), std::fstream::in);
 
     if (verbose) {
-	std::cout<<"Reading mapping file: "<<filename<<std::endl<<std::endl;    
+	std::cout<<"Reading mapping file: "<<file<<std::endl<<std::endl;    
 	if (!infile.good()) {
-	    std::cerr<<"ERROR in PixelMap::ReadPixelMap: File "<<filename<<" cannot be found."<<std::endl;
+	    std::cerr<<"ERROR in PixelMap::ReadPixelMap: File "<<file<<" cannot be found."<<std::endl;
 	}
     }
Index: /pixelmap/PixelMap.h
===================================================================
--- /pixelmap/PixelMap.h	(revision 17)
+++ /pixelmap/PixelMap.h	(revision 18)
@@ -13,10 +13,10 @@
 public:
     
-    PixelMap(bool verbose=false);
+    PixelMap(std::string file, bool verbose=false);
     ~PixelMap();
     
     std::map<std::string, Pixel*> pixelmap;
 
-    void ReadPixelMap(std::map<std::string, Pixel*>& pixelmap, bool verbose=false);
+    void ReadPixelMap(std::map<std::string, Pixel*>& pixelmap, std::string file, bool verbose=false);
     void Print();
 
Index: ols/pixelmap_test/PixelMap.txt
===================================================================
--- /tools/pixelmap_test/PixelMap.txt	(revision 17)
+++ 	(revision )
@@ -1,35 +1,0 @@
-#######################################################################
-#
-# Mapping table to connect DRS channels to HV channels   
-#
-# =====================================================================
-#
-# needed for HV feedback -> read by DAQ and HV program
-# 
-# to be edited if DRS or HV channels change
-#
-# Format for pixel names is (x-x-x), to be followed by : delimiter
-#
-# gAPD arrangement within pixel is NOT defined here
-#
-# =====================================================================
-#
-# allowed field separators: space and tab in arbitrary combination
-#
-# empty lines allowed
-#
-# lines _starting_ with # considered as comment (first character!)
-#
-# =====================================================================
-#
-# pixel numbering: module-superpixel-pixel
-#
-######################################################################
-
-
-#Pixel:  DRS-board DRS-chip DRS-channel   HV board HV-chain HV-channel
-#---------------------------------------------------------------------
-0-1-1:		0	0	0		0	2	0
-0-1-2:		0	0	1		0	0	1
-10-2-3:		7	8	6		6 	9	1 	
-#---------------------------------------------------------------------
Index: /tools/pixelmap_test/PixelMapTest.cc
===================================================================
--- /tools/pixelmap_test/PixelMapTest.cc	(revision 17)
+++ /tools/pixelmap_test/PixelMapTest.cc	(revision 18)
@@ -12,5 +12,5 @@
     std::cout << std::endl;
 
-    PixelMap* pm = new PixelMap(true);
+    PixelMap* pm = new PixelMap("Test_PixelMap.txt", true);
 
     pm->Print();
Index: /tools/pixelmap_test/Test_PixelMap.txt
===================================================================
--- /tools/pixelmap_test/Test_PixelMap.txt	(revision 18)
+++ /tools/pixelmap_test/Test_PixelMap.txt	(revision 18)
@@ -0,0 +1,35 @@
+#######################################################################
+#
+# Mapping table to connect DRS channels to HV channels   
+#
+# =====================================================================
+#
+# needed for HV feedback -> read by DAQ and HV program
+# 
+# to be edited if DRS or HV channels change
+#
+# Format for pixel names is (x-x-x), to be followed by : delimiter
+#
+# gAPD arrangement within pixel is NOT defined here
+#
+# =====================================================================
+#
+# allowed field separators: space and tab in arbitrary combination
+#
+# empty lines allowed
+#
+# lines _starting_ with # considered as comment (first character!)
+#
+# =====================================================================
+#
+# pixel numbering: module-superpixel-pixel
+#
+######################################################################
+
+
+#Pixel:  DRS-board DRS-chip DRS-channel   HV board HV-chain HV-channel
+#---------------------------------------------------------------------
+0-1-1:		0	0	0		0	2	0
+0-1-2:		0	0	1		0	0	1
+10-2-3:		7	8	6		6 	9	1 	
+#---------------------------------------------------------------------