Parealell Lines: PEDE-worthy

glukicov · Jul 3, 2017 · eb761c6 · eb761c6
1 parent 126502d
commit eb761c6
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 15 deletions.
diff --git a/mpIIDESY/AlignTracker_methods.cpp b/mpIIDESY/AlignTracker_methods.cpp
@@ -509,8 +509,8 @@ void Tracker::write_constraint_file(ofstream& constraint_file, ofstream& debug_c
         float one = 1.0;
 
         for (int i_module = 0; i_module < moduleN; i_module++){ 
+            if (i_module==0){
             //if (i_module==0 || i_module==moduleN-1){
-            if (i_module==0 || i_module==moduleN-1){
             	constraint_file << "Constraint 0.0" << endl;
                 	int labelt=i_module+1; // Millepede doesn't like 0 as a label...
                 	//Fixing module 0 and the last module

diff --git a/mpIIDESY/AlignTracker_methods.h b/mpIIDESY/AlignTracker_methods.h
@@ -82,7 +82,7 @@ class Tracker {
 	//initialising physics variables
  	// MF + inhomogeneity, E_loss, MS
 
-    float dispX[8] = {0.0, 0.05, 0.1, 0.0, 0.0, 0.0, 0.0, 0.0}; // manual misalignment [relative misalignment per module]
+    float dispX[8] = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}; // manual misalignment [relative misalignment per module]
     float overallMis; // the overall misalignment - calculated in the misalignment method  
 
  	static constexpr float resolution=0.015;  // 150um = 0.015 cm for hit smearing

diff --git a/mpIIDESY/PEDE_tests_seed.bash b/mpIIDESY/PEDE_tests_seed.bash
@@ -1,29 +1,29 @@
 #!/bin/bash
 clear 
 echo "AlignTracker for 5000 tracks with different seeds"
-#mv PEDE_Mis.txt PEDE_Mis.txt.BK
+mv PEDE_Mis.txt PEDE_Mis.txt.BK
 echo "Staring PEDE tests..."
 
 x=0
 #mv g_seed.txt g_seed.txt.BK
 #mv u_seed.txt u_seed.txt.BK
-while [ $x -le 1000 ]
+while [ $x -le 80 ]
 
 do
 	y=$(( ( RANDOM % 1000000 )  + 1 ))
 	python randomIntGenerator.py -g True -o gaussian_ran.txt -s $y -n 80000
 	echo $y >> g_seed.txt 
-	sleep 2
+	sleep 1.2
 	z=$(( ( RANDOM % 1000000 )  + 1 )) 
 	python randomIntGenerator.py -u True -o uniform_ran.txt -s $z -n 5000
 	echo $z >> u_seed.txt 
-	sleep 1
+	sleep 0.5
 	"./AlignTracker" d 5000
-	sleep 3
+	sleep 2.2
 	"./pede" Tracker_str.txt
-	sleep 3
+	sleep 1
 	python ConcatenatePEDE.py &
-	sleep 0.2
+	sleep 0.1
 	x=$(( $x + 1 ))
 done
 

diff --git a/mpIIDESY/TrackerLaunchSeed.py b/mpIIDESY/TrackerLaunchSeed.py
@@ -78,12 +78,26 @@
 h_dm4  = TH1F("h_dm4", "dM Module 4", 49, -6, 6)
 h_dm5  = TH1F("h_dm5", "dM Module 5", 49, -6, 6)
 
-h_er0  = TH1F("h_er0", "er Module 0", 19, -0.1, 0.1)
-h_er1  = TH1F("h_er1", "er Module 1", 19, 1.2, 1.4)
-h_er2  = TH1F("h_er2", "er Module 2", 19, 1.2, 1.4)
-h_er3  = TH1F("h_er3", "er Module 3", 19, -0.1, 0.1)
-h_er4  = TH1F("h_er4", "er Module 4", 1000, -1, 1)
-h_er5  = TH1F("h_er5", "er Module 5", 1000, -1, 1)
+h_er0  = TH1F("h_er0", "error Module 0", 19, -0.1, 0.1)
+h_er1  = TH1F("h_er1", "error Module 1", 19, 1.2, 1.8)
+h_er2  = TH1F("h_er2", "error Module 2", 19, 1.2, 1.8)
+h_er3  = TH1F("h_er3", "error Module 3", 19, 1.2, 1.8)
+h_er4  = TH1F("h_er4", "error Module 4", 1000, -1, 1)
+h_er5  = TH1F("h_er5", "error Module 5", 1000, -1, 1)
+
+h_dm0.GetXaxis().SetTitle("[um]");
+h_dm1.GetXaxis().SetTitle("[um]");
+h_dm2.GetXaxis().SetTitle("[um]");
+h_dm3.GetXaxis().SetTitle("[um]");
+h_dm4.GetXaxis().SetTitle("[um]");
+h_dm5.GetXaxis().SetTitle("[um]");
+
+h_er0.GetXaxis().SetTitle("[um]");
+h_er1.GetXaxis().SetTitle("[um]");
+h_er2.GetXaxis().SetTitle("[um]");
+h_er3.GetXaxis().SetTitle("[um]");
+h_er4.GetXaxis().SetTitle("[um]");
+h_er5.GetXaxis().SetTitle("[um]");
 
 
 for i_module in range(0, moduleN):