Changeset 210 in Idarraga

Timestamp:

Jul 15, 2011, 2:00:46 PM (13 years ago)

Author:

benoit

Message:

Fixed Digitizer for FEI4

Location:

allpix

Files:

• flags.gmk (modified) (1 diff)
• macros/telescope1_Inventor_vis.in (modified) (3 diffs)
• models/pixeldetector.xml (modified) (1 diff)
• src/AllPixDetectorConstruction.cc (modified) (1 diff)
• src/AllPixFEI3StandardDigitizer.cc (modified) (10 diffs)

allpix/flags.gmk

@@ -1 +1 @@
 # ROOT paths and libs
 INCFLAGS += $(shell $(ROOTSYS)/bin/root-config --cflags)
-LDLIBS   += $(shell $(ROOTSYS)/bin/root-config --libs) -lGeom -lVMC -lEG -lXMLIO -lXMLParser
+LDLIBS   += $(shell $(ROOTSYS)/bin/root-config --libs) -lGeom -lVMC -lEG -lXMLIO -lXMLParser -ljpeg -lFL -limage
 
 # If OpenInventor is installed in user-space from vp1 snapshot

allpix/macros/telescope1_Inventor_vis.in

@@ -134 +134 @@
 ####################################################################
 # Bz field
-/allpix/extras/setPeakField 3.0 tesla
+#/allpix/extras/setPeakField 3.0 tesla
 
 ####################################################################
@@ -145 +145 @@
 /vis/viewer/set/style s
 
-/vis/open OIX 1024x768-100+100
+#/vis/open OIX 1024x768-100+100
 #/vis/open OGLIXm 1024x768-100+100
 
@@ -152 +152 @@
 #/vis/open OGLSQt
 #/vis/open OIX
-#/vis/open OGLIX 1024x768-100+100
+/vis/open OGLIX 1024x768-100+100
 #/vis/open OGLSXm
 #/vis/open DAWNFILE

allpix/models/pixeldetector.xml

@@ -87 +87 @@
 <pixeldet id="200,201">
 
-<digitizer>Medipix2</digitizer>
+<digitizer>FEI3Standard</digitizer>
 
 <npix_x>80</npix_x>

allpix/src/AllPixDetectorConstruction.cc

@@ -719 +719 @@
 
                 // FIXME !!! --> feed this value from the macro
-                m_magField = new MorourgoMagField(fieldValue, 252.5*mm);
+                //m_magField = new MorourgoMagField(fieldValue, 252.5*mm);
 
                 //m_magField = new G4UniformMagField(G4ThreeVector(0., fieldValue, 0.));

allpix/src/AllPixFEI3StandardDigitizer.cc

@@ -166 +166 @@
          */
 
+//      double calib_A=1;
+//      double calib_B=1;
+//      double calib_C=1;
+
         FEIX = 4;
 
@@ -175 +179 @@
                 CounterDepth=255;
                 Lv1Unit = 25*ns;
-                chipNoise = 300*elec;
-                m_digitIn.thl = 3500*elec;
-                chargeSharingConstant =0.0;
+                chipNoise = 300;
+                m_digitIn.thl = 3500;
+                chargeSharingConstant = 0.0;
                 break;
 
@@ -185 +189 @@
                 MipCharge=40000;
                 CounterDepth=15;
-                Lv1Unit = 25*ns;
+                Lv1Unit = 25;
                 chipNoise = 125*elec;
                 m_digitIn.thl = 3200*elec;
-                chargeSharingConstant =0.02;
+                chargeSharingConstant =0.0;
                 break;
 
@@ -460 +464 @@
                 // Hit Info
                 //Ugly Hack !!!
-                if(xpos>0)xpos=-pitchX/2+xpos;
-                else xpos=pitchX/2+xpos;
+                //if(xpos>0)xpos=-pitchX/2+xpos;
+                //else xpos=pitchX/2+xpos;
 
                 G4double zpos = CLHEP::RandGauss::shoot(zpos,10*um);
@@ -498 +502 @@
                 //if(fabs(xpos)>=pitchX/2.-10*sigma && fabs(ypos)>pitchY/2.0-10*sigma){
 
-                if( (fabs(xpos) >= pitchX/2.-6*sigma || fabs(ypos) >=pitchY/2.-6*sigma) ){
+                if( (fabs(xpos) >= pitchX/2.-3*sigma || fabs(ypos) >=pitchY/2.-3*sigma) ){
 
 //              if( (fabs(xpos) >= pitchX/2.-3*sigma || fabs(ypos) >=pitchY/2.-3*sigma) ){
@@ -555 +559 @@
                                 };
 
-
-
-
-//              if(xpos - maxIntegration < -pitchX/2){ // left pixel
-//                      extraPixel.first -= 1;
-//                      if(extraPixel.first >= 0){
-//                              pixelsContent[extraPixel] += eHit/10.;
-//                      }
-//              }else if(xpos + maxIntegration > pitchX/2){ // right
-//                      extraPixel.first += 1;
-//                      if(extraPixel.first < 18){
-//                              pixelsContent[extraPixel] += eHit/10.;
-//                      }
-//              }else if(ypos - maxIntegration < -pitchY/2){ // up
-//                      extraPixel.second += 1;
-//                      if(extraPixel.second < 164){
-//                              pixelsContent[extraPixel] += eHit/10.;
-//                      }
-//              }else if(ypos + maxIntegration > pitchY/2){ // down
-//                      extraPixel.second -= 1;
-//                      if(extraPixel.second >= 0){
-//                              pixelsContent[extraPixel] += eHit/10.;
-//                      }
-//              }else{}
-
-                //G4cout << "Sigma : " << sigma << G4endl;
-                // Let's integrate up to 3 sigma
-                //G4double nCharges = (*hitsCollection)[itr]->GetEdep()/3.6; // [eV]
-                /*
-                // Integrate in X
-                f1->SetParameters((*hitsCollection)[itr]->GetPosWithRespectToPixel().x(),
-                                sigma);
-                f1->Integral(0, (*hitsCollection)[itr]->GetPosWithRespectToPixel().x() + maxIntegration);
-
-                // Integrate in Y
-                f1->SetParameters((*hitsCollection)[itr]->GetPosWithRespectToPixel().y(),
-                                sigma);
-                f1->Integral(0, (*hitsCollection)[itr]->GetPosWithRespectToPixel().y() + maxIntegration);
-                 */
-
-                // Is here a good place to calculate the charge sharing ?
-//              G4double erfVal = Erf(eHit);
-                //G4cout << eHit << " : " << erfVal << G4endl;
-                //G4cout << "  pre  " << tempPixel.first << ", " << tempPixel.second << G4endl;
-                //G4cout << "  post " << postPosX << ", " << postPosY << G4endl;
-
         }
 
-
+        }
         // Now create digits.  One per pixel
         map<pair<G4int, G4int>, G4double >::iterator pCItr = pixelsContent.begin();
@@ -619 +577 @@
                         digit->SetPixelIDX((*pCItr).first.first);
                         digit->SetPixelIDY((*pCItr).first.second);
-                        digit->SetPixelCounts(EnergyToTOT((*pCItr).second,threshold));
+                        digit->SetPixelCounts(EnergyToTOT((*pCItr).second/elec,threshold));
                         //digit->IncreasePixelCounts(); // Counting mode
-                        cout << "TOT= "<< EnergyToTOT((*pCItr).second,threshold) << endl;
-                        cout << "Energy= "<< (*pCItr).second/elec << endl;
+                        //cout << "TOT= "<< EnergyToTOT((*pCItr).second/elec,threshold/elec) << endl;
+                        //cout << "Energy= "<< (*pCItr).second/elec << endl;
 
                         // MC only //
@@ -636 +594 @@
         }
 
-        }
+
 
         G4int dc_entries = m_digitsCollection->entries();
@@ -751 +709 @@
 {
 
-        G4double dEdt = (MipCharge*elec- threshold)/(MipTOT*Lv1Unit);
+        G4double dEdt = (MipCharge- threshold)/(MipTOT*Lv1Unit);
         //G4int TOT = TMath::FloorNint((Energy-threshold)/(dEdt*Lv1Unit*ns));
         G4int TOT = TMath::FloorNint((Energy-threshold)/(dEdt*Lv1Unit));
@@ -763 +721 @@
 
 
+//G4int AllPixFEI3StandardDigitizer::EnergyToTOTFEI4(G4double Energy, G4double threshold)
+//{
+//      double ToT=(1.0/(Energy+calib_C)+ calib_A)*calib_B;
+//
+//      return TMath::Floor(ToT);
+//}
 
 //______________________________________________________________________________