Index: pixelmap/PixelMap.cc
===================================================================
--- pixelmap/PixelMap.cc	(revision 16)
+++ 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 16)
+++ 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();