Index: trunk/MagicSoft/Mars/macros/readCT1.C =================================================================== --- trunk/MagicSoft/Mars/macros/readCT1.C (revision 596) +++ trunk/MagicSoft/Mars/macros/readCT1.C (revision 597) @@ -11,8 +11,6 @@ MNphotEvent *phevt = new MNphotEvent() ; - plist->AddToList( phevt ) ; - //MReadCT1Ascii *readct1 = new MReadCT1Ascii("/hd10/www/Anal_MAGIC/MCCT1_99_ga20.dat") ; @@ -22,5 +20,4 @@ Int_t icount = 0 ; - MCamDisplay display(0) ; @@ -31,15 +28,22 @@ cout << "Event: " << icount++ << endl ; - if ( icount == 3 ) { - phevt->Print() ; - } - + + phevt->Print() ; + display->Draw( phevt ) ; - // display->DrawError( phevt ) ; - gClient->HandleInput(); - if(getchar()=='q') break; + + phevt->CleanLevel1() ; + + phevt->CleanLevel2() ; + + display->Draw( phevt ) ; + gClient->HandleInput(); + if(getchar()=='q') + break; + + } Index: trunk/MagicSoft/Mars/manalysis/AnalysisIncl.h =================================================================== --- trunk/MagicSoft/Mars/manalysis/AnalysisIncl.h (revision 596) +++ trunk/MagicSoft/Mars/manalysis/AnalysisIncl.h (revision 597) @@ -5,4 +5,5 @@ #include "MParContainer.h" +#include "MCamNeighbor.h" #endif // __CINT__ Index: trunk/MagicSoft/Mars/manalysis/MNphotEvent.cc =================================================================== --- trunk/MagicSoft/Mars/manalysis/MNphotEvent.cc (revision 596) +++ trunk/MagicSoft/Mars/manalysis/MNphotEvent.cc (revision 597) @@ -6,4 +6,5 @@ #include "MCamGeom.h" +#include "MCamNeighbor.h" #include "MCamDisplay.h" #include "MHexagon.h" @@ -16,4 +17,5 @@ // default constructor fPixId = pix ; + fIsUsed = kTRUE ; fPhot = phot ; fErrPhot = errphot ; @@ -23,4 +25,5 @@ { fPixId = pix ; + fIsUsed = kTRUE ; fPhot = phot ; fErrPhot = errphot ; @@ -30,6 +33,13 @@ { // information about a pixel - cout << "MNphotPix: Pixel: "<< fPixId - << " Nphot= " << fPhot + cout << "MNphotPix: Pixel: "<< fPixId ; + + if ( fIsUsed == kTRUE ) + cout << " Used " ; + else + if ( fIsUsed == kFALSE ) + cout << " UnUsed " ; + + cout << " Nphot= " << fPhot << " Error(Nphot) = " << fErrPhot << endl ; @@ -54,4 +64,6 @@ fPixels = new TClonesArray ("MNphotPix", 577) ; + fNN = new MCamNeighbor() ; + fPixels->Clear() ; } @@ -59,5 +71,5 @@ void MNphotEvent::Draw(Option_t* option) { - // + // FIXME!!! // @@ -102,5 +114,88 @@ } } - + +void MNphotEvent::CleanLevel1() +{ + // This method looks for all pixels with an entry (photons) + // that is three times bigger than the noise of the pixel + + Float_t entry, noise ; + + // first look for pixels above some noise level + + for (Int_t il=0; ilGetEntries(); il++ ) + { + entry = ((MNphotPix *) fPixels->At(il))->GetPhotons() ; + noise = 3 * ((MNphotPix *) fPixels->At(il))->GetErrorPhot() ; + + if (entry < 3 * noise ) + ((MNphotPix *) fPixels->At(il))->SetPixelUnused() ; + + } +} + +void MNphotEvent::CleanLevel2() +{ + // check if the survived pixel have a neighbor, that also + // survived + + Int_t id, id2 ; + Int_t itest ; + + for (Int_t il=0; ilGetEntries(); il++ ) + { + if ( ((MNphotPix *) fPixels->At(il))->IsPixelUsed() == kTRUE ) + { + id = ((MNphotPix *) fPixels->At(il))->GetPixId() ; + + itest = 0 ; + for (Int_t in=0 ; in < 6 ; in++ ) { + + id2 = fNN->GetNN(id, in ) ; + + if ( PixelIsUsed(id2) == kTRUE ) + cout << " hulibu " << id << "/" << id2 << endl ; + + + } + } + } +} + +Bool_t MNphotEvent::PixelExist(Int_t id ) +{ + // Checks if in the pixel list is an entry with pixel id + + for (Int_t il=0; ilGetEntries(); il++ ) + { + if ( id == ((MNphotPix *) fPixels->At(il))->GetPixId() ) { + + cout << " PixelExist " << il ; + return kTRUE ; + } + } + + return kFALSE ; + +} + +Bool_t MNphotEvent::PixelIsUsed(Int_t id ) +{ + // Checks if in the pixel list is an entry with pixel id + + for (Int_t il=0; ilGetEntries(); il++ ) + { + if ( id == ((MNphotPix *) fPixels->At(il))->GetPixId() && + ((MNphotPix *) fPixels->At(il))->IsPixelUsed() == kTRUE ) { + + cout << " PixelIsUsed " << il ; + return kTRUE ; + } + } + + return kFALSE ; + +} + Int_t MNphotEvent::GetPixelId(Int_t i ) { @@ -108,4 +203,9 @@ } +Bool_t MNphotEvent::IsPixelUsed(Int_t i ) +{ + return ( ( (MNphotPix *) fPixels->At(i))->IsPixelUsed() ) ; +} + Float_t MNphotEvent::GetPhotons(Int_t i ) { Index: trunk/MagicSoft/Mars/manalysis/MNphotEvent.h =================================================================== --- trunk/MagicSoft/Mars/manalysis/MNphotEvent.h (revision 596) +++ trunk/MagicSoft/Mars/manalysis/MNphotEvent.h (revision 597) @@ -10,4 +10,5 @@ class TClonesArray ; class TObjArray ; +class MCamNeighbor ; class MNphotPix : public TObject @@ -16,7 +17,8 @@ Int_t fPixId ; // the pixel Id + Bool_t fIsUsed ; // the pixel is used for calculations --> kTRUE Float_t fPhot ; // The number of Cerenkov photons Float_t fErrPhot ; // the error of fPhot - + public: @@ -42,4 +44,21 @@ void SetPixelContent(Int_t pix , Float_t phot , Float_t errphot ) ; + Bool_t IsPixelUsed() + { + return fIsUsed ; + } + + void SetPixelUnused() + { + fIsUsed = kFALSE ; + } + + void SetPixelUsed() + { + fIsUsed = kTRUE ; + } + + + ClassDef(MNphotPix, 1) // Cerenkov Photons class for the pixel } ; @@ -57,4 +76,7 @@ Int_t fNbPixels ; // TClonesArray *fPixels ; // + + + MCamNeighbor *fNN ; //! the class with the information about neighbors public: @@ -72,5 +94,12 @@ void Print() ; + void CleanLevel1() ; + void CleanLevel2() ; + + Bool_t PixelExist( Int_t id ) ; + Bool_t PixelIsUsed( Int_t id ) ; + Int_t GetPixelId(Int_t i ) ; + Bool_t IsPixelUsed(Int_t i ) ; Float_t GetPhotons(Int_t i ) ; Float_t GetErrorPhot(Int_t i ) ; @@ -80,5 +109,5 @@ ClassDef(MNphotEvent, 1) // class for Nphotons Events -}; +}; #endif Index: trunk/MagicSoft/Mars/manalysis/MReadCT1Ascii.cc =================================================================== --- trunk/MagicSoft/Mars/manalysis/MReadCT1Ascii.cc (revision 596) +++ trunk/MagicSoft/Mars/manalysis/MReadCT1Ascii.cc (revision 597) @@ -27,4 +27,13 @@ fFileName = fname; + + // set the pedestals to default values + + for (Int_t i = 0; i<127; i++ ) + { + + fPedest[i] = 1.5 ; + } + } @@ -67,4 +76,9 @@ return kFALSE ; + // if the first number is negativ this is the pedestal line + + if (dummyI < 0 ) + ReadPedestal() ; + fscanf ( fInputfile, "%d", &dummyI ) ; fscanf ( fInputfile, "%d", &dummyI ) ; @@ -78,7 +92,6 @@ fscanf ( fInputfile, "%f", &dummyF ) ; - if ( dummyF > 0.0 ) { - fNphot->AddPixel(i, dummyF, sqrt(dummyF) ) ; + fNphot->AddPixel(i, dummyF, fPedest[i] ) ; } @@ -94,2 +107,32 @@ } + +void MReadCT1Ascii::ReadPedestal() +{ + cout << " Read in the Pedestals " << endl ; + Int_t dummyI ; + Float_t dummyF ; + + // the next for values are for dummy + fscanf ( fInputfile, "%d", &dummyI ) ; + fscanf ( fInputfile, "%d", &dummyI ) ; + fscanf ( fInputfile, "%d", &dummyI ) ; + fscanf ( fInputfile, "%d", &dummyI ) ; + + // read in the next 127 numbers as the pedestals + + for (Int_t i = 0; i<127; i++ ) + { + fscanf ( fInputfile, "%f", &dummyF ) ; + + if ( dummyF > 0.0 ) { + fPedest[i] = dummyF ; + } + + } + + fscanf ( fInputfile, "%d", &dummyI ) ; + + +} + Index: trunk/MagicSoft/Mars/manalysis/MReadCT1Ascii.h =================================================================== --- trunk/MagicSoft/Mars/manalysis/MReadCT1Ascii.h (revision 596) +++ trunk/MagicSoft/Mars/manalysis/MReadCT1Ascii.h (revision 597) @@ -17,4 +17,6 @@ MNphotEvent *fNphot ; //! the data container for all data. + Float_t fPedest[127] ; //! + public: MReadCT1Ascii(const char *filename, @@ -26,6 +28,9 @@ Bool_t PostProcess(); + void ReadPedestal() ; + ClassDef(MReadCT1Ascii, 1) // Reads the CT1 data file }; - + #endif + Index: trunk/MagicSoft/Mars/mgui/GuiLinkDef.h =================================================================== --- trunk/MagicSoft/Mars/mgui/GuiLinkDef.h (revision 596) +++ trunk/MagicSoft/Mars/mgui/GuiLinkDef.h (revision 597) @@ -15,4 +15,5 @@ #pragma link C++ class MPixGeom; #pragma link C++ class MCamGeom; +#pragma link C++ class MCamNeighbor; #pragma link C++ class MCamDisplay; Index: trunk/MagicSoft/Mars/mgui/MCamDisplay.cc =================================================================== --- trunk/MagicSoft/Mars/mgui/MCamDisplay.cc (revision 596) +++ trunk/MagicSoft/Mars/mgui/MCamDisplay.cc (revision 597) @@ -144,14 +144,14 @@ UpdateLegend() ; } - - - - cout << fMinPhe << "/" << fMaxPhe << endl ; + + // update the picture for (Int_t i=0 ; iGetNbPixels() ; i++ ) { - ( (MHexagon*) fPixels->At( event->GetPixelId(i) ))->SetFillColor( GetColor(event->GetPhotons(i))) ; - } - + if ( event->IsPixelUsed(i) == TRUE ) + ( (MHexagon*) fPixels->At( event->GetPixelId(i) ))->SetFillColor( GetColor(event->GetPhotons(i))) ; + + } + Draw() ; Index: trunk/MagicSoft/Mars/mgui/MCamGeom.h =================================================================== --- trunk/MagicSoft/Mars/mgui/MCamGeom.h (revision 596) +++ trunk/MagicSoft/Mars/mgui/MCamGeom.h (revision 597) @@ -82,6 +82,4 @@ void Print() ; - - ClassDef(MCamGeom, 1) // Base (abstract) class for a task }; Index: trunk/MagicSoft/Mars/mgui/MCamNeighbor.cc =================================================================== --- trunk/MagicSoft/Mars/mgui/MCamNeighbor.cc (revision 597) +++ trunk/MagicSoft/Mars/mgui/MCamNeighbor.cc (revision 597) @@ -0,0 +1,637 @@ +#include "MCamNeighbor.h" + +#include + +ClassImp(MCamNeighbor) + + +MCamNeighbor::MCamNeighbor() +{ + // default constructor + + Int_t help [577][6] = { + 1, 2, 3, 4, 5, 6, + 0, 2, 6, 7, 8, 18, + 0, 1, 3, 8, 9, 10, + 0, 2, 4, 10, 11, 12, + 0, 3, 5, 12, 13, 14, + 0, 4, 6, 14, 15, 16, + 0, 1, 5, 16, 17, 18, + 1, 8, 18, 19, 20, 36, + 1, 2, 7, 9, 20, 21, + 2, 8, 10, 21, 22, 23, + 2, 3, 9, 11, 23, 24, + 3, 10, 12, 24, 25, 26, + 3, 4, 11, 13, 26, 27, + 4, 12, 14, 27, 28, 29, + 4, 5, 13, 15, 29, 30, + 5, 14, 16, 30, 31, 32, + 5, 6, 15, 17, 32, 33, + 6, 16, 18, 33, 34, 35, + 1, 6, 7, 17, 35, 36, + 7, 20, 36, 37, 38, 60, + 7, 8, 19, 21, 38, 39, + 8, 9, 20, 22, 39, 40, + 9, 21, 23, 40, 41, 42, + 9, 10, 22, 24, 42, 43, + 10, 11, 23, 25, 43, 44, + 11, 24, 26, 44, 45, 46, + 11, 12, 25, 27, 46, 47, + 12, 13, 26, 28, 47, 48, + 13, 27, 29, 48, 49, 50, + 13, 14, 28, 30, 50, 51, + 14, 15, 29, 31, 51, 52, + 15, 30, 32, 52, 53, 54, + 15, 16, 31, 33, 54, 55, + 16, 17, 32, 34, 55, 56, + 17, 33, 35, 56, 57, 58, + 17, 18, 34, 36, 58, 59, + 7, 18, 19, 35, 59, 60, + 19, 38, 60, 61, 62, 90, + 19, 20, 37, 39, 62, 63, + 20, 21, 38, 40, 63, 64, + 21, 22, 39, 41, 64, 65, + 22, 40, 42, 65, 66, 67, + 22, 23, 41, 43, 67, 68, + 23, 24, 42, 44, 68, 69, + 24, 25, 43, 45, 69, 70, + 25, 44, 46, 70, 71, 72, + 25, 26, 45, 47, 72, 73, + 26, 27, 46, 48, 73, 74, + 27, 28, 47, 49, 74, 75, + 28, 48, 50, 75, 76, 77, + 28, 29, 49, 51, 77, 78, + 29, 30, 50, 52, 78, 79, + 30, 31, 51, 53, 79, 80, + 31, 52, 54, 80, 81, 82, + 31, 32, 53, 55, 82, 83, + 32, 33, 54, 56, 83, 84, + 33, 34, 55, 57, 84, 85, + 34, 56, 58, 85, 86, 87, + 34, 35, 57, 59, 87, 88, + 35, 36, 58, 60, 88, 89, + 19, 36, 37, 59, 89, 90, + 37, 62, 90, 91, 92, 126, + 37, 38, 61, 63, 92, 93, + 38, 39, 62, 64, 93, 94, + 39, 40, 63, 65, 94, 95, + 40, 41, 64, 66, 95, 96, + 41, 65, 67, 96, 97, 98, + 41, 42, 66, 68, 98, 99, + 42, 43, 67, 69, 99, 100, + 43, 44, 68, 70, 100, 101, + 44, 45, 69, 71, 101, 102, + 45, 70, 72, 102, 103, 104, + 45, 46, 71, 73, 104, 105, + 46, 47, 72, 74, 105, 106, + 47, 48, 73, 75, 106, 107, + 48, 49, 74, 76, 107, 108, + 49, 75, 77, 108, 109, 110, + 49, 50, 76, 78, 110, 111, + 50, 51, 77, 79, 111, 112, + 51, 52, 78, 80, 112, 113, + 52, 53, 79, 81, 113, 114, + 53, 80, 82, 114, 115, 116, + 53, 54, 81, 83, 116, 117, + 54, 55, 82, 84, 117, 118, + 55, 56, 83, 85, 118, 119, + 56, 57, 84, 86, 119, 120, + 57, 85, 87, 120, 121, 122, + 57, 58, 86, 88, 122, 123, + 58, 59, 87, 89, 123, 124, + 59, 60, 88, 90, 124, 125, + 37, 60, 61, 89, 125, 126, + 61, 92, 126, 127, 128, 168, + 61, 62, 91, 93, 128, 129, + 62, 63, 92, 94, 129, 130, + 63, 64, 93, 95, 130, 131, + 64, 65, 94, 96, 131, 132, + 65, 66, 95, 97, 132, 133, + 66, 96, 98, 133, 134, 135, + 66, 67, 97, 99, 135, 136, + 67, 68, 98, 100, 136, 137, + 68, 69, 99, 101, 137, 138, + 69, 70, 100, 102, 138, 139, + 70, 71, 101, 103, 139, 140, + 71, 102, 104, 140, 141, 142, + 71, 72, 103, 105, 142, 143, + 72, 73, 104, 106, 143, 144, + 73, 74, 105, 107, 144, 145, + 74, 75, 106, 108, 145, 146, + 75, 76, 107, 109, 146, 147, + 76, 108, 110, 147, 148, 149, + 76, 77, 109, 111, 149, 150, + 77, 78, 110, 112, 150, 151, + 78, 79, 111, 113, 151, 152, + 79, 80, 112, 114, 152, 153, + 80, 81, 113, 115, 153, 154, + 81, 114, 116, 154, 155, 156, + 81, 82, 115, 117, 156, 157, + 82, 83, 116, 118, 157, 158, + 83, 84, 117, 119, 158, 159, + 84, 85, 118, 120, 159, 160, + 85, 86, 119, 121, 160, 161, + 86, 120, 122, 161, 162, 163, + 86, 87, 121, 123, 163, 164, + 87, 88, 122, 124, 164, 165, + 88, 89, 123, 125, 165, 166, + 89, 90, 124, 126, 166, 167, + 61, 90, 91, 125, 167, 168, + 91, 128, 168, 169, 170, 216, + 91, 92, 127, 129, 170, 171, + 92, 93, 128, 130, 171, 172, + 93, 94, 129, 131, 172, 173, + 94, 95, 130, 132, 173, 174, + 95, 96, 131, 133, 174, 175, + 96, 97, 132, 134, 175, 176, + 97, 133, 135, 176, 177, 178, + 97, 98, 134, 136, 178, 179, + 98, 99, 135, 137, 179, 180, + 99, 100, 136, 138, 180, 181, + 100, 101, 137, 139, 181, 182, + 101, 102, 138, 140, 182, 183, + 102, 103, 139, 141, 183, 184, + 103, 140, 142, 184, 185, 186, + 103, 104, 141, 143, 186, 187, + 104, 105, 142, 144, 187, 188, + 105, 106, 143, 145, 188, 189, + 106, 107, 144, 146, 189, 190, + 107, 108, 145, 147, 190, 191, + 108, 109, 146, 148, 191, 192, + 109, 147, 149, 192, 193, 194, + 109, 110, 148, 150, 194, 195, + 110, 111, 149, 151, 195, 196, + 111, 112, 150, 152, 196, 197, + 112, 113, 151, 153, 197, 198, + 113, 114, 152, 154, 198, 199, + 114, 115, 153, 155, 199, 200, + 115, 154, 156, 200, 201, 202, + 115, 116, 155, 157, 202, 203, + 116, 117, 156, 158, 203, 204, + 117, 118, 157, 159, 204, 205, + 118, 119, 158, 160, 205, 206, + 119, 120, 159, 161, 206, 207, + 120, 121, 160, 162, 207, 208, + 121, 161, 163, 208, 209, 210, + 121, 122, 162, 164, 210, 211, + 122, 123, 163, 165, 211, 212, + 123, 124, 164, 166, 212, 213, + 124, 125, 165, 167, 213, 214, + 125, 126, 166, 168, 214, 215, + 91, 126, 127, 167, 215, 216, + 127, 170, 216, 217, 218, 270, + 127, 128, 169, 171, 218, 219, + 128, 129, 170, 172, 219, 220, + 129, 130, 171, 173, 220, 221, + 130, 131, 172, 174, 221, 222, + 131, 132, 173, 175, 222, 223, + 132, 133, 174, 176, 223, 224, + 133, 134, 175, 177, 224, 225, + 134, 176, 178, 225, 226, 227, + 134, 135, 177, 179, 227, 228, + 135, 136, 178, 180, 228, 229, + 136, 137, 179, 181, 229, 230, + 137, 138, 180, 182, 230, 231, + 138, 139, 181, 183, 231, 232, + 139, 140, 182, 184, 232, 233, + 140, 141, 183, 185, 233, 234, + 141, 184, 186, 234, 235, 236, + 141, 142, 185, 187, 236, 237, + 142, 143, 186, 188, 237, 238, + 143, 144, 187, 189, 238, 239, + 144, 145, 188, 190, 239, 240, + 145, 146, 189, 191, 240, 241, + 146, 147, 190, 192, 241, 242, + 147, 148, 191, 193, 242, 243, + 148, 192, 194, 243, 244, 245, + 148, 149, 193, 195, 245, 246, + 149, 150, 194, 196, 246, 247, + 150, 151, 195, 197, 247, 248, + 151, 152, 196, 198, 248, 249, + 152, 153, 197, 199, 249, 250, + 153, 154, 198, 200, 250, 251, + 154, 155, 199, 201, 251, 252, + 155, 200, 202, 252, 253, 254, + 155, 156, 201, 203, 254, 255, + 156, 157, 202, 204, 255, 256, + 157, 158, 203, 205, 256, 257, + 158, 159, 204, 206, 257, 258, + 159, 160, 205, 207, 258, 259, + 160, 161, 206, 208, 259, 260, + 161, 162, 207, 209, 260, 261, + 162, 208, 210, 261, 262, 263, + 162, 163, 209, 211, 263, 264, + 163, 164, 210, 212, 264, 265, + 164, 165, 211, 213, 265, 266, + 165, 166, 212, 214, 266, 267, + 166, 167, 213, 215, 267, 268, + 167, 168, 214, 216, 268, 269, + 127, 168, 169, 215, 269, 270, + 169, 218, 270, 271, 272, 330, + 169, 170, 217, 219, 272, 273, + 170, 171, 218, 220, 273, 274, + 171, 172, 219, 221, 274, 275, + 172, 173, 220, 222, 275, 276, + 173, 174, 221, 223, 276, 277, + 174, 175, 222, 224, 277, 278, + 175, 176, 223, 225, 278, 279, + 176, 177, 224, 226, 279, 280, + 177, 225, 227, 280, 281, 282, + 177, 178, 226, 228, 282, 283, + 178, 179, 227, 229, 283, 284, + 179, 180, 228, 230, 284, 285, + 180, 181, 229, 231, 285, 286, + 181, 182, 230, 232, 286, 287, + 182, 183, 231, 233, 287, 288, + 183, 184, 232, 234, 288, 289, + 184, 185, 233, 235, 289, 290, + 185, 234, 236, 290, 291, 292, + 185, 186, 235, 237, 292, 293, + 186, 187, 236, 238, 293, 294, + 187, 188, 237, 239, 294, 295, + 188, 189, 238, 240, 295, 296, + 189, 190, 239, 241, 296, 297, + 190, 191, 240, 242, 297, 298, + 191, 192, 241, 243, 298, 299, + 192, 193, 242, 244, 299, 300, + 193, 243, 245, 300, 301, 302, + 193, 194, 244, 246, 302, 303, + 194, 195, 245, 247, 303, 304, + 195, 196, 246, 248, 304, 305, + 196, 197, 247, 249, 305, 306, + 197, 198, 248, 250, 306, 307, + 198, 199, 249, 251, 307, 308, + 199, 200, 250, 252, 308, 309, + 200, 201, 251, 253, 309, 310, + 201, 252, 254, 310, 311, 312, + 201, 202, 253, 255, 312, 313, + 202, 203, 254, 256, 313, 314, + 203, 204, 255, 257, 314, 315, + 204, 205, 256, 258, 315, 316, + 205, 206, 257, 259, 316, 317, + 206, 207, 258, 260, 317, 318, + 207, 208, 259, 261, 318, 319, + 208, 209, 260, 262, 319, 320, + 209, 261, 263, 320, 321, 322, + 209, 210, 262, 264, 322, 323, + 210, 211, 263, 265, 323, 324, + 211, 212, 264, 266, 324, 325, + 212, 213, 265, 267, 325, 326, + 213, 214, 266, 268, 326, 327, + 214, 215, 267, 269, 327, 328, + 215, 216, 268, 270, 328, 329, + 169, 216, 217, 269, 329, 330, + 217, 272, 330, 331, 332, 396, + 217, 218, 271, 273, 332, 333, + 218, 219, 272, 274, 333, 334, + 219, 220, 273, 275, 334, 335, + 220, 221, 274, 276, 335, 336, + 221, 222, 275, 277, 336, 337, + 222, 223, 276, 278, 337, 338, + 223, 224, 277, 279, 338, 339, + 224, 225, 278, 280, 339, 340, + 225, 226, 279, 281, 340, 341, + 226, 280, 282, 341, 342, 343, + 226, 227, 281, 283, 343, 344, + 227, 228, 282, 284, 344, 345, + 228, 229, 283, 285, 345, 346, + 229, 230, 284, 286, 346, 347, + 230, 231, 285, 287, 347, 348, + 231, 232, 286, 288, 348, 349, + 232, 233, 287, 289, 349, 350, + 233, 234, 288, 290, 350, 351, + 234, 235, 289, 291, 351, 352, + 235, 290, 292, 352, 353, 354, + 235, 236, 291, 293, 354, 355, + 236, 237, 292, 294, 355, 356, + 237, 238, 293, 295, 356, 357, + 238, 239, 294, 296, 357, 358, + 239, 240, 295, 297, 358, 359, + 240, 241, 296, 298, 359, 360, + 241, 242, 297, 299, 360, 361, + 242, 243, 298, 300, 361, 362, + 243, 244, 299, 301, 362, 363, + 244, 300, 302, 363, 364, 365, + 244, 245, 301, 303, 365, 366, + 245, 246, 302, 304, 366, 367, + 246, 247, 303, 305, 367, 368, + 247, 248, 304, 306, 368, 369, + 248, 249, 305, 307, 369, 370, + 249, 250, 306, 308, 370, 371, + 250, 251, 307, 309, 371, 372, + 251, 252, 308, 310, 372, 373, + 252, 253, 309, 311, 373, 374, + 253, 310, 312, 374, 375, 376, + 253, 254, 311, 313, 376, 377, + 254, 255, 312, 314, 377, 378, + 255, 256, 313, 315, 378, 379, + 256, 257, 314, 316, 379, 380, + 257, 258, 315, 317, 380, 381, + 258, 259, 316, 318, 381, 382, + 259, 260, 317, 319, 382, 383, + 260, 261, 318, 320, 383, 384, + 261, 262, 319, 321, 384, 385, + 262, 320, 322, 385, 386, 387, + 262, 263, 321, 323, 387, 388, + 263, 264, 322, 324, 388, 389, + 264, 265, 323, 325, 389, 390, + 265, 266, 324, 326, 390, 391, + 266, 267, 325, 327, 391, 392, + 267, 268, 326, 328, 392, 393, + 268, 269, 327, 329, 393, 394, + 269, 270, 328, 330, 394, 395, + 217, 270, 271, 329, 395, 396, + 271, 332, 396, 397, 432, -9999, + 271, 272, 331, 333, 397, -9999, + 272, 273, 332, 334, 398, -9999, + 273, 274, 333, 335, 398, -9999, + 274, 275, 334, 336, 399, -9999, + 275, 276, 335, 337, 399, -9999, + 276, 277, 336, 338, 400, -9999, + 277, 278, 337, 339, 400, -9999, + 278, 279, 338, 340, 401, -9999, + 279, 280, 339, 341, 401, -9999, + 280, 281, 340, 342, 402, -9999, + 281, 341, 343, 402, 403, -9999, + 281, 282, 342, 344, 403, -9999, + 282, 283, 343, 345, 404, -9999, + 283, 284, 344, 346, 404, -9999, + 284, 285, 345, 347, 405, -9999, + 285, 286, 346, 348, 405, -9999, + 286, 287, 347, 349, 406, -9999, + 287, 288, 348, 350, 406, -9999, + 288, 289, 349, 351, 407, -9999, + 289, 290, 350, 352, 407, -9999, + 290, 291, 351, 353, 408, -9999, + 291, 352, 354, 408, 409, -9999, + 291, 292, 353, 355, 409, -9999, + 292, 293, 354, 356, 410, -9999, + 293, 294, 355, 357, 410, -9999, + 294, 295, 356, 358, 411, -9999, + 295, 296, 357, 359, 411, -9999, + 296, 297, 358, 360, 412, -9999, + 297, 298, 359, 361, 412, -9999, + 298, 299, 360, 362, 413, -9999, + 299, 300, 361, 363, 413, -9999, + 300, 301, 362, 364, 414, -9999, + 301, 363, 365, 414, 415, -9999, + 301, 302, 364, 366, 415, -9999, + 302, 303, 365, 367, 416, -9999, + 303, 304, 366, 368, 416, -9999, + 304, 305, 367, 369, 417, -9999, + 305, 306, 368, 370, 417, -9999, + 306, 307, 369, 371, 418, -9999, + 307, 308, 370, 372, 418, -9999, + 308, 309, 371, 373, 419, -9999, + 309, 310, 372, 374, 419, -9999, + 310, 311, 373, 375, 420, -9999, + 311, 374, 376, 420, 421, -9999, + 311, 312, 375, 377, 421, -9999, + 312, 313, 376, 378, 422, -9999, + 313, 314, 377, 379, 422, -9999, + 314, 315, 378, 380, 423, -9999, + 315, 316, 379, 381, 423, -9999, + 316, 317, 380, 382, 424, -9999, + 317, 318, 381, 383, 424, -9999, + 318, 319, 382, 384, 425, -9999, + 319, 320, 383, 385, 425, -9999, + 320, 321, 384, 386, 426, -9999, + 321, 385, 387, 426, 427, -9999, + 321, 322, 386, 388, 427, -9999, + 322, 323, 387, 389, 428, -9999, + 323, 324, 388, 390, 428, -9999, + 324, 325, 389, 391, 429, -9999, + 325, 326, 390, 392, 429, -9999, + 326, 327, 391, 393, 430, -9999, + 327, 328, 392, 394, 430, -9999, + 328, 329, 393, 395, 431, -9999, + 329, 330, 394, 396, 431, -9999, + 271, 330, 331, 395, 432, -9999, + 331, 332, 398, 432, 433, 434, + 333, 334, 397, 399, 434, -9999, + 335, 336, 400, 435, 436, -9999, + 337, 338, 399, 401, 437, -9999, + 339, 340, 400, 402, 438, -9999, + 341, 342, 401, 403, 438, 439, + 342, 343, 402, 404, 440, 441, + 344, 345, 403, 441, 442, -9999, + 346, 347, 404, 442, 443, -9999, + 348, 349, 405, 443, 444, -9999, + 350, 351, 406, 444, 445, -9999, + 352, 353, 407, 409, 445, 446, + 353, 354, 408, 410, 447, 448, + 355, 356, 409, 411, 448, -9999, + 357, 358, 410, 412, 449, -9999, + 359, 360, 411, 450, 451, -9999, + 361, 362, 412, 414, 452, -9999, + 363, 364, 413, 415, 452, 453, + 364, 365, 414, 416, 454, 455, + 366, 367, 415, 417, 455, -9999, + 368, 369, 418, 456, 457, -9999, + 370, 371, 417, 419, 458, -9999, + 372, 373, 418, 420, 459, -9999, + 374, 375, 419, 421, 459, 460, + 375, 376, 420, 422, 461, 462, + 377, 378, 421, 462, 463, -9999, + 379, 380, 422, 463, 464, -9999, + 381, 382, 423, 464, 465, -9999, + 383, 384, 424, 465, 466, -9999, + 385, 386, 425, 427, 466, 467, + 386, 387, 426, 428, 468, 469, + 388, 389, 427, 429, 469, -9999, + 390, 391, 428, 430, 470, -9999, + 392, 393, 429, 471, 472, -9999, + 394, 395, 430, 432, 473, -9999, + 331, 396, 397, 431, 473, 474, + 397, 434, 474, 475, 476, -9999, + 397, 398, 433, 435, 476, 477, + 398, 399, 434, 436, 477, 478, + 399, 400, 435, 437, 478, 479, + 400, 401, 436, 438, 479, 480, + 401, 402, 437, 439, 480, 481, + 402, 438, 440, 481, 482, -9999, + 403, 439, 441, 483, 484, -9999, + 403, 404, 440, 442, 484, 485, + 404, 405, 441, 443, 485, 486, + 405, 406, 442, 444, 486, 487, + 406, 407, 443, 445, 487, 488, + 407, 408, 444, 446, 488, 489, + 408, 445, 447, 489, 490, -9999, + 409, 446, 448, 491, 492, -9999, + 409, 410, 447, 449, 492, 493, + 410, 411, 448, 450, 493, 494, + 411, 412, 449, 451, 494, 495, + 412, 413, 450, 452, 495, 496, + 413, 414, 451, 453, 496, 497, + 414, 452, 454, 497, 498, -9999, + 415, 453, 455, 499, 500, -9999, + 415, 416, 454, 456, 500, 501, + 416, 417, 455, 457, 501, 502, + 417, 418, 456, 458, 502, 503, + 418, 419, 457, 459, 503, 504, + 419, 420, 458, 460, 504, 505, + 420, 459, 461, 505, 506, -9999, + 421, 460, 462, 507, 508, -9999, + 421, 422, 461, 463, 508, 509, + 422, 423, 462, 464, 509, 510, + 423, 424, 463, 465, 510, 511, + 424, 425, 464, 466, 511, 512, + 425, 426, 465, 467, 512, 513, + 426, 466, 468, 513, 514, -9999, + 427, 467, 469, 515, 516, -9999, + 427, 428, 468, 470, 516, 517, + 428, 429, 469, 471, 517, 518, + 429, 430, 470, 472, 518, 519, + 430, 431, 471, 473, 519, 520, + 431, 432, 472, 474, 520, 521, + 432, 433, 473, 521, 522, -9999, + 433, 476, 522, 523, 524, -9999, + 433, 434, 475, 477, 524, 525, + 434, 435, 476, 478, 525, 526, + 435, 436, 477, 479, 526, 527, + 436, 437, 478, 480, 527, 528, + 437, 438, 479, 481, 528, 529, + 438, 439, 480, 482, 529, 530, + 439, 481, 483, 530, 531, -9999, + 440, 482, 484, 532, 533, -9999, + 440, 441, 483, 485, 533, 534, + 441, 442, 484, 486, 534, 535, + 442, 443, 485, 487, 535, 536, + 443, 444, 486, 488, 536, 537, + 444, 445, 487, 489, 537, 538, + 445, 446, 488, 490, 538, 539, + 446, 489, 491, 539, 540, -9999, + 447, 490, 492, 541, 542, -9999, + 447, 448, 491, 493, 542, 543, + 448, 449, 492, 494, 543, 544, + 449, 450, 493, 495, 544, 545, + 450, 451, 494, 496, 545, 546, + 451, 452, 495, 497, 546, 547, + 452, 453, 496, 498, 547, 548, + 453, 497, 499, 548, 549, -9999, + 454, 498, 500, 550, 551, -9999, + 454, 455, 499, 501, 551, 552, + 455, 456, 500, 502, 552, 553, + 456, 457, 501, 503, 553, 554, + 457, 458, 502, 504, 554, 555, + 458, 459, 503, 505, 555, 556, + 459, 460, 504, 506, 556, 557, + 460, 505, 507, 557, 558, -9999, + 461, 506, 508, 559, 560, -9999, + 461, 462, 507, 509, 560, 561, + 462, 463, 508, 510, 561, 562, + 463, 464, 509, 511, 562, 563, + 464, 465, 510, 512, 563, 564, + 465, 466, 511, 513, 564, 565, + 466, 467, 512, 514, 565, 566, + 467, 513, 515, 566, 567, -9999, + 468, 514, 516, 568, 569, -9999, + 468, 469, 515, 517, 569, 570, + 469, 470, 516, 518, 570, 571, + 470, 471, 517, 519, 571, 572, + 471, 472, 518, 520, 572, 573, + 472, 473, 519, 521, 573, 574, + 473, 474, 520, 522, 574, 575, + 474, 475, 521, 575, 576, -9999, + 475, 524, 576, -9999, -9999, -9999, + 475, 476, 523, 525, -9999, -9999, + 476, 477, 524, 526, -9999, -9999, + 477, 478, 525, 527, -9999, -9999, + 478, 479, 526, 528, -9999, -9999, + 479, 480, 527, 529, -9999, -9999, + 480, 481, 528, 530, -9999, -9999, + 481, 482, 529, 531, -9999, -9999, + 482, 530, 532, -9999, -9999, -9999, + 483, 531, 533, -9999, -9999, -9999, + 483, 484, 532, 534, -9999, -9999, + 484, 485, 533, 535, -9999, -9999, + 485, 486, 534, 536, -9999, -9999, + 486, 487, 535, 537, -9999, -9999, + 487, 488, 536, 538, -9999, -9999, + 488, 489, 537, 539, -9999, -9999, + 489, 490, 538, 540, -9999, -9999, + 490, 539, 541, -9999, -9999, -9999, + 491, 540, 542, -9999, -9999, -9999, + 491, 492, 541, 543, -9999, -9999, + 492, 493, 542, 544, -9999, -9999, + 493, 494, 543, 545, -9999, -9999, + 494, 495, 544, 546, -9999, -9999, + 495, 496, 545, 547, -9999, -9999, + 496, 497, 546, 548, -9999, -9999, + 497, 498, 547, 549, -9999, -9999, + 498, 548, 550, -9999, -9999, -9999, + 499, 549, 551, -9999, -9999, -9999, + 499, 500, 550, 552, -9999, -9999, + 500, 501, 551, 553, -9999, -9999, + 501, 502, 552, 554, -9999, -9999, + 502, 503, 553, 555, -9999, -9999, + 503, 504, 554, 556, -9999, -9999, + 504, 505, 555, 557, -9999, -9999, + 505, 506, 556, 558, -9999, -9999, + 506, 557, 559, -9999, -9999, -9999, + 507, 558, 560, -9999, -9999, -9999, + 507, 508, 559, 561, -9999, -9999, + 508, 509, 560, 562, -9999, -9999, + 509, 510, 561, 563, -9999, -9999, + 510, 511, 562, 564, -9999, -9999, + 511, 512, 563, 565, -9999, -9999, + 512, 513, 564, 566, -9999, -9999, + 513, 514, 565, 567, -9999, -9999, + 514, 566, 568, -9999, -9999, -9999, + 515, 567, 569, -9999, -9999, -9999, + 515, 516, 568, 570, -9999, -9999, + 516, 517, 569, 571, -9999, -9999, + 517, 518, 570, 572, -9999, -9999, + 518, 519, 571, 573, -9999, -9999, + 519, 520, 572, 574, -9999, -9999, + 520, 521, 573, 575, -9999, -9999, + 521, 522, 574, 576, -9999, -9999, + 522, 523, 575, -9999, -9999, -9999 } ; + + + for (Int_t ip=0; ip<577; ip++) + for (Int_t in=0; in<6; in++) + fNN[ip][in] = help[ip][in] ; + + +} + +Int_t MCamNeighbor::GetNN(Int_t pix, Int_t inn ) +{ + // return the number of one neighbor + + if ( pix >= 577 ) { + cout << "ERROR GetNN -> pixel out of range" << endl ; + exit (123) ; + } + + if ( inn >= 6 ) { + cout << "ERROR GetNN -> not more than 6 neighbors" << endl ; + exit (123) ; + } + + return fNN[pix][inn] ; +} + +void MCamNeighbor::CheckPixel(Int_t pix) +{ + cout << " Pixel " << pix << " has neighbors " ; + for (Int_t i=0; i<6; i++ ) + cout << fNN[pix][i] << "/" ; + cout << endl ; + +} + +void MCamNeighbor::Print() +{ + for (Int_t i=0; i<577; i++ ) { + + cout << " Pixel " << i ; + + for (Int_t j=0; j<6; j++ ) { + cout << " ->" << fNN[i][j] ; + } + cout << endl ; + + } +} Index: trunk/MagicSoft/Mars/mgui/MCamNeighbor.h =================================================================== --- trunk/MagicSoft/Mars/mgui/MCamNeighbor.h (revision 597) +++ trunk/MagicSoft/Mars/mgui/MCamNeighbor.h (revision 597) @@ -0,0 +1,27 @@ +#ifndef MCAMNEIGHBOR_H +#define MCAMNEIGHBOR_H + +#include + +#include "MAGIC.h" + +class MCamNeighbor +{ + private: + + Int_t fNN[577][6] ; + + public: + + MCamNeighbor() ; + + Int_t GetNN(Int_t pix, Int_t inn) ; + void CheckPixel(Int_t pix) ; + void Print() ; + + ClassDef(MCamNeighbor, 1) // +} ; + + +#endif + Index: trunk/MagicSoft/Mars/mgui/Makefile =================================================================== --- trunk/MagicSoft/Mars/mgui/Makefile (revision 596) +++ trunk/MagicSoft/Mars/mgui/Makefile (revision 597) @@ -59,4 +59,5 @@ MHexagon.cc \ MCamGeom.cc \ + MCamNeighbor.cc \ MCamDisplay.cc