Merge pull request #17 from cerati/mk-build-improve

Mk build improve2
slava77 · Jan 12, 2016 · c5f8c4c · c5f8c4c
2 parents 3533a68 + 6543d70
commit c5f8c4c
Show file tree

Hide file tree

Showing 13 changed files with 83,742 additions and 85 deletions.
diff --git a/Simulation.cc b/Simulation.cc
@@ -339,10 +339,12 @@ void setupTrackFromTextFile(SVector3& pos, SVector3& mom, SMatrixSym66& covtrk,
   initTSs.reserve(Config::nTotHit);
 
   bool doSmearing = true;
-  std::ifstream infile("cmssw.simtracks.SingleMu10GeV.10k.eta06z5.txt");
-  // std::ifstream infile("cmssw.simtracks.SingleMu1GeV.1k.eta06z5.txt");
-  // std::ifstream infile("cmssw.simtracks.SingleMu1GeVNoMaterial.1k.eta06z5.txt");doSmearing = false;
-  // std::ifstream infile("cmssw.simtracks.SingleMu06GeV.1k.eta06z5.txt");
+  // std::ifstream infile("cmssw.simtracks.SingleMu1GeV.test.txt");doSmearing = false;
+  // std::ifstream infile("cmssw.simtracks.SingleMu10GeV.10k.new.txt");
+  std::ifstream infile("cmssw.simtracks.SingleMu1GeV.10k.new.txt");
+  // std::ifstream infile("cmssw.rectracks.SingleMu10GeV.10k.new.txt");
+  // std::ifstream infile("cmssw.rectracks.SingleMu1GeV.10k.new.txt");
+  // std::ifstream infile("cmssw.rectracks.SingleMu1GeV.test.txt");
   std::string line;
   int countTracks = -1;
   unsigned int countHits   = 0;
@@ -438,7 +440,39 @@ void setupTrackFromTextFile(SVector3& pos, SVector3& mom, SMatrixSym66& covtrk,
       if (countHits>=Config::nLayers) return;
 
     }
+
+    if (type=="recHit" && gotTrack) {
+
+      countHits++;
+
+      float hitX,hitY,hitZ;
+      float hitXX,hitXY,hitYY,hitYZ,hitZZ,hitZX;
+      float r,eta;
+      float radl,xi;
+      iss >> hitX >> hitY >> hitZ >> hitXX >> hitXY >> hitYY >> hitYZ >> hitZZ >> hitZX >> r >> eta >> radl >> xi;
+
+      SVector3 x1(hitX,hitY,hitZ);
+      SMatrixSym33 covXYZ = ROOT::Math::SMatrixIdentity();
+      covXYZ(0,0) = hitXX;
+      covXYZ(0,1) = hitXY;
+      covXYZ(1,0) = covXYZ(0,1);
+      covXYZ(1,1) = hitYY;
+      covXYZ(1,2) = hitYZ;
+      covXYZ(2,1) = covXYZ(1,2);
+      covXYZ(2,2) = hitZZ;
+      covXYZ(2,0) = hitZX;
+      covXYZ(0,2) = covXYZ(2,0);
 
+      MCHitInfo hitinfo(itrack, simLayer, layer_counts[simLayer]);
+      initialhitinfo[hitinfo.mcHitID_] = hitinfo;
+      hits.emplace_back(x1,covXYZ,hitinfo.mcHitID_);
+
+      ++layer_counts[simLayer];
+
+      if (countHits>=Config::nLayers) return;
+
+    }
+
     // process pair (a,b)
   }
 

diff --git a/benchmark-mic-fit.sh b/benchmark-mic-fit.sh
@@ -4,25 +4,23 @@ sed -i 's/constexpr int nTracks = 20000/constexpr int nTracks = 20000/g' Config.
 
 make clean
 make -j 8
-
 for nth in 1 3 7 21 42 63 84 105 126 147 168 189 210
 do
 echo nth=${nth}
-ssh mic0 ./mkFit-mic --fit-std-only --num-thr ${nth} >& log_mic_10x20k_FIT_NVU16_NTH${nth}.txt
+ssh mic0 ./mkFit-mic --fit-std-only --num-thr ${nth} >& log_mic_10x20k_FIT_NVU16int_NTH${nth}.txt
 done
 
-#sed -i 's/define MPT_SIZE 16/define MPT_SIZE XX/g' Config.h
-#for nvu in 1 2 4 8
-#do
-#echo nvu=${nvu}
-#sed -i "s/define MPT_SIZE XX/define MPT_SIZE ${nvu} \/\/tmp/g" Config.h
-#make clean
-#make -j 8
-#ssh mic0 ./mkFit-mic --fit-std-only --num-thr 1 >& log_mic_10x20k_FIT_NVU${nvu}_NTH1.txt
-#sed -i "s/define MPT_SIZE ${nvu} \/\/tmp/define MPT_SIZE XX/g" Config.h
-#done
-
-#sed -i "s/define MPT_SIZE XX/define MPT_SIZE 16/g" Config.h
+sed -i 's/# USE_INTRINSICS := -DMPT_SIZE=1/USE_INTRINSICS := -DMPT_SIZE=XX/g' Makefile.config
+for nvu in 1 2 4 8 16
+do
+sed -i "s/MPT_SIZE=XX/MPT_SIZE=${nvu}/g" Makefile.config
+make clean
+make -j 8
+echo nvu=${nvu}
+ssh mic0 ./mkFit-mic --fit-std-only --num-thr 1 >& log_mic_10x20k_FIT_NVU${nvu}_NTH1.txt
+sed -i "s/MPT_SIZE=${nvu}/MPT_SIZE=XX/g" Makefile.config
+done
+sed -i 's/USE_INTRINSICS := -DMPT_SIZE=XX/# USE_INTRINSICS := -DMPT_SIZE=1/g' Makefile.config
 
 sed -i 's/constexpr int nTracks = 20000/constexpr int nTracks = 20000/g' Config.h 
 

diff --git a/benchmark-mic.sh b/benchmark-mic.sh
@@ -8,25 +8,24 @@ make -j 8
 for nth in 1 3 7 21 #42 63 84 105 126 147 168 189 210
 do
 echo nth=${nth}
-ssh mic0 ./mkFit-mic --build-bh --num-thr ${nth} >& log_mic_10x20k_BH_NVU16_NTH${nth}.txt
-ssh mic0 ./mkFit-mic --build-ce --num-thr ${nth} >& log_mic_10x20k_CE_NVU16_NTH${nth}.txt
-ssh mic0 ./mkFit-mic --build-ce --num-thr ${nth} --cloner-single-thread >& log_mic_10x20k_CEST_NVU16_NTH${nth}.txt
+ssh mic0 ./mkFit-mic --build-bh --num-thr ${nth} >& log_mic_10x20k_BH_NVU16int_NTH${nth}.txt
+ssh mic0 ./mkFit-mic --build-ce --num-thr ${nth} >& log_mic_10x20k_CE_NVU16int_NTH${nth}.txt
+ssh mic0 ./mkFit-mic --build-ce --num-thr ${nth} --cloner-single-thread >& log_mic_10x20k_CEST_NVU16int_NTH${nth}.txt
 done
 
-#sed -i 's/define MPT_SIZE 16/define MPT_SIZE XX/g' Config.h
-#for nvu in 1 2 4 8
-#do
-#sed -i "s/define MPT_SIZE XX/define MPT_SIZE ${nvu} \/\/tmp/g" Config.h
-#make clean
-#make -j 8
-#echo nvu=${nvu}
-#ssh mic0 ./mkFit-mic --build-bh --num-thr 1 >& log_mic_10x20k_BH_NVU${nvu}_NTH1.txt
-#ssh mic0 ./mkFit-mic --build-ce --num-thr 1 >& log_mic_10x20k_CE_NVU${nvu}_NTH1.txt
-#ssh mic0 ./mkFit-mic --build-ce --num-thr 1 --cloner-single-thread >& log_mic_10x20k_CEST_NVU${nvu}_NTH1.txt
-#sed -i "s/define MPT_SIZE ${nvu} \/\/tmp/define MPT_SIZE XX/g" Config.h
-#done
-
-#sed -i "s/define MPT_SIZE XX/define MPT_SIZE 16/g" Config.h
+sed -i 's/# USE_INTRINSICS := -DMPT_SIZE=1/USE_INTRINSICS := -DMPT_SIZE=XX/g' Makefile.config
+for nvu in 1 2 4 8 16
+do
+sed -i "s/MPT_SIZE=XX/MPT_SIZE=${nvu}/g" Makefile.config
+make clean
+make -j 8
+echo nvu=${nvu}
+ssh mic0 ./mkFit-mic --build-bh --num-thr 1 >& log_mic_10x20k_BH_NVU${nvu}_NTH1.txt
+ssh mic0 ./mkFit-mic --build-ce --num-thr 1 >& log_mic_10x20k_CE_NVU${nvu}_NTH1.txt
+ssh mic0 ./mkFit-mic --build-ce --num-thr 1 --cloner-single-thread >& log_mic_10x20k_CEST_NVU${nvu}_NTH1.txt
+sed -i "s/MPT_SIZE=${nvu}/MPT_SIZE=XX/g" Makefile.config
+done
+sed -i 's/USE_INTRINSICS := -DMPT_SIZE=XX/# USE_INTRINSICS := -DMPT_SIZE=1/g' Makefile.config
 
 sed -i 's/\#define PRINTOUTS_FOR_PLOTS/\/\/\#define PRINTOUTS_FOR_PLOTS/g' mkFit/MkBuilder.cc