Changeset 87 in Idarraga

Timestamp:

Mar 11, 2011, 6:42:24 PM (13 years ago)

Author:

idarraga

Message:

 

Location:

allpix

Files:

• newdigitizer.sh (modified) (4 diffs)
• src/AllPixDetectorConstructionAppliances.cc (modified) (4 diffs)
• src/AllPixDetectorConstructionTestStructure.cc (modified) (1 diff)
• src/AllPixEventAction.cc (modified) (1 diff)
• src/AllPixTrackerSD.cc (modified) (4 diffs)

allpix/newdigitizer.sh

@@ -45 +45 @@
 sed "s|__|${nameFragment}|g" < include/${digiHeader} > include/${digiHeader}_new
 sed "s|AAAuthor|${authorS}|g" < include/${digiHeader}_new > include/${digiHeader}_new2
+rm -f include/${digiHeader}_new
 mv include/${digiHeader}_new2 include/${digiHeader}
 
@@ -50 +51 @@
 sed "s|__|${nameFragment}|g" < src/${digiImp} > src/${digiImp}_new
 sed "s|AAAuthor|${authorS}|g" < src/${digiImp}_new > src/${digiImp}_new2
+rm -f src/${digiImp}_new
 mv src/${digiImp}_new2 src/${digiImp}
 
@@ -55 +57 @@
 sed "s|__|${nameFragment}|g" < include/${digitizerHeader} > include/${digitizerHeader}_new
 sed "s|AAAuthor|${authorS}|g" < include/${digitizerHeader}_new > include/${digitizerHeader}_new2
+rm -f include/${digitizerHeader}_new
 mv include/${digitizerHeader}_new2 include/${digitizerHeader}
 
@@ -60 +63 @@
 sed "s|__|${nameFragment}|g" < src/${digitizerImp} > src/${digitizerImp}_new
 sed "s|AAAuthor|${authorS}|g" < src/${digitizerImp}_new > src/${digitizerImp}_new2
+rm -f src/${digitizerImp}_new
 mv src/${digitizerImp}_new2 src/${digitizerImp}
 
+### Proceed with activation of new digitizer at AllPixEventAction::SetupDigitizers()
+echo "[INFO] including new digitizer in the setup"
+# save old src/AllPixSetupDigitizers.cc file
+mv src/AllPixSetupDigitizers.cc src/AllPixSetupDigitizers.cc_save
+# copy headers and include the new one
+cp src/digitizers_base/AllPixSetupDigitizers.cc_headers src/AllPixSetupDigitizers.cc
+cat <<EOF>>src/AllPixSetupDigitizers.cc
+// Included by newdigitizer.sh script --> ${digiName}
+#include "${nameFragment}Digitizer.hh"
+EOF
+# copy the main code
+cat src/digitizers_base/AllPixSetupDigitizers.cc_head >> src/AllPixSetupDigitizers.cc
+# include new digi code
+cat <<EOF>>src/AllPixSetupDigitizers.cc
+// Included by newdigitizer.sh script --> ${digiName}
+else if (digitizerName == "${digiName}") {
+                        ${nameFragment}Digitizer * dp = new ${nameFragment}Digitizer(digitizerModulesNames[itr] , hcName, digitColectionName);
+                        dmPtr = static_cast<AllPixDigitizerInterface *> (dp);
+                        cout << "    Setting up a " << digitizerName << " digitizer for det : " << detectorId << endl;
+                }
+EOF
+# include the tail
+cat src/digitizers_base/AllPixSetupDigitizers.cc_tail >> src/AllPixSetupDigitizers.cc
+
+echo "*************************************************************************************"
+echo "README !!!"
+echo "1) please recompile allpix: gmake"
+echo "2) If you want to use this digitizer you need to call it in the detector description."
+echo "   The name of your new digitizer is: ${digiName}"
+echo "   I can be used in the corresponding tag, i.e: <digitizer>${digiName}</digitizer>"
+echo "    inside the file models/pixeldetector.xml which you should modify by hand."
+echo "*************************************************************************************"
+
+echo "[DONE]"

allpix/src/AllPixDetectorConstructionAppliances.cc

@@ -45 +45 @@
         // fit in.
 
-
         // Example
         G4cout << "Build Appliance " << G4endl;
@@ -51 +50 @@
         G4NistManager * nistman = G4NistManager::Instance();
         //G4Material * mat = nistman->FindOrBuildMaterial("G4_C");
-        G4Material * mat = nistman->FindOrBuildMaterial("G4_Al");
+        G4Material * mat = nistman->FindOrBuildMaterial("G4_POLYETHYLENE");
+
+        //G4_C
+        //G4_Al
+        //G4_LITHIUM_FLUORIDE
+        //G4_POLYETHYLENE
+
+        //std::vector<G4String> mats = nistman->GetNistMaterialNames();
+        //std::vector<G4String>::iterator itr = mats.begin();
+        //for( ; itr != mats.end() ; itr++) G4cout << *itr << G4endl;
 
         G4Box * appliance_box = new G4Box("Appliance_box",
@@ -69 +77 @@
         G4String appPhysS = "Appliance_";
         char temp[128];
+
+        // SD manager
+        G4SDManager * SDman = G4SDManager::GetSDMpointer();
 
         for( ; aplItr != m_posVectorAppliances.end() ; aplItr++) {
@@ -97 +108 @@
                                 0,
                                 true);
+
+                // Make this volume a sensitive device
+                // I get automatically a hits ROOT file for each device
+                AllPixTrackerSD * aTrackerSD = new AllPixTrackerSD( "NeutronSD",
+                                m_posVectorAppliances[detId],
+                                0);
+
+                SDman->AddNewDetector( aTrackerSD );
+                appliance_log->SetSensitiveDetector( aTrackerSD );
+
         }
 

allpix/src/AllPixDetectorConstructionTestStructure.cc

@@ -1 @@
-/**
+ /**
  * Author: John Idarraga <idarraga@cern.ch> , 2010
  *

allpix/src/AllPixEventAction.cc

@@ -28 +28 @@
 }
 
-void AllPixEventAction::SetupDigitizers(){
 
-        // Digit manager
-        G4DigiManager * fDM = G4DigiManager::GetDMpointer();
-
-        // geo description
-        extern ReadGeoDescription * g_GeoDsc; // already loaded ! :)
-        map<int, AllPixGeoDsc *> * geoMap = g_GeoDsc->GetDetectorsMap();
-
-        // I need as many digitizer as detectors.
-        // I decide that through the hitCollections
-        // There is one hit collection by detector
-        //  but not all of them are pixel detectors
-        G4SDManager * SDman = G4SDManager::GetSDMpointer();
-        G4HCtable * HCTable = SDman->GetHCtable();
-        m_nHC = HCTable->entries();
-        map<int, AllPixGeoDsc *>::iterator geoItr;
-        G4String digitizerName;
-        G4int detectorId;
-
-        for(G4int itr = 0 ; itr < m_nHC ; itr++)
-        {
-
-                G4String hcName = HCTable->GetHCname(itr);
-
-                // find the detector id for this digitizer in the detector db
-                bool found = false;
-                for( geoItr = geoMap->begin() ; geoItr != geoMap->end() ; geoItr++ ){
-                        if( hcName == (*geoItr).second->GetHitsCollectionName() ){
-                                digitizerName = (*geoItr).second->GetSensorDigitizer();
-                                detectorId = (*geoItr).first;
-                                found = true;
-                                break;
-                        }
-                }
-                if(!found){
-                        cout << "Couldn't find the detector in the list !!!??? "<< endl;
-                        exit(1);
-                }
-
-                G4String digitSuffix = "_";
-                digitSuffix += digitizerName;
-                digitSuffix += "Digitizer";
-                G4String digitizerModName = GetNewName(hcName, "HitsCollection", digitSuffix);
-
-                (*geoMap)[detectorId]->SetDigitCollectionName(digitizerModName);
-
-                // Check if this is a Box.  If it is not a Si wafer it doesn't need to be digitized
-                G4String searchS = "BoxSD";
-
-                if(!digitizerModName.contains("Box")){
-                        G4cout << "SD [" << hcName
-                                        << "] --> This is not a sensitive detector needing a Digitizer ! ... skipping"
-                                        << G4endl;
-                        continue;
-                }
-
-                // first check if this digitizer module is already there
-                vector<G4String>::iterator it;
-                it = find (digitizerModulesNames.begin(), digitizerModulesNames.end(), digitizerModName);
-
-                // If the digitizer module is in the list,
-                //  it means the digitizer was already created for this detector, jump !
-                G4cout << "SD [" << hcName << "] Attemping to build digitizer \""
-                                << digitizerModName << "\"" << G4endl;
-
-                if(it != digitizerModulesNames.end()) {
-                        G4cout << "WARNING : Digitizer module \"" << digitizerModName
-                                        << "\" was already created ... skipping." << G4endl;
-                        continue;
-                }
-
-                digitizerModulesNames.push_back(digitizerModName);
-
-                // Now build the digit Collection name
-                G4String digitColectionName = GetNewName(hcName,"HitsCollection","_DigitCollection");
-
-                // Creating an instance of the actual digitizer, and keep pointer through the interface
-                AllPixDigitizerInterface * dmPtr;
-                if (digitizerName == "FEI3Standard") {
-                        AllPixFEI3StandardDigitizer * dp = new AllPixFEI3StandardDigitizer(digitizerModulesNames[itr] , hcName, digitColectionName);
-                        dmPtr = static_cast<AllPixDigitizerInterface *> (dp);
-                        cout << "    Setting up a " << digitizerName << " digitizer for det : " << detectorId << endl;
-                } else if (digitizerName == "Medipix2") {
-                        AllPixMedipix2Digitizer * dp = new AllPixMedipix2Digitizer(digitizerModulesNames[itr] , hcName, digitColectionName);
-                        dmPtr = static_cast<AllPixDigitizerInterface *> (dp);
-                        cout << "    Setting up a " << digitizerName << " digitizer for det : " << detectorId << endl;
-                } else {
-                        G4cout << "    can't find digitizer with name : " << digitizerName << G4endl;
-                        exit(1);
-                }
-
-                ///////////////////////////////////////////////////////////
-                // Common task to all digitizers provided in the interface
-                // pass here the AllPixGeoDsc ptr
-                dmPtr->SetDetectorGeoDscPtr((*geoMap)[detectorId]);
-
-                // push back the digitizer
-                m_digiPtrs.push_back( dmPtr );
-                fDM->AddNewModule(m_digiPtrs[itr]);
-                m_nDigitizers++;
-
-        }
-
-}
 
 G4String AllPixEventAction::GetNewName(G4String oldName, G4String toErase, G4String toAppend){

allpix/src/AllPixTrackerSD.cc

@@ -71 +71 @@
         m_rotationOfWrapper = rot;
         m_gD = gD; // Geo description
+        m_thisIsAPixelDetector = true;
+}
+
+/*
+ * Second constructor for sensitive devices wich are
+ * not actual pixel detectors
+ */
+AllPixTrackerSD::AllPixTrackerSD(G4String name,
+                G4ThreeVector absPos,
+                G4RotationMatrix * rot)
+:G4VSensitiveDetector(name)
+{
+
+        m_thisHitsCollectionName = name + "_HitsCollection";
+        collectionName.insert( m_thisHitsCollectionName ); // only one hit collection per detector for now
+
+        // reduced set of parameters for a SD which is not a pixel detector
+        m_absolutePosOfWrapper = absPos;
+        m_relativePosOfSD = G4ThreeVector(0,0,0);
+        m_rotationOfWrapper = rot;
+        m_gD = 0x0; // Geo description
+        m_thisIsAPixelDetector = false;
 }
 
@@ -96 +118 @@
 }
 
+
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
@@ -110 +133 @@
         const G4TouchableHandle touchablepost = postStepPoint->GetTouchableHandle();
 
-        // This positions are global, I will bring them to pixel-centered frame
-        // I can use the physical volumes for that
-        G4ThreeVector prePos = preStepPoint->GetPosition();
-        G4ThreeVector postPos;
-
-        // Find the inverse rotation
-        G4RotationMatrix invRot = CLHEP::inverseOf(*m_rotationOfWrapper);
-
-        // Absolute center of Si wafer
-        G4ThreeVector absCenterOfDetector = m_absolutePosOfWrapper + m_relativePosOfSD;
-
-        // Bring the detector to the Origin
-        G4ThreeVector correctedPos = prePos;
-        correctedPos -= absCenterOfDetector;
-        // apply rotation !
-        correctedPos = invRot * correctedPos;
-
-        // Now let's finally provide pixel-centered coordinates for each hit
-        // Build the center of the Pixel
-        G4ThreeVector centerOfPixel(
-                        m_gD->GetPixelX()*TMath::FloorNint(correctedPos.x() / m_gD->GetPixelX()) + m_gD->GetHalfPixelX(),
-                        m_gD->GetPixelY()*TMath::FloorNint(correctedPos.y() / m_gD->GetPixelY()) + m_gD->GetHalfPixelY(),
-                        0.); // in the middle of the tower
-
-        // The position within the pixel !!!
-        correctedPos = correctedPos - centerOfPixel;
-        //G4cout << "correctedPos : " << correctedPos.x()/um << " " << correctedPos.y()/um
-        //         << " " << correctedPos.z()/um << " [um]" << G4endl;
-
-        // depth 1 --> x
-        // depth 0 --> y
-        G4int copyIDy_pre  = touchablepre->GetCopyNumber();
-        G4int copyIDx_pre  = touchablepre->GetCopyNumber(1);
+        G4int copyIDy_pre  = -1;
+        G4int copyIDx_pre  = -1;
         G4int copyIDy_post = -1;
         G4int copyIDx_post = -1;
-
+        G4ThreeVector correctedPos(0,0,0);
+
+        if(m_thisIsAPixelDetector){
+                // This positions are global, I will bring them to pixel-centered frame
+                // I can use the physical volumes for that
+                G4ThreeVector prePos = preStepPoint->GetPosition();
+
+
+                // Find the inverse rotation
+                G4RotationMatrix invRot = CLHEP::inverseOf(*m_rotationOfWrapper);
+
+                // Absolute center of Si wafer
+                G4ThreeVector absCenterOfDetector = m_absolutePosOfWrapper + m_relativePosOfSD;
+
+                // Bring the detector to the Origin
+                correctedPos = prePos;
+                correctedPos -= absCenterOfDetector;
+                // apply rotation !
+                correctedPos = invRot * correctedPos;
+
+                // Now let's finally provide pixel-centered coordinates for each hit
+                // Build the center of the Pixel
+                G4ThreeVector centerOfPixel(
+                                m_gD->GetPixelX()*TMath::FloorNint(correctedPos.x() / m_gD->GetPixelX()) + m_gD->GetHalfPixelX(),
+                                m_gD->GetPixelY()*TMath::FloorNint(correctedPos.y() / m_gD->GetPixelY()) + m_gD->GetHalfPixelY(),
+                                0.); // in the middle of the tower
+
+                // The position within the pixel !!!
+                correctedPos = correctedPos - centerOfPixel;
+                //G4cout << "correctedPos : " << correctedPos.x()/um << " " << correctedPos.y()/um
+                //         << " " << correctedPos.z()/um << " [um]" << G4endl;
+
+                // depth 1 --> x
+                // depth 0 --> y
+                copyIDy_pre  = touchablepre->GetCopyNumber();
+                copyIDx_pre  = touchablepre->GetCopyNumber(1);
+        }
         // Look at the touchablepost only if in the same volume, i.e. in the sensitive Si Box
         // If the hit is in a different pixel, it is still the same phys volume
         // The problem is that if I the postStep is in a different volume, GetCopyNumber(1)
         //  doesn't make sense anymore.
+        G4ThreeVector postPos(0,0,0);
         if(preStepPoint->GetPhysicalVolume() == postStepPoint->GetPhysicalVolume()){
                 postPos = postStepPoint->GetPosition();
@@ -222 +251 @@
 G4cout << "previous correctedPos : " << correctedPos.x()/um << " " << correctedPos.y()/um
                         << " " << correctedPos.z()/um << " [um]" << G4endl << G4endl;
-*/
-
+ */
+