Index: trunk/MagicSoft/Mars/Changelog =================================================================== --- trunk/MagicSoft/Mars/Changelog (revision 664) +++ trunk/MagicSoft/Mars/Changelog (revision 665) @@ -1,3 +1,18 @@ -*-*- END -*-*- + 2000/03/01: Thomas Bretz + + * manalysis/Makefile, mdatacheck/Makefile, meventdisp/Makefile, + mgui/Makefile: + new + + * mdatacheck/MFillAdcSpect.[h,cc]: + changed high and low to hi and lo + + * mdatacheck/MGDisplayAdc.[h,cc]: + added some new member functions to make code more clear + + * mdatacheck/MHistosAdc.h: + changed high and low to hi and lo + 2000/03/01: Thomas Bretz Index: trunk/MagicSoft/Mars/manalysis/Makefile =================================================================== --- trunk/MagicSoft/Mars/manalysis/Makefile (revision 664) +++ trunk/MagicSoft/Mars/manalysis/Makefile (revision 665) @@ -6,24 +6,21 @@ # ################################################################## -# @maintitle - -# @code - -# -# please change all system depend values in the -# config.mk.${OSTYPE} file -# -# include ../Makefile.conf.$(OSTYPE) include ../Makefile.conf.general -# @endcode +# +# Handling name of the Root Dictionary Files +# +CINT = Analysis +# +# Library name to creatre +# +LIB = manalysis.a + +# +# connect the include files defined in the config.mk file +# INCLUDES = -I. -I../mbase -I../mgui - -# @code - -CINT = Analysis -LIB = manalysis.a #------------------------------------------------------------------------------ @@ -31,8 +28,8 @@ .SUFFIXES: .c .cc .cxx .h .hxx .o -SRCFILES = MCerPhotEvt.cc \ - MCerPhotPix.cc \ - MCT1Pedestals.cc \ - MCT1ReadAscii.cc +SRCFILES = MCT1Pedestals.cc \ + MCT1ReadAscii.cc \ + MCerPhotEvt.cc \ + MCerPhotPix.cc SRCS = $(SRCFILES) @@ -46,5 +43,5 @@ include ../Makefile.rules -clean: rmlib rmcint rmobjs rmcore +clean: rmlib rmcint rmobjs rmcore rmbin mrproper: clean rmbak Index: trunk/MagicSoft/Mars/mdatacheck/MFillAdcSpect.cc =================================================================== --- trunk/MagicSoft/Mars/mdatacheck/MFillAdcSpect.cc (revision 664) +++ trunk/MagicSoft/Mars/mdatacheck/MFillAdcSpect.cc (revision 665) @@ -25,22 +25,20 @@ // connect the raw data with this task + fHistos = (MHistosAdc*)pList->FindObject("MHistosAdc"); + if (!fHistos) + { + cout << "MRawFileRead::PreProcess - WARNING: MHistosAdc not found... creating." << endl; + fHistos = new MHistosAdc; + pList->AddToList(fHistos); + } + fRawEvtData = (MRawEvtData*)pList->FindObject("MRawEvtData"); - if (!fRawEvtData) { - cout << "MRawFileRead::PreProcess - WARNING: MRawEvtData not found... creating." << endl; - return kFALSE ; + cout << "MRawFileRead::PreProcess - WARNING: MRawEvtData not found... exit." << endl; + return kFALSE; } fPixelIter = new MRawEvtPixelIter( fRawEvtData ); - - fHistos = (MHistosAdc*)pList->FindObject("MHistosAdc"); - - if (!fHistos) - { - cout << "MRawFileRead::PreProcess - WARNING: MHistosAdc not found... exit..." << endl; - return kFALSE ; - } - return kTRUE ; @@ -55,6 +53,6 @@ fPixelIter->Reset() ; - Int_t iHighSamples = fRawEvtData->GetNumHiGainSamples() ; - Int_t iLowSamples = fRawEvtData->GetNumLoGainSamples() ; + const Int_t nhisamples = fRawEvtData->GetNumHiGainSamples() ; + const Int_t nlosamples = fRawEvtData->GetNumLoGainSamples() ; // cout << "HighSamples " << iHighSamples ; @@ -62,13 +60,13 @@ while ( fPixelIter->Next() ) { - for (Int_t i=0 ; i< iHighSamples ; i++ ) + for (Int_t i=0 ; iFillAdcHistHigh ( fPixelIter->GetPixelId(), + fHistos->FillAdcHistHi ( fPixelIter->GetPixelId(), fPixelIter->GetHiGainFadcSamples()[i] ); } - for (Int_t i=0 ; i< iLowSamples ; i++ ) + for (Int_t i=0 ; iFillAdcHistLow ( fPixelIter->GetPixelId(), + fHistos->FillAdcHistLo ( fPixelIter->GetPixelId(), fPixelIter->GetLoGainFadcSamples()[i] ); } Index: trunk/MagicSoft/Mars/mdatacheck/MGDisplayAdc.cc =================================================================== --- trunk/MagicSoft/Mars/mdatacheck/MGDisplayAdc.cc (revision 664) +++ trunk/MagicSoft/Mars/mdatacheck/MGDisplayAdc.cc (revision 665) @@ -1,12 +1,8 @@ #include "MGDisplayAdc.h" -#include // TGListBox #include // TGTextButton -#include // TGVSlider #include // TCanvas.h #include // TGMsgBox #include // TRootEmbeddedCanvas - -#include "MHistosAdc.h" enum ComIdentDisplayAdc { @@ -163,11 +159,10 @@ fHistoList->Select(1, kTRUE); - fHists->GetHighList()->At( fHistoList->GetSelected()-1)->Draw() ; - fHistoList->SetTopEntry(fHistoList->GetSelected()); + DrawSelectedHi() ; + SetSelectedTopEntry(); fCanv->Modified() ; - fCanv->Update() ; - fVslider1->SetPosition( fHistoList->GetSelected()-1); + fCanv->Update() ; + SetSelectedPos(); - MapWindow(); SetWMSizeHints(550, 550, 1000, 1000, 1, 1); @@ -207,6 +202,4 @@ delete fFrameLow ; delete fFrameTop ; - - } @@ -233,21 +226,23 @@ Bool_t MGDisplayAdc::BuildHistoList(Int_t type ) -{ - // looks in the container of the AdcSpectra and reads in the - // Histogramms in there. - // - // In the class MHistosAdc are in fact two lists. One for the high and - // one for the low gain. Here we will use only the high gain list!!! - // With some special options (settings in the gui) we will also be able - // to plot the low gain - // - for ( Int_t i=0 ; i < fHists->GetHighEntries(); i++ ) { - fHistoList->AddEntry(fHists->GetHighList()->At(i)->GetName(), i+1) ; - - } - - fHistoList->MapSubwindows() ; - fHistoList->Layout() ; - return (kTRUE) ; +{ + // + // looks in the container of the AdcSpectra and reads in the + // Histogramms in there. + // + // In the class MHistosAdc are in fact two lists. One for the high and + // one for the low gain. Here we will use only the high gain list!!! + // With some special options (settings in the gui) we will also be able + // to plot the low gain + // + + const Int_t nhi = fHists->GetHiEntries(); + for ( Int_t i=0 ; i < nhi; i++ ) { + fHistoList->AddEntry(fHists->GetHistHi(i)->GetName(), i+1) ; + } + + fHistoList->MapSubwindows() ; + fHistoList->Layout() ; + return kTRUE ; } @@ -257,317 +252,258 @@ Bool_t MGDisplayAdc::ProcessMessage(Long_t msg, Long_t parm1, Long_t parm2) { - - // Process events generated by the buttons in the frame. - // - Int_t buttons = 4, retval = 0 ; - //Char_t wort[100] ; - //Char_t extens[5] ; - //Char_t command[110] ; - - //TGFileItem *item ; // to process items in the file view container - //void *np = NULL ; // null pointer - - switch (GET_MSG(msg)) - { - case kC_COMMAND: - switch (GET_SUBMSG(msg)) - { - case kCM_BUTTON: - - switch (parm1) - { + // + // Process events generated by the buttons in the frame. + // + Int_t buttons = 4, retval = 0 ; + //Char_t wort[100] ; + //Char_t extens[5] ; + //Char_t command[110] ; + + //TGFileItem *item ; // to process items in the file view container + //void *np = NULL ; // null pointer + + switch (GET_MSG(msg)) + { + case kC_COMMAND: + switch (GET_SUBMSG(msg)) + { + case kCM_BUTTON: + + switch (parm1) + { + case M_BUTTON_SAVE: + new TGMsgBox(fClient->GetRoot(), this, + "WARNING!", + "Not implemented yet.", + kMBIconExclamation, buttons, &retval); + break ; + + case M_BUTTON_PRINT: + break; + + case M_BUTTON_RESET: + new TGMsgBox(fClient->GetRoot(), this, + "WARNING!", + "Not implemented yet.", + kMBIconExclamation, buttons, &retval); + break; + + case M_BUTTON_CLOSE: + CloseWindow() ; + break ; + + // The selection for "Next Histogram". + // There is also a link for the sicronisation with the slider + // + case M_BUTTON_PREV: + if (GetSelected()-1 != 0) + { + if (fHistoLock == kTRUE ) + { + fCanvas->cd(1); + SelectSelected(); + DrawSelectedHi() ; + fCanvas->cd(2); + DrawSelectedLo() ; + } + else + { + fCanv->cd(); + SelectSelected(); + DrawSelectedHi() ; + } + + SetSelectedTopEntry(); + fCanv->Modified() ; + fCanv->Update() ; + SetSelectedPos(); + } + if (fRadio[1]->GetState() != kButtonDown) + break; + + fRadio[0]->SetState(kButtonDown); + fRadio[1]->SetState(kButtonUp); + + break; + + //The same as above, but for next histogram + case M_BUTTON_NEXT: + if (GetSelected()-1 != 576) + { + if (fHistoLock == kTRUE ) + { + fCanvas->cd(1); + SelectSelected(); + DrawSelectedHi() ; + fCanvas->cd(2); + DrawSelectedLo() ; + } + else + { + fCanv->cd(); + SelectSelected(); + DrawSelectedHi() ; + + } + SetSelectedTopEntry(); + fCanv->Modified() ; + fCanv->Update() ; + SetSelectedPos(); + + } + if (fRadio[1]->GetState() != kButtonDown) + break; + + fRadio[0]->SetState(kButtonDown); + fRadio[1]->SetState(kButtonUp); + + break; + + default: + break ; + } + break; + + case kCM_RADIOBUTTON: + + switch(parm1) + { + case M_RADIO_HIGH: + fRadio[1]->SetState(kButtonUp); + fRadio[2]->SetState(kButtonUp); + fHistoLock = kFALSE; + fHistoType=1; + fCanv->cd(); + SelectSelected(); + DrawSelectedHi() ; + SetSelectedTopEntry(); + fCanv->Modified() ; + fCanv->Update() ; + SetSelectedPos(); + break; - case M_BUTTON_SAVE: - new TGMsgBox(fClient->GetRoot(), this, - "WARNING!", - "Not implemented yet.", - kMBIconExclamation, buttons, &retval); - - break ; - - case M_BUTTON_PRINT: - break; - - case M_BUTTON_RESET: - new TGMsgBox(fClient->GetRoot(), this, - "WARNING!", - "Not implemented yet.", - kMBIconExclamation, buttons, &retval); - - break; - - - case M_BUTTON_CLOSE: - CloseWindow() ; - break ; - - // The selection for "Next Histogram". - // There is also a link for the sicronisation with the slider - // - case M_BUTTON_PREV: - - if (!( fHistoList->GetSelected()-1 ) == 0) - { - if (fHistoLock == kTRUE ) - { - fCanvas->cd(1); - fHistoList->Select(fHistoList->GetSelected()-1, kTRUE); - fHists->GetHighList()->At( fHistoList->GetSelected()-1)->Draw() ; - fCanvas->cd(2); - fHists->GetLowList()->At( fHistoList->GetSelected()-1)->Draw() ; - } - else - { - fCanv->cd(); - fHistoList->Select(fHistoList->GetSelected()-1, kTRUE); - fHists->GetHighList()->At( fHistoList->GetSelected()-1)->Draw() ; - } - - fHistoList->SetTopEntry(fHistoList->GetSelected()); - fCanv->Modified() ; - fCanv->Update() ; - fVslider1->SetPosition( fHistoList->GetSelected()-1); - } - if ((fRadio[1]->GetState()) == kButtonDown) - { - fRadio[0]->SetState(kButtonDown); - fRadio[1]->SetState(kButtonUp); - } - - - break; - - //The same as above, but for next histogram - - case M_BUTTON_NEXT: - - if (!((fHistoList->GetSelected()-1)==576)) - - { - if (fHistoLock == kTRUE ) - { - fCanvas->cd(1); - fHistoList->Select(fHistoList->GetSelected()+1, kTRUE); - fHists->GetHighList()->At( fHistoList->GetSelected()-1)->Draw() ; - fCanvas->cd(2); - fHists->GetLowList()->At( fHistoList->GetSelected()-1)->Draw() ; - } - else - { - fCanv->cd(); - fHistoList->Select(fHistoList->GetSelected()+1, kTRUE); - fHists->GetHighList()->At( fHistoList->GetSelected()-1)->Draw() ; - - } - fHistoList->SetTopEntry(fHistoList->GetSelected()); - fCanv->Modified() ; - fCanv->Update() ; - fVslider1->SetPosition( fHistoList->GetSelected()-1); - - } - if ((fRadio[1]->GetState()) == kButtonDown) - { - fRadio[0]->SetState(kButtonDown); - fRadio[1]->SetState(kButtonUp); - } - break; - default: - break ; - } - - case kCM_MENU: - switch (parm1) - { - } - break ; - - default: - break ; + case M_RADIO_LOW: + fRadio[0]->SetState(kButtonUp); + fRadio[2]->SetState(kButtonUp); + fCanv->cd(); + fHistoLock = kFALSE; + fHistoType = 2; + + SelectSelected(); + DrawSelectedLo() ; + SetSelectedTopEntry(); + + fCanv->Modified() ; + fCanv->Update() ; + SetSelectedPos(); + break; + + case M_RADIO_LH: + fRadio[0]->SetState(kButtonUp); + fRadio[1]->SetState(kButtonUp); + + if (fHistoLock == kFALSE) + { + fCanvas = fECanv->GetCanvas(); + fCanvas->Divide(1,2, 0, 0 ,0); + + fCanv->Modified() ; + fCanv->Update() ; + fHistoLock = kTRUE; + fHistoType = 3; + } + + fCanvas->cd(1); + + SelectSelected(); + DrawSelectedHi() ; + SetSelectedTopEntry(); + + fCanvas->cd(2); + SelectSelected(); + DrawSelectedLo() ; + SetSelectedTopEntry(); + + fCanv->Modified() ; + fCanv->Update(); + + default: + break; + } + break; + } - - - case kCM_RADIOBUTTON: - - switch(parm1) - { - case M_RADIO_HIGH: - fRadio[1]->SetState(kButtonUp); - fRadio[2]->SetState(kButtonUp); - fHistoLock = kFALSE; - fHistoType=1; - fCanv->cd(); - fHistoList->Select(fHistoList->GetSelected(), kTRUE); - fHists->GetHighList()->At( fHistoList->GetSelected()-1)->Draw() ; - fHistoList->SetTopEntry(fHistoList->GetSelected()); - fCanv->Modified() ; - fCanv->Update() ; - fVslider1->SetPosition( fHistoList->GetSelected()-1); - - - break; - - case M_RADIO_LOW: - fRadio[0]->SetState(kButtonUp); - fRadio[2]->SetState(kButtonUp); - fCanv->cd(); - fHistoLock = kFALSE; - fHistoType = 2; - - fHistoList->Select(fHistoList->GetSelected(), kTRUE); - fHists->GetLowList()->At( fHistoList->GetSelected()-1)->Draw() ; - fHistoList->SetTopEntry(fHistoList->GetSelected()); - - fCanv->Modified() ; - fCanv->Update() ; - fVslider1->SetPosition( fHistoList->GetSelected()-1); - - break; - case M_RADIO_LH: - fRadio[0]->SetState(kButtonUp); - fRadio[1]->SetState(kButtonUp); - - if (fHistoLock == kFALSE) - { - fCanvas = fECanv->GetCanvas(); - fCanvas->Divide(1,2, 0, 0 ,0); - - fCanv->Modified() ; - fCanv->Update() ; - fHistoLock = kTRUE; - fHistoType = 3; - - } - - fCanvas->cd(1); - - fHistoList->Select(fHistoList->GetSelected(), kTRUE); - fHists->GetHighList()->At( fHistoList->GetSelected()-1)->Draw() ; - fHistoList->SetTopEntry(fHistoList->GetSelected()); - - - - - fCanvas->cd(2); - fHistoList->Select(fHistoList->GetSelected(), kTRUE); - fHists->GetLowList()->At( fHistoList->GetSelected()-1)->Draw() ; - fHistoList->SetTopEntry(fHistoList->GetSelected()); - - - - fCanv->Modified() ; - fCanv->Update(); - - default: - break; - } - break; - - - } - - case kCM_LISTBOX: - switch (GET_SUBMSG(msg)) - { - case M_LIST_HISTO: - - if (fHistoLock == kTRUE ) - { - fCanvas->cd(1); - fHists->GetHighList()->At( fHistoList->GetSelected()-1)->Draw() ; - fCanvas->cd(2); - fHists->GetLowList()->At( fHistoList->GetSelected()-1)->Draw() ; - - } - else - { - - fCanv->cd() ; - - fHists->GetHighList()->At( fHistoList->GetSelected()-1)->Draw() ; - - } - fCanv->Modified() ; - fCanv->Update() ; - fVslider1->SetPosition( fHistoList->GetSelected()-1); - - - - default: - break ; - } - - - case kC_CONTAINER: - switch (GET_SUBMSG(msg)) - { - - case kCT_ITEMDBLCLICK: - - break; - - default: - break ; - } - - - - default: - break; - - case kC_VSLIDER: - switch(GET_SUBMSG(msg)) - { - case kSL_POS: - { - switch(parm1) - { - case M_VSId1: - - // Check for the slider movement and sicronise with TGListBox - if ((parm2 >= 0) && (parm2) <= 576) - { - - if (fHistoLock==kTRUE) - { - fCanvas->cd(1) ; - fHists->GetHighList()->At(parm2)->Draw() ; - fHistoList->Select(parm2+1, kTRUE); - - fCanvas->cd(2) ; - fHists->GetLowList()->At(parm2)->Draw() ; - fHistoList->Select(parm2+1, kTRUE); - fHistoList->SetTopEntry(fHistoList->GetSelected()); - - } - - else - { - fCanv->cd() ; - fHists->GetHighList()->At(parm2)->Draw() ; - fHistoList->Select(parm2+1, kTRUE); - - fHistoList->SetTopEntry(fHistoList->GetSelected()); - - } - fCanv->Modified() ; - fCanv->Update() ; - - if ((fRadio[1]->GetState()) == kButtonDown) - { - fRadio[0]->SetState(kButtonDown); - fRadio[1]->SetState(kButtonUp); - } - - - } - break; - } - break; - } - break; - } - break; - - } - return kTRUE; -} + case kCM_LISTBOX: + if (GET_SUBMSG(msg) != M_LIST_HISTO) + break; + + if (fHistoLock == kTRUE ) + { + fCanvas->cd(1); + DrawSelectedHi() ; + fCanvas->cd(2); + DrawSelectedLo() ; + } + else + { + fCanv->cd() ; + DrawSelectedHi() ; + } + fCanv->Modified() ; + fCanv->Update() ; + SetSelectedPos(); + break ; + +/* + case kC_CONTAINER: + switch (GET_SUBMSG(msg)) + { + + case kCT_ITEMDBLCLICK: + break; + + default: + break ; + } +*/ + + case kC_VSLIDER: + if (GET_SUBMSG(msg)!=kSL_POS || parm1!=M_VSId1) + break; + + // Check for the slider movement and sicronise with TGListBox + if (parm2<0 || parm2>576) + break; + + if (fHistoLock==kTRUE) + { + fCanvas->cd(1) ; + DrawHi(parm2) ; + fHistoList->Select(parm2+1, kTRUE); + + fCanvas->cd(2) ; + DrawLo(parm2) ; + } + else + { + fCanv->cd() ; + DrawHi(parm2) ; + } + + fHistoList->Select(parm2+1, kTRUE); + SetSelectedTopEntry(); + + fCanv->Modified() ; + fCanv->Update() ; + + if (fRadio[1]->GetState() != kButtonDown) + break; + + fRadio[0]->SetState(kButtonDown); + fRadio[1]->SetState(kButtonUp); + + break; + + } + return kTRUE; +} Index: trunk/MagicSoft/Mars/mdatacheck/MGDisplayAdc.h =================================================================== --- trunk/MagicSoft/Mars/mdatacheck/MGDisplayAdc.h (revision 664) +++ trunk/MagicSoft/Mars/mdatacheck/MGDisplayAdc.h (revision 665) @@ -3,13 +3,20 @@ #ifndef ROOT_TFrame -#include // TGTransientFrame +#include // TGTransientFrame +#endif +#ifndef ROOT_TGListBox +#include // TGListBox +#endif +#ifndef ROOT_TGSlider +#include // TGVSlider #endif -class MHistosAdc; -class TGListBox; +#ifndef MHISTOSADC_H +#include "MHistosAdc.h" +#endif + class TGTextButton; class TRootEmbeddedCanvas; class TCanvas; -class TGVSlider; class TGRadioButton; @@ -40,6 +47,12 @@ TGVSlider *fVslider1; - - + void DrawHi(Int_t i) { fHists->DrawHi(i); } + void DrawLo(Int_t i) { fHists->DrawLo(i); } + void DrawSelectedHi() { DrawHi( GetSelected()-1) ; } + void DrawSelectedLo() { DrawLo( GetSelected()-1) ; } + Int_t GetSelected() { return fHistoList->GetSelected(); } + void SelectSelected() { fHistoList->Select(GetSelected()-1, kTRUE); } + void SetSelectedTopEntry() { fHistoList->SetTopEntry(GetSelected()); } + void SetSelectedPos() { fVslider1->SetPosition( GetSelected()-1); } public: Index: trunk/MagicSoft/Mars/mdatacheck/MHistosAdc.cc =================================================================== --- trunk/MagicSoft/Mars/mdatacheck/MHistosAdc.cc (revision 664) +++ trunk/MagicSoft/Mars/mdatacheck/MHistosAdc.cc (revision 665) @@ -23,7 +23,4 @@ // - fHistHigh = new TObjArray(577); - fHistLow = new TObjArray(577); - // // set the name and title of this object @@ -38,8 +35,9 @@ // connect all the histogram with the container fHist // + fHistHi = new TObjArray(577); + fHistLo = new TObjArray(577); Char_t tmp1[40]; Char_t tmp2[40]; - TH1F *h1; for ( Int_t i = 0 ; i < 577 ; i++) @@ -48,14 +46,10 @@ sprintf ( tmp2, "high gain Pixel %d", i ) ; - h1 = new TH1F ( tmp1, tmp2, 256, 0., 255. ) ; - - fHistHigh->Add( h1 ) ; + fHistHi->Add( new TH1F ( tmp1, tmp2, 256, 0., 255. ) ) ; sprintf ( tmp1, "low %d", i ) ; sprintf ( tmp2, "low gain Pixel %d", i ) ; - h1 = new TH1F ( tmp1, tmp2, 256, 0., 255. ) ; - - fHistLow->Add( h1 ) ; + fHistLo->Add( new TH1F ( tmp1, tmp2, 256, 0., 255. ) ) ; } @@ -67,6 +61,6 @@ // default destructor // - delete fHistHigh ; - delete fHistLow ; + delete fHistHi ; + delete fHistLo ; } @@ -75,20 +69,20 @@ for ( Int_t i = 0 ; i < 576 ; i++) { - fHistHigh[i].Print() ; + fHistHi[i].Print() ; } } -void MHistosAdc::FillAdcHistHigh ( Int_t iPix, Byte_t data) +void MHistosAdc::FillAdcHistHi ( Int_t iPix, Byte_t data) { // - ((TH1F*) (fHistHigh->At(iPix)))->Fill( (Float_t) data ) ; + GetHistHi(iPix)->Fill( (Float_t) data ) ; } -void MHistosAdc::FillAdcHistLow ( Int_t iPix, Byte_t data) +void MHistosAdc::FillAdcHistLo ( Int_t iPix, Byte_t data) { // - ((TH1F*) (fHistLow->At(iPix)))->Fill( (Float_t) data ) ; + GetHistLo(iPix)->Fill( (Float_t) data ) ; } @@ -99,4 +93,9 @@ // + // + // FIXME: Don't open a file and write to this file! + // just Fill the current container (or the two histograms + // to an open file. The user must choose a file before. + // TFile out( name, "recreate") ; @@ -105,6 +104,6 @@ // - fHistLow->Write() ; - fHistHigh->Write() ; + fHistLo->Write() ; + fHistHi->Write() ; } Index: trunk/MagicSoft/Mars/mdatacheck/MHistosAdc.h =================================================================== --- trunk/MagicSoft/Mars/mdatacheck/MHistosAdc.h (revision 664) +++ trunk/MagicSoft/Mars/mdatacheck/MHistosAdc.h (revision 665) @@ -6,4 +6,7 @@ #endif +#ifndef ROOT_TH1 +#include +#endif #ifndef ROOT_TObjArray #include @@ -17,6 +20,6 @@ { private: - TObjArray *fHistHigh; // List of High gain Histograms - TObjArray *fHistLow; // List of Low gain Histograms + TObjArray *fHistHi; // List of High gain Histograms + TObjArray *fHistLo; // List of Low gain Histograms public: @@ -24,30 +27,36 @@ ~MHistosAdc(); - void FillAdcHistHigh(Int_t iPix, Byte_t data); - void FillAdcHistLow (Int_t iPix, Byte_t data); + void FillAdcHistHi (Int_t iPix, Byte_t data); + void FillAdcHistLo (Int_t iPix, Byte_t data); void SaveHist(char *name); - void Print(Option_t * t = NULL); + void Print(Option_t *t = NULL); + TH1F *GetHistHi(Int_t i) { return (TH1F*)(fHistHi->At(i)); } + TH1F *GetHistLo(Int_t i) { return (TH1F*)(fHistLo->At(i)); } - TObjArray* GetHighList() + void DrawHi(Int_t i) { GetHistHi(i)->Draw(); } + void DrawLo(Int_t i) { GetHistHi(i)->Draw(); } + +/* + TObjArray* GetHiList() { - return ( fHistHigh ) ; + return fHistHi ; } - TObjArray* GetLowList() + TObjArray* GetLoList() { - return ( fHistLow ) ; + return fHistLo ; } - - Int_t GetHighEntries() +*/ + Int_t GetHiEntries() { - return (fHistHigh->GetEntries() ) ; + return fHistHi->GetEntries() ; } - Int_t GetLowEntries() + Int_t GetLoEntries() { - return (fHistLow->GetEntries() ) ; + return fHistLo->GetEntries() ; } Index: trunk/MagicSoft/Mars/mdatacheck/Makefile =================================================================== --- trunk/MagicSoft/Mars/mdatacheck/Makefile (revision 664) +++ trunk/MagicSoft/Mars/mdatacheck/Makefile (revision 665) @@ -6,20 +6,15 @@ # ################################################################## -# @maintitle - -# @code - -# -# please change all system depend values in the -# config.mk.${OSTYPE} file -# -# include ../Makefile.conf.$(OSTYPE) include ../Makefile.conf.general -# @endcode +# +# Handling name of the Root Dictionary Files +# +CINT = DataCheck -# @code - +# +# Library name to creatre +# LIB = mdatacheck.a @@ -27,35 +22,16 @@ # connect the include files defined in the config.mk file # -INCLUDES = -I. -I../ -I../mbase -I../mraw - -# -# ----->>> root libraries -# - -ROOTLIBS = `root-config --libs` -ROOTGLIBS = `root-config --glibs` -ROOTCFLAGS = `root-config --cflags` - -# -# compiler flags -# - -CXXFLAGS = $(ROOTCFLAGS) $(INCLUDES) $(OPTIM) $(DEBUG) -CFLAGS = $(CXXFLAGS) -FFLAGS = $(CXXFLAGS) +INCLUDES = -I. -I../mbase -I../mraw #------------------------------------------------------------------------------ -#.SILENT: - .SUFFIXES: .c .cc .cxx .h .hxx .o - -SRCFILES = MViewAdcSpectra.cc \ +SRCFILES = MDumpEvtHeader.cc \ MFillAdcSpect.cc \ - MDumpEvtHeader.cc \ + MGDisplayAdc.cc \ + MHistosAdc.cc \ MShowSpect.cc \ - MHistosAdc.cc \ - MGDisplayAdc.cc + MViewAdcSpectra.cc SRCS = $(SRCFILES) @@ -67,60 +43,9 @@ all: $(LIB) -depend: - @makedepend $(SRCS) $(INCLUDES) $(ROOTCFLAGS) \ - -f../Makefile.depend 2> kk.kk ; cat kk.kk +include ../Makefile.rules -$(LIB): $(OBJS) DataCheckCint.o - @echo " - Building Library $(LIB) ... " - $(AR) $(LIB) *.o +clean: rmlib rmcint rmobjs rmcore rmbin -DataCheckCint.cc: $(HEADERS) - @echo - @echo " - Generating dictionary DataCheckCint.cc ..." - - $(ROOTSYS)/bin/rootcint -f DataCheckCint.cc \ - -c $(INCLUDES) $(HEADERS) DataCheckIncl.h DataCheckLinkDef.h - -.cxx.o: - @echo " - Compiling " $< - $(CXX) $(CXXFLAGS) -c $< -o $@ - -.cc.o: - @echo " - Compiling " $< - $(CXX) $(CXXFLAGS) -c $< -o $@ - -.c.o: - @echo " - Compiling " $< - $(CC) $(CFLAGS) -c $< -o $@ - -# -# The cleaning facility -# - -rmlib: - @echo "Removing libraries..." - @rm -f lib*.a - -rmcint: - @echo "Removing cint-stuff..." - @rm -f DataCheckCint.* - -rmobjs: - @echo "Removing object files..." - @rm -f *.o - -rmbin: - @echo "Removing binary files..." - @rm -f core - - -clean: rmlib rmcint rmobjs rmbin - -mrproper: clean - @echo "Removing *~ kk.kk html/..." - @rm -f *~ kk.kk - -cflags: - @echo $(INCLUDES) $(CXXFLAGS) +mrproper: clean rmbak # @endcode Index: trunk/MagicSoft/Mars/meventdisp/Makefile =================================================================== --- trunk/MagicSoft/Mars/meventdisp/Makefile (revision 664) +++ trunk/MagicSoft/Mars/meventdisp/Makefile (revision 665) @@ -1,3 +1,3 @@ -################################################################# +################################################################## # # makefile @@ -6,20 +6,15 @@ # ################################################################## -# @maintitle - -# @code - -# -# please change all system depend values in the -# config.mk.${OSTYPE} file -# -# include ../Makefile.conf.$(OSTYPE) include ../Makefile.conf.general -# @endcode +# +# Handling name of the Root Dictionary Files +# +CINT = EvtDisp -# @code - +# +# Library name to creatre +# LIB = meventdisp.a @@ -27,31 +22,11 @@ # connect the include files defined in the config.mk file # -INCLUDES = -I. -I../ -I../mbase -I../mraw - -# -# ----->>> root libraries -# - -ROOTLIBS = `root-config --libs` -ROOTGLIBS = `root-config --glibs` -ROOTCFLAGS = `root-config --cflags` - -# -# compiler flags -# - -CXXFLAGS = $(ROOTCFLAGS) $(INCLUDES) $(OPTIM) $(DEBUG) -CFLAGS = $(CXXFLAGS) -FFLAGS = $(CXXFLAGS) +INCLUDES = -I. -I../mbase -I../mraw #------------------------------------------------------------------------------ -#.SILENT: - .SUFFIXES: .c .cc .cxx .h .hxx .o - SRCFILES = MGFadcDisp.cc - SRCS = $(SRCFILES) @@ -63,60 +38,9 @@ all: $(LIB) -depend: - @makedepend $(SRCS) $(INCLUDES) $(ROOTCFLAGS) \ - -f../Makefile.depend 2> kk.kk ; cat kk.kk +include ../Makefile.rules -$(LIB): $(OBJS) EvtDispCint.o - @echo " - Building Library $(LIB) ... " - $(AR) $(LIB) *.o +clean: rmlib rmcint rmobjs rmcore rmbin -EvtDispCint.cc: $(HEADERS) - @echo - @echo " - Generating dictionary EvtDispCint.cc ..." - - $(ROOTSYS)/bin/rootcint -f EvtDispCint.cc \ - -c $(INCLUDES) $(HEADERS) EvtDispIncl.h EvtDispLinkDef.h - -.cxx.o: - @echo " - Compiling " $< - $(CXX) $(CXXFLAGS) -c $< -o $@ - -.cc.o: - @echo " - Compiling " $< - $(CXX) $(CXXFLAGS) -c $< -o $@ - -.c.o: - @echo " - Compiling " $< - $(CC) $(CFLAGS) -c $< -o $@ - -# -# The cleaning facility -# - -rmlib: - @echo "Removing libraries..." - @rm -f lib*.a - -rmcint: - @echo "Removing cint-stuff..." - @rm -f EvtDispCint.* - -rmobjs: - @echo "Removing object files..." - @rm -f *.o - -rmbin: - @echo "Removing binary files..." - @rm -f core - - -clean: rmlib rmcint rmobjs rmbin - -mrproper: clean - @echo "Removing *~ kk.kk html/..." - @rm -f *~ kk.kk - -cflags: - @echo $(INCLUDES) $(CXXFLAGS) +mrproper: clean rmbak # @endcode Index: trunk/MagicSoft/Mars/mgui/MHexagon.h =================================================================== --- trunk/MagicSoft/Mars/mgui/MHexagon.h (revision 664) +++ trunk/MagicSoft/Mars/mgui/MHexagon.h (revision 665) @@ -11,13 +11,13 @@ #ifndef ROOT_TObject -#include "TObject.h" +#include #endif #ifndef ROOT_TAttLine -#include "TAttLine.h" +#include #endif #ifndef ROOT_TAttFill -#include "TAttFill.h" +#include #endif Index: trunk/MagicSoft/Mars/mgui/Makefile =================================================================== --- trunk/MagicSoft/Mars/mgui/Makefile (revision 664) +++ trunk/MagicSoft/Mars/mgui/Makefile (revision 665) @@ -6,20 +6,15 @@ # ################################################################## -# @maintitle - -# @code - -# -# please change all system depend values in the -# config.mk.${OSTYPE} file -# -# include ../Makefile.conf.$(OSTYPE) include ../Makefile.conf.general -# @endcode +# +# Handling name of the Root Dictionary Files +# +CINT = Gui -# @code - +# +# Library name to creatre +# LIB = mgui.a @@ -27,40 +22,20 @@ # connect the include files defined in the config.mk file # -INCLUDES = -I. -I../mbase -I../mraw -I../mdatacheck -I../meventdisp -I../manalysis - -# -# ----->>> root libraries -# - -ROOTLIBS = `root-config --libs` -ROOTGLIBS = `root-config --glibs` -ROOTCFLAGS = `root-config --cflags` - -# -# compiler flags -# - -CXXFLAGS = $(ROOTCFLAGS) $(INCLUDES) $(OPTIM) $(DEBUG) -CFLAGS = $(CXXFLAGS) -FFLAGS = $(CXXFLAGS) +INCLUDES = -I. -I../mbase -I../manalysis -I../mdatacheck -I../meventdisp #------------------------------------------------------------------------------ -#.SILENT: - .SUFFIXES: .c .cc .cxx .h .hxx .o - -SRCFILES = MGMarsMain.cc \ +SRCFILES = MCamDisplay.cc \ + MCamNeighbor.cc \ + MGDataCheckMain.cc \ MGEventDispMain.cc \ - MGDataCheckMain.cc \ + MGMarsMain.cc \ MGMonteCarloMain.cc \ - MGPrototyp.cc \ - MHexagon.cc \ + MGPrototyp.cc \ MGeomCam.cc \ MGeomPix.cc \ - MCamNeighbor.cc \ - MCamDisplay.cc - + MHexagon.cc SRCS = $(SRCFILES) @@ -72,60 +47,9 @@ all: $(LIB) -depend: - @makedepend $(SRCS) $(INCLUDES) $(ROOTCFLAGS) \ - -f../Makefile.depend 2> kk.kk ; cat kk.kk +include ../Makefile.rules -$(LIB): $(OBJS) GuiCint.o - @echo " - Building Library $(LIB) ... " - $(AR) $(LIB) *.o +clean: rmlib rmcint rmobjs rmcore rmbin -GuiCint.cc: $(HEADERS) - @echo - @echo " - Generating dictionary GuiCint.cc ..." - - $(ROOTSYS)/bin/rootcint -f GuiCint.cc \ - -c $(INCLUDES) $(HEADERS) GuiIncl.h GuiLinkDef.h - -.cxx.o: - @echo " - Compiling " $< - $(CXX) $(CXXFLAGS) -c $< -o $@ - -.cc.o: - @echo " - Compiling " $< - $(CXX) $(CXXFLAGS) -c $< -o $@ - -.c.o: - @echo " - Compiling " $< - $(CC) $(CFLAGS) -c $< -o $@ - -# -# The cleaning facility -# - -rmlib: - @echo "Removing libraries..." - @rm -f lib*.a - -rmcint: - @echo "Removing cint-stuff..." - @rm -f GuiCint.* - -rmobjs: - @echo "Removing object files..." - @rm -f *.o - -rmbin: - @echo "Removing binary files..." - @rm -f core - - -clean: rmlib rmcint rmobjs rmbin - -mrproper: clean - @echo "Removing *~ kk.kk html/..." - @rm -f *~ kk.kk - -cflags: - @echo $(INCLUDES) $(CXXFLAGS) +mrproper: clean rmbak # @endcode Index: trunk/MagicSoft/Mars/mraw/MRawFileRead.cc =================================================================== --- trunk/MagicSoft/Mars/mraw/MRawFileRead.cc (revision 664) +++ trunk/MagicSoft/Mars/mraw/MRawFileRead.cc (revision 665) @@ -24,6 +24,6 @@ ClassImp(MRawFileRead) -/* - ----------- please don't delete ------------ + +// ----------- please don't delete ------------ #define kBUFSZ 1024 @@ -41,5 +41,5 @@ int underflow() { - int sz=fread(fBuffer, 1, kBUFSZ, fd); + int sz=fread(fBuffer, kBUFSZ, 1, fd); setg(fBuffer, fBuffer, fBuffer+kBUFSZ); @@ -53,5 +53,5 @@ } }; -*/ + MRawFileRead::MRawFileRead(const char *fname, const char *name, const char *title) @@ -63,5 +63,5 @@ // open the input stream // - fIn = new ifstream(fname); + fIn = new bifstream(fname); if (!(*fIn)) Index: trunk/MagicSoft/Mars/mraw/MRawFileRead.h =================================================================== --- trunk/MagicSoft/Mars/mraw/MRawFileRead.h (revision 664) +++ trunk/MagicSoft/Mars/mraw/MRawFileRead.h (revision 665) @@ -6,5 +6,5 @@ #endif -class ifstream; +class bifstream; class MTime; @@ -24,5 +24,5 @@ MTime *fRawEvtTime; // raw evt time information container to fill from file - ifstream *fIn; //! buffered input stream (file to read from) + bifstream *fIn; //! buffered input stream (file to read from) public: