Changeset 140 in Idarraga for allpix

Timestamp:

Apr 15, 2011, 11:13:03 AM (13 years ago)

Author:

benoit

Message:

 

Location:

allpix

Files:

• include/AllPixFEI3StandardDigitizer.hh (modified) (1 diff)
• src/AllPixFEI3StandardDigitizer.cc (modified) (4 diffs)

allpix/include/AllPixFEI3StandardDigitizer.hh

@@ -128 +128 @@
   //G4double maxIntegration = 5; //
 
+   G4double sigma;
+
+
 
 };

allpix/src/AllPixFEI3StandardDigitizer.cc

@@ -170 +170 @@
 
 
-         FEI3
-         FEI4, SlimEdge or Conservative
-         Omegapix2
+         1=FEI3
+         2,3= FEI4, SlimEdge or Conservative
+         4=Omegapix2
          Default = FEI3
 
          */
-        Sensor = "FEI3";
+        Sensor = 1;
 
         switch (Sensor) {
 
-        case "FEI3" :
+        case 1 :
                 doSlimEdge=false;
                 GRShift =0*um;
-        case "FEI4-Conservative" :
+        case 2 :
                 doSlimEdge=true;
                 GRShift =250*um;
-        case "FEI4-SlimEdge" :
+        case 3 :
                 doSlimEdge=true;
                 GRShift =500*um;
-        case "OmegaPix2" :
+        case 4 :
                 doSlimEdge=true;
                 GRShift =500*um;
@@ -367 +367 @@
                 G4double ypos = (*hitsCollection)[itr]->GetPosWithRespectToPixel().y();
                 G4double zpos = (*hitsCollection)[itr]->GetPosWithRespectToPixel().z();
-                G4double sigma;
                 G4double driftTime;
                 if(doFullField==false){
@@ -657 +656 @@
                 if((xpos+pitchX/2. < GRShift))eEdge = eHit*(1-0.5*(xpos+pitchX/2)/(100*um));
                 else{eEdge=eHit;};
-                if(!isSingleHit){
-                Etemp = IntegrateGaussian(xpos/nm,ypos/nm,sigma/nm,(-pitchX/2.0 + i*pitchX)/nm,(-pitchX/2.+(i+1)*pitchX)/nm,(-pitchY/2 + j*pitchY)/nm,(-pitchY/2 + (j+1)*pitchY)/nm, eEdge );
-                }
-                else
-                {
                 Etemp=eEdge;
-                }
                 }
 
@@ -669 +662 @@
                 if((pitchX/2.-xpos < GRShift))eEdge = eHit*(1-0.5*(pitchX/2.-xpos)/(100*um));
                 else{eEdge=eHit;};
-
-                if(!isSingleHit){
-                        Etemp = IntegrateGaussian(xpos/nm,ypos/nm,sigma/nm,(-pitchX/2.0 + i*pitchX)/nm,(-pitchX/2.+(i+1)*pitchX)/nm,(-pitchY/2 + j*pitchY)/nm,(-pitchY/2 + (j+1)*pitchY)/nm, eEdge );
-                }
-                else
-                {
-                        Etemp=eEdge;
-                }
+                Etemp=eEdge;
 
         }