Changeset 55 in svn for trunk/src

Timestamp:

Nov 27, 2008, 3:05:11 PM (16 years ago)

Author:

severine ovyn

Message:

1file ->several

File:

• trunk/src/SmearUtil.cc (modified) (3 diffs)

trunk/src/SmearUtil.cc

@@ -427 +427 @@
                                          pow(ELG_Ccen*energy,2) + 
                                          pow(ELG_Scen*sqrt(energy),2) ));
-  } else { // outside the tracker
+  } 
+  if(fabs(electron.Eta()) > MAX_TRACKER && fabs(electron.Eta()) < MAX_CALO_FWD){
     energyS = gRandom->Gaus(energy, sqrt(
                                          pow(ELG_Nfwd,2) +
@@ -478 +479 @@
 
   energyS = ((energyS1>0)?energyS1:0) + ((energyS2>0)?energyS2:0);
-  } else { 
+  } 
+  if(abs(hadron.Eta()) > MAX_CALO_CEN && fabs(hadron.Eta()) < MAX_CALO_FWD){ 
     energyS = gRandom->Gaus(energy, sqrt(
                             pow(HAD_Nhf,2) +
                             pow(HAD_Chf*energy,2) +
                             pow(HAD_Shf*sqrt(energy),2) ));
-  }
+}
+  
 
 
@@ -602 +605 @@
 }
 
-
-float Charge(const long int pid) {
-   // source: RPP chap 34 Monte Carlo Particle Numbering Scheme
-/*   switch (abs(pid)) {
-        case 1: case 3: case 5: case 7: return (float) sign(pid)*(-1/3); break;   // d, s, b, b'
-        case 2: case 4: case 6: case 8: return (float) sign(pid)*2/3; break;      // u, c, t, t'
-
-        case 11: case 13: case 15:      return (float) sign(pid)*(-1); break;     // e, mu, tau
-        case 12: case 14: case 16:      return (float) 0; break;     // nu_e, nu_mu, nu_tau
-
-        case 9: case 21: case 22: case 23: case 25: 
-                case 32: case 33: case 35: case 36: return (float) 0; break; // neutral gauge/higgs bosons
-        case 24: case 34: case 37: return (float) sign(pid); break; // charged gauge/higgs bosons
-   }
-*/
-        return 0;
-}
+int Charge(int pid)
+{
+  int charge;
+  if(
+     (pid == pGAMMA)    ||
+     (pid == pPI0)      ||
+     (pid == pK0L)      ||
+     (pid == pN)        ||
+     (pid == pSIGMA0)   ||
+     (pid == pDELTA0)   ||
+     (pid == pK0S)   // not charged particles : invisible by tracker
+     )
+    charge = 0;
+  else charge = (sign(pid));
+cout<<"charge "<<charge<<endl;
+  return charge;
+            
+}