From: Samir Amar-Youcef Date: Mon, 23 Mar 2015 13:44:07 +0000 (+0100) Subject: small changes X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=17de739157d4ec82d91683f2e10244686fa528d6;p=mvd_soft.git small changes --- diff --git a/normalmode/unpacker/unpack.C b/normalmode/unpacker/unpack.C index 5ceabbe..9539df6 100755 --- a/normalmode/unpacker/unpack.C +++ b/normalmode/unpacker/unpack.C @@ -1,6 +1,3 @@ -#ifndef UNPACK_H -#define UNPACK_H - #include "TMath.h" #include "unpack.h" // #include "help.h" @@ -1135,5 +1132,4 @@ Int_t unpacker::print_progress(Float_t ProgressInPercent) { return nCharacter; } -//#################################################################### -#endif \ No newline at end of file +//#################################################################### \ No newline at end of file diff --git a/normalmode/unpacker/unpack.h b/normalmode/unpacker/unpack.h index d23db67..44bd785 100755 --- a/normalmode/unpacker/unpack.h +++ b/normalmode/unpacker/unpack.h @@ -1,3 +1,5 @@ +#ifndef UNPACK_H +#define UNPACK_H //----------------- #ifndef CONFIG_H #define CONFIG_H @@ -76,4 +78,5 @@ public: unpacker(); // ready ~unpacker(); // ready void scanFrames(UInt_t Start, UInt_t Entries); // ready -}; \ No newline at end of file +}; +#endif \ No newline at end of file diff --git a/s-curves/analysis_gui/GUI/output.root b/s-curves/analysis_gui/GUI/output.root deleted file mode 100644 index 6082f4f..0000000 Binary files a/s-curves/analysis_gui/GUI/output.root and /dev/null differ diff --git a/s-curves/cpp_sam/Makefile b/s-curves/cpp_sam/Makefile index a31dd25..ea1c5d2 100644 --- a/s-curves/cpp_sam/Makefile +++ b/s-curves/cpp_sam/Makefile @@ -2,7 +2,7 @@ CC=g++ CFLAGS=-c -g -Wall -std=c++11 `root-config --cflags` LDFLAGS=`root-config --glibs` CLDFLAGS = -std=c++11 `root-config --cflags --glibs` -lboost_system -lboost_filesystem -SOURCES= main.C unpacker.C unpacker.h help.h header.h +SOURCES= main.C unpacker.C unpacker.h help.h OBJECTS=$(subst .cc,.o,$(SOURCES)) EXECUTABLE=unpacker diff --git a/s-curves/cpp_sam/config.h b/s-curves/cpp_sam/config.h deleted file mode 100755 index 6990304..0000000 --- a/s-curves/cpp_sam/config.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef CONFIG_H -#define CONFIG_H - -#define SAVE 4 -#define ENDING "hld" -#define CONTENTIN 1048576 -#define BUFSIZE 32000 -#define MAXSENSORS 64 -#define MAXSTATES 1140 - -#endif diff --git a/s-curves/cpp_sam/header.h b/s-curves/cpp_sam/header.h deleted file mode 100755 index 3a13e83..0000000 --- a/s-curves/cpp_sam/header.h +++ /dev/null @@ -1,51 +0,0 @@ -#include -#include -#include -#include -#include "Riostream.h" -#include -#include "TString.h" -#include "TMath.h" -#include -#include -#include -#include -#include "TH1.h" -#include "TF1.h" -#include "TROOT.h" -#include -#include "TCanvas.h" -#include "TObject.h" -#include "TStyle.h" -#include "TEnv.h" -#include "TGraph.h" -#include "TGaxis.h" -#include "TStyle.h" -#include "TFrame.h" -#include "TVector.h" -#include "TVectorD.h" -#include "Foption.h" -#include "TRandom.h" -#include "TRandom3.h" -#include "TSpline.h" -#include "TPaveStats.h" -#include "TVirtualFitter.h" -#include "TVirtualPad.h" -//#include "TVirtualGraphPainter.h" -#include "TBrowser.h" -#include "TSystem.h" -#include "TPluginManager.h" -#include "TPad.h" -#include -#include -#include -#include "TControlBar.h" -#include -#include -#include -#include "TGraphErrors.h" -#include "TMinuit.h" -#include -#include -#include -using namespace std; \ No newline at end of file diff --git a/s-curves/cpp_sam/help.h b/s-curves/cpp_sam/help.h index ba033e1..bee0b0c 100755 --- a/s-curves/cpp_sam/help.h +++ b/s-curves/cpp_sam/help.h @@ -5,92 +5,7 @@ #define MAXSTATES 1140 #endif -#include -#include -#include -#include -#include -#include -#include -#include "TStopwatch.h" - -//#################################################################### - -// Int_t print_progress(Float_t ProgressInPercent) { -// -// Int_t nCharacter = printf("\r ["); -// Int_t iBlock; -// -// for( iBlock=0; iBlock -#include #include "unpacker.h" -#include "TROOT.h" +#include //#################################################################### int main(int argc, char** argv) { - gROOT->Reset(); +// gROOT->Reset(); TString Dir; TString File; diff --git a/s-curves/cpp_sam/unpacker.C b/s-curves/cpp_sam/unpacker.C index 3b93825..44f0dc6 100644 --- a/s-curves/cpp_sam/unpacker.C +++ b/s-curves/cpp_sam/unpacker.C @@ -1,16 +1,14 @@ -#ifndef UNPACKER_H -#define UNPACKER_H - #define CONTENTIN 1048576 // --> 1 MByte //----------------- #include "unpacker.h" -#include "header.h" - +#include "TMath.h" #include -// #include -// #include -// #include +#include +#include + + +using namespace std; //----------------- //#################################################################### @@ -564,5 +562,4 @@ Int_t unpacker::print_progress(Float_t ProgressInPercent) { return nCharacter; } -//#################################################################### -#endif \ No newline at end of file +//#################################################################### \ No newline at end of file diff --git a/s-curves/cpp_sam/unpacker.h b/s-curves/cpp_sam/unpacker.h index 4cc2429..e8664d2 100644 --- a/s-curves/cpp_sam/unpacker.h +++ b/s-curves/cpp_sam/unpacker.h @@ -1,23 +1,11 @@ -//----------------- -#ifndef CONFIG_H -#define CONFIG_H +#ifndef UNPACKER_H +#define UNPACKER_H -#define SAVE 4 -#define ENDING "hld" -#define CONTENTIN 1048576 // --> 1 MByte -#define BUFSIZE 32000 -#define MAXSENSORS 64 -#define MAXSTATES 1140 -#define MAXCLUSTERS 1140 -#endif -//----------------- - -// #include -#include #include #include #include #include "help.h" +#include class unpacker { @@ -85,4 +73,5 @@ public: void anaScurves (); void saveScurveData (); -}; \ No newline at end of file +}; +#endif \ No newline at end of file