4.6 from nicolo

Carriers.h

@@ -32,7 +32,7 @@
 //#define CNMGAINLENGHT 2
 #define CNMDexp 1 //1 // needs to be 0!!! otherwise simulation does not work well
 // FBK
-#define FBKGAINDEPTH 0.6 
+#define FBKGAINDEPTH 0.62 
 #define FBKGAINLENGTH 1.2 
 //
 //#define FBKGAINDEPTH 1.0

Dict.cxx

@@ -403,8 +403,8 @@ namespace {
 0
     };
     static const char* includePaths[] = {
-"/usr/local/Cellar/root/6.12.04_1/include/root",
-"/Users/Home/weightfield2/",
+"/root61206/include",
+"/Users/nicolo/work/GruppoV_UFSD/Weightfield_evolution/weightfield4.6/",
 0
     };
     static const char* fwdDeclCode = R"DICTFWDDCLS(

Makefile

@@ -3,11 +3,11 @@
 #################################
 
 weightfield: WFGUI.h WFGUI.cxx Potentials.h Potentials.cxx Field.h Field.cxx Carriers.h Carriers.cxx
-	rootcling -f Dict.cxx -c WFGUI.h LinkDef.h 
+	rootcint -f Dict.cxx -c WFGUI.h LinkDef.h 
 	g++ -O3 -Wall -Wextra -o weightfield Weightfield.cxx WFGUI.cxx Potentials.cxx Field.cxx Carriers.cxx `root-config --cflags --glibs` Dict.cxx  
 all: WFGUI.h WFGUI.cxx Potentials.h Potentials.cxx Field.h Field.cxx Carriers.h Carriers.cxx
-	rootcling -f Dict.cxx -c WFGUI.h LinkDef.h 
+	rootcint -f Dict.cxx -c WFGUI.h LinkDef.h 
 	g++ -O3 -Wall -Wextra -o weightfield Weightfield.cxx WFGUI.cxx Potentials.cxx Field.cxx Carriers.cxx `root-config --cflags --glibs` Dict.cxx  
 debug: WFGUI.h WFGUI.cxx Potentials.h Potentials.cxx Field.h Field.cxx Carriers.h Carriers.cxx
-	rootcling -f Dict.cxx -c WFGUI.h LinkDef.h 
+	rootcint -f Dict.cxx -c WFGUI.h LinkDef.h 
 	g++ -g -O0 -Wall -Wextra -o weightfield Weightfield.cxx WFGUI.cxx Potentials.cxx Field.cxx Carriers.cxx `root-config --cflags --glibs` Dict.cxx 

Potentials.cxx

@@ -158,8 +158,8 @@ void Potentials::SetDoping(unsigned char s, unsigned char b) {
 //////////////////////////////////////////////////////////////////////
 void Potentials::SetPitchWidthXY(int dimy, int nstrip,double p, double w, double Stepx, double Stepy )
 {
-
-  //  cout << " SetPitch = " << dimy << " " << nstrip << " " << p << " " << w << " Stepx " << Stepx << " stepy " << Stepy << endl;
+  //  Stepy = 0.1;
+  //  cout << " In Potential SetPitch = " << dimy << " " << nstrip << " " << p << " " << w << " Stepx " << Stepx << " stepy " << Stepy << endl;
   ref=0;
   pitch=p; // here it's in micron
   width=w; // here it's in micron
@@ -212,6 +212,8 @@ void Potentials::SetPitchWidthXY(int dimy, int nstrip,double p, double w, double
 
 
   BinSizey = 1.*dimy/(1.*YMAX);
+  //  BinSizey = Stepy;
+
   BinSizex = 1.*count*pitch/(1.*XMAX);
 
  //here we change from micron to bins
@@ -224,7 +226,7 @@ void Potentials::SetPitchWidthXY(int dimy, int nstrip,double p, double w, double
   pitch=(int) (pitch/BinSizex); // here it's in # bin
   width= (int) (width/BinSizex); // here it's in # bin
 
-  //   cout << "Bin size x = " << GetBinSizex() << " micron " << endl;
+  cout << "Bin size y = " << GetBinSizey() << " micron " << endl;
   // cout << "Bin size y = " << GetBinSizey() << " micron " << endl;
   //  cout << "Number of bin: X = " << XMAX<< ", Y =  " << YMAX << endl;
 
@@ -256,7 +258,7 @@ void Potentials::SetPitchWidthXY(int dimy, int nstrip,double p, double w, double
     }
   }
 
-
+  //  cout << " In Potential end SetPitch = " << dimy << " " << nstrip << " " << p << " " << w << " Stepx " << Stepx << " stepy " << Stepy << endl;
 
 }
 //////////////////////////////////////////////////////////////////////

WFGUI.h

@@ -81,6 +81,7 @@ class WFGUI : public TGMainFrame {
 		bool UniformQFlag;
 		bool UserUniformQFlag;
 		bool ReadOutTopFlag;
+		int Eflag=0;
 		unsigned char stripdoping;
 		unsigned char  bulkdoping;
 
@@ -224,7 +225,8 @@ class WFGUI : public TGMainFrame {
 		TGHorizontalFrame *DJDetailsBottomFrame;
 
 		// SettingsFrame2 contains:
-		TGGroupFrame *ControlFrame;
+		//		TGGroupFrame *ControlFrame;
+		TGVerticalFrame *ControlFrame;
 		TGVerticalFrame *RightFrame;	
 
 		//ControlFrame contains 
@@ -544,11 +546,15 @@ class WFGUI : public TGMainFrame {
 	TGTextButton *DrawCutsUserEntry;
 	TGTextButton *DrawCutsUserEntry2;
 	TGTextButton *FileNameButton;
-  TGLabel *FileNameLabel;
+	TGLabel *FileNameLabel;
   // Added saving gui buttons
 	TGTextEntry *FileNameEntry;
-  TGTextEntry *SaveFileName;
-  TGTextButton *SaveButton;
+	TGTextEntry *SaveFileName;
+	TGTextButton *SaveButton;
+	TGTextButton *LoadButton;
+
+	TGTextEntry *SaveFileName1;
+	TGTextButton *SaveButton1;
 
 	//TGComboBox *SetAlpha;		//!!!! original particle selection
 	TGHorizontalFrame *fSliceExtentL;
@@ -659,7 +665,9 @@ class WFGUI : public TGMainFrame {
 		void CallCalculateCurrents();				// Method to calculate currents
 		//		static void* StartPotentialCalcTh(void*);
 		void CloseWindow();						// Method to close window
-    void SaveData(); // Method to save plots
+		void SaveData(); // Method to save plots
+		void LoadData(); // Method to save plots
+		void SaveGraph(); // Method to save graph
 		TH2F* Getwhist();						// Method which returns whist
 		TH2F* Getdhist();						// Method which returns dhist
 		TH2F* Getchist();						// Method which returns dhist