small changes

diff --git a/normalmode/unpacker/unpack.C b/normalmode/unpacker/unpack.C
index 5ceabbe397c74b2e63c0379bc45c914594673557..9539df6f1758c71c454a1b2e43f4dda386f31cc1 100755 (executable)
--- 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 d23db67cdd1f87aba066d9913c3dc5a611621a68..44bd785aa4cfd6c1f0babc9ab97eb0a5d7acfa41 100755 (executable)
--- 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 (file)
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 a31dd254f3bc80a60011e6043c14ddbac1078b04..ea1c5d2428f5bb6e8084ab0d533b2769b705d4b5 100644 (file)
--- 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 (executable)
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 (executable)
index 3a13e83..0000000
--- a/s-curves/cpp_sam/header.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#include <stdlib.h>
-#include <TClass.h>
-#include <fstream>
-#include <iostream>
-#include "Riostream.h"
-#include <string>
-#include "TString.h"
-#include "TMath.h"
-#include <TFile.h>
-#include <TNtuple.h>
-#include <TH1F.h>
-#include <TH2F.h>
-#include "TH1.h"
-#include "TF1.h"
-#include "TROOT.h"
-#include <TApplication.h>
-#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 <TQObject.h>
-#include <TMultiGraph.h>
-#include <vector>
-#include "TControlBar.h"
-#include <string>
-#include <stdio.h>
-#include <stdlib.h>
-#include "TGraphErrors.h"
-#include "TMinuit.h"
-#include <iomanip>
-#include <sys/time.h>
-#include <TLegend.h>
-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 ba033e11d68439a79da27202009ceff77cb9c38c..bee0b0c04e532d7c7cf29bf865d390751e421422 100755 (executable)
--- a/s-curves/cpp_sam/help.h
+++ b/s-curves/cpp_sam/help.h
@@ -5,92 +5,7 @@
 #define MAXSTATES 1140
 #endif
 
-#include <iostream>
-#include <cstdlib>
-#include <unistd.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <unistd.h>
-#include "TStopwatch.h"
-
-//####################################################################
-
-// Int_t print_progress(Float_t ProgressInPercent) {
-//     
-//     Int_t nCharacter = printf("\r [");
-//     Int_t iBlock;
-//     
-//     for( iBlock=0; iBlock<ProgressInPercent/2; ++iBlock )
-//     {
-//             putchar( '=' );
-//             nCharacter++;
-//     }
-//     
-//     for( ; iBlock<100/2; ++iBlock )
-//     {
-//             putchar( ' ' );
-//             nCharacter++;
-//     }
-//     
-// //  Int_t sec       = TimeInSec%60;
-// //  Int_t min       = TimeInSec/60;
-// //  Int_t hours     = TimeInSec/3600;
-//     
-//     nCharacter += printf( "] %4.0f%%", ProgressInPercent);
-//     fflush( stdout );
-//     
-//     if((Int_t)ProgressInPercent==100) 
-//     {
-//             printf("\r");
-//             for(Int_t i=0; i<nCharacter; i++)
-//             {
-//                     putchar( ' ' );
-//             }
-//             printf("\r ... done! \n");
-//     }
-//     
-//     return nCharacter;
-// }
-
-//####################################################################
-
-// Int_t print_progress(Float_t ProgressInPercent, Int_t TimeInSec) {
-//     
-//     Int_t nCharacter = printf("\r [");
-//     Int_t iBlock;
-//     
-//     for( iBlock=0; iBlock<ProgressInPercent/2; ++iBlock )
-//     {
-//             putchar( '=' );
-//             nCharacter++;
-//     }
-//     
-//     for( ; iBlock<100/2; ++iBlock )
-//     {
-//             putchar( ' ' );
-//             nCharacter++;
-//     }
-//     
-//     Int_t sec       = TimeInSec%60;
-//     Int_t min       = TimeInSec/60;
-//     Int_t hours     = TimeInSec/3600;
-//     
-//     nCharacter += printf( "] %6.2f%% \t %3i:%02i:%02i   ", ProgressInPercent, hours, min, sec );
-//     fflush( stdout );
-//     
-//     if(ProgressInPercent==100) 
-//     {
-//             printf("\r");
-//             for(Int_t i=0; i<nCharacter; i++)
-//             {
-//                     putchar( ' ' );
-//             }
-//             printf("\r ...done! \t ( %i:%02i:%02i ) \n", hours, min, sec );
-//     }
-//     
-//     return nCharacter;
-// }
+#include "TROOT.h"
 
 //####################################################################
 

diff --git a/s-curves/cpp_sam/main.C b/s-curves/cpp_sam/main.C
index 8fba9894eee669211067542b8fd14657751ef58c..97ea87139b51960a2f475aa285ccc229028fc3dd 100644 (file)
--- a/s-curves/cpp_sam/main.C
+++ b/s-curves/cpp_sam/main.C
@@ -1,15 +1,12 @@
-// #include "TApplication.h"
-#include <sstream>
-#include <TString.h>
 #include "unpacker.h"
-#include "TROOT.h"
+#include <TString.h>
 
 //####################################################################
 
 
 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 3b938253bd924e0777898850c62ab5aa2a679317..44f0dc62f3280d6582693f9ff731cd7e7f0e536d 100644 (file)
--- 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 <dirent.h>
-// #include <help.h>
-// #include <time.h>
-// #include <sys/stat.h>
+#include <iostream>
+#include <iomanip>
+
+
+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 4cc242940d246602813fedb7ccdc20d58957d3ce..e8664d277a1d20e0771da8340cff19fb60ccf4af 100644 (file)
--- 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 <header.h>
-#include <dirent.h>
 #include <TFile.h>
 #include <TTree.h>
 #include <vector>
 #include "help.h"
+#include <fstream>
 
 class unpacker {
        
@@ -85,4 +73,5 @@ public:
        void    anaScurves                      ();
        void    saveScurveData          ();
 
-};
\ No newline at end of file
+};
+#endif
\ No newline at end of file