Index: trunk/MagicSoft/Simulation/Corsika/GuiSimone/MainFrameSimone.cxx =================================================================== --- trunk/MagicSoft/Simulation/Corsika/GuiSimone/MainFrameSimone.cxx (revision 423) +++ trunk/MagicSoft/Simulation/Corsika/GuiSimone/MainFrameSimone.cxx (revision 424) @@ -11,5 +11,4 @@ - MainFrameSimone::MainFrameSimone(const TGWindow *p, UInt_t w, UInt_t h) : TGMainFrame(p, w, h) @@ -17,7 +16,17 @@ sprintf (fInputPath, "\0" ) ; fNumEvents = 0 ; - + + fEvtNb = 0 ; + + // + // set up the NTuples + // fNtup = new TNtuple ("fNtup", "Ntuple with Run distributions", "PartID:Energy:CoreX:CoreY:Theta:Phi:FirstInt") ; + + fNtupEvt = new TNtuple ("fNtupEvt", "Ntuple with Event distributions", + "WaveLen:PosX:PoxY:Height:Time:DireX:DireY") ; + + // // Create a main frame with a number of different buttons. @@ -377,6 +386,5 @@ return ( kTRUE ) ; } - - return (kFALSE) ; + } @@ -395,7 +403,11 @@ canvas->Modified() ; canvas->Update() ; + + return(kTRUE) ; } else - printf("No Ntuple exist!!\n"); + printf("No Ntuple exist!!\n"); + + return (kFALSE) ; } @@ -583,4 +595,5 @@ Int_t retval = 0 ; Char_t wort[100] ; + Char_t wort2[10] ; Char_t testfile[100] ; Char_t extens[5] ; @@ -603,9 +616,24 @@ sprintf ( fInputPath, "\0") ; fSelectButton->SetState(kButtonDisabled) ; + fDir2->RemoveEntry(1) ; fDir2->AddEntry(fInputPath,1) ; fDir2->MapSubwindows() ; fDir2->Layout() ; - + + fDir3->RemoveEntry(1) ; + fDir3->AddEntry(fInputPath,1) ; + fDir3->MapSubwindows() ; + fDir3->Layout() ; + + + sprintf (wort2, "\0" ) ; + fDirEvtNb->RemoveEntry(1) ; + fDirEvtNb->AddEntry( wort2, 1 ) ; + fDirEvtNb->MapSubwindows() ; + fDirEvtNb->Layout() ; + + + // // goto the parent directory @@ -651,4 +679,16 @@ fDir2->Layout() ; + fDir3->RemoveEntry(1) ; + fDir3->AddEntry(fInputPath,1) ; + fDir3->MapSubwindows() ; + fDir3->Layout() ; + + fEvtNb = 0 ; + sprintf (wort2, "%d", fEvtNb ) ; + fDirEvtNb->RemoveEntry(1) ; + fDirEvtNb->AddEntry( wort2, 1 ) ; + fDirEvtNb->MapSubwindows() ; + fDirEvtNb->Layout() ; + } } @@ -657,5 +697,5 @@ case M_BUTTON_PRINT: canvas->Print("simone.ps") ; - // gSystem->Exec("lpr simone.ps") ; + gSystem->Exec("lpr simone.ps") ; gSystem->Exec("rm -f simone.ps") ; break; @@ -683,4 +723,29 @@ case M_BUTTON_FIRSTINT: DrawRunParam("FirstInt") ; + break; + + + + case M_BUTTON_PREV: + fEvtNb-- ; + + + + sprintf (wort2, "%d", fEvtNb ) ; + fDirEvtNb->RemoveEntry(1) ; + fDirEvtNb->AddEntry( wort2, 1 ) ; + fDirEvtNb->MapSubwindows() ; + fDirEvtNb->Layout() ; + break; + + + case M_BUTTON_NEXT: + fEvtNb++ ; + + sprintf (wort2, "%d", fEvtNb ) ; + fDirEvtNb->RemoveEntry(1) ; + fDirEvtNb->AddEntry( wort2, 1 ) ; + fDirEvtNb->MapSubwindows() ; + fDirEvtNb->Layout() ; break; @@ -762,5 +827,17 @@ fDir2->AddEntry(fInputPath,1) ; fDir2->MapSubwindows() ; - fDir2->Layout() ; + fDir2->Layout() ; + + fDir3->RemoveEntry(1) ; + fDir3->AddEntry(fInputPath,1) ; + fDir3->MapSubwindows() ; + fDir3->Layout() ; + + sprintf (wort2, "\0" ) ; + fDirEvtNb->RemoveEntry(1) ; + fDirEvtNb->AddEntry( wort2, 1 ) ; + fDirEvtNb->MapSubwindows() ; + fDirEvtNb->Layout() ; + // // goto directory Index: trunk/MagicSoft/Simulation/Corsika/GuiSimone/MainFrameSimone.hxx =================================================================== --- trunk/MagicSoft/Simulation/Corsika/GuiSimone/MainFrameSimone.hxx (revision 423) +++ trunk/MagicSoft/Simulation/Corsika/GuiSimone/MainFrameSimone.hxx (revision 424) @@ -55,5 +55,8 @@ Char_t fNtupPath[200] ; + Int_t fEvtNb ; + TNtuple *fNtup ; + TNtuple *fNtupEvt ; TGMenuBar *fMenuBar ; Index: trunk/MagicSoft/Simulation/Corsika/GuiSimone/Makefile =================================================================== --- trunk/MagicSoft/Simulation/Corsika/GuiSimone/Makefile (revision 423) +++ trunk/MagicSoft/Simulation/Corsika/GuiSimone/Makefile (revision 424) @@ -19,7 +19,7 @@ # # $RCSfile: Makefile,v $ -# $Revision: 1.3 $ +# $Revision: 1.4 $ # $Author: harald $ -# $Date: 2000-07-15 09:31:07 $ +# $Date: 2000-07-15 11:15:57 $ # ################################################################## @@ -168,89 +168,36 @@ ../../Detector/include-CORSIKA/COREventHeader.o: ../../Detector/include-CORSIKA/COREventHeader.hxx ../../Detector/include-CORSIKA/COREventHeader.o: /usr/include/stdlib.h -../../Detector/include-CORSIKA/COREventHeader.o: /usr/include/features.h -../../Detector/include-CORSIKA/COREventHeader.o: /usr/include/sys/cdefs.h -../../Detector/include-CORSIKA/COREventHeader.o: /usr/include/gnu/stubs.h -../../Detector/include-CORSIKA/COREventHeader.o: /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/stddef.h +../../Detector/include-CORSIKA/COREventHeader.o: /usr/include/standards.h +../../Detector/include-CORSIKA/COREventHeader.o: /usr/include/getopt.h ../../Detector/include-CORSIKA/COREventHeader.o: /usr/include/sys/types.h -../../Detector/include-CORSIKA/COREventHeader.o: /usr/include/bits/types.h -../../Detector/include-CORSIKA/COREventHeader.o: /usr/include/time.h -../../Detector/include-CORSIKA/COREventHeader.o: /usr/include/endian.h -../../Detector/include-CORSIKA/COREventHeader.o: /usr/include/bits/endian.h +../../Detector/include-CORSIKA/COREventHeader.o: /usr/include/mach/machine/vm_types.h ../../Detector/include-CORSIKA/COREventHeader.o: /usr/include/sys/select.h -../../Detector/include-CORSIKA/COREventHeader.o: /usr/include/bits/select.h -../../Detector/include-CORSIKA/COREventHeader.o: /usr/include/bits/sigset.h -../../Detector/include-CORSIKA/COREventHeader.o: /usr/include/sys/sysmacros.h -../../Detector/include-CORSIKA/COREventHeader.o: /usr/include/alloca.h ../../Detector/include-CORSIKA/COREventHeader.o: /usr/include/math.h -../../Detector/include-CORSIKA/COREventHeader.o: /usr/include/bits/huge_val.h -../../Detector/include-CORSIKA/COREventHeader.o: /usr/include/bits/mathdef.h -../../Detector/include-CORSIKA/COREventHeader.o: /usr/include/bits/mathcalls.h -../../Detector/include-CORSIKA/COREventHeader.o: /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/float.h ../../Detector/include-CORSIKA/CORParticle.o: ../../Detector/include-CORSIKA/CORParticle.hxx ../../Detector/include-CORSIKA/CORParticle.o: /usr/include/stdlib.h -../../Detector/include-CORSIKA/CORParticle.o: /usr/include/features.h -../../Detector/include-CORSIKA/CORParticle.o: /usr/include/sys/cdefs.h -../../Detector/include-CORSIKA/CORParticle.o: /usr/include/gnu/stubs.h -../../Detector/include-CORSIKA/CORParticle.o: /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/stddef.h +../../Detector/include-CORSIKA/CORParticle.o: /usr/include/standards.h +../../Detector/include-CORSIKA/CORParticle.o: /usr/include/getopt.h ../../Detector/include-CORSIKA/CORParticle.o: /usr/include/sys/types.h -../../Detector/include-CORSIKA/CORParticle.o: /usr/include/bits/types.h -../../Detector/include-CORSIKA/CORParticle.o: /usr/include/time.h -../../Detector/include-CORSIKA/CORParticle.o: /usr/include/endian.h -../../Detector/include-CORSIKA/CORParticle.o: /usr/include/bits/endian.h +../../Detector/include-CORSIKA/CORParticle.o: /usr/include/mach/machine/vm_types.h ../../Detector/include-CORSIKA/CORParticle.o: /usr/include/sys/select.h -../../Detector/include-CORSIKA/CORParticle.o: /usr/include/bits/select.h -../../Detector/include-CORSIKA/CORParticle.o: /usr/include/bits/sigset.h -../../Detector/include-CORSIKA/CORParticle.o: /usr/include/sys/sysmacros.h -../../Detector/include-CORSIKA/CORParticle.o: /usr/include/alloca.h ../../Detector/include-CORSIKA/CORParticle.o: /usr/include/math.h -../../Detector/include-CORSIKA/CORParticle.o: /usr/include/bits/huge_val.h -../../Detector/include-CORSIKA/CORParticle.o: /usr/include/bits/mathdef.h -../../Detector/include-CORSIKA/CORParticle.o: /usr/include/bits/mathcalls.h -../../Detector/include-CORSIKA/CORParticle.o: /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/float.h ../../Detector/include-CORSIKA/CORStatfile.o: ../../Detector/include-CORSIKA/CORStatfile.hxx ../../Detector/include-CORSIKA/CORStatfile.o: /usr/include/stdlib.h -../../Detector/include-CORSIKA/CORStatfile.o: /usr/include/features.h -../../Detector/include-CORSIKA/CORStatfile.o: /usr/include/sys/cdefs.h -../../Detector/include-CORSIKA/CORStatfile.o: /usr/include/gnu/stubs.h -../../Detector/include-CORSIKA/CORStatfile.o: /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/stddef.h +../../Detector/include-CORSIKA/CORStatfile.o: /usr/include/standards.h +../../Detector/include-CORSIKA/CORStatfile.o: /usr/include/getopt.h ../../Detector/include-CORSIKA/CORStatfile.o: /usr/include/sys/types.h -../../Detector/include-CORSIKA/CORStatfile.o: /usr/include/bits/types.h -../../Detector/include-CORSIKA/CORStatfile.o: /usr/include/time.h -../../Detector/include-CORSIKA/CORStatfile.o: /usr/include/endian.h -../../Detector/include-CORSIKA/CORStatfile.o: /usr/include/bits/endian.h +../../Detector/include-CORSIKA/CORStatfile.o: /usr/include/mach/machine/vm_types.h ../../Detector/include-CORSIKA/CORStatfile.o: /usr/include/sys/select.h -../../Detector/include-CORSIKA/CORStatfile.o: /usr/include/bits/select.h -../../Detector/include-CORSIKA/CORStatfile.o: /usr/include/bits/sigset.h -../../Detector/include-CORSIKA/CORStatfile.o: /usr/include/sys/sysmacros.h -../../Detector/include-CORSIKA/CORStatfile.o: /usr/include/alloca.h ../../Detector/include-CORSIKA/CORStatfile.o: /usr/include/math.h -../../Detector/include-CORSIKA/CORStatfile.o: /usr/include/bits/huge_val.h -../../Detector/include-CORSIKA/CORStatfile.o: /usr/include/bits/mathdef.h -../../Detector/include-CORSIKA/CORStatfile.o: /usr/include/bits/mathcalls.h -../../Detector/include-CORSIKA/CORStatfile.o: /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/float.h MainFrameSimone.o: MainFrameSimone.hxx MainFrameSimone.o: ../../Detector/include-CORSIKA/COREventHeader.hxx -MainFrameSimone.o: /usr/include/stdlib.h /usr/include/features.h -MainFrameSimone.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h -MainFrameSimone.o: /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/stddef.h -MainFrameSimone.o: /usr/include/sys/types.h /usr/include/bits/types.h -MainFrameSimone.o: /usr/include/time.h /usr/include/endian.h -MainFrameSimone.o: /usr/include/bits/endian.h /usr/include/sys/select.h -MainFrameSimone.o: /usr/include/bits/select.h /usr/include/bits/sigset.h -MainFrameSimone.o: /usr/include/sys/sysmacros.h /usr/include/alloca.h -MainFrameSimone.o: /usr/include/math.h /usr/include/bits/huge_val.h -MainFrameSimone.o: /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h -MainFrameSimone.o: /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/float.h -simone.o: /usr/include/stdlib.h /usr/include/features.h -simone.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h -simone.o: /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/stddef.h -simone.o: /usr/include/sys/types.h /usr/include/bits/types.h -simone.o: /usr/include/time.h /usr/include/endian.h -simone.o: /usr/include/bits/endian.h /usr/include/sys/select.h -simone.o: /usr/include/bits/select.h /usr/include/bits/sigset.h -simone.o: /usr/include/sys/sysmacros.h /usr/include/alloca.h +MainFrameSimone.o: /usr/include/stdlib.h /usr/include/standards.h +MainFrameSimone.o: /usr/include/getopt.h /usr/include/sys/types.h +MainFrameSimone.o: /usr/include/mach/machine/vm_types.h +MainFrameSimone.o: /usr/include/sys/select.h /usr/include/math.h +simone.o: /usr/include/stdlib.h /usr/include/standards.h +simone.o: /usr/include/getopt.h /usr/include/sys/types.h +simone.o: /usr/include/mach/machine/vm_types.h /usr/include/sys/select.h simone.o: MainFrameSimone.hxx simone.o: ../../Detector/include-CORSIKA/COREventHeader.hxx -simone.o: /usr/include/math.h /usr/include/bits/huge_val.h -simone.o: /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h -simone.o: /usr/lib/gcc-lib/i486-linux/2.7.2.3/include/float.h +simone.o: /usr/include/math.h