Changeset 271 in Idarraga

Timestamp:

Mar 8, 2012, 3:29:02 PM (12 years ago)

Author:

idarraga

Message:

check detector id replicated

File:

• allpix/src/ReadGeoDescription.cc (modified) (5 diffs)

allpix/src/ReadGeoDescription.cc

@@ -13 +13 @@
 #include <TList.h>
 #include <TString.h>
+
+#include <set>
+using namespace std;
+
 
 // to be used as extern later
@@ -66 +70 @@
 G4int ReadGeoDescription::UseTheseDetectorsOnly(vector<G4int> useDetectors){
 
+        // Check for replicated sensors
+        set<G4int> checkIds;
+
         // first verify if all detectors are in the db
         vector<G4int>::iterator itr = useDetectors.begin();
@@ -76 +83 @@
                 }
 
-        }
+                if( checkIds.find(*itr) == checkIds.end()) { // not in the list all good
+                        checkIds.insert( *itr );
+                } else {
+                        G4cout << "[OOPS] detector with Id " << *itr << " duplicated in the macro ! please check your macro." << G4endl;
+                        G4cout << "       Allpix can't recover ... so long, and thanks for all the fish ;)" << G4endl;
+                        exit(1);
+                }
+
+        }
+
+        exit(1);
 
         // now erase what's not needed
@@ -348 +365 @@
 
                                 }
+        
                                 else if(m_currentNodeName == __sensor_Resistivity){
 
@@ -353 +371 @@
                                         m_detsGeo[m_firstIndx]->SetResistivity(val);
 
-                                }
-
-
+                                }                               
+                                
+                                
+                                else if(m_currentNodeName == __MIP_Tot_S){
+
+                                        float val = atoi(tempContent.c_str());
+                                        m_detsGeo[m_firstIndx]->SetMIPTot(val);
+
+                                }
+                                
+                                else if(m_currentNodeName == __MIP_Charge_S){
+
+                                        float val = atof(tempContent.c_str());
+                                        m_detsGeo[m_firstIndx]->SetMIPCharge(val);
+
+                                }
+                                                                
+                                else if(m_currentNodeName == __Counter_Depth_S){
+
+                                        float val = atoi(tempContent.c_str());
+                                        m_detsGeo[m_firstIndx]->SetCounterDepth(val);
+
+                                }                               
+
+                                else if(m_currentNodeName == __Clock_Unit_S){
+
+                                        float val = atof(tempContent.c_str());
+                                        m_detsGeo[m_firstIndx]->SetClockUnit(val);
+
+                                }                                       
+                                
+                                else if(m_currentNodeName == __Chip_Noise_S){
+
+                                        float val = atof(tempContent.c_str());
+                                        m_detsGeo[m_firstIndx]->SetChipNoise(val);
+
+                                }
+
+                                else if(m_currentNodeName == __Chip_Threshold_S){
+
+                                        float val = atof(tempContent.c_str());
+                                        m_detsGeo[m_firstIndx]->SetThreshold(val);
+
+                                }
+                                
+                                else if(m_currentNodeName == __Cross_Talk_S){
+
+                                        float val = atof(tempContent.c_str());
+                                        m_detsGeo[m_firstIndx]->SetCrossTalk(val);
+
+                                }
+                                                                
+
+                                else if(m_currentNodeName == __Saturation_Energy_S){
+
+                                        float val = atof(tempContent.c_str());
+                                        m_detsGeo[m_firstIndx]->SetSaturationEnergy(val);
+
+                                }
+                                                                
+                                
+                                
+                                
+                                
                         }
+                        
                         /*
                         if(StringIsRelevant(tempContent))