Index: /pixelmap/Pixel.cc =================================================================== --- /pixelmap/Pixel.cc (revision 15) +++ /pixelmap/Pixel.cc (revision 16) @@ -10,5 +10,5 @@ _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??? } Index: /pixelmap/PixelMap.cc =================================================================== --- /pixelmap/PixelMap.cc (revision 15) +++ /pixelmap/PixelMap.cc (revision 16) @@ -6,8 +6,8 @@ #include -PixelMap::PixelMap() { +PixelMap::PixelMap(bool verbose) { pixelmap.clear(); - ReadPixelMap(pixelmap, false); + ReadPixelMap(pixelmap, verbose); } @@ -26,8 +26,9 @@ std::ifstream infile(filename.c_str(), std::fstream::in); - std::cout<<"Reading mapping file: "< 4) && (count1 < 7) && (count2 == 2) ) { @@ -99,5 +100,7 @@ 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,7 +111,5 @@ if(verbose){ - std::cout << "Skipping empty line" << std::endl; - } @@ -119,11 +120,7 @@ } - if(verbose){ - for( std::map::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,5 +138,5 @@ } -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,10 +155,12 @@ 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,5 +169,5 @@ } -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,9 +187,11 @@ 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,18 +200,22 @@ } -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::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,18 +225,22 @@ } -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::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,18 +250,22 @@ } -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::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,18 +275,22 @@ } -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::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,18 +300,22 @@ } -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::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,20 +325,24 @@ } -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::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; Index: /pixelmap/PixelMap.h =================================================================== --- /pixelmap/PixelMap.h (revision 15) +++ /pixelmap/PixelMap.h (revision 16) @@ -13,5 +13,5 @@ public: - PixelMap(); + PixelMap(bool verbose=false); ~PixelMap(); @@ -21,14 +21,14 @@ 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); }; Index: /tools/pixelmap_test/PixelMapTest.cc =================================================================== --- /tools/pixelmap_test/PixelMapTest.cc (revision 15) +++ /tools/pixelmap_test/PixelMapTest.cc (revision 16) @@ -12,30 +12,41 @@ std::cout << std::endl; - PixelMap* pm = new PixelMap(); + PixelMap* pm = new PixelMap(true); pm->Print(); - std::string drs1 = pm->DRS_to_Pixel(0,0,0); + std::string drs1 = pm->DRS_to_Pixel(0,0,0,true); std::cout << "Name: " << drs1 << std::endl; - std::string drs2 = pm->DRS_to_Pixel(1,0,0); + std::string drs2 = pm->DRS_to_Pixel(1,0,0,true); std::cout << "Name: " << drs2 << std::endl; - std::string hv1 = pm->HV_to_Pixel(6,1,8); + std::string drs3 = pm->DRS_to_Pixel(0,0,0,true); + std::cout << "Name: " << drs3 << std::endl; + + std::string hv1 = pm->HV_to_Pixel(6,1,8,true); std::cout << "Name: " << hv1 << std::endl; - std::string hv2 = pm->HV_to_Pixel(1,0,0); + std::string hv2 = pm->HV_to_Pixel(6,9,1,true); std::cout << "Name: " << hv2 << std::endl; - unsigned int drsb1 = pm->Pixel_to_DRSboard("0-1-1"); + std::string hv3 = pm->HV_to_Pixel(1,0,0,true); + std::cout << "Name: " << hv3 << std::endl; + + unsigned int drsb1 = pm->Pixel_to_DRSboard("0-1-1",true); std::cout << "Board: " << drsb1 << std::endl; - unsigned int drsb2 = pm->Pixel_to_DRSboard("1-0-0"); + unsigned int drsb2 = pm->Pixel_to_DRSboard("1-0-0",true); std::cout << "Board: " << drsb2 << std::endl; - unsigned int hvchain1 = pm->Pixel_to_HVchain("0-1-1"); + pm->Print(); + + std::string drs4 = pm->DRS_to_Pixel(0,0,1,true); + std::cout << "Name: " << drs4 << std::endl; + + unsigned int hvchain1 = pm->Pixel_to_HVchain("0-1-1",true); std::cout << "Chain: " << hvchain1 << std::endl; - unsigned int hvchain2 = pm->Pixel_to_HVchain("1-0-0"); + unsigned int hvchain2 = pm->Pixel_to_HVchain("1-0-0",true); std::cout << "Chain: " << hvchain2 << std::endl;