Index: /trunk/MagicSoft/Mars/mgui/MCamDisplay.cc =================================================================== --- /trunk/MagicSoft/Mars/mgui/MCamDisplay.cc (revision 1399) +++ /trunk/MagicSoft/Mars/mgui/MCamDisplay.cc (revision 1400) @@ -317,4 +317,5 @@ fDrawingPad->SetBorderMode(0); + fDrawingPad->SetFillColor(22); // @@ -341,9 +342,4 @@ // - // Setup the correct environment - // - gPad->SetFillColor(22); - - // // Draw all pixels of the camera // (means apend all pixelobjects to the current pad) @@ -351,4 +347,7 @@ for (UInt_t i=0; i ROOT_VERSION(3,01,06) + (*this)[i].SetBit(kNoContextMenu|kCannotPick); +#endif (*this)[i].SetFillColor(22); (*this)[i].Draw(); @@ -371,4 +370,7 @@ box->SetY2(H*((i+1)*h - 1.)); box->SetFillColor(22); +#if ROOT_VERSION_CODE > ROOT_VERSION(3,01,06) + box->SetBit(kNoContextMenu|kCannotPick); +#endif box->Draw(); @@ -376,4 +378,7 @@ txt->SetX(fRange+1.5*w); txt->SetY(H*((i+0.5)*h - 1.)); +#if ROOT_VERSION_CODE > ROOT_VERSION(3,01,06) + txt->SetBit(kNoContextMenu|kCannotPick); +#endif txt->Draw(); } @@ -400,5 +405,5 @@ const MHexagon &h = (MHexagon&)*(*fPixels)[i]; TText *nt = txt.DrawText(h.GetX(), h.GetY(), num); - nt->SetTextSize(0.0005*h.GetD()); + nt->SetTextSize(0.3*h.GetD()/fGeomCam->GetMaxRadius()); } } @@ -460,6 +465,6 @@ // Update display physically // - gPad->Modified(); - gPad->Update(); + fDrawingPad->Modified(); + fDrawingPad->Update(); } Index: /trunk/MagicSoft/Mars/mgui/MGeomCamCT1.cc =================================================================== --- /trunk/MagicSoft/Mars/mgui/MGeomCamCT1.cc (revision 1399) +++ /trunk/MagicSoft/Mars/mgui/MGeomCamCT1.cc (revision 1400) @@ -77,6 +77,6 @@ { 1, 8, 18, 19, 20, 36}, { 1, 2, 7, 9, 20, 21}, - { 2, 8, 10, 21, 22, 23}, // 10 - { 2, 3, 9, 11, 23, 24}, + { 2, 8, 10, 21, 22, 23}, + { 2, 3, 9, 11, 23, 24}, // 10 { 3, 10, 12, 24, 25, 26}, { 3, 4, 11, 13, 26, 27}, @@ -87,6 +87,6 @@ { 6, 16, 18, 33, 34, 35}, { 1, 6, 7, 17, 35, 36}, - { 7, 20, 36, 37, 38, 60}, // 20 - { 7, 8, 19, 21, 38, 39}, + { 7, 20, 36, 37, 38, 60}, + { 7, 8, 19, 21, 38, 39}, // 20 { 8, 9, 20, 22, 39, 40}, { 9, 21, 23, 40, 41, 42}, @@ -97,6 +97,6 @@ { 12, 13, 26, 28, 47, 48}, { 13, 27, 29, 48, 49, 50}, - { 13, 14, 28, 30, 50, 51}, // 30 - { 14, 15, 29, 31, 51, 52}, + { 13, 14, 28, 30, 50, 51}, + { 14, 15, 29, 31, 51, 52}, // 30 { 15, 30, 32, 52, 53, 54}, { 15, 16, 31, 33, 54, 55}, @@ -107,6 +107,6 @@ { 19, 38, 60, 61, 62, 90}, { 19, 20, 37, 39, 62, 63}, - { 20, 21, 38, 40, 63, 64}, // 40 - { 21, 22, 39, 41, 64, 65}, + { 20, 21, 38, 40, 63, 64}, + { 21, 22, 39, 41, 64, 65}, // 40 { 22, 40, 42, 65, 66, 67}, { 22, 23, 41, 43, 67, 68}, @@ -117,6 +117,6 @@ { 26, 27, 46, 48, 73, 74}, { 27, 28, 47, 49, 74, 75}, - { 28, 48, 50, 75, 76, 77}, // 50 - { 28, 29, 49, 51, 77, 78}, + { 28, 48, 50, 75, 76, 77}, + { 28, 29, 49, 51, 77, 78}, // 50 { 29, 30, 50, 52, 78, 79}, { 30, 31, 51, 53, 79, 80}, @@ -127,6 +127,6 @@ { 34, 56, 58, 85, 86, 87}, { 34, 35, 57, 59, 87, 88}, - { 35, 36, 58, 60, 88, 89}, // 60 - { 19, 36, 37, 59, 89, 90}, + { 35, 36, 58, 60, 88, 89}, + { 19, 36, 37, 59, 89, 90}, // 60 { 37, 62, 90, 91, 92, 126}, { 37, 38, 61, 63, 92, 93}, @@ -137,6 +137,6 @@ { 41, 42, 66, 68, 98, 99}, { 42, 43, 67, 69, 99, 100}, - { 43, 44, 68, 70, 100, 101}, // 70 - { 44, 45, 69, 71, 101, 102}, + { 43, 44, 68, 70, 100, 101}, + { 44, 45, 69, 71, 101, 102}, // 70 { 45, 70, 72, 102, 103, 104}, { 45, 46, 71, 73, 104, 105}, @@ -147,6 +147,6 @@ { 49, 50, 76, 78, 110, 111}, { 50, 51, 77, 79, 111, 112}, - { 51, 52, 78, 80, 112, 113}, // 80 - { 52, 53, 79, 81, 113, 114}, + { 51, 52, 78, 80, 112, 113}, + { 52, 53, 79, 81, 113, 114}, // 80 { 53, 80, 82, 114, 115, 116}, { 53, 54, 81, 83, 116, 117}, @@ -157,7 +157,7 @@ { 57, 58, 86, 88, 122, 123}, { 58, 59, 87, 89, 123, 124}, - { 59, 60, 88, 90, 124, 125}, // 90 - { 37, 60, 61, 89, 125, 126}, - { 61, 92, 126, 127, -1, -1}, + { 59, 60, 88, 90, 124, 125}, + { 37, 60, 61, 89, 125, 126}, // 90 + { 61, 92, 126, -1, -1, -1}, { 61, 62, 91, 93, -1, -1}, { 62, 63, 92, 94, -1, -1}, @@ -167,6 +167,6 @@ { 66, 96, 98, -1, -1, -1}, { 66, 67, 97, 99, -1, -1}, - { 67, 68, 98, 100, -1, -1}, // 100 - { 68, 69, 99, 101, -1, -1}, + { 67, 68, 98, 100, -1, -1}, + { 68, 69, 99, 101, -1, -1}, // 100 { 69, 70, 100, 102, -1, -1}, { 70, 71, 101, 103, -1, -1}, @@ -177,6 +177,6 @@ { 74, 75, 106, 108, -1, -1}, { 75, 76, 107, 109, -1, -1}, - { 76, 108, 110, -1, -1, -1}, // 110 - { 76, 77, 109, 111, -1, -1}, + { 76, 108, 110, -1, -1, -1}, + { 76, 77, 109, 111, -1, -1}, // 110 { 77, 78, 110, 112, -1, -1}, { 78, 79, 111, 113, -1, -1}, @@ -187,11 +187,12 @@ { 82, 83, 116, 118, -1, -1}, { 83, 84, 117, 119, -1, -1}, - { 84, 85, 118, 120, -1, -1}, // 120 - { 85, 86, 119, 121, -1, -1}, + { 84, 85, 118, 120, -1, -1}, + { 85, 86, 119, 121, -1, -1}, // 120 { 86, 120, 122, -1, -1, -1}, { 86, 87, 121, 123, -1, -1}, { 87, 88, 122, 124, -1, -1}, { 88, 89, 123, 125, -1, -1}, - { 89, 90, 124, 126, -1, -1} // 126 + { 89, 90, 124, 126, -1, -1}, + { 61, 90, 91, 125, -1, -1} // 126 };