ss

Tools/BM07Raytracing.py

@@ -23,28 +23,17 @@ bm07.SHIFT_ANG_SOURCE = args.beam_ang
 bm07.SHIFT_ALT_SL0 = args.SL0
 bm07.SHIFT_ALT_M1 = args.M1
 bm07.SHIFT_ALT_MOVEH = args.MOVEH
-<<<<<<< HEAD
 bm07.NB_BEAM = 100
-=======
-bm07.NB_BEAM = 1000
->>>>>>> 1d06cd8f5fbf3b4ccd21ff8a906265288f1c0f39
 
 dataX = [-4, -3.5, -3, -2.5, -2, -1.5, -1, -0.5, 0, 0.5, 1, 1.5, 2, 2.5, 3, 3.5, 4]
 P_Source, photon_distribution, angles_distribution = bm07.creation_source()
 
-<<<<<<< HEAD
 diodeList = []
 for shift in dataX:   
     AllObject = bm07.create_geometry()
     nbHit, nbHitWeighted, rayons, rayons_w, hauteurFluo3 = bm07.propagation(AllObject, P_Source, photon_distribution, angles_distribution)
     print("SHIFT, NB HIT IN DIODE = ", shift, nbHit)
     diodeList.append(nbHitWeighted)
-=======
-arglist=[]
-for shift in dataX:
-    geometry = bm07.create_geometry(shift)
-    arglist.append([geometry,  P_Source, photon_distribution, angles_distribution])
->>>>>>> 1d06cd8f5fbf3b4ccd21ff8a906265288f1c0f39
 
 with Pool() as p: 
     nbHits, nbHitWeighteds, rayonss, rayons_ws = zip(*p.starmap(bm07.propagation, arglist))