|
36 | 36 | #include <TGTextEntry.h>
|
37 | 37 | #include <TGNumberEntry.h>
|
38 | 38 | #include <TGTextViewStream.h>
|
| 39 | +#include <TGMenu.h> |
39 | 40 |
|
40 | 41 | #include <fstream>
|
41 | 42 |
|
@@ -244,7 +245,7 @@ private:
|
244 | 245 |
|
245 | 246 | void To_full_xy_projection();
|
246 | 247 |
|
247 |
| - void Projection_2d( bool flagXY, bool toShow = true ); |
| 248 | + void Projection_2d( bool flagXY, bool toShow ); |
248 | 249 |
|
249 | 250 | void SetMarker_2d( Event_t* );
|
250 | 251 |
|
@@ -557,9 +558,9 @@ void ROOTSCOPE::To_response(Event_t* e) {
|
557 | 558 |
|
558 | 559 | if( key_symbol == kKey_q ) { To_Back_to_disply_histos(); }
|
559 | 560 |
|
560 |
| - else if( key_symbol == kKey_p ) { Projection_2d( 1 ); } |
| 561 | + else if( key_symbol == kKey_p ) { Projection_2d( 1, true ); } |
561 | 562 |
|
562 |
| - else if( key_symbol == kKey_P ) { Projection_2d( 0 ); } |
| 563 | + else if( key_symbol == kKey_P ) { Projection_2d( 0, true ); } |
563 | 564 |
|
564 | 565 | else if( key_symbol == kKey_n ) { Clear_Marker2d( ); }
|
565 | 566 |
|
@@ -1100,12 +1101,11 @@ void ROOTSCOPE::Initialization() {
|
1100 | 1101 | fH2_pickX[i] = 0;
|
1101 | 1102 | fH2_pickY[i] = 0;
|
1102 | 1103 | }
|
| 1104 | + |
1103 | 1105 | fWhich_active_2d = 1;
|
1104 | 1106 | fCmp_2d_X = 1;
|
1105 | 1107 | fCmp_2d_Y = 1;
|
1106 | 1108 |
|
1107 |
| - |
1108 |
| - |
1109 | 1109 | fBG_const = 0.0;
|
1110 | 1110 | fBG_linear = 0.0;
|
1111 | 1111 |
|
@@ -4693,8 +4693,8 @@ void ROOTSCOPE::To_response_menu( Int_t menu_id ){
|
4693 | 4693 | if( fIsTH2_inPad ) {
|
4694 | 4694 | switch( menu_id ) {
|
4695 | 4695 | case 200: To_show_histo2d_operation_dlg(); break;
|
4696 |
| - case 202: Projection_2d( 1 ); break; |
4697 |
| - case 203: Projection_2d( 0 ); break; |
| 4696 | + case 202: Projection_2d( 1, true ); break; |
| 4697 | + case 203: Projection_2d( 0, true ); break; |
4698 | 4698 |
|
4699 | 4699 | case 204: Expand_2d(); break;
|
4700 | 4700 | case 205: Unexpand_2d(); break;
|
|
0 commit comments